rubygems-update 1.8.12 → 1.8.13

data/History.txt

@@ -1,5 +1,16 @@
 # coding: UTF-8
 
+=== 1.8.13 / 2011-12-21
+
+* 1 bug fix:
+
+  * Check loaded_specs properly when trying to satisfy a dep
+
+* 2 minor enhancements:
+
+  * Remove using #loaded_path? for performance
+  * Remove Zlib workaround for Windows build.
+
 === 1.8.12 / 2011-12-02
 
 * Bug fix:

data/lib/rubygems.rb

@@ -118,7 +118,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.12'
+  VERSION = '1.8.13'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -980,9 +980,8 @@ module Gem
 
   def self.loaded_path? path
     # TODO: ruby needs a feature to let us query what's loaded in 1.8 and 1.9
-    $LOADED_FEATURES.find { |s|
-      s =~ /(^|\/)#{Regexp.escape path}#{Regexp.union(*Gem.suffixes)}$/
-    }
+    re = /(^|\/)#{Regexp.escape path}#{Regexp.union(*Gem.suffixes)}$/
+    $LOADED_FEATURES.any? { |s| s =~ re }
   end
 
   ##

data/lib/rubygems/custom_require.rb

@@ -32,7 +32,7 @@ module Kernel
   # that file has already been loaded is preserved.
 
   def require path
-    if Gem.unresolved_deps.empty? or Gem.loaded_path? path then
+    if Gem.unresolved_deps.empty? then
       gem_original_require path
     else
       spec = Gem::Specification.find { |s|

data/lib/rubygems/package/tar_input.rb

@@ -210,21 +210,25 @@ class Gem::Package::TarInput
   # the unpacking speed) we threw our hands in the air and declared that
   # this method would use the String IO approach on all platforms at all
   # times.  And that's the way it is.
-
+  #
+  # Revisited.  Here's the beginning of the long story.
+  # http://osdir.com/ml/lang.ruby.gems.devel/2007-06/msg00045.html
+  #
+  # StringIO wraping has never worked as a workaround by definition.  Skipping
+  # initial 10 bytes and passing -MAX_WBITS to Zlib::Inflate luckily works as
+  # gzip reader, but it only works if the GZip header is 10 bytes long (see
+  # below) and it does not check inflated stream consistency (CRC value in the
+  # Gzip trailer.)
+  #
+  #   RubyGems generated Gzip Header: 10 bytes
+  #     magic(2) + method(1) + flag(1) + mtime(4) + exflag(1) + os(1) +
+  #     orig_name(0) + comment(0)
+  #
+  # Ideally, it must return a GZipReader without meaningless buffering.  We
+  # have lots of CRuby committers around so let's fix windows build when we
+  # received an error.
   def zipped_stream(entry)
-    if defined? Rubinius or defined? Maglev then
-      # these implementations have working Zlib
-      zis = Zlib::GzipReader.new entry
-      dis = zis.read
-      is = StringIO.new(dis)
-    else
-      # This is Jamis Buck's Zlib workaround for some unknown issue
-      entry.read(10) # skip the gzip header
-      zis = Zlib::Inflate.new(-Zlib::MAX_WBITS)
-      is = StringIO.new(zis.inflate(entry.read))
-    end
-  ensure
-    zis.finish if zis
+    Zlib::GzipReader.new entry
   end
 
 end

data/lib/rubygems/specification.rb

@@ -756,8 +756,16 @@ class Gem::Specification
 
   def activate_dependencies
     self.runtime_dependencies.each do |spec_dep|
-      # TODO: check for conflicts! not just name!
-      next if Gem.loaded_specs.include? spec_dep.name
+      if loaded = Gem.loaded_specs[spec_dep.name]
+        next if spec_dep.matches_spec? loaded
+
+        msg = "can't satisfy '#{spec_dep}', already activated '#{loaded.full_name}'"
+        e = Gem::LoadError.new msg
+        e.name = spec_dep.name
+
+        raise e
+      end
+
       specs = spec_dep.to_specs
 
       if specs.size == 1 then

data/lib/rubygems/test_case.rb

@@ -499,8 +499,11 @@ class Gem::TestCase < MiniTest::Unit::TestCase
 
     if deps then
       block = proc do |s|
-        deps.each do |n, req|
-          s.add_dependency n, (req || '>= 0')
+        # Since Hash#each is unordered in 1.8, sort
+        # the keys and iterate that way so the tests are
+        # deteriminstic on all implementations.
+        deps.keys.sort.each do |n|
+          s.add_dependency n, (deps[n] || '>= 0')
         end
       end
     end
@@ -520,8 +523,11 @@ class Gem::TestCase < MiniTest::Unit::TestCase
 
     if deps then
       block = proc do |s|
-        deps.each do |n, req|
-          s.add_dependency n, (req || '>= 0')
+        # Since Hash#each is unordered in 1.8, sort
+        # the keys and iterate that way so the tests are
+        # deteriminstic on all implementations.
+        deps.keys.sort.each do |n|
+          s.add_dependency n, (deps[n] || '>= 0')
         end
       end
     end

data/test/rubygems/test_gem.rb

@@ -351,6 +351,29 @@ class TestGem < Gem::TestCase
     end
   end
 
+  ##
+  # [A] depends on
+  #     [C]  = 1.0 depends on
+  #         [B] = 2.0
+  #     [B] ~> 1.0 (satisfied by 1.0)
+
+  def test_self_activate_checks_dependencies
+    a, _  = util_spec 'a', '1.0'
+            a.add_dependency 'c', '= 1.0'
+            a.add_dependency 'b', '~> 1.0'
+
+            util_spec 'b', '1.0'
+            util_spec 'b', '2.0'
+    c,  _ = util_spec 'c', '1.0', 'b' => '= 2.0'
+
+    e = assert_raises Gem::LoadError do
+      assert_activate nil, a, c, "b"
+    end
+
+    expected = "can't satisfy 'b (~> 1.0)', already activated 'b-2.0'"
+    assert_equal expected, e.message
+  end
+
   ##
   # [A] depends on
   #     [B] ~> 1.0 (satisfied by 1.0)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 1
   - 8
-  - 12
-  version: 1.8.12
+  - 13
+  version: 1.8.13
 platform: ruby
 authors: 
 - Jim Weirich
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2011-12-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -25,14 +25,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 17
         segments: 
         - 2
-        - 1
-        - 0
-        version: 2.1.0
+        - 9
+        version: "2.9"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -141,21 +140,6 @@ dependencies:
         version: "2.12"
   type: :development
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
-  type: :development
-  version_requirements: *id009
 description: |-
   RubyGems is a package management framework for Ruby.
   
@@ -399,7 +383,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.12 Documentation
+- --title=RubyGems 1.8.13 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement