bundler 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 828d688b53800760eabd11c4c520dbff151ef88b6029ee4368ed7b47bb9c9bc5
-  data.tar.gz: 76b9369b4bd4d2ad94a993f38032154072382cf6a60b30d37b64e170af46de7e
+  metadata.gz: 87387b9f72e30a787aa9c773a5437015916914e31ea4938341e300a46aca04b4
+  data.tar.gz: 3048c8736eac41c151ea005306bc5c3ed4f28c74d11f96da86dbdea47fe158d7
 SHA512:
-  metadata.gz: 4eef0f08b20de1250d50239fbf189b222452199ee28a9056ecc31a320c983b532213c1e3f6d5df54b719fcb88ac6f97d6dec161a64f36c78223edb38708d8bad
-  data.tar.gz: b771b91e794af665a128a62cc7f30130ff4dd3a3ad38bb49ef51d4dddaf1d6d875561e84a229ccea03ef8a2cab5c268bb4d7bbbd93ef8a855c74fb7c181bd4bf
+  metadata.gz: cab74e52ba7effecbab97ce894aa5c5f8e12f5200c994198d03bbaf3984eb299f991b0044af1691ab2573c3d8e10d0ae49f9f1b626837ca9c9d3deec3deb7ebd
+  data.tar.gz: aa1a8882ccd7375c98e7a8baccdc5f5e0bcedad47dbe39ecede1d4e326f9e4a9d939e7867309e21ef115b32274936600988fa21008208b9ea2c54841a77df2b3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.2.2 (December 17, 2020)
+
+## Bug fixes:
+
+  - Fix resolver crash when a candidate has 0 matching platforms [#4163](https://github.com/rubygems/rubygems/pull/4163)
+  - Restore change to copy global with/without config locally upon `bundle install` [#4154](https://github.com/rubygems/rubygems/pull/4154)
+
 # 2.2.1 (December 14, 2020)
 
 ## Bug fixes:

data/lib/bundler/build_metadata.rb

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2020-12-14".freeze
-    @git_commit_sha = "b98d6b2035".freeze
+    @built_at = "2020-12-17".freeze
+    @git_commit_sha = "d85cd5b7c3".freeze
     @release = true
     # end ivars
 

data/lib/bundler/cli/install.rb

@@ -152,18 +152,27 @@ module Bundler
 
       check_for_group_conflicts_in_cli_options
 
+      Bundler.settings.set_command_option :with, nil if options[:with] == []
+      Bundler.settings.set_command_option :without, nil if options[:without] == []
+
       with = options.fetch(:with, [])
       with |= Bundler.settings[:with].map(&:to_s)
       with -= options[:without] if options[:without]
-      with = nil if options[:with] == []
 
       without = options.fetch(:without, [])
       without |= Bundler.settings[:without].map(&:to_s)
       without -= options[:with] if options[:with]
-      without = nil if options[:without] == []
 
-      Bundler.settings.set_command_option :without, without
-      Bundler.settings.set_command_option :with,    with
+      options[:with]    = with
+      options[:without] = without
+
+      unless Bundler.settings[:without] == options[:without] && Bundler.settings[:with] == options[:with]
+        # need to nil them out first to get around validation for backwards compatibility
+        Bundler.settings.set_command_option :without, nil
+        Bundler.settings.set_command_option :with,    nil
+        Bundler.settings.set_command_option :without, options[:without] - options[:with]
+        Bundler.settings.set_command_option :with,    options[:with]
+      end
     end
 
     def normalize_settings
@@ -190,7 +199,7 @@ module Bundler
 
       Bundler.settings.set_command_option_if_given :clean, options["clean"]
 
-      normalize_groups if options[:without] || options[:with]
+      normalize_groups
 
       options[:force] = options[:redownload]
     end

data/lib/bundler/resolver.rb

@@ -155,6 +155,8 @@ module Bundler
         search.each do |sg|
           next unless sg.for?(platform)
           sg_all_platforms = sg.copy_for(self.class.sort_platforms(@platforms).reverse)
+          next unless sg_all_platforms
+
           selected_sgs << sg_all_platforms
 
           next if sg_all_platforms.activated_platforms == [Gem::Platform::RUBY]

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.2.1".freeze
+  VERSION = "2.2.2".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - André Arko
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -350,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.2.0
+rubygems_version: 3.2.1
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies