Author: toulmean
Date: Tue Jun 29 20:37:52 2010
New Revision: 959092

URL: http://svn.apache.org/viewvc?rev=959092&view=rev
Log:
remove annoying warning message from rubygems, and make sure to only check for 
runtime dependencies

Modified:
    buildr/trunk/_buildr
    buildr/trunk/_jbuildr

Modified: buildr/trunk/_buildr
URL: 
http://svn.apache.org/viewvc/buildr/trunk/_buildr?rev=959092&r1=959091&r2=959092&view=diff
==============================================================================
--- buildr/trunk/_buildr (original)
+++ buildr/trunk/_buildr Tue Jun 29 20:37:52 2010
@@ -20,8 +20,12 @@
 require 'rubygems'
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib') << 
File.join(File.dirname(__FILE__), 'addon')
 spec = Gem::Specification.load(File.join(File.dirname(__FILE__), 
'buildr.gemspec'))
+# To avoid a warning about the version_requirements deprecation, we use this 
method inline.
+def version_required(gem_def)
+  return Gem::Dependency.instance_methods.include?("requirement") ? 
gem_def.requirement : gem_def.version_requirements
+end
 spec.dependencies.each do |dep|
-  gem dep.name, dep.version_requirements.to_s
+  gem dep.name, version_required(dep).to_s if dep.type == :runtime
 end
 Gem.loaded_specs['buildr'] = spec # Prevents RubyGem from loading files from 
installed Buildr gems
 

Modified: buildr/trunk/_jbuildr
URL: 
http://svn.apache.org/viewvc/buildr/trunk/_jbuildr?rev=959092&r1=959091&r2=959092&view=diff
==============================================================================
--- buildr/trunk/_jbuildr (original)
+++ buildr/trunk/_jbuildr Tue Jun 29 20:37:52 2010
@@ -20,8 +20,12 @@
 require 'rubygems'
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib') << 
File.join(File.dirname(__FILE__), 'addon')
 spec = Gem::Specification.load(File.join(File.dirname(__FILE__), 
'buildr.gemspec'))
+# To avoid a warning about the version_requirements deprecation, we use this 
method inline.
+def version_required(gem_def)
+  return Gem::Dependency.instance_methods.include?("requirement") ? 
gem_def.requirement : gem_def.version_requirements
+end
 spec.dependencies.each do |dep|
-  gem dep.name, dep.version_requirements.to_s
+  gem dep.name, version_required(dep).to_s if dep.type == :runtime
 end
 Gem.loaded_specs['buildr'] = spec # Prevents RubyGem from loading files from 
installed Buildr gems
 


Reply via email to