Merge pull request #4320 from rubygems/release/bundler_2.2.7_rubygems_3.2.7

Prepare rubygems 3.2.7 and bundler 2.2.7

Author: deivid-rodriguez

.github/workflows/install-rubygems.yml

@@ -61,13 +61,13 @@ jobs:
         run: gem build bundler.gemspec
         working-directory: ./bundler
       - name: Install built bundler
-        run: gem install bundler-*.gem --verbose > output.txt
+        run: gem install bundler-*.gem --verbose --backtrace > output.txt
         working-directory: ./bundler
       - name: Check bundler install didn't hit the network
         run: if grep -q 'GET http' output.txt; then false; else true; fi
         working-directory: ./bundler
       - name: Check rails can be installed
-        run: gem install rails
+        run: gem install rails --verbose --backtrace
         if: matrix.ruby.name != 'truffleruby-20.3'
     timeout-minutes: 10
 

.github/workflows/older-rubygems-bundler.yml

@@ -31,8 +31,6 @@ jobs:
           - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-3.1, value: v3.1.5 } }
           - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
           - { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.0 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
-          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.4, value: 2.4.10 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
-          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.5, value: 2.5.8 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
           - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
           - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
           - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.0 }, rgv: { name: rgv-3.2, value: v3.2.4 } }

.github/workflows/ubuntu-bundler.yml

@@ -29,6 +29,8 @@ jobs:
 
         exclude:
           - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.3, value: 2.3.8 } }
+          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.4, value: 2.4.10 } }
+          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.5, value: 2.5.8 } }
     env:
       RGV: ..
       RUBYOPT: --disable-gems

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 3.2.7 / 2021-01-26
+
+## Bug fixes:
+
+* Generate plugin wrappers with relative requires. Pull request #4317 by
+  deivid-rodriguez
+
 # 3.2.6 / 2021-01-18
 
 ## Enhancements:

bundler/CHANGELOG.md

@@ -1,3 +1,22 @@
+# 2.2.7 (January 26, 2021)
+
+## Enhancements:
+
+  - Improve error messages when dependency on bundler conflicts with running version [#4308](https://github.com/rubygems/rubygems/pull/4308)
+  - Avoid showing platforms with requirements in error messages [#4310](https://github.com/rubygems/rubygems/pull/4310)
+  - Introduce disable_local_revision_check config [#4237](https://github.com/rubygems/rubygems/pull/4237)
+  - Reverse rubygems require mixin with bundler standalone [#4299](https://github.com/rubygems/rubygems/pull/4299)
+
+## Bug fixes:
+
+  - Fix releasing from a not yet pushed branch [#4309](https://github.com/rubygems/rubygems/pull/4309)
+  - Install cache only once if it already exists [#4304](https://github.com/rubygems/rubygems/pull/4304)
+  - Fix `force_ruby_platform` no longer being respected [#4302](https://github.com/rubygems/rubygems/pull/4302)
+
+## Performance:
+
+  - Fix resolver dependency comparison [#4289](https://github.com/rubygems/rubygems/pull/4289)
+
 # 2.2.6 (January 18, 2021)
 
 ## Enhancements:

bundler/Rakefile

@@ -155,12 +155,14 @@ end
 
 load "task/automatiek.rake"
 
-# We currently ship Molinillo 0.7.0 with a patch on top to make use of `Array#-`
-# instead of `Array#&` on hot resolution code paths because it performs a lot
-# better.
+# We currently ship Molinillo master branch as of
+# https://github.com/CocoaPods/Molinillo/commit/0f3d33d004214f5e3a426c3382c4af37bc3f27e5,
+# plus the following changes:
+# * Properly print requirements (https://github.com/CocoaPods/Molinillo/pull/149).
+# * Allow custom comparison of dependencies (https://github.com/CocoaPods/Molinillo/pull/150).
 desc "Vendor a specific version of molinillo"
 Automatiek::RakeTask.new("molinillo") do |lib|
-  lib.version = "0.7.0"
+  lib.version = "master"
   lib.download = { :github => "https://github.com/CocoaPods/Molinillo" }
   lib.namespace = "Molinillo"
   lib.prefix = "Bundler"

bundler/bin/bundle3

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 module Bundler
-  VERSION = "3.0.0.dev".freeze
+  VERSION = "3.0.0".freeze
 end
 
 load File.expand_path("../bundle", __FILE__)

bundler/lib/bundler/cli/cache.rb

@@ -30,6 +30,7 @@ def install
       require_relative "install"
       options = self.options.dup
       options["local"] = false if Bundler.settings[:cache_all_platforms]
+      options["no-cache"] = true
       Bundler::CLI::Install.new(options).run
     end
 

bundler/lib/bundler/definition.rb

@@ -913,6 +913,7 @@ def source_requirements
       metadata_dependencies.each do |dep|
         source_requirements[dep.name] = sources.metadata_source
       end
+      source_requirements[:default_bundler] = source_requirements["bundler"] || source_requirements[:default]
       source_requirements["bundler"] = sources.metadata_source # needs to come last to override
       source_requirements
     end

bundler/lib/bundler/feature_flag.rb

@@ -27,7 +27,6 @@ def self.settings_method(name, key, &default)
 
     (1..10).each {|v| define_method("bundler_#{v}_mode?") { major_version >= v } }
 
-    settings_flag(:allow_bundler_dependency_conflicts) { bundler_3_mode? }
     settings_flag(:allow_offline_install) { bundler_3_mode? }
     settings_flag(:auto_clean_without_path) { bundler_3_mode? }
     settings_flag(:cache_all) { bundler_3_mode? }