bundler 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0af01fdf441e83df2f02f7e0028ca485d12bb37986101861fa498f0768763708
-  data.tar.gz: 319299292a4a3b6e295e8d28bd6c9c7f2f478d686ff6ea733f31271c4f574512
+  metadata.gz: 828d688b53800760eabd11c4c520dbff151ef88b6029ee4368ed7b47bb9c9bc5
+  data.tar.gz: 76b9369b4bd4d2ad94a993f38032154072382cf6a60b30d37b64e170af46de7e
 SHA512:
-  metadata.gz: cc0d1557b038284fb34953722569b55cfd4541f172a099583d12b53eed299768664df54e032bc9ad7f1c7b379e069ccd2a9e1ad85a7c6bc9afa5087c03da986c
-  data.tar.gz: de013b518986f6a7fcb8a5e36541e33dfd574aabd662a71f506bf4099c9fc690aeeed6a07b36aee698cac464cf5070b603da1aca3fbe96d796ec59e907d4e5ae
+  metadata.gz: 4eef0f08b20de1250d50239fbf189b222452199ee28a9056ecc31a320c983b532213c1e3f6d5df54b719fcb88ac6f97d6dec161a64f36c78223edb38708d8bad
+  data.tar.gz: b771b91e794af665a128a62cc7f30130ff4dd3a3ad38bb49ef51d4dddaf1d6d875561e84a229ccea03ef8a2cab5c268bb4d7bbbd93ef8a855c74fb7c181bd4bf

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 2.2.1 (December 14, 2020)
+
+## Bug fixes:
+
+  - Ad-hoc fix for platform regression [#4127](https://github.com/rubygems/rubygems/pull/4127)
+  - Workaround JRuby + Windows issue with net-http-persistent vendored code [#4138](https://github.com/rubygems/rubygems/pull/4138)
+  - Reset also root when in a nested invocation [#4140](https://github.com/rubygems/rubygems/pull/4140)
+  - Restore 2.1.4 resolution times [#4134](https://github.com/rubygems/rubygems/pull/4134)
+  - Fix `bundle outdated --strict` crash [#4133](https://github.com/rubygems/rubygems/pull/4133)
+  - Autoload `Bundler::RemoteSpecification` to workaround crash on jruby [#4114](https://github.com/rubygems/rubygems/pull/4114)
+
 # 2.2.0 (December 7, 2020)
 
 ## Enhancements:
@@ -34,7 +45,11 @@
 
 # 2.2.0.rc.2 (October 6, 2020)
 
-## Minor enhancements:
+## Features:
+
+  - Add `bundle fund` command [#3390](https://github.com/rubygems/rubygems/pull/3390)
+
+## Enhancements:
 
   - Fix ls-files matching regexp [#3845](https://github.com/rubygems/rubygems/pull/3845)
   - Remove redundant `bundler/setup` require from `spec_helper.rb` generated by `bundle gem` [#3791](https://github.com/rubygems/rubygems/pull/3791)
@@ -67,10 +82,6 @@
 
   - Deprecate `bundle cache --all` flag [#3932](https://github.com/rubygems/rubygems/pull/3932)
 
-## Features:
-
-  - Add `bundle fund` command [#3390](https://github.com/rubygems/rubygems/pull/3390)
-
 ## Documentation:
 
   - Correct grammar in Gemfile docs [#3990](https://github.com/rubygems/rubygems/pull/3990)
@@ -81,12 +92,12 @@
 
 # 2.2.0.rc.1 (July 2, 2020)
 
-## Major enhancements:
+## Features:
 
   - Windows support. There's still gotchas and unimplemented features, but a Windows CI is now enforced.
   - Full multiplatform support. Bundler should now seamlessly handle multiplatform `Gemfile` or `gems.rb` files.
 
-## Features:
+## Enhancements:
 
   - `bundle info` now includes gem metadata [#7376](https://github.com/rubygems/bundler/pull/7376)
   - `bundle list --without-group` and `bundle list --only-group` now support space separated list of groups in addition to single groups [#7404](https://github.com/rubygems/bundler/pull/7404)
@@ -97,9 +108,6 @@
   - Add `bundle plugin uninstall` [#3482](https://github.com/rubygems/rubygems/pull/3482)
   - `bundle gem` now supports a `--ci` flag and a `gem.ci` configuration that adds CI config files for the main CI providers to the generated gem skeleton [#3667](https://github.com/rubygems/rubygems/pull/3667)
   - Allow setting a tag prefix to be used by release tasks [#3766](https://github.com/rubygems/rubygems/pull/3766)
-
-## Minor enhancements:
-
   - `bundle outdated` now prints output in columns for better readability [#4474](https://github.com/rubygems/bundler/pull/4474)
   - bundler's `release` rake task now prints a better message when not being logged in and trying to push a gem [#7513](https://github.com/rubygems/bundler/pull/7513)
   - `BUNDLE_APP_CONFIG` environment variable is now documented [#7563](https://github.com/rubygems/bundler/pull/7563)
@@ -192,7 +200,7 @@
   - Restore previous `BUNDLE_GEMFILE` in `bundler/inline` [#7418](https://github.com/rubygems/bundler/pull/7418)
   - Fix error when using `gem` DSL's `:glob` option for selecting gemspecs from a specific source [#7419](https://github.com/rubygems/bundler/pull/7419)
 
-## Minor enhancements:
+## Enhancements:
 
   - `bundle config` no longer warns when using "old interface" (might be deprecated again in the future) [#7475](https://github.com/rubygems/bundler/pull/7475)
   - `bundle update` no longer warns when used without arguments (might be deprecated again in the future) [#7475](https://github.com/rubygems/bundler/pull/7475)
@@ -321,7 +329,7 @@
 
 # 2.0.2 (June 13, 2019)
 
-## Minor enhancements:
+## Enhancements:
 
   - Fixes for Bundler integration with ruby-src ([#6941](https://github.com/rubygems/bundler/pull/6941), [#6973](https://github.com/bundler/bundler/pull/6973), [#6977](https://github.com/bundler/bundler/pull/6977), [#6315](https://github.com/bundler/bundler/pull/6315), [#7061](https://github.com/bundler/bundler/pull/7061))
   - Use `__dir__` instead of `__FILE__` when generating a gem with `bundle gem` ([#6503](https://github.com/rubygems/bundler/pull/6503))
@@ -365,7 +373,7 @@
 
   - Ruby 2.6 compatibility fixes (@segiddins)
 
-## Minor enhancements:
+## Enhancements:
 
   - Import changes from Bundler 1.17.3 release
 
@@ -460,7 +468,7 @@ Changes
 
 # 1.16.6 (October 5, 2018)
 
-## Minor enhancements:
+## Enhancements:
 
   - Add an error message when adding a gem with `bundle add` that's already in the bundle ([#6341](https://github.com/rubygems/bundler/issues/6341), @agrim123)
   - Add Homepage, Source Code and Changelog URI metadata fields to the `bundle gem` gemspec template (@walf443)
@@ -482,7 +490,7 @@ Changes
 
 # 1.16.5 (September 18, 2018)
 
-## Minor enhancements:
+## Enhancements:
 
   - Add support for TruffleRuby (@eregon)
 
@@ -498,7 +506,7 @@ Changes
 
 # 1.16.4 (August 17, 2018)
 
-## Minor enhancements:
+## Enhancements:
 
   - Welcome new members to the Bundler core team (@indirect)
   - Don't mutate original error trees when determining version_conflict_message (@greysteil)
@@ -540,7 +548,7 @@ Changes
 
 # 1.16.2 (April 20, 2018)
 
-## Minor enhancements:
+## Enhancements:
 
   - Include the gem's source in the gem install error message when available (@papanikge)
   - Remove unnecessary executable bit from gem template (@voxik)
@@ -1519,7 +1527,7 @@ Changes
   - prefer gemspecs closest to the directory root ([#3428](https://github.com/rubygems/bundler/issues/3428), @segiddins)
   - debug log for API request limits ([#3452](https://github.com/rubygems/bundler/issues/3452), @neerfri)
 
-## Minor enhancements:
+## Enhancements:
 
   - Molinillo resolver, shared with CocoaPods (@segiddins)
   - updated Thor to v0.19.1 (@segiddins)

data/lib/bundler.rb

@@ -212,6 +212,15 @@ module Bundler
         end
     end
 
+    def locked_bundler_version
+      return nil unless defined?(@definition) && @definition
+
+      locked_gems = definition.locked_gems
+      return nil unless locked_gems
+
+      locked_gems.bundler_version
+    end
+
     def ruby_scope
       "#{Bundler.rubygems.ruby_engine}/#{RbConfig::CONFIG["ruby_version"]}"
     end
@@ -602,8 +611,9 @@ EOF
       reset_rubygems!
     end
 
-    def reset_settings!
+    def reset_settings_and_root!
       @settings = nil
+      @root = nil
     end
 
     def reset_paths!

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-10".freeze
-    @git_commit_sha = "d3628e5019".freeze
+    @built_at = "2020-12-14".freeze
+    @git_commit_sha = "b98d6b2035".freeze
     @release = true
     # end ivars
 

data/lib/bundler/cli.rb

@@ -57,7 +57,7 @@ module Bundler
       custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile]
       if custom_gemfile && !custom_gemfile.empty?
         Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", File.expand_path(custom_gemfile)
-        Bundler.reset_settings!
+        Bundler.reset_settings_and_root!
       end
 
       Bundler.settings.set_command_option_if_given :retry, options[:retry]

data/lib/bundler/cli/outdated.rb

@@ -76,6 +76,8 @@ module Bundler
         next unless gems.empty? || gems.include?(current_spec.name)
 
         active_spec = retrieve_active_spec(definition, current_spec)
+        next unless active_spec
+
         next unless filter_options_patch.empty? || update_present_via_semver_portions(current_spec, active_spec, options)
 
         gem_outdated = Gem::Version.new(active_spec.version) > Gem::Version.new(current_spec.version)
@@ -229,8 +231,6 @@ module Bundler
     end
 
     def update_present_via_semver_portions(current_spec, active_spec, options)
-      return false if active_spec.nil?
-
       current_major = current_spec.version.segments.first
       active_major = active_spec.version.segments.first
 

data/lib/bundler/definition.rb

@@ -269,7 +269,9 @@ module Bundler
           else
             # Run a resolve against the locally available gems
             Bundler.ui.debug("Found changes from the lockfile, re-resolving dependencies because #{change_reason}")
-            last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, last_resolve, gem_version_promoter, additional_base_requirements_for_resolve, platforms)
+            platforms_for_resolve = platforms.one? {|p| generic(p) == Gem::Platform::RUBY } ? platforms : platforms.reject{|p| p == Gem::Platform::RUBY }
+            expanded_dependencies = expand_dependencies(dependencies + metadata_dependencies, @remote, platforms_for_resolve.map {|p| generic(p) })
+            last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, last_resolve, gem_version_promoter, additional_base_requirements_for_resolve, platforms_for_resolve)
           end
 
         # filter out gems that _can_ be installed on multiple platforms, but don't need
@@ -548,11 +550,7 @@ module Bundler
     private
 
     def add_current_platform
-      current_platforms.each {|platform| add_platform(platform) }
-    end
-
-    def current_platforms
-      [local_platform, generic_local_platform].uniq
+      add_platform(local_platform)
     end
 
     def change_reason
@@ -847,14 +845,6 @@ module Bundler
       @locked_specs[dep].any? {|s| s.satisfies?(dep) && (!dep.source || s.source.include?(dep.source)) }
     end
 
-    # This list of dependencies is only used in #resolve, so it's OK to add
-    # the metadata dependencies here
-    def expanded_dependencies
-      @expanded_dependencies ||= begin
-        expand_dependencies(dependencies + metadata_dependencies, @remote)
-      end
-    end
-
     def metadata_dependencies
       @metadata_dependencies ||= begin
         ruby_versions = ruby_version_requirements(@ruby_version)
@@ -881,7 +871,8 @@ module Bundler
       end
     end
 
-    def expand_dependencies(dependencies, remote = false)
+    def expand_dependencies(dependencies, remote = false, platforms = nil)
+      platforms ||= @platforms
       deps = []
       dependencies.each do |dep|
         dep = Dependency.new(dep, ">= 0") unless dep.respond_to?(:name)

data/lib/bundler/dependency.rb

@@ -96,9 +96,11 @@ module Bundler
     def gem_platforms(valid_platforms)
       return valid_platforms if @platforms.empty?
 
+      valid_generic_platforms = valid_platforms.map {|p| [p, GemHelpers.generic(p)] }.to_h
       @gem_platforms ||= expanded_platforms.compact.uniq
 
-      valid_platforms & @gem_platforms
+      filtered_generic_platforms = valid_generic_platforms.values & @gem_platforms
+      valid_generic_platforms.select {|_, v| filtered_generic_platforms.include?(v) }.keys
     end
 
     def expanded_platforms

data/lib/bundler/lazy_specification.rb

@@ -82,7 +82,7 @@ module Bundler
         search_object = if source.is_a?(Source::Path)
           Dependency.new(name, version)
         else
-          self
+          ruby_platform_materializes_to_ruby_platform? ? self : Dependency.new(name, version)
         end
         platform_object = Gem::Platform.new(platform)
         candidates = source.specs.search(search_object)
@@ -129,5 +129,19 @@ module Bundler
 
       @specification.send(method, *args, &blk)
     end
+
+    #
+    # Bundler 2.2.0 was the first version that records the full resolution
+    # including platform specific gems in the lockfile, which means that if a
+    # gem with RUBY platform is recorded, the RUBY platform version of the gem
+    # should be installed. Previously bundler would record only generic versions
+    # in the lockfile and then install the most specific platform variant if
+    # available.
+    #
+    def ruby_platform_materializes_to_ruby_platform?
+      locked_bundler_version = Bundler.locked_bundler_version
+
+      locked_bundler_version.nil? || Gem::Version.new(locked_bundler_version) >= Gem::Version.new("2.2.0")
+    end
   end
 end

data/lib/bundler/resolver.rb

@@ -75,7 +75,7 @@ module Bundler
       return unless debug?
       debug_info = yield
       debug_info = debug_info.inspect unless debug_info.is_a?(String)
-      warn debug_info.split("\n").map {|s| "BUNDLER: " + "  " * depth + s }
+      puts debug_info.split("\n").map {|s| "BUNDLER: " + "  " * depth + s }
     end
 
     def debug?
@@ -106,18 +106,19 @@ module Bundler
       specification.dependencies_for_activated_platforms
     end
 
-    def search_for(dependency)
-      platform = dependency.__platform
-      dependency = dependency.dep unless dependency.is_a? Gem::Dependency
-      search = @search_for[dependency] ||= begin
+    def search_for(dependency_proxy)
+      platform = dependency_proxy.__platform
+      dependency = dependency_proxy.dep
+      @search_for[dependency_proxy] ||= begin
+        name = dependency.name
         index = index_for(dependency)
-        results = index.search(dependency, @base[dependency.name])
+        results = index.search(dependency, @base[name])
 
-        if vertex = @base_dg.vertex_named(dependency.name)
+        if vertex = @base_dg.vertex_named(name)
           locked_requirement = vertex.payload.requirement
         end
 
-        if !@prerelease_specified[dependency.name] && (!@use_gvp || locked_requirement.nil?)
+        if !@prerelease_specified[name] && (!@use_gvp || locked_requirement.nil?)
           # Move prereleases to the beginning of the list, so they're considered
           # last during resolution.
           pre, results = results.partition {|spec| spec.version.prerelease? }
@@ -145,31 +146,25 @@ module Bundler
         end
         # GVP handles major itself, but it's still a bit risky to trust it with it
         # until we get it settled with new behavior. For 2.x it can take over all cases.
-        if !@use_gvp
+        search = if !@use_gvp
           spec_groups
         else
           @gem_version_promoter.sort_versions(dependency, spec_groups)
         end
-      end
-      selected_sgs = []
-      search.each do |sg|
-        next unless sg.for?(platform)
-        # Add a spec group for "non platform specific spec" as the fallback
-        # spec group.
-        sg_ruby = sg.copy_for(Gem::Platform::RUBY)
-        selected_sgs << sg_ruby if sg_ruby
-        sg_all_platforms = nil
-        all_platforms = @platforms + [platform]
-        self.class.sort_platforms(all_platforms).reverse_each do |other_platform|
-          if sg_all_platforms.nil?
-            sg_all_platforms = sg.copy_for(other_platform)
-          else
-            sg_all_platforms.activate_platform!(other_platform)
-          end
+        selected_sgs = []
+        search.each do |sg|
+          next unless sg.for?(platform)
+          sg_all_platforms = sg.copy_for(self.class.sort_platforms(@platforms).reverse)
+          selected_sgs << sg_all_platforms
+
+          next if sg_all_platforms.activated_platforms == [Gem::Platform::RUBY]
+          # Add a spec group for "non platform specific spec" as the fallback
+          # spec group.
+          sg_ruby = sg.copy_for([Gem::Platform::RUBY])
+          selected_sgs.insert(-2, sg_ruby) if sg_ruby
         end
-        selected_sgs << sg_all_platforms
+        selected_sgs
       end
-      selected_sgs
     end
 
     def index_for(dependency)

data/lib/bundler/resolver/spec_group.rb

@@ -6,7 +6,7 @@ module Bundler
       include GemHelpers
 
       attr_accessor :name, :version, :source
-      attr_accessor :ignores_bundler_dependencies
+      attr_accessor :ignores_bundler_dependencies, :activated_platforms
 
       def initialize(all_specs)
         @all_specs = all_specs
@@ -32,17 +32,13 @@ module Bundler
         end.compact.uniq
       end
 
-      def activate_platform!(platform)
-        return unless for?(platform)
-        return if @activated_platforms.include?(platform)
-        @activated_platforms << platform
-      end
+      def copy_for(platforms)
+        platforms.select! {|p| for?(p) }
+        return unless platforms.any?
 
-      def copy_for(platform)
         copied_sg = self.class.new(@all_specs)
         copied_sg.ignores_bundler_dependencies = @ignores_bundler_dependencies
-        return nil unless copied_sg.for?(platform)
-        copied_sg.activate_platform!(platform)
+        copied_sg.activated_platforms = platforms
         copied_sg
       end
 

data/lib/bundler/rubygems_integration.rb

@@ -565,7 +565,6 @@ module Bundler
     end
 
     def all_specs
-      require_relative "remote_specification"
       Gem::Specification.stubs.map do |stub|
         StubSpecification.from_stub(stub)
       end

data/lib/bundler/stub_specification.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "remote_specification"
-
 module Bundler
   class StubSpecification < RemoteSpecification
     def self.from_stub(stub)

data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb

@@ -159,7 +159,14 @@ class Bundler::Persistent::Net::HTTP::Persistent
   # limits (typically windows).
 
   if Process.const_defined? :RLIMIT_NOFILE
-    DEFAULT_POOL_SIZE = Process.getrlimit(Process::RLIMIT_NOFILE).first / 4
+    open_file_limits = Process.getrlimit(Process::RLIMIT_NOFILE)
+
+    # Under JRuby on Windows Process responds to `getrlimit` but returns something that does not match docs
+    if open_file_limits.respond_to?(:first)
+      DEFAULT_POOL_SIZE = open_file_limits.first / 4
+    else
+      DEFAULT_POOL_SIZE = 256
+    end
   else
     DEFAULT_POOL_SIZE = 256
   end

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.2.0".freeze
+  VERSION = "2.2.1".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.0
+  version: 2.2.1
 platform: ruby
 authors:
 - André Arko
@@ -19,10 +19,10 @@ authors:
 - Terence Lee
 - Carl Lerche
 - Yehuda Katz
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -335,7 +335,7 @@ metadata:
   changelog_uri: https://github.com/rubygems/rubygems/blob/master/bundler/CHANGELOG.md
   homepage_uri: https://bundler.io/
   source_code_uri: https://github.com/rubygems/rubygems/
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -351,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.2
 requirements: []
 rubygems_version: 3.2.0
-signing_key:
+signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []