rubygems-update 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33fc382d6a0acd7e0eaa22d067a5b303e3db630e
-  data.tar.gz: e62ae0a2c43adf972a86ec7e0b6cf86a61a48281
+  metadata.gz: 2e637cea941cba1038aa966e4b493ee19b015f16
+  data.tar.gz: 2f3a0e95c40344b31b87a509b76ba85b01884304
 SHA512:
-  metadata.gz: 7bcb015d0fe23b6774a1c05b56bfcae79e6d3e5b8771cdc5b012defe1d81d2bc8c0a12bd5028ba5cdeb375d857fe03bf7796e3e8775e6f914121730b9acf4b47
-  data.tar.gz: f4ad540901b518c621824ecd5ffee80dad0a24e90a3591bb898e5aa6fbd07ce675b6aa426a8991362731209dc43405518eeb214ea79d2aa283de1b6804c6b498
+  metadata.gz: 8e2600876b6e09cee7b0cc41b72ae5d5deefa904b38b886f594737f30e12facc67a9584d5fc2188eadb41b124211fdc91a70f1a17f531013be5d436511640071
+  data.tar.gz: d01dd0b8aea7c52cd8095f61b0bf637621798af6bf47821601b5e1df0ef2542261b32e21871702cdb4f35ee707b4bcf338bdcce16cf135507c889312f15eaa5b

data/.travis.yml

@@ -3,7 +3,7 @@ after_script:
 - rake travis:after -t
 before_script:
 - gem uninstall executable-hooks gem-wrappers -x --force -i `gem env home`@global
-- gem install rake --no-document
+- gem install rake -v '~> 10.5' --no-document
 - gem install hoe-travis --no-document
 - gem install minitest -v '~> 4.7' --no-document
 - rake travis:before -t
@@ -14,6 +14,11 @@ notifications:
   email:
   - drbrain@segment7.net
   - evan+notify@phx.io
+branches:
+  only:
+    - master
+    - auto
+    - /[\d.]+/
 rvm:
 - 1.8.7
 - 1.9.2

data/History.txt

@@ -1,5 +1,18 @@
 # coding: UTF-8
 
+=== 2.6.2 / 2016-03-12
+
+Bug fixes:
+
+* Fix wrong version of gem activation for bin stub. Pull request #1527 by
+  Aaron Patterson.
+* Speed up gem activation failures. Pull request #1539 by Aaron Patterson.
+* Fix platform sorting in the resolver. Pull request #1542 by Samuel E.
+  Giddins.
+* Ensure we unlock the monitor even if try_activate throws. Pull request
+  #1538 by Charles Oliver Nutter.
+
+
 === 2.6.1 / 2016-02-28
 
 Bug fixes:

data/MAINTAINERS.md

@@ -2,4 +2,4 @@ André Arko <andre@arko.net> (@indirect)
 Jeremy Hinegardner <jeremy@copiousfreetime.org> (@copiousfreetime)
 Kurtis Rainbolt-Greene <me@kurtisrainboltgreene.name> (@krainboltgreene)
 Samuel Giddins <segiddins@segiddins.me> (@segiddins)
-Marie Markwell <me@marie.so> (@duckinator)
+Ellen Marie Dash <me@duckie.co> (@duckinator)

data/Rakefile

@@ -26,7 +26,6 @@ end
 
 Hoe::RUBY_FLAGS << " --disable-gems" if RUBY_VERSION > "1.9"
 
-Hoe.plugin :minitest
 Hoe.plugin :git
 Hoe.plugin :travis
 
@@ -78,6 +77,7 @@ end
 
 v = hoe.version
 
+hoe.testlib      = :minitest
 hoe.test_prelude = 'gem "minitest", "~> 4.0"'
 
 Rake::Task['docs'].clear
@@ -173,7 +173,7 @@ task :package => %W[
 
 desc "Upload release to gemcutter S3"
 task :upload_to_gemcutter do
-  sh "s3cmd put -P pkg/rubygems-update-#{v}.gem pkg/rubygems-#{v}.zip pkg/rubygems-#{v}.tgz s3://production.s3.rubygems.org/rubygems/"
+  sh "s3cmd put -P pkg/rubygems-update-#{v}.gem pkg/rubygems-#{v}.zip pkg/rubygems-#{v}.tgz s3://oregon.production.s3.rubygems.org/rubygems/"
 end
 
 desc "Upload release to rubygems.org"

data/appveyor.yml

@@ -3,13 +3,15 @@ version: "{build}"
 branches:
   only:
     - master
+    - auto
+    - /[\d.]+/
 clone_depth: 10
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - SET GEM_HOME=%APPDATA%\.gem
   - ruby --version
   - gem --version
-  - gem install rake --no-rdoc --no-ri
+  - gem install rake -v "~> 10.5" --no-rdoc --no-ri
   - gem install hoe-travis --no-rdoc --no-ri
   - gem install minitest -v "~> 4.7" --no-rdoc --no-ri
   - rake travis:before --trace

data/lib/rubygems.rb

@@ -10,7 +10,7 @@ require 'rbconfig'
 require 'thread'
 
 module Gem
-  VERSION = '2.6.1'
+  VERSION = '2.6.2'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -174,14 +174,6 @@ module Gem
   @pre_reset_hooks      ||= []
   @post_reset_hooks     ||= []
 
-  def self.env_requirement(gem_name)
-    @env_requirements_by_name ||= {}
-    @env_requirements_by_name[gem_name] ||= begin
-      req = ENV["GEM_REQUIREMENT_#{gem_name.upcase}"] || '>= 0'.freeze
-      Gem::Requirement.create(req)
-    end
-  end
-
   ##
   # Try to activate a gem containing +path+. Returns true if
   # activation succeeded or wasn't needed because it was already
@@ -243,11 +235,15 @@ module Gem
     requirements = Gem::Requirement.default if
       requirements.empty?
 
+    find_spec_for_exe(name, exec_name, requirements).bin_file exec_name
+  end
+
+  def self.find_spec_for_exe name, exec_name, requirements
     dep = Gem::Dependency.new name, requirements
 
     loaded = Gem.loaded_specs[name]
 
-    return loaded.bin_file exec_name if loaded && dep.matches_spec?(loaded)
+    return loaded if loaded && dep.matches_spec?(loaded)
 
     specs = dep.matching_specs(true)
 
@@ -263,6 +259,24 @@ module Gem
       raise Gem::GemNotFoundException, msg
     end
 
+    spec
+  end
+  private_class_method :find_spec_for_exe
+
+  ##
+  # Find the full path to the executable for gem +name+.  If the +exec_name+
+  # is not given, the gem's default_executable is chosen, otherwise the
+  # specified executable's path is returned.  +requirements+ allows
+  # you to specify specific gem versions.
+  #
+  # A side effect of this method is that it will activate the gem that
+  # contains the executable.
+  #
+  # This method should *only* be used in bin stub files.
+
+  def self.activate_bin_path name, exec_name, requirement # :nodoc:
+    spec = find_spec_for_exe name, exec_name, [requirement]
+    Gem::LOADED_SPECS_MUTEX.synchronize { spec.activate }
     spec.bin_file exec_name
   end
 
@@ -849,6 +863,15 @@ An Array was passed in from #{caller[3]}
     @ruby_api_version ||= RbConfig::CONFIG['ruby_version'].dup
   end
 
+  def self.env_requirement(gem_name)
+    @env_requirements_by_name ||= {}
+    @env_requirements_by_name[gem_name] ||= begin
+      req = ENV["GEM_REQUIREMENT_#{gem_name.upcase}"] || '>= 0'.freeze
+      Gem::Requirement.create(req)
+    end
+  end
+  post_reset { @env_requirements_by_name = {} }
+
   ##
   # Returns the latest release-version specification for the gem +name+.
 

data/lib/rubygems/core_ext/kernel_require.rb

@@ -121,14 +121,17 @@ module Kernel
   rescue LoadError => load_error
     RUBYGEMS_ACTIVATION_MONITOR.enter
 
-    if load_error.message.start_with?("Could not find") or
-        (load_error.message.end_with?(path) and Gem.try_activate(path)) then
-      RUBYGEMS_ACTIVATION_MONITOR.exit
-      return gem_original_require(path)
-    else
+    begin
+      if load_error.message.start_with?("Could not find") or
+          (load_error.message.end_with?(path) and Gem.try_activate(path)) then
+        require_again = true
+      end
+    ensure
       RUBYGEMS_ACTIVATION_MONITOR.exit
     end
 
+    return gem_original_require(path) if require_again
+
     raise load_error
   end
 

data/lib/rubygems/dependency.rb

@@ -286,7 +286,9 @@ class Gem::Dependency
       }
     end
 
-    matches.sort_by { |s| s.sort_obj } # HACK: shouldn't be needed
+    # `stubs_for` returns oldest first, but `matching_specs` is supposed to
+    # return newest first, so just reverse the list
+    matches.reverse
   end
 
   ##
@@ -302,14 +304,13 @@ class Gem::Dependency
     # TODO: check Gem.activated_spec[self.name] in case matches falls outside
 
     if matches.empty? then
-      specs = Gem::Specification.find_all { |s|
-                s.name == name
-              }.map { |x| x.full_name }
+      specs = Gem::Specification.stubs_for name
 
       if specs.empty?
-        total = Gem::Specification.to_a.size
+        total = Gem::Specification.stubs.size
         msg   = "Could not find '#{name}' (#{requirement}) among #{total} total gem(s)\n".dup
       else
+        specs = specs.map(&:full_name)
         msg   = "Could not find '#{name}' (#{requirement}) - did find: [#{specs.join ','}]\n".dup
       end
       msg << "Checked in 'GEM_PATH=#{Gem.path.join(File::PATH_SEPARATOR)}', execute `gem env` for more information"
@@ -334,6 +335,6 @@ class Gem::Dependency
 
     matches.delete_if { |spec| spec.nil? || spec.version.prerelease? } unless prerelease?
 
-    matches.last
+    matches.first
   end
 end

data/lib/rubygems/installer.rb

