dependabot-bundler 0.181.0 → 0.182.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd13dd7f8f5050ff58f1bc327f8910fd3e055f0ea1948ea86b861d0003f2b5a0
-  data.tar.gz: fdc7bf5c0c4551757fd75c227244e6cda24761b306faf710b175a24d631fbdd2
+  metadata.gz: b6e8b17a6202f2d8376e6c74105653cb6b2f1b509a15eaefe449b7e2910cd176
+  data.tar.gz: 497ece32e4c87242d7a265d9285d4f5b39035d484dca5c94da19ff468edf8666
 SHA512:
-  metadata.gz: 7647a1c27872515ee4d8156a91d5d7040a36302e4337d59bf06dac29f88478cf2303abe36252130bab534c0e076a3b5b0974bcbb2202cf660ee005ed3f1a7757
-  data.tar.gz: 6f73826f5f4f7af9abfd957d15ea785cffab809afebdb21e020695cc3f62566a7dae0bddf97f2f200cdb919b87f900f679887651f7e1f630e3fb0227b878c5ff
+  metadata.gz: c4e3b2c446bd563b4c92cecdcab9eb8b562f8f85be7cf910f0906fd22dd03490f0ec28e5dbe28028d4ff1a40499e875bb5f6a8da3e27ede67ee81e9a6f372e26
+  data.tar.gz: 21132929ba3121c4c91aa5756e156e1c43336a3bb711df73df7293de171168e34b15176dc1f028928dda5c2056a4ca4788310a1c39a02af204d52721a280a544

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.181.0
+  version: 0.182.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-19 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.181.0
+        version: 0.182.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.181.0
+        version: 0.182.2
 - !ruby/object:Gem::Dependency
   name: debase
   requirement: !ruby/object:Gem::Requirement