Merge pull request #4364 from rubygems/release/bundler_2.2.9_rubygems_3.2.9

simi · web-flow · commit 30e740c073e9 · 2021-02-08T20:15:31.000+01:00
Prepare rubygems 3.2.9 and bundler 2.2.9
diff --git a/.github/workflows/ruby-core.yml b/.github/workflows/ruby-core.yml
@@ -49,7 +49,7 @@ jobs:
       - name: Test RubyGems
         run: |
           ruby tool/sync_default_gems.rb rubygems
-          make test-all TESTS="rubygems -j2"
+          make -j2 -s test-all TESTS="rubygems --no-retry"
         working-directory: ruby/ruby
         if: matrix.target == 'Rubygems'
       - name: Test Bundler
diff --git a/.github/workflows/truffleruby-bundler.yml b/.github/workflows/truffleruby-bundler.yml
@@ -0,0 +1,33 @@
+name: truffleruby-bundler
+
+on:
+  pull_request:
+
+  push:
+    branches:
+      - master
+      - 3.2
+
+jobs:
+  jruby_bundler:
+    name: Bundler (Truffleruby)
+    runs-on: ubuntu-20.04
+
+    env:
+      RGV: ..
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: truffleruby-20.3.0
+          bundler: none
+      - name: Prepare dependencies
+        run: |
+          bin/rake spec:parallel_deps
+        working-directory: ./bundler
+      - name: Run Test
+        run: |
+          bin/parallel_rspec --tag truffleruby
+        working-directory: ./bundler
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# 3.2.9 / 2021-02-08
+
+## Bug fixes:
+
+* Fix error message when underscore selection can't find bundler. Pull
+  request #4363 by deivid-rodriguez
+* Fix `Gem::Specification.stubs_for` returning wrong named specs. Pull
+  request #4356 by tompng
+* Don't error out when activating a binstub unless necessary. Pull request
+  #4351 by deivid-rodriguez
+* Fix `gem outdated` incorrectly handling platform specific gems. Pull
+  request #4248 by deivid-rodriguez
+
 # 3.2.8 / 2021-02-02
 
 ## Bug fixes:
diff --git a/bundler/CHANGELOG.md b/bundler/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 2.2.9 (February 8, 2021)
+
+## Enhancements:
+
+  - Stop removing existing platforms when force_ruby_platform is true [#4336](https://github.com/rubygems/rubygems/pull/4336)
+
+## Bug fixes:
+
+  - Don't install platform specific gems on truffleruby [#4333](https://github.com/rubygems/rubygems/pull/4333)
+
 # 2.2.8 (February 2, 2021)
 
 ## Enhancements:
diff --git a/bundler/lib/bundler.rb b/bundler/lib/bundler.rb
@@ -440,7 +440,7 @@ def unbundled_exec(*args)
     end
 
     def local_platform
-      return Gem::Platform::RUBY if settings[:force_ruby_platform]
+      return Gem::Platform::RUBY if settings[:force_ruby_platform] || Gem.platforms == [Gem::Platform::RUBY]
       Gem::Platform.local
     end
 
diff --git a/bundler/lib/bundler/definition.rb b/bundler/lib/bundler/definition.rb
@@ -82,11 +82,7 @@ def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil, opti
         @lockfile_contents = Bundler.read_file(lockfile)
         @locked_gems = LockfileParser.new(@lockfile_contents)
         @locked_platforms = @locked_gems.platforms
-        if Bundler.settings[:force_ruby_platform]
-          @platforms = [Gem::Platform::RUBY]
-        else
-          @platforms = @locked_platforms.dup
-        end
+        @platforms = @locked_platforms.dup
         @locked_bundler_version = @locked_gems.bundler_version
         @locked_ruby_version = @locked_gems.ruby_version
 
diff --git a/bundler/lib/bundler/version.rb b/bundler/lib/bundler/version.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.2.8".freeze
+  VERSION = "2.2.9".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i
diff --git a/bundler/spec/bundler/gem_helper_spec.rb b/bundler/spec/bundler/gem_helper_spec.rb
@@ -98,6 +98,7 @@ def mock_build_message(name, version)
         context "before installation" do
           it "raises an error with appropriate message" do
             task_names.each do |name|
+              skip "Rake::FileTask '#{name}' exists" if File.exist?(name)
               expect { Rake.application[name] }.
                 to raise_error(/^Don't know how to build task '#{name}'/)
             end
diff --git a/bundler/spec/commands/info_spec.rb b/bundler/spec/commands/info_spec.rb
@@ -165,7 +165,7 @@
       G
 
       bundle "info rac"
-      expect(out).to eq "1 : rack\n2 : rack-obama\n0 : - exit -\n>"
+      expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>)?\z/)
     end
   end
 
diff --git a/bundler/spec/commands/lock_spec.rb b/bundler/spec/commands/lock_spec.rb
@@ -220,6 +220,30 @@ def read_lockfile(file = "Gemfile.lock")
     expect(lockfile.platforms).to match_array(local_platforms.unshift(java, mingw).uniq)
   end
 
+  it "supports adding new platforms with force_ruby_platform = true" do
+    lockfile <<-L
+      GEM
+        remote: #{file_uri_for(gem_repo1)}/
+        specs:
+          platform_specific (1.0)
+          platform_specific (1.0-x86-linux)
+
+      PLATFORMS
+        ruby
+        x86-linux
+
+      DEPENDENCIES
+        platform_specific
+    L
+
+    bundle "config set force_ruby_platform true"
+    bundle "lock --add-platform java x86-mingw32"
+
+    allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
+    lockfile = Bundler::LockfileParser.new(read_lockfile)
+    expect(lockfile.platforms).to contain_exactly(rb, linux, java, mingw)
+  end
+
   it "supports adding the `ruby` platform" do
     bundle "lock --add-platform ruby"
 
diff --git a/bundler/spec/commands/show_spec.rb b/bundler/spec/commands/show_spec.rb
@@ -173,7 +173,7 @@
       G
 
       bundle "show rac"
-      expect(out).to eq "1 : rack\n2 : rack-obama\n0 : - exit -\n>"
+      expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>)?\z/)
     end
   end
 
diff --git a/bundler/spec/install/gemfile/platform_spec.rb b/bundler/spec/install/gemfile/platform_spec.rb
@@ -299,6 +299,48 @@
     bundle :install
     expect(vendored_gems("gems/rack-1.0.0")).to exist
   end
+
+  it "keeps existing platforms when installing with force_ruby_platform" do
+    lockfile <<-G
+      GEM
+        remote: #{file_uri_for(gem_repo1)}/
+        specs:
+          platform_specific (1.0-java)
+
+      PLATFORMS
+        java
+
+      DEPENDENCIES
+        platform_specific
+    G
+
+    bundle "config set --local force_ruby_platform true"
+
+    install_gemfile <<-G
+      source "#{file_uri_for(gem_repo1)}"
+      gem "platform_specific"
+    G
+
+    expect(the_bundle).to include_gem "platform_specific 1.0 RUBY"
+
+    lockfile_should_be <<-G
+      GEM
+        remote: #{file_uri_for(gem_repo1)}/
+        specs:
+          platform_specific (1.0)
+          platform_specific (1.0-java)
+
+      PLATFORMS
+        java
+        ruby
+
+      DEPENDENCIES
+        platform_specific
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    G
+  end
 end
 
 RSpec.describe "bundle install with platform conditionals" do
diff --git a/bundler/spec/runtime/platform_spec.rb b/bundler/spec/runtime/platform_spec.rb
@@ -112,6 +112,15 @@
     expect(the_bundle).to include_gems "nokogiri 1.4.2", "platform_specific 1.0 RUBY"
   end
 