@@ -216,7 +216,8 @@ class Gem::Installer
       existing = io.read.slice(%r{
           ^(
             gem \s |
-            load \s Gem\.bin_path\(
+            load \s Gem\.bin_path\( |
+            load \s Gem\.activate_bin_path\(
           )
           (['"])(.*?)(\2),
         }x, 3)
@@ -719,7 +720,7 @@ if ARGV.first
   end
 end
 
-load Gem.bin_path('#{spec.name}', '#{bin_file_name}', version)
+load Gem.activate_bin_path('#{spec.name}', '#{bin_file_name}', version)
 TEXT
   end
 

data/lib/rubygems/installer_test_case.rb

@@ -170,6 +170,8 @@ class Gem::InstallerTestCase < Gem::TestCase
         EOF
       end
 
+      yield @spec if block_given?
+
       use_ui ui do
         FileUtils.rm_f @gem
 

data/lib/rubygems/resolver.rb

@@ -193,7 +193,7 @@ class Gem::Resolver
     conflict = e.conflicts.values.first
     raise Gem::DependencyResolutionError, Conflict.new(conflict.requirement_trees.first.first, conflict.existing, conflict.requirement)
   ensure
-    @output.close if @output and !debug?
+    @output.close if defined?(@output) and !debug?
   end
 
   ##
@@ -233,7 +233,7 @@ class Gem::Resolver
       exc.errors = @set.errors
       raise exc
     end
-    possibles.sort_by { |s| [s.source, s.version, s.platform.to_s == Gem::Platform.local.to_s ? 1 : 0] }.
+    possibles.sort_by { |s| [s.source, s.version, Gem::Platform.local =~ s.platform ? 1 : 0] }.
       map { |s| ActivationRequest.new s, dependency, [] }
   end
 

data/lib/rubygems/test_case.rb

@@ -223,6 +223,10 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     @orig_gem_spec_cache = ENV['GEM_SPEC_CACHE']
     @orig_rubygems_gemdeps = ENV['RUBYGEMS_GEMDEPS']
     @orig_rubygems_host = ENV['RUBYGEMS_HOST']
+    ENV.keys.find_all { |k| k.start_with?('GEM_REQUIREMENT_') }.each do |k|
+      ENV.delete k
+    end
+    @orig_gem_env_requirements = ENV.to_hash
 
     ENV['GEM_VENDOR'] = nil
 
@@ -277,6 +281,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     ENV['HOME'] = @userhome
     Gem.instance_variable_set :@user_home, nil
     Gem.instance_variable_set :@gemdeps, nil
+    Gem.instance_variable_set :@env_requirements_by_name, nil
     Gem.send :remove_instance_variable, :@ruby_version if
       Gem.instance_variables.include? :@ruby_version
 
@@ -368,6 +373,11 @@ class Gem::TestCase < MiniTest::Unit::TestCase
 
     FileUtils.rm_rf @tempdir unless ENV['KEEP_FILES']
 
+    ENV.clear
+    @orig_gem_env_requirements.each do |k,v|
+      ENV[k] = v
+    end
+
     ENV['GEM_HOME']   = @orig_gem_home
     ENV['GEM_PATH']   = @orig_gem_path
     ENV['GEM_VENDOR'] = @orig_gem_vendor
@@ -1493,4 +1503,3 @@ tmpdirs << (ENV['GEM_PATH'] = Dir.mktmpdir("path"))
 pid = $$
 END {tmpdirs.each {|dir| Dir.rmdir(dir)} if $$ == pid}
 Gem.clear_paths
-

data/test/rubygems/test_gem.rb

@@ -816,6 +816,17 @@ class TestGem < Gem::TestCase
     RbConfig::CONFIG['ruby_version'] = orig_ruby_version
   end
 
+  def test_self_env_requirement
+    ENV["GEM_REQUIREMENT_FOO"] = '>= 1.2.3'
+    ENV["GEM_REQUIREMENT_BAR"] = '1.2.3'
+    ENV["GEM_REQUIREMENT_BAZ"] = 'abcd'
+
+    assert_equal Gem::Requirement.create('>= 1.2.3'), Gem.env_requirement('foo')
+    assert_equal Gem::Requirement.create('1.2.3'), Gem.env_requirement('bAr')
+    assert_raises(Gem::Requirement::BadRequirementError) { Gem.env_requirement('baz') }
+    assert_equal Gem::Requirement.default, Gem.env_requirement('qux')
+  end
+
   def test_self_ruby_version_1_8_5
     util_set_RUBY_VERSION '1.8.5'
 

data/test/rubygems/test_gem_installer.rb

@@ -48,7 +48,7 @@ if ARGV.first
   end
 end
 
-load Gem.bin_path('a', 'executable', version)
+load Gem.activate_bin_path('a', 'executable', version)
     EOF
 
     wrapper = @installer.app_script_text 'executable'
@@ -781,6 +781,55 @@ gem 'other', version
     assert_match(/ran executable/, e.message)
   end
 
+  def test_conflicting_binstubs
+    Dir.mkdir util_inst_bindir
+    util_clear_gems
+
+    # build old version that has a bin file
+    util_setup_gem do |spec|
+      File.open File.join('bin', 'executable'), 'w' do |f|
+        f.puts "require 'code'"
+      end
+      File.open File.join('lib', 'code.rb'), 'w' do |f|
+        f.puts 'raise "I have an executable"'
+      end
+    end
+
+    @installer.wrappers = true
+    build_rake_in do
+      use_ui @ui do
+        @newspec = @installer.install
+      end
+    end
+
+    old_bin_file = File.join @installer.bin_dir, 'executable'
+
+    # build new version that doesn't have a bin file
+    util_setup_gem do |spec|
+      FileUtils.rm File.join('bin', 'executable')
+      spec.files.delete File.join('bin', 'executable')
+      spec.executables.delete 'executable'
+      spec.version = @spec.version.bump
+      File.open File.join('lib', 'code.rb'), 'w' do |f|
+        f.puts 'raise "I do not have an executable"'
+      end
+    end
+
+    build_rake_in do
+      use_ui @ui do
+        @newspec = @installer.install
+      end
+    end
+
+    e = assert_raises RuntimeError do
+      instance_eval File.read(old_bin_file)
+    end
+
+    # We expect the bin stub to activate the version that actually contains
+    # the binstub.
+    assert_match('I have an executable', e.message)
+  end
+
   def test_install_creates_binstub_that_understand_version
     Dir.mkdir util_inst_bindir
     util_setup_gem

data/test/rubygems/test_gem_resolver.rb

@@ -695,6 +695,18 @@ class TestGemResolver < Gem::TestCase
     assert_equal [a1, a1_p1], selected
   end
 
+  def test_search_for_local_platform_partial_string_match
+    a1    = util_spec 'a', 1
+    a1_p1 = util_spec 'a', 1 do |s| s.platform = Gem::Platform.local.os end
+    a1_p2 = util_spec 'a', 1 do |s| s.platform = 'unknown'              end
+
+    s = set(a1_p1, a1_p2, a1)
+    d = [make_dep('a')]
+    r = Gem::Resolver.new(d, s)
+
+    assert_resolves_to [a1_p1], r
+  end
+
   def test_raises_and_explains_when_platform_prevents_install
     a1 = util_spec "a", "1" do |s|
       s.platform = Gem::Platform.new %w[c p 1]

data/test/rubygems/test_kernel.rb

@@ -64,6 +64,13 @@ class TestKernel < Gem::TestCase
     assert gem('d', '>= 1.a'), 'prerelease requirement may load prerelease'
   end
 
+  def test_gem_env_req
+    ENV["GEM_REQUIREMENT_A"] = '~> 2.0'
+    assert_raises(Gem::LoadError) { gem('a', '= 1') }
+    assert gem('a', '> 1')
+    assert_equal @a2, Gem.loaded_specs['a']
+  end
+
   def test_gem_conflicting
     assert gem('a', '= 1'), "Should load"
 

data/test/rubygems/test_require.rb

@@ -319,4 +319,32 @@ class TestGemRequire < Gem::TestCase
   def unresolved_names
     Gem::Specification.unresolved_deps.values.map(&:to_s).sort
   end
+
+  def test_try_activate_error_unlocks_require_monitor
+    silence_warnings do
+      class << ::Gem
+        alias old_try_activate try_activate
+        def try_activate(*); raise 'raised from try_activate'; end
+      end
+    end
+
+    require 'does_not_exist_for_try_activate_test'
+  rescue RuntimeError => e
+    assert_match(/raised from try_activate/, e.message)
+    assert Kernel::RUBYGEMS_ACTIVATION_MONITOR.try_enter, "require monitor was not unlocked when try_activate raised"
+  ensure
+    silence_warnings do
+      class << ::Gem
+        alias try_activate old_try_activate
+      end
+    end
+    Kernel::RUBYGEMS_ACTIVATION_MONITOR.exit
+  end
+
+  def silence_warnings
+    old_verbose, $VERBOSE = $VERBOSE, false
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Jim Weirich
@@ -10,22 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +82,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -555,7 +555,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.0
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby