rubygems-update 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbc3146d444b0206ed2811c6e2827fcc64547fee
-  data.tar.gz: 8fdcaecea808e972b177eb780f351bf09a2ec884
+  metadata.gz: 33fc382d6a0acd7e0eaa22d067a5b303e3db630e
+  data.tar.gz: e62ae0a2c43adf972a86ec7e0b6cf86a61a48281
 SHA512:
-  metadata.gz: c98ed35c5cf9f940941cf8bde958d4e6b479d4f69fb89e2cc1118a7119e9c41771488939ee86828c218f0e0207320604b8afa52a28529dffb65ae22f11873515
-  data.tar.gz: 0e560eaee32adc1be7cd038294434d6f3df03acdc3641b553c976c315651e4f9572f7ed50254ac3f01237df4121b305f1910ab1e5b9f7df3f87e5335adbb632e
+  metadata.gz: 7bcb015d0fe23b6774a1c05b56bfcae79e6d3e5b8771cdc5b012defe1d81d2bc8c0a12bd5028ba5cdeb375d857fe03bf7796e3e8775e6f914121730b9acf4b47
+  data.tar.gz: f4ad540901b518c621824ecd5ffee80dad0a24e90a3591bb898e5aa6fbd07ce675b6aa426a8991362731209dc43405518eeb214ea79d2aa283de1b6804c6b498

data/CONTRIBUTING.rdoc

@@ -94,7 +94,7 @@ accepted. There should also be more detailed information in the comments.
   reference the existing issue.
 * *abandonded* - This is an issue/pull request that has aged off, is no longer
   applicable or similar.
-* *declined* - An issue that won't be fixed/implemented or a pull request that 
+* *declined* - An issue that won't be fixed/implemented or a pull request that
   is not accepted.
 * *deprecated* - An issue/pull request that no longer applies to the actively
   maintained codebase.

data/History.txt

@@ -1,5 +1,16 @@
 # coding: UTF-8
 
+=== 2.6.1 / 2016-02-28
+
+Bug fixes:
+
+* Ensure `default_path` and `home` are set for paths. Pull request #1513
+  by Aaron Patterson.
+* Restore but deprecate support for Array values on `Gem.paths=`. Pull
+  request #1514 by Aaron Patterson.
+* Fix invalid gem file preventing gem install from working. Pull request
+  #1499 by Luis Sagastume.
+
 === 2.6.0 / 2016-02-26
 
 Minor enhancements:

data/Rakefile

@@ -354,7 +354,7 @@ SHA256 Checksums:
 
       io.flush
 
-      sh ENV['EDITOR'], io.path
+      sh(ENV['EDITOR'] || 'vim', io.path)
 
       FileUtils.cp io.path, path
     end

data/lib/rubygems.rb

@@ -10,7 +10,7 @@ require 'rbconfig'
 require 'thread'
 
 module Gem
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -345,10 +345,32 @@ module Gem
   # Initialize the filesystem paths to use from +env+.
   # +env+ is a hash-like object (typically ENV) that
   # is queried for 'GEM_HOME', 'GEM_PATH', and 'GEM_SPEC_CACHE'
+  # Keys for the +env+ hash should be Strings, and values of the hash should
+  # be Strings or +nil+.
 
   def self.paths=(env)
     clear_paths
-    @paths = Gem::PathSupport.new ENV.to_hash.merge(env)
+    target = {}
+    env.each_pair do |k,v|
+      case k
+      when 'GEM_HOME', 'GEM_PATH', 'GEM_SPEC_CACHE'
+        case v
+        when nil, String
+          target[k] = v
+        when Array
+          unless Gem::Deprecate.skip
+            warn <<-eowarn
+Array values in the parameter are deprecated. Please use a String or nil.
+An Array was passed in from #{caller[3]}
+            eowarn
+          end
+          target[k] = v.join File::PATH_SEPARATOR
+        end
+      else
+        target[k] = v
+      end
+    end
+    @paths = Gem::PathSupport.new ENV.to_hash.merge(target)
     Gem::Specification.dirs = @paths.path
   end
 
@@ -956,7 +978,7 @@ module Gem
   def self.use_paths(home, *paths)
     paths.flatten!
     paths.compact!
-    hash = { "GEM_HOME" => home, "GEM_PATH" => paths.join(File::PATH_SEPARATOR) }
+    hash = { "GEM_HOME" => home, "GEM_PATH" => paths.empty? ? home : paths.join(File::PATH_SEPARATOR) }
     hash.delete_if { |_, v| v.nil? }
     self.paths = hash
   end

data/lib/rubygems/resolver/installer_set.rb

@@ -138,10 +138,14 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
 
       local_source = Gem::Source::Local.new
 
-      if local_spec = local_source.find_gem(name, dep.requirement) then
-        res << Gem::Resolver::IndexSpecification.new(
-          self, local_spec.name, local_spec.version,
-          local_source, local_spec.platform)
+      begin
+        if local_spec = local_source.find_gem(name, dep.requirement) then
+          res << Gem::Resolver::IndexSpecification.new(
+            self, local_spec.name, local_spec.version,
+            local_source, local_spec.platform)
+        end
+      rescue Gem::Package::FormatError
+        # ignore
       end
     end
 

data/test/rubygems/test_gem.rb

@@ -1010,6 +1010,45 @@ class TestGem < Gem::TestCase
     assert_equal expected, err
   end
 
+  def test_self_use_paths_with_nils
+    orig_home = ENV.delete 'GEM_HOME'
+    orig_path = ENV.delete 'GEM_PATH'
+    Gem.use_paths nil, nil
+    assert_equal Gem.default_dir, Gem.paths.home
+    assert_equal (Gem.default_path + [Gem.paths.home]).uniq, Gem.paths.path
+  ensure
+    ENV['GEM_HOME'] = orig_home
+    ENV['GEM_PATH'] = orig_path
+  end
+
+  def test_setting_paths_does_not_warn_about_unknown_keys
+    stdout, stderr = capture_io do
+      Gem.paths = { 'foo'      => [],
+                    'bar'      => Object.new,
+                    'GEM_HOME' => Gem.paths.home,
+                    'GEM_PATH' => 'foo' }
+    end
+    assert_equal ['foo', Gem.paths.home], Gem.paths.path
+    assert_equal '', stderr
+    assert_equal '', stdout
+  end
+
+  def test_setting_paths_does_not_mutate_parameter_object
+    Gem.paths = { 'GEM_HOME' => Gem.paths.home,
+                  'GEM_PATH' => 'foo' }.freeze
+    assert_equal ['foo', Gem.paths.home], Gem.paths.path
+  end
+
+  def test_deprecated_paths=
+    stdout, stderr = capture_io do
+      Gem.paths = { 'GEM_HOME' => Gem.paths.home,
+                    'GEM_PATH' => [Gem.paths.home, 'foo'] }
+    end
+    assert_equal [Gem.paths.home, 'foo'], Gem.paths.path
+    assert_match(/Array values in the parameter are deprecated. Please use a String or nil/, stderr)
+    assert_equal '', stdout
+  end
+
   def test_self_use_paths
     util_ensure_gem_dirs
 

data/test/rubygems/test_gem_commands_build_command.rb

@@ -62,7 +62,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     assert_equal '', @ui.output
     assert_equal "ERROR:  Gemspec file not found: some_gem\n", @ui.error
   end
-  
+
   def test_can_find_gemspecs_without_dot_gemspec
     gemspec_file = File.join(@tempdir, @gem.spec_name)
 

data/test/rubygems/test_gem_commands_install_command.rb

@@ -438,6 +438,26 @@ ERROR:  Possible alternatives: non_existent_with_hint
     assert_match "1 gem installed", @ui.output
   end
 
+  def test_execute_with_invalid_gem_file
+    FileUtils.touch("a.gem")
+
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
+
+    @cmd.options[:args] = %w[a]
+
+    use_ui @ui do
+      assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
+      end
+    end
+
+    assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
+
+    assert_match "1 gem installed", @ui.output
+  end
+
   def test_execute_remote_ignores_files
     specs = spec_fetcher do |fetcher|
       fetcher.gem 'a', 1

data/test/rubygems/test_gem_commands_open_command.rb

@@ -42,7 +42,7 @@ class TestGemCommandsOpenCommand < Gem::TestCase
     @cmd.options[:version] = "4.0"
     @cmd.options[:args] = %w[foo]
 
-    spec = gem "foo", "5.0"
+    gem "foo", "5.0"
 
     assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Jim Weirich
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -555,7 +555,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.0
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby