rubygems-update 1.6.1 → 1.6.2

data/History.txt

@@ -1,4 +1,12 @@
-=== 1.6.1 / 2011-03-03
+=== 1.6.2 / 2011-03-08
+
+Bug Fixes:
+
+* require of an activated gem could cause activation conflicts.  Fixes
+  Bug #29056 by Dave Verwer.
+* `gem outdated` now works with up-to-date prerelease gems.
+
+=== 1.6.1 / 2011-03-03
 
 Bug Fixes:
 

data/README.rdoc

@@ -23,8 +23,7 @@ See UPGRADING.rdoc for more details and alternative instructions.
 
 -----
 
-If you don't have any RubyGems install, there is still the pre-gem approach to
-getting software, doing it manually:
+If you don't have RubyGems installed, your can still do it manually:
 
 * Download from: https://rubygems.org/pages/download
 * Unpack into a directory and cd there
@@ -38,11 +37,11 @@ For more details and other options, see:
 
 === Support Requests
 
-Are you unsure of how to use rubygems?  Do you think you've found a bug and
+Are you unsure of how to use RubyGems?  Do you think you've found a bug and
 you're not sure?  If that is the case, the best place for you is to file a
 support request at {help.rubygems.org}[http://help.rubygems.org].
 
-=== Filing tickets
+=== Filing Tickets
 
 You're sure you've found a bug!  But where do you let us know?  The best place
 for letting the RubyGems team know about bugs you've found is {on the rubygems

data/lib/rubygems.rb

@@ -118,7 +118,7 @@ require 'rbconfig'
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -252,6 +252,7 @@ module Gem
       # list of candidate gems, then we have a version conflict.
       existing_spec = @loaded_specs[dep.name]
 
+      # TODO: unless dep.matches_spec? existing_spec then
       unless matches.any? { |spec| spec.version == existing_spec.version } then
         sources_message = sources.map { |spec| spec.full_name }
         stack_message = @loaded_stacks[dep.name].map { |spec| spec.full_name }

data/lib/rubygems/commands/outdated_command.rb

@@ -19,12 +19,13 @@ class Gem::Commands::OutdatedCommand < Gem::Command
     locals = Gem::SourceIndex.from_installed_gems
 
     locals.outdated.sort.each do |name|
-      local = locals.find_name(name).last
-
-      dep = Gem::Dependency.new local.name, ">= #{local.version}"
+      local   = locals.find_name(name).last
+      dep     = Gem::Dependency.new local.name, ">= #{local.version}"
       remotes = Gem::SpecFetcher.fetcher.fetch dep
-      remote = remotes.last.first
 
+      next if remotes.empty?
+
+      remote = remotes.last.first
       say "#{local.name} (#{local.version} < #{remote.version})"
     end
   end

data/lib/rubygems/custom_require.rb

@@ -35,15 +35,20 @@ module Kernel
     if Gem.unresolved_deps.empty? or Gem.loaded_path? path then
       gem_original_require path
     else
-      specs = Gem.searcher.find_in_unresolved path
-      unless specs.empty? then
-        specs = [specs.last]
-      else
-        specs = Gem.searcher.find_in_unresolved_tree path
-      end
+      spec = Gem.searcher.find_active path
+
+      unless spec then
+        found_specs = Gem.searcher.find_in_unresolved path
+        unless found_specs.empty? then
+          found_specs = [found_specs.last]
+        else
+          found_specs = Gem.searcher.find_in_unresolved_tree path
+        end
 
-      specs.each do |spec|
-        Gem.activate spec.name, spec.version # FIX: this is dumb
+        found_specs.each do |found_spec|
+          # FIX: this is dumb, activate a spec instead of name/version
+          Gem.activate found_spec.name, found_spec.version
+        end
       end
 
       return gem_original_require path

data/lib/rubygems/gem_path_searcher.rb

@@ -50,6 +50,14 @@ class Gem::GemPathSearcher
     end
   end
 
+  def find_active(glob)
+    # HACK violation of encapsulation
+    @gemspecs.find do |spec|
+      # TODO: inverted responsibility
+      spec.loaded? and matching_file? spec, glob
+    end
+  end
+
   ##
   # Works like #find, but finds all gemspecs matching +glob+.
 

data/lib/rubygems/spec_fetcher.rb

@@ -70,7 +70,8 @@ class Gem::SpecFetcher
   # Returns the local directory to write +uri+ to.
 
   def cache_dir(uri)
-    escaped_path = uri.path.sub(%r[^/([a-z]):/]i, '/\\1-/') # Correct for windows paths
+    # Correct for windows paths
+    escaped_path = uri.path.sub(/^\/([a-z]):\//i, '/\\1-/')
     File.join @dir, "#{uri.host}%#{uri.port}", File.dirname(escaped_path)
   end
 
@@ -80,8 +81,14 @@ class Gem::SpecFetcher
   # false, all platforms are returned. If +prerelease+ is true,
   # prerelease versions are included.
 
-  def fetch_with_errors(dependency, all = false, matching_platform = true, prerelease = false)
-    specs_and_sources, errors = find_matching_with_errors dependency, all, matching_platform, prerelease
+  def fetch_with_errors(dependency,
+                        all               = false,
+                        matching_platform = true,
+                        prerelease        = false)
+    specs_and_sources, errors = find_matching_with_errors(dependency,
+                                                          all,
+                                                          matching_platform,
+                                                          prerelease)
 
     ss = specs_and_sources.map do |spec_tuple, source_uri|
       [fetch_spec(spec_tuple, URI.parse(source_uri)), source_uri]

data/test/rubygems/test_gem.rb

@@ -168,6 +168,46 @@ class TestGem < Gem::TestCase
     end
   end
 
+  def test_require_already_activated
+    save_loaded_features do
+      a1 = new_spec "a", "1", nil, "lib/d.rb"
+
+      install_specs a1 # , a2, b1, b2, c1, c2
+
+      Gem.activate "a", "= 1"
+      assert_equal %w(a-1), loaded_spec_names
+      assert_equal [], unresolved_names
+
+      assert require "d"
+
+      assert_equal %w(a-1), loaded_spec_names
+      assert_equal [], unresolved_names
+    end
+  end
+
+  def test_require_already_activated_indirect_conflict
+    save_loaded_features do
+      a1 = new_spec "a", "1", "b" => "> 0"
+      a2 = new_spec "a", "2", "b" => "> 0"
+      b1 = new_spec "b", "1", "c" => ">= 1"
+      b2 = new_spec "b", "2", "c" => ">= 2"
+      c1 = new_spec "c", "1", nil, "lib/d.rb"
+      c2 = new_spec("c", "2", { "a" => "1" }, "lib/d.rb") # conflicts with a-2
+
+      install_specs a1, a2, b1, b2, c1, c2
+
+      Gem.activate "a", "= 1"
+      Gem.activate "c", "= 1"
+      assert_equal %w(a-1 c-1), loaded_spec_names
+      assert_equal ["b (> 0)"], unresolved_names
+
+      assert require "d"
+
+      assert_equal %w(a-1 c-1), loaded_spec_names
+      assert_equal ["b (> 0)"], unresolved_names
+    end
+  end
+
   def test_require_missing
     save_loaded_features do
       assert_raises ::LoadError do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - Jim Weirich
@@ -38,7 +38,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-03-03 00:00:00 -08:00
+date: 2011-03-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,12 +110,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 41
         segments: 
         - 2
         - 9
-        - 0
-        version: 2.9.0
+        - 1
+        version: 2.9.1
   type: :development
   version_requirements: *id005
 description: |-
@@ -134,8 +134,7 @@ description: |-
   
   -----
   
-  If you don't have any RubyGems install, there is still the pre-gem approach to
-  getting software, doing it manually:
+  If you don't have RubyGems installed, your can still do it manually:
   
   * Download from: https://rubygems.org/pages/download
   * Unpack into a directory and cd there
@@ -361,7 +360,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.6.1 Documentation
+- --title=RubyGems 1.6.2 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -387,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.6.0
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby