rubygems-update 1.8.15 → 1.8.16

data/History.txt

@@ -1,5 +1,13 @@
 # coding: UTF-8
 
+=== 1.8.16 / 2012-02-12
+
+* 3 bug fixes:
+
+  * Fix gem specification loading when encoding is not UTF-8. #146
+  * Allow group writable if umask allows it already.
+  * Uniquify the spec list based on directory order priority
+
 === 1.8.15 / 2012-01-06
 
 * 1 bug fix:

data/lib/rubygems.rb

@@ -118,7 +118,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.15'
+  VERSION = '1.8.16'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -445,7 +445,7 @@ module Gem
     require 'fileutils'
 
     old_umask = File.umask
-    File.umask old_umask | 022
+    File.umask old_umask | 002
 
     %w[cache doc gems specifications].each do |name|
       subdir = File.join dir, name

data/lib/rubygems/specification.rb

@@ -262,18 +262,19 @@ class Gem::Specification
 
   def self._all # :nodoc:
     unless defined?(@@all) && @@all then
-      specs = []
+      specs = {}
 
-      self.dirs.reverse_each { |dir|
+      self.dirs.each { |dir|
         Dir[File.join(dir, "*.gemspec")].each { |path|
           spec = Gem::Specification.load path.untaint
           # #load returns nil if the spec is bad, so we just ignore
           # it at this stage
-          specs << spec if spec
+          specs[spec.full_name] ||= spec if spec
         }
       }
 
-      @@all = specs
+      @@all = specs.values
+
       _resort!
     end
     @@all
@@ -537,7 +538,7 @@ class Gem::Specification
     file = file.dup.untaint
 
     code = if defined? Encoding
-             File.read file, :encoding => "UTF-8"
+             File.read file, :mode => 'r:UTF-8:-'
            else
              File.read file
            end

data/lib/rubygems/test_case.rb

@@ -243,7 +243,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   ##
   # Builds and installs the Gem::Specification +spec+
 
-  def install_gem spec
+  def install_gem spec, options = {}
     require 'rubygems/installer'
 
     use_ui Gem::MockGemUi.new do
@@ -254,26 +254,14 @@ class Gem::TestCase < MiniTest::Unit::TestCase
 
     gem = File.join(@tempdir, File.basename(spec.cache_file)).untaint
 
-    Gem::Installer.new(gem, :wrappers => true).install
+    Gem::Installer.new(gem, options.merge({:wrappers => true})).install
   end
 
   ##
   # Builds and installs the Gem::Specification +spec+ into the user dir
 
   def install_gem_user spec
-    require 'rubygems/installer'
-
-    use_ui Gem::MockGemUi.new do
-      Dir.chdir @tempdir do
-        Gem::Builder.new(spec).build
-      end
-    end
-
-    gem = File.join(@tempdir, File.basename(spec.cache_file)).untaint
-
-    i = Gem::Installer.new(gem, :wrappers => true, :user_install => true)
-    i.install
-    i.spec
+    install_gem spec, :user_install => true
   end
 
   ##
@@ -880,4 +868,3 @@ Also, a list:
   end
 
 end
-

data/test/rubygems/test_gem.rb

@@ -629,8 +629,8 @@ class TestGem < Gem::TestCase
     File.umask 0
     Gem.ensure_gem_subdirectories @gemhome
 
-    assert_equal 0, File::Stat.new(@gemhome).mode & 022
-    assert_equal 0, File::Stat.new(File.join(@gemhome, "cache")).mode & 022
+    assert_equal 0, File::Stat.new(@gemhome).mode & 002
+    assert_equal 0, File::Stat.new(File.join(@gemhome, "cache")).mode & 002
   ensure
     File.umask old_umask
   end unless win_platform?
@@ -1122,6 +1122,86 @@ class TestGem < Gem::TestCase
     end
   end
 
+  def test_gem_path_ordering
+    refute_equal Gem.dir, Gem.user_dir
+
+    write_file File.join(@tempdir, 'lib', "g.rb") { |fp| fp.puts "" }
+    write_file File.join(@tempdir, 'lib', 'm.rb') { |fp| fp.puts "" }
+
+    g = new_spec 'g', '1', nil, "lib/g.rb"
+    m = new_spec 'm', '1', nil, "lib/m.rb"
+
+    install_gem g, :install_dir => Gem.dir
+    m0 = install_gem m, :install_dir => Gem.dir
+    m1 = install_gem m, :install_dir => Gem.user_dir
+
+    assert_equal m0.gem_dir, File.join(Gem.dir, "gems", "m-1")
+    assert_equal m1.gem_dir, File.join(Gem.user_dir, "gems", "m-1")
+
+    tests = [
+      [:dir0, [ Gem.dir, Gem.user_dir], m0],
+      [:dir1, [ Gem.user_dir, Gem.dir], m1]
+    ]
+
+    tests.each do |_name, _paths, expected|
+      Gem.paths = { 'GEM_HOME' => _paths.first, 'GEM_PATH' => _paths }
+      Gem::Specification.reset
+      Gem.searcher = nil
+
+      assert_equal Gem::Dependency.new('m','1').to_specs,
+                   Gem::Dependency.new('m','1').to_specs.sort
+
+      assert_equal \
+        [expected.gem_dir],
+        Gem::Dependency.new('m','1').to_specs.map(&:gem_dir).sort,
+        "Wrong specs for #{_name}"
+
+      spec = Gem::Dependency.new('m','1').to_spec
+
+      assert_equal \
+        File.join(_paths.first, "gems", "m-1"),
+        spec.gem_dir,
+        "Wrong spec before require for #{_name}"
+      refute spec.activated?, "dependency already activated for #{_name}"
+
+      gem "m"
+
+      spec = Gem::Dependency.new('m','1').to_spec
+      assert spec.activated?, "dependency not activated for #{_name}"
+
+      assert_equal \
+        File.join(_paths.first, "gems", "m-1"),
+        spec.gem_dir,
+        "Wrong spec after require for #{_name}"
+
+      spec.instance_variable_set :@activated, false
+      Gem.loaded_specs.delete(spec.name)
+      $:.delete(File.join(spec.gem_dir, "lib"))
+    end
+  end
+
+  def test_gem_path_ordering_short
+    write_file File.join(@tempdir, 'lib', "g.rb") { |fp| fp.puts "" }
+    write_file File.join(@tempdir, 'lib', 'm.rb') { |fp| fp.puts "" }
+
+    g = new_spec 'g', '1', nil, "lib/g.rb"
+    m = new_spec 'm', '1', nil, "lib/m.rb"
+
+    install_gem g, :install_dir => Gem.dir
+    install_gem m, :install_dir => Gem.dir
+    install_gem m, :install_dir => Gem.user_dir
+
+    Gem.paths = {
+      'GEM_HOME' => Gem.dir,
+      'GEM_PATH' => [ Gem.dir, Gem.user_dir]
+    }
+
+    assert_equal \
+      File.join(Gem.dir, "gems", "m-1"),
+      Gem::Dependency.new('m','1').to_spec.gem_dir,
+      "Wrong spec selected"
+  end
+
   def with_plugin(path)
     test_plugin_path = File.expand_path("test/rubygems/plugin/#{path}",
                                         @@project_dir)

data/test/rubygems/test_gem_specification.rb

@@ -292,6 +292,29 @@ bindir:
     assert_equal @a2, spec
   end
 
+  if defined?(Encoding)
+  def test_self_load_utf8_with_ascii_encoding
+    int_enc = Encoding.default_internal
+    silence_warnings { Encoding.default_internal = 'US-ASCII' }
+
+    spec2 = @a2.dup
+    bin = "\u5678"
+    spec2.authors = [bin]
+    full_path = spec2.spec_file
+    write_file full_path do |io|
+      io.write spec2.to_ruby_for_cache.force_encoding('BINARY').sub("\\u{5678}", bin.force_encoding('BINARY'))
+    end
+
+    spec = Gem::Specification.load full_path
+
+    spec2.files.clear
+
+    assert_equal spec2, spec
+  ensure
+    silence_warnings { Encoding.default_internal = int_enc }
+  end
+  end
+
   def test_self_load_legacy_ruby
     spec = Gem::Deprecate.skip_during do
       eval LEGACY_RUBY_SPEC
@@ -1577,4 +1600,11 @@ end
       # ignore
     end
   end
+
+  def silence_warnings
+    old_verbose, $VERBOSE = $VERBOSE, false
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 8
-  - 15
-  version: 1.8.15
+  - 16
+  version: 1.8.16
 platform: ruby
 authors: 
 - Jim Weirich
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-06 00:00:00 Z
+date: 2012-02-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -399,7 +399,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.15 Documentation
+- --title=RubyGems 1.8.16 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement