From 56318eba117619fc18ea651734700dc6edb8b31e Mon Sep 17 00:00:00 2001 From: Chad Fowler Date: Wed, 9 Jun 2004 00:50:29 +0000 Subject: [PATCH] Fixed a problem due to a method name change on Version::Requirement git-svn-id: svn+ssh://rubyforge.org/var/svn/rubygems/trunk@293 3d4018f9-ac1a-0410-99e9-8a154d859a19 --- rubygems/ChangeLog | 3 +++ rubygems/examples/application/an-app.gemspec | 1 + rubygems/lib/rubygems.rb | 6 +++--- rubygems/lib/rubygems/specification.rb | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/rubygems/ChangeLog b/rubygems/ChangeLog index 22e46e2b..df4750ff 100644 --- a/rubygems/ChangeLog +++ b/rubygems/ChangeLog @@ -1,3 +1,6 @@ +2004-06-07 Chad Fowler + * Fixed bug caused by method change on Version::Requirement + 2004-06-08 Rich Kilmer * fixed bug in doc_manager.rb whereby the extra_rdoc_files should be appended to the list of directories prior to prepending the diff --git a/rubygems/examples/application/an-app.gemspec b/rubygems/examples/application/an-app.gemspec index e2bacd0e..cf7b54f8 100644 --- a/rubygems/examples/application/an-app.gemspec +++ b/rubygems/examples/application/an-app.gemspec @@ -8,6 +8,7 @@ spec = Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.summary = "This gem demonstrates executable scripts" s.requirements << 'a computer processor' + s.add_dependency("session", "> 0.0.0") s.files = Dir.glob("lib/**/*").delete_if {|item| item.include?("CVS")} s.files.concat Dir.glob("bin/**/*").delete_if {|item| item.include?("CVS")} s.require_path = 'lib' diff --git a/rubygems/lib/rubygems.rb b/rubygems/lib/rubygems.rb index d052b9d9..cdd6e646 100644 --- a/rubygems/lib/rubygems.rb +++ b/rubygems/lib/rubygems.rb @@ -17,7 +17,7 @@ def require_gem(gem, *version_requirements) unless version_requirements.size > 0 version_requirements = ["> 0.0.0"] end - unless gem.respond_to?(:name) && gem.respond_to?(:version_requirement) + unless gem.respond_to?(:name) && gem.respond_to?(:version_requirements) gem = Gem::Dependency.new(gem, version_requirements) end @@ -25,9 +25,9 @@ def require_gem(gem, *version_requirements) if matches.size==0 matches = Gem.cache.search(gem.name) if matches.size==0 - raise LoadError.new("\nCould not find RubyGem #{gem.name} (#{gem.version_requirement})\n") + raise LoadError.new("\nCould not find RubyGem #{gem.name} (#{gem.version_requirements})\n") else - raise LoadError.new("\nRubyGem version error: #{gem.name}(#{matches.first.version} not #{gem.version_requirement.version})\n") + raise LoadError.new("\nRubyGem version error: #{gem.name}(#{matches.first.version} not #{gem.version_requirements})\n") end else # Get highest matching version diff --git a/rubygems/lib/rubygems/specification.rb b/rubygems/lib/rubygems/specification.rb index d8e11c50..d306e0dc 100644 --- a/rubygems/lib/rubygems/specification.rb +++ b/rubygems/lib/rubygems/specification.rb @@ -275,7 +275,7 @@ def platform=(platform=Gem::Platform::RUBY) # requirement:: [default="> 0.0.0"] The version requirement. # def add_dependency(gem, requirement="> 0.0.0") - unless gem.respond_to?(:name) && gem.respond_to?(:version_requirement) + unless gem.respond_to?(:name) && gem.respond_to?(:version_requirements) gem = Dependency.new(gem, requirement) end dependencies << gem @@ -375,7 +375,7 @@ def to_ruby result << " s.requirements.concat [" + (requirements.collect {|req| '%q{'+req+'}'}).join(', ') + "]\n" end dependencies.each do |dep| - result << " s.add_dependency(%q{" + dep.name + "}, %q{" + dep.version_requirement.to_s + "})\n" + result << " s.add_dependency(%q{" + dep.name + "}, %q{" + dep.version_requirements.to_s + "})\n" end result << " s.files = [" + (files.collect {|f| '"' + f + '"'}).join(', ') + "]\n" if require_paths