bundler 2.2.2 → 2.2.7

data/lib/bundler/source/path/installer.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../rubygems_gem_installer"
+
 module Bundler
   class Source
     class Path

data/lib/bundler/source/rubygems.rb

@@ -145,6 +145,8 @@ module Bundler
 
           Bundler.mkdir_p bin_path, :no_sudo => true unless spec.executables.empty? || Bundler.rubygems.provides?(">= 2.7.5")
 
+          require_relative "../rubygems_gem_installer"
+
           installed_spec = Bundler::RubyGemsGemInstaller.at(
             path,
             :install_dir         => install_path.to_s,
@@ -351,7 +353,6 @@ module Bundler
       def installed_specs
         @installed_specs ||= Index.build do |idx|
           Bundler.rubygems.all_specs.reverse_each do |spec|
-            next if spec.name == "bundler"
             spec.source = self
             if Bundler.rubygems.spec_missing_extensions?(spec, false)
               Bundler.ui.debug "Source #{self} is ignoring #{spec} because it is missing extensions"
@@ -487,8 +488,15 @@ module Bundler
           uri = spec.remote.uri
           Bundler.ui.confirm("Fetching #{version_message(spec)}")
           rubygems_local_path = Bundler.rubygems.download_gem(spec, uri, download_path)
+
+          # older rubygems return varying file:// variants depending on version
+          rubygems_local_path = rubygems_local_path.gsub(/\Afile:/, "") unless Bundler.rubygems.provides?(">= 3.2.0.rc.2")
+          rubygems_local_path = rubygems_local_path.gsub(%r{\A//}, "") if Bundler.rubygems.provides?("< 3.1.0")
+
           if rubygems_local_path != local_path
-            FileUtils.mv(rubygems_local_path, local_path)
+            SharedHelpers.filesystem_access(local_path) do
+              FileUtils.mv(rubygems_local_path, local_path)
+            end
           end
           cache_globally(spec, local_path)
         end

data/lib/bundler/spec_set.rb

@@ -22,12 +22,13 @@ module Bundler
         break unless dep = deps.shift
         next if !handled.add?(dep) || skip.include?(dep.name)
 
-        if spec = spec_for_dependency(dep, match_current_platform)
-          specs << spec
+        specs_for_dep = spec_for_dependency(dep, match_current_platform)
+        if specs_for_dep.any?
+          specs += specs_for_dep
 
-          spec.dependencies.each do |d|
+          specs_for_dep.first.dependencies.each do |d|
             next if d.type == :development
-            d = DepProxy.new(d, dep.__platform) unless match_current_platform
+            d = DepProxy.get_proxy(d, dep.__platform) unless match_current_platform
             deps << d
           end
         elsif check
@@ -184,11 +185,7 @@ module Bundler
     def spec_for_dependency(dep, match_current_platform)
       specs_for_platforms = lookup[dep.name]
       if match_current_platform
-        Bundler.rubygems.platforms.reverse_each do |pl|
-          match = GemHelpers.select_best_platform_match(specs_for_platforms, pl)
-          return match if match
-        end
-        nil
+        GemHelpers.select_best_platform_match(specs_for_platforms, Bundler.local_platform)
       else
         GemHelpers.select_best_platform_match(specs_for_platforms, dep.__platform)
       end

data/lib/bundler/templates/newgem/Gemfile.tt

@@ -16,5 +16,5 @@ gem "<%= config[:test] %>", "~> <%= config[:test_framework_version] %>"
 <%- end -%>
 <%- if config[:rubocop] -%>
 
-gem "rubocop", "~> 0.80"
+gem "rubocop", "~> <%= config[:rubocop_version] %>"
 <%- end -%>

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
 <%- if config[:mit] -%>
   spec.license       = "MIT"
 <%- end -%>
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= <%= config[:required_ruby_version] %>")
 
   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 

data/lib/bundler/templates/newgem/rubocop.yml.tt

@@ -1,3 +1,6 @@
+AllCops:
+  TargetRubyVersion: <%= ::Gem::Version.new(config[:required_ruby_version]).segments[0..1].join(".") %>
+
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes

data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb

@@ -26,6 +26,13 @@ module Bundler::Molinillo
         end
       end
 
+      # (see Bundler::Molinillo::SpecificationProvider#dependencies_equal?)
+      def dependencies_equal?(dependencies, other_dependencies)
+        with_no_such_dependency_error_handling do
+          specification_provider.dependencies_equal?(dependencies, other_dependencies)
+        end
+      end
+
       # (see Bundler::Molinillo::SpecificationProvider#name_for)
       def name_for(dependency)
         with_no_such_dependency_error_handling do

data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb

@@ -121,7 +121,7 @@ module Bundler::Molinillo
           t = ''.dup
           depth = 2
           tree.each do |req|
-            t << '  ' * depth << req.to_s
+            t << '  ' * depth << printable_requirement.call(req)
             unless tree.last == req
               if spec = conflict.activated_by_name[name_for(req)]
                 t << %( was resolved to #{version_for_spec.call(spec)}, which)

data/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb

@@ -45,6 +45,17 @@ module Bundler::Molinillo
       true
     end
 
+    # Determines whether two arrays of dependencies are equal, and thus can be
+    # grouped.
+    #
+    # @param [Array<Object>] dependencies
+    # @param [Array<Object>] other_dependencies
+    # @return [Boolean] whether `dependencies` and `other_dependencies` should
+    #   be considered equal.
+    def dependencies_equal?(dependencies, other_dependencies)
+      dependencies == other_dependencies
+    end
+
     # Returns the name for the given `dependency`.
     # @note This method should be 'pure', i.e. the return value should depend
     #   only on the `dependency` parameter.

data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb

@@ -329,11 +329,11 @@ module Bundler::Molinillo
 
         # Look for past conflicts that could be unwound to affect the
         # requirement tree for the current conflict
+        all_reqs = last_detail_for_current_unwind.all_requirements
+        all_reqs_size = all_reqs.size
         relevant_unused_unwinds = unused_unwind_options.select do |alternative|
-          intersecting_requirements =
-            last_detail_for_current_unwind.all_requirements &
-            alternative.requirements_unwound_to_instead
-          next if intersecting_requirements.empty?
+          diff_reqs = all_reqs - alternative.requirements_unwound_to_instead
+          next if diff_reqs.size == all_reqs_size
           # Find the highest index unwind whilst looping through
           current_detail = alternative if alternative > current_detail
           alternative
@@ -344,8 +344,12 @@ module Bundler::Molinillo
         state.unused_unwind_options += unwind_details.reject { |detail| detail.state_index == -1 }
 
         # Update the requirements_unwound_to_instead on any relevant unused unwinds
-        relevant_unused_unwinds.each { |d| d.requirements_unwound_to_instead << current_detail.state_requirement }
-        unwind_details.each { |d| d.requirements_unwound_to_instead << current_detail.state_requirement }
+        relevant_unused_unwinds.each do |d|
+          (d.requirements_unwound_to_instead << current_detail.state_requirement).uniq!
+        end
+        unwind_details.each do |d|
+          (d.requirements_unwound_to_instead << current_detail.state_requirement).uniq!
+        end
 
         current_detail
       end
@@ -803,7 +807,7 @@ module Bundler::Molinillo
 
         possibilities.reverse_each do |possibility|
           dependencies = dependencies_for(possibility)
-          if current_possibility_set && current_possibility_set.dependencies == dependencies
+          if current_possibility_set && dependencies_equal?(current_possibility_set.dependencies, dependencies)
             current_possibility_set.possibilities.unshift(possibility)
           else
             possibility_sets.unshift(PossibilitySet.new(dependencies, [possibility]))

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.2.2".freeze
+  VERSION = "2.2.7".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.2
+  version: 2.2.7
 platform: ruby
 authors:
 - André Arko
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -74,6 +74,7 @@ files:
 - lib/bundler/cli/viz.rb
 - lib/bundler/compact_index_client.rb
 - lib/bundler/compact_index_client/cache.rb
+- lib/bundler/compact_index_client/gem_parser.rb
 - lib/bundler/compact_index_client/updater.rb
 - lib/bundler/constants.rb
 - lib/bundler/current_ruby.rb
@@ -112,31 +113,57 @@ files:
 - lib/bundler/lockfile_generator.rb
 - lib/bundler/lockfile_parser.rb
 - lib/bundler/man/.document
+- lib/bundler/man/bundle-add.1
 - lib/bundler/man/bundle-add.1.ronn
+- lib/bundler/man/bundle-binstubs.1
 - lib/bundler/man/bundle-binstubs.1.ronn
+- lib/bundler/man/bundle-cache.1
 - lib/bundler/man/bundle-cache.1.ronn
+- lib/bundler/man/bundle-check.1
 - lib/bundler/man/bundle-check.1.ronn
+- lib/bundler/man/bundle-clean.1
 - lib/bundler/man/bundle-clean.1.ronn
+- lib/bundler/man/bundle-config.1
 - lib/bundler/man/bundle-config.1.ronn
+- lib/bundler/man/bundle-doctor.1
 - lib/bundler/man/bundle-doctor.1.ronn
+- lib/bundler/man/bundle-exec.1
 - lib/bundler/man/bundle-exec.1.ronn
+- lib/bundler/man/bundle-gem.1
 - lib/bundler/man/bundle-gem.1.ronn
+- lib/bundler/man/bundle-info.1
 - lib/bundler/man/bundle-info.1.ronn
+- lib/bundler/man/bundle-init.1
 - lib/bundler/man/bundle-init.1.ronn
+- lib/bundler/man/bundle-inject.1
 - lib/bundler/man/bundle-inject.1.ronn
+- lib/bundler/man/bundle-install.1
 - lib/bundler/man/bundle-install.1.ronn
+- lib/bundler/man/bundle-list.1
 - lib/bundler/man/bundle-list.1.ronn
+- lib/bundler/man/bundle-lock.1
 - lib/bundler/man/bundle-lock.1.ronn
+- lib/bundler/man/bundle-open.1
 - lib/bundler/man/bundle-open.1.ronn
+- lib/bundler/man/bundle-outdated.1
 - lib/bundler/man/bundle-outdated.1.ronn
+- lib/bundler/man/bundle-platform.1
 - lib/bundler/man/bundle-platform.1.ronn
+- lib/bundler/man/bundle-pristine.1
 - lib/bundler/man/bundle-pristine.1.ronn
+- lib/bundler/man/bundle-remove.1
 - lib/bundler/man/bundle-remove.1.ronn
+- lib/bundler/man/bundle-show.1
 - lib/bundler/man/bundle-show.1.ronn
+- lib/bundler/man/bundle-update.1
 - lib/bundler/man/bundle-update.1.ronn
+- lib/bundler/man/bundle-viz.1
 - lib/bundler/man/bundle-viz.1.ronn
+- lib/bundler/man/bundle.1
 - lib/bundler/man/bundle.1.ronn
+- lib/bundler/man/gemfile.5
 - lib/bundler/man/gemfile.5.ronn
+- lib/bundler/man/index.txt
 - lib/bundler/match_platform.rb
 - lib/bundler/mirror.rb
 - lib/bundler/plugin.rb
@@ -301,32 +328,6 @@ files:
 - lib/bundler/vlad.rb
 - lib/bundler/worker.rb
 - lib/bundler/yaml_serializer.rb
-- man/bundle-add.1
-- man/bundle-binstubs.1
-- man/bundle-cache.1
-- man/bundle-check.1
-- man/bundle-clean.1
-- man/bundle-config.1
-- man/bundle-doctor.1
-- man/bundle-exec.1
-- man/bundle-gem.1
-- man/bundle-info.1
-- man/bundle-init.1
-- man/bundle-inject.1
-- man/bundle-install.1
-- man/bundle-list.1
-- man/bundle-lock.1
-- man/bundle-open.1
-- man/bundle-outdated.1
-- man/bundle-platform.1
-- man/bundle-pristine.1
-- man/bundle-remove.1
-- man/bundle-show.1
-- man/bundle-update.1
-- man/bundle-viz.1
-- man/bundle.1
-- man/gemfile.5
-- man/index.txt
 homepage: https://bundler.io
 licenses:
 - MIT
@@ -350,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.2.1
+rubygems_version: 3.2.7
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies