slimgems 1.3.9.3 → 1.3.9.4

data/lib/rubygems.rb

@@ -106,7 +106,7 @@ require 'thread'
 module Gem
   NAME = 'SlimGems'
   GEM_NAME = 'slimgems'
-  VERSION = '1.3.9.3'
+  VERSION = '1.3.9.4'
   SlimGemsVersion = RubyGemsVersion = VERSION
 
   ##

data/lib/rubygems/dependency_installer.rb

@@ -149,12 +149,27 @@ class Gem::DependencyInstaller
           results = find_gems_with_sources(dep).reverse
 
           results.reject! do |dep_spec,|
-            to_do.push dep_spec
-
-            @source_index.any? do |_, installed_spec|
-              dep.name == installed_spec.name and
-                dep.requirement.satisfied_by? installed_spec.version
+            dep_met = false
+            installed_dep_spec = nil
+
+            @source_index.each do |_, installed_spec|
+              if (dep.name == installed_spec.name) && (dep.requirement.satisfied_by?(installed_spec.version))
+                installed_dep_spec = installed_spec
+                dep_met = true
+                break
+              end
+            end
+            
+            if !dep_met
+              to_do.push dep_spec
+            else
+              # Since we resolve dependencies transitively, if this installed
+              # gem is missing some dependencies, go ahead and try to do it,
+              # but for this exact version.
+              to_do.push installed_dep_spec
             end
+
+            dep_met
           end
 
           results.each do |dep_spec, source_uri|

data/test/test_gem_dependency_installer.rb

@@ -147,6 +147,34 @@ class TestGemDependencyInstaller < RubyGemTestCase
 
     assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
   end
+  
+  def test_install_dependencies_earliest_satisfied
+    r1, r1_gem = util_gem 'r', '1'
+    q1, q1_gem = util_gem 'q', '1'
+    q2, q2_gem = util_gem 'q', '2' do |s|
+      s.add_dependency 'r'
+    end
+    e1, e1_gem = util_gem 'e', '1' do |s|
+      s.add_dependency 'q', '>= 1'
+    end
+
+    FileUtils.rm_rf File.join(@gemhome, 'gems')
+    Gem.source_index.refresh!
+
+    FileUtils.mv e1_gem, @tempdir # not in index
+    FileUtils.mv q1_gem, @tempdir # not in index
+    FileUtils.mv q2_gem, @tempdir # not in index
+    FileUtils.mv r1_gem, @tempdir # not in index
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new
+      inst.install 'q-1'
+      inst.install 'e-1'
+    end
+
+    installed = Gem::SourceIndex.from_installed_gems.map { |n,s| s.full_name }
+    assert_equal %w[e-1 q-1], installed
+  end
 
   def test_install_dependency
     FileUtils.mv @a1_gem, @tempdir

data/test/test_gem_specification.rb

@@ -132,46 +132,49 @@ end
   def test_self_load_escape_curly
     @a2.name = 'a};raise "improper escaping";%q{'
 
-    full_path = @a2.spec_file
-    write_file full_path do |io|
-      io.write @a2.to_ruby_for_cache
+    full_path = nil
+    write_file @a2.spec_name do |io|
+      full_path = io.path
+      io.write @a2.to_ruby
     end
 
     spec = Gem::Specification.load full_path
 
-    @a2.files.clear
-
     assert_equal @a2, spec
+
+    @a2.files.clear
   end
 
   def test_self_load_escape_interpolation
     @a2.name = 'a#{raise %<improper escaping>}'
 
-    full_path = @a2.spec_file
-    write_file full_path do |io|
-      io.write @a2.to_ruby_for_cache
+    full_path = nil
+    write_file @a2.spec_name do |io|
+      full_path = io.path
+      io.write @a2.to_ruby
     end
 
     spec = Gem::Specification.load full_path
 
-    @a2.files.clear
-
     assert_equal @a2, spec
+
+    @a2.files.clear
   end
 
   def test_self_load_escape_quote
     @a2.name = 'a";raise "improper escaping";"'
 
-    full_path = @a2.spec_file
-    write_file full_path do |io|
-      io.write @a2.to_ruby_for_cache
+    full_path = nil
+    write_file @a2.spec_name do |io|
+      full_path = io.path
+      io.write @a2.to_ruby
     end
 
     spec = Gem::Specification.load full_path
 
-    @a2.files.clear
-
     assert_equal @a2, spec
+
+    @a2.files.clear
   end
 
   def test_self_load_legacy_ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimgems
 version: !ruby/object:Gem::Version
-  version: 1.3.9.3
+  version: 1.3.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000 -04:00
+date: 2012-01-08 00:00:00.000000000 -05:00
 default_executable: 
 dependencies: []
 description: ! "SlimGems is a drop-in replacement for RubyGems, a package management
@@ -216,7 +216,7 @@ files:
 has_rdoc: true
 homepage: http://slimgems.github.com
 licenses: []
-post_install_message: ! "Upgraded from RubyGems to SlimGems 1.3.9.3\n\uFEFF=== 1.3.9.3
+post_install_message: ! "Upgraded from RubyGems to SlimGems 1.3.9.4\n\uFEFF=== 1.3.9.3
   / 2011-09-07\n\nSlimGems is a drop-in replacement for RubyGems. See README.md for
   more.\n\n* Add support for Ruby 1.9.3 preview release (#9)\n* Fix rubygems-pwn gem
   install remote execution vulnerability (#10)\n\n"
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.3.9.2
+rubygems_version: 1.3.9.3
 signing_key: 
 specification_version: 3
 summary: SlimGems is a package management framework for Ruby