Author: toulmean
Date: Tue Oct 12 13:47:11 2010
New Revision: 1021773
URL: http://svn.apache.org/viewvc?rev=1021773&view=rev
Log:
fix for BUILDR-528 Stop using deprecated method
Gem::Dependency.version_requirements correctly
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/rakelib/setup.rake
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1021773&r1=1021772&r2=1021773&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Tue Oct 12 13:47:11 2010
@@ -13,6 +13,7 @@
repositories.release_to (Peter Donald)
* Fixed: BUILDR-526 Gracefully handle h2 sections with no id in documentation
(Peter Donald)
* Fixed: BUILDR-527 package(:war) if libs passed are files (instead of
artifacts)
+* Fixed: BUILDR-528 Stop using deprecated method
Gem::Dependency.version_requirements correctly (Peter Donald)
* Fixed: JavaRebel was previously not correctly detected.
1.4.2 (2010-09-18)
Modified: buildr/trunk/rakelib/setup.rake
URL:
http://svn.apache.org/viewvc/buildr/trunk/rakelib/setup.rake?rev=1021773&r1=1021772&r2=1021773&view=diff
==============================================================================
--- buildr/trunk/rakelib/setup.rake (original)
+++ buildr/trunk/rakelib/setup.rake Tue Oct 12 13:47:11 2010
@@ -36,7 +36,7 @@ def install_gem(name, options = {})
args << 'sudo' << 'env' << "JAVA_HOME=#{ENV['JAVA_HOME']}" if sudo_needed?
and RAKE_SUDO
args << rb_bin << '-S' << 'gem' << 'install' << name
- if (spec.respond_to? :requirement)
+ if (dep.respond_to? :requirement)
args << '--version' << dep.requirement.to_s
else
# Dependency.version_requirements deprecated in rubygems 1.3.6
@@ -56,7 +56,7 @@ desc "If you're building from sources, r
task :setup do
missing = spec.dependencies.select { |dep|
Gem::SourceIndex.from_installed_gems.search(dep).empty? }
missing.each do |dep|
- if (spec.respond_to? :requirement)
+ if (dep.respond_to? :requirement)
install_gem dep.name, :version=>dep.requirement
else
# Dependency.version_requirements deprecated in rubygems 1.3.6