+  it "doesn't pull platform specific gems on truffleruby", :truffleruby do
+    install_gemfile <<-G
+     source "#{file_uri_for(gem_repo1)}"
+     gem "platform_specific"
+    G
+
+    expect(the_bundle).to include_gems "platform_specific 1.0 RUBY"
+  end
+
   it "allows specifying only-ruby-platform on windows with dependency platforms" do
     simulate_windows do
       install_gemfile <<-G
diff --git a/bundler/spec/support/filters.rb b/bundler/spec/support/filters.rb
@@ -32,7 +32,8 @@ def inspect
   config.filter_run_excluding :no_color_tty => Gem.win_platform? || !ENV["GITHUB_ACTION"].nil?
   config.filter_run_excluding :permissions => Gem.win_platform?
   config.filter_run_excluding :readline => Gem.win_platform?
-  config.filter_run_excluding :jruby => RUBY_PLATFORM != "java"
+  config.filter_run_excluding :jruby => RUBY_ENGINE != "jruby"
+  config.filter_run_excluding :truffleruby => RUBY_ENGINE != "truffleruby"
 
   config.filter_run_when_matching :focus unless ENV["CI"]
 end
diff --git a/bundler/spec/support/rubygems_version_manager.rb b/bundler/spec/support/rubygems_version_manager.rb
@@ -78,6 +78,7 @@ def switch_local_copy_if_needed
   end
 
   def rubygems_unrequire_needed?
+    require "rubygems"
     !$LOADED_FEATURES.include?(local_copy_path.join("lib/rubygems.rb").to_s)
   end
 
diff --git a/dev_gems.rb.lock b/dev_gems.rb.lock
@@ -112,4 +112,4 @@ DEPENDENCIES
   webrick (~> 1.6)
 
 BUNDLED WITH
-   2.2.8
+   2.2.9
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = "3.2.8".freeze
+  VERSION = "3.2.9".freeze
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -275,7 +275,7 @@ def self.find_spec_for_exe(name, exec_name, requirements)
 
     unless spec = specs.first
       msg = "can't find gem #{dep} with executable #{exec_name}"
-      if name == "bundler" && bundler_message = Gem::BundlerVersionFinder.missing_version_message
+      if dep.filters_bundler? && bundler_message = Gem::BundlerVersionFinder.missing_version_message
         msg = bundler_message
       end
       raise Gem::GemNotFoundException, msg
diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb
@@ -277,7 +277,7 @@ def matching_specs(platform_only = false)
       requirement.satisfied_by?(spec.version) && env_req.satisfied_by?(spec.version)
     end.map(&:to_spec)
 
-    Gem::BundlerVersionFinder.filter!(matches) if name == "bundler".freeze && !requirement.specific?
+    Gem::BundlerVersionFinder.filter!(matches) if filters_bundler?
 
     if platform_only
       matches.reject! do |spec|
@@ -295,6 +295,10 @@ def specific?
     @requirement.specific?
   end
 
+  def filters_bundler?
+    name == "bundler".freeze && !specific?
+  end
+
   def to_specs
     matches = matching_specs true
 
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
@@ -827,7 +827,9 @@ def self.stubs_for(name)
     if @@stubs
       @@stubs_by_name[name] || []
     else
-      @@stubs_by_name[name] ||= stubs_for_pattern("#{name}-*.gemspec")
+      @@stubs_by_name[name] ||= stubs_for_pattern("#{name}-*.gemspec").select do |s|
+        s.name == name
+      end
     end
   end
 
@@ -848,7 +850,9 @@ def self._resort!(specs) # :nodoc:
     specs.sort! do |a, b|
       names = a.name <=> b.name
       next names if names.nonzero?
-      b.version <=> a.version
+      versions = b.version <=> a.version
+      next versions if versions.nonzero?
+      b.platform == Gem::Platform::RUBY ? -1 : 1
     end
   end
 
@@ -1084,20 +1088,15 @@ def self.latest_spec_for(name)
   end
 
   def self._latest_specs(specs, prerelease = false) # :nodoc:
-    result = Hash.new {|h,k| h[k] = {} }
-    native = {}
+    result = {}
 
     specs.reverse_each do |spec|
       next if spec.version.prerelease? unless prerelease
 
-      native[spec.name] = spec.version if spec.platform == Gem::Platform::RUBY
-      result[spec.name][spec.platform] = spec
+      result[spec.name] = spec
     end
 
-    result.map(&:last).map(&:values).flatten.reject do |spec|
-      minimum = native[spec.name]
-      minimum && spec.version < minimum
-    end.sort_by{|tup| tup.name }
+    result.map(&:last).flatten.sort_by{|tup| tup.name }
   end
 
   ##
@@ -2552,7 +2551,7 @@ def traverse(trail = [], visited = {}, &block)
     begin
       dependencies.each do |dep|
         next unless dep.runtime?
-        dep.to_specs.each do |dep_spec|
+        dep.matching_specs(true).each do |dep_spec|
           next if visited.has_key?(dep_spec)
           visited[dep_spec] = true
           trail.push(dep_spec)
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
@@ -311,7 +311,7 @@ def setup
     ENV['XDG_CONFIG_HOME'] = nil
     ENV['XDG_DATA_HOME'] = nil
     ENV['SOURCE_DATE_EPOCH'] = nil
-    ENV["TMPDIR"] = @tmp
+    ENV['BUNDLER_VERSION'] = nil
 
     @current_dir = Dir.pwd
     @fetcher     = nil
@@ -322,13 +322,10 @@ def setup
     # capture output
     Gem::DefaultUserInteraction.ui = Gem::MockGemUi.new
 
-    tmpdir = File.realpath Dir.tmpdir
-    tmpdir.tap(&Gem::UNTAINT)
-
-    @tempdir = File.join(tmpdir, "test_rubygems_#{$$}")
+    @tempdir = Dir.mktmpdir("test_rubygems_", @tmp)
     @tempdir.tap(&Gem::UNTAINT)
 
-    FileUtils.mkdir_p @tempdir
+    ENV["TMPDIR"] = @tempdir
 
     @orig_SYSTEM_WIDE_CONFIG_FILE = Gem::ConfigFile::SYSTEM_WIDE_CONFIG_FILE
     Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE
@@ -367,7 +364,9 @@ def setup
     Dir.chdir @tempdir
 
     ENV['HOME'] = @userhome
+    Gem.instance_variable_set :@config_file, nil
     Gem.instance_variable_set :@user_home, nil
+    Gem.instance_variable_set :@config_home, nil
     Gem.instance_variable_set :@data_home, nil
     Gem.instance_variable_set :@gemdeps, nil
     Gem.instance_variable_set :@env_requirements_by_name, nil
diff --git a/rubygems-update.gemspec b/rubygems-update.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.2.8"
+  s.version = "3.2.9"
   s.authors = ["Jim Weirich", "Chad Fowler", "Eric Hodel", "Luis Lavena", "Aaron Patterson", "Samuel Giddins", "André Arko", "Evan Phoenix", "Hiroshi SHIBATA"]
   s.email = ["", "", "drbrain@segment7.net", "luislavena@gmail.com", "aaron@tenderlovemaking.com", "segiddins@segiddins.me", "andre@arko.net", "evan@phx.io", "hsbt@ruby-lang.org"]
 
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
diff --git a/test/rubygems/test_gem_commands_outdated_command.rb b/test/rubygems/test_gem_commands_outdated_command.rb
diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
diff --git a/test/rubygems/test_gem_util.rb b/test/rubygems/test_gem_util.rb

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@`
`165`	`165`	`G`
`166`	`166`
`167`	`167`	`bundle "info rac"`
`168`		`- expect(out).to eq "1 : rack\n2 : rack-obama\n0 : - exit -\n>"`
	`168`	`+ expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>)?\z/)`
`169`	`169`	`end`
`170`	`170`	`end`
`171`	`171`