dependabot-bundler 0.182.0 → 0.182.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e57188bd1df112be594b310a3cab71c8b8541e83d1fd61be7e7ce2a3f141720
-  data.tar.gz: b78a75e3514f9ada72f9ba77e529e2126db93a4043f5b4622e09d644b41984e4
+  metadata.gz: 2f9930097ef435f9b3bf76a340d065b02b92cd537c14978ede57a8343b90d897
+  data.tar.gz: b41d593a3b1ece997045749d93309cb2b3c0171114c59073fed23eea4a29a126
 SHA512:
-  metadata.gz: f947e37c1ffce4c8fd0f5c9c8f4895dca8c2a08002499c90565d3befd0a4b94c449f222571ec43e0e73a089a3601c683a4bde4ba4419fa5faa191df364180213
-  data.tar.gz: 4a67bc46c197fe3684df0cc5d414497b11f9843fa0f281e9461e2447d663e059d6d7ae762c7bede10a2a2d1077e27e5b4aea2a6efd70ad0ac7f30945d07da0f4
+  metadata.gz: 3e73af493a593ad30a02e6ab5aa4bd49f60083fdf9443eb96e270eb909478664ef3749a3e7b0550a024ae0564ebfea03f5023dcf9bedb12644dbaa5bee25741a
+  data.tar.gz: f3f3d4553df9ae695e18904435bac8ac916bf0640db2d7ba5f9e097fc59388bcd2d290a53759292382a4ef338ecbef29bfabc069b868d5214013b4ab477957ff

data/helpers/v2/build

@@ -22,6 +22,6 @@ cd "$install_dir"
 
 # NOTE: Sets `BUNDLED WITH` to match the installed v2 version in Gemfile.lock
 # forcing specs and native helpers to run with the same version
-BUNDLER_VERSION=2.3.10 bundle config --local path ".bundle"
-BUNDLER_VERSION=2.3.10 bundle config --local without "test"
-BUNDLER_VERSION=2.3.10 bundle install
+BUNDLER_VERSION=2.3.12 bundle config --local path ".bundle"
+BUNDLER_VERSION=2.3.12 bundle config --local without "test"
+BUNDLER_VERSION=2.3.12 bundle install

data/helpers/v2/monkey_patches/definition_ruby_version_patch.rb

@@ -5,16 +5,32 @@ require "bundler/definition"
 module BundlerDefinitionRubyVersionPatch
   def source_requirements
     if ruby_version
-      requested_version = ruby_version.to_gem_version_with_patchlevel
+      requested_version = ruby_version.gem_version
       sources.metadata_source.specs <<
         Gem::Specification.new("Ruby\0", requested_version)
     end
 
     sources.metadata_source.specs <<
-      Gem::Specification.new("Ruby\0", "2.5.3p105")
+      Gem::Specification.new("Ruby\0", "2.5.3")
 
     super
   end
+
+  def metadata_dependencies
+    @metadata_dependencies ||=
+      [
+        Bundler::Dependency.new("Ruby\0", ruby_version_requirements),
+        Bundler::Dependency.new("RubyGems\0", Gem::VERSION)
+      ]
+  end
+
+  def ruby_version_requirements
+    return [] unless ruby_version
+
+    ruby_version.versions.map do |version|
+      Gem::Requirement.new(version)
+    end
+  end
 end
 
 Bundler::Definition.prepend(BundlerDefinitionRubyVersionPatch)

data/lib/dependabot/bundler/file_updater/lockfile_updater.rb

@@ -16,6 +16,7 @@ module Dependabot
         require_relative "gemspec_updater"
         require_relative "gemspec_sanitizer"
         require_relative "gemspec_dependency_name_finder"
+        require_relative "ruby_requirement_setter"
 
         LOCKFILE_ENDING =
           /(?<ending>\s*(?:RUBY VERSION|BUNDLED WITH).*)/m.freeze
@@ -82,7 +83,7 @@ module Dependabot
         end
 
         def write_temporary_dependency_files
-          File.write(gemfile.name, updated_gemfile_content(gemfile))
+          File.write(gemfile.name, prepared_gemfile_content(gemfile))
           File.write(lockfile.name, sanitized_lockfile_body)
 
           top_level_gemspecs.each do |gemspec|
@@ -222,6 +223,16 @@ module Dependabot
         end
         # rubocop:enable Metrics/PerceivedComplexity
 
+        def prepared_gemfile_content(file)
+          content = updated_gemfile_content(file)
+
+          top_level_gemspecs.each do |gs|
+            content = RubyRequirementSetter.new(gemspec: gs).rewrite(content)
+          end
+
+          content
+        end
+
         def updated_gemfile_content(file)
           GemfileUpdater.new(
             dependencies: dependencies,

data/lib/dependabot/bundler/helpers.rb

@@ -4,7 +4,7 @@ module Dependabot
   module Bundler
     module Helpers
       V1 = "1.17.3"
-      V2 = "2.3.10"
+      V2 = "2.3.12"
       # If we are updating a project with no Gemfile.lock, we default to the
       # newest version we support
       DEFAULT = V2

data/lib/dependabot/bundler/native_helpers.rb

@@ -36,7 +36,7 @@ module Dependabot
       def self.run_bundler_subprocess(function:, args:, bundler_version:, options: {})
         # Run helper suprocess with all bundler-related ENV variables removed
         bundler_major_version = bundler_version.split(".").first
-        helpers_path = versioned_helper_path(bundler_version: bundler_major_version)
+        helpers_path = versioned_helper_path(bundler_major_version)
         ::Bundler.with_original_env do
           command = BundleCommand.
                     new(options[:timeout_per_operation_seconds]).
@@ -47,7 +47,7 @@ module Dependabot
             args: args,
             env: {
               # Bundler will pick the matching installed major version
-              "BUNDLER_VERSION" => bundler_version,
+              "BUNDLER_VERSION" => installed_bundler_version(bundler_major_version),
               "BUNDLE_GEMFILE" => File.join(helpers_path, "Gemfile"),
               # Prevent the GEM_HOME from being set to a folder owned by root
               "GEM_HOME" => File.join(helpers_path, ".bundle")
@@ -61,8 +61,15 @@ module Dependabot
         end
       end
 
-      def self.versioned_helper_path(bundler_version:)
-        File.join(native_helpers_root, "v#{bundler_version}")
+      def self.versioned_helper_path(bundler_major_version)
+        File.join(native_helpers_root, "v#{bundler_major_version}")
+      end
+
+      # Maps the major version unto the specific version we have installed
+      def self.installed_bundler_version(bundler_major_version)
+        return Helpers::V1 if bundler_major_version == "1"
+
+        Helpers::V2
       end
 
       def self.native_helpers_root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.182.0
+  version: 0.182.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.182.0
+        version: 0.182.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.182.0
+        version: 0.182.3
 - !ruby/object:Gem::Dependency
   name: debase
   requirement: !ruby/object:Gem::Requirement