Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
chad committed Jun 9, 2004
1 parent 286d91a commit 56318eb
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
3 changes: 3 additions & 0 deletions rubygems/ChangeLog
@@ -1,3 +1,6 @@
2004-06-07 Chad Fowler <chad@chadfowler.com>
* Fixed bug caused by method change on Version::Requirement

2004-06-08 Rich Kilmer <rich@infoether.com>
* fixed bug in doc_manager.rb whereby the extra_rdoc_files should
be appended to the list of directories prior to prepending the
Expand Down
1 change: 1 addition & 0 deletions rubygems/examples/application/an-app.gemspec
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions rubygems/lib/rubygems.rb
Expand Up @@ -17,17 +17,17 @@ 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

matches = Gem.cache.search(gem.name, 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
Expand Down
4 changes: 2 additions & 2 deletions rubygems/lib/rubygems/specification.rb
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 56318eb

Please sign in to comment.