dependabot-bundler 0.159.2 → 0.162.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d65296794048f6e8d506164a37be0417746bbe2b536166262a86578f77fea89
-  data.tar.gz: 7700181a3955b0a843a5fa4288a231debe8b0080b18fd85b85f8869bbc21c281
+  metadata.gz: 1cf2c5b2a8e0b5bb7cc387ad78774f79bb0b945983829521ae526def463cfdcd
+  data.tar.gz: fbe6a332290864c9525a5b1b6dc5877b275883ddd004d27dccc25c66bb3c1bd8
 SHA512:
-  metadata.gz: aa2935f4563617e7147c72b1684f450ee46b78e1eb1f5697526229e7377142072d6d02fda545060113b47c7de2188ec951e88f61ecb1935b71ba9eb867dea182
-  data.tar.gz: 3dbd87d4cc4de4214ec659e538d685be7d7619fa95656ec54c4a192114de614efe6488d5306e1d1b5d1497fdd42e4a3da3aeff47a348db3fd45cfe4054829c1b
+  metadata.gz: 63f7f145c1184a2c23054711608c7d8280f2d8e211ef084df7614933ab4cbe0faa020f58752d7be6b7fbdcc1e6ed5c4e13b874d3660c4b1c924411486f028aa3
+  data.tar.gz: 61ef440e27fb6ea60a0cfd6c47c8df32d33dd67900f1b1497d6648265e8c37bf6ff98b1c861615c63d28739cecb75629bb96a3000eac7bd207c67b0bb78bcbfa

data/helpers/v1/build

@@ -20,6 +20,6 @@ cd "$install_dir"
 
 # NOTE: Sets `BUNDLED WITH` to match the installed v1 version in Gemfile.lock
 # forcing native helpers to run with the same version
-BUNDLER_VERSION=1 bundle config set --local path ".bundle"
-BUNDLER_VERSION=1 bundle config set --local without "test"
-BUNDLER_VERSION=1 bundle install
+BUNDLER_VERSION=1.17.3 bundle config set --local path ".bundle"
+BUNDLER_VERSION=1.17.3 bundle config set --local without "test"
+BUNDLER_VERSION=1.17.3 bundle install

data/helpers/v2/build

@@ -20,6 +20,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 bundle config set --local path ".bundle"
-BUNDLER_VERSION=2 bundle config set --local without "test"
-BUNDLER_VERSION=2 bundle install
+BUNDLER_VERSION=2.2.26 bundle config set --local path ".bundle"
+BUNDLER_VERSION=2.2.26 bundle config set --local without "test"
+BUNDLER_VERSION=2.2.26 bundle install

data/helpers/v2/lib/functions/force_updater.rb

@@ -106,7 +106,7 @@ module Functions
         gemfile_name,
         lockfile_name,
         gems: gems_to_unlock + subdependencies,
-        lock_shared_dependencies: true
+        conservative: true
       )
 
       # Remove the Gemfile / gemspec requirements on the gems we're

data/helpers/v2/lib/functions/version_resolver.rb

@@ -97,7 +97,7 @@ module Functions
         gemfile_name,
         lockfile_name,
         gems: dependencies_to_unlock,
-        lock_shared_dependencies: true
+        conservative: true
       )
     end
 

data/lib/dependabot/bundler/helpers.rb

@@ -3,8 +3,8 @@
 module Dependabot
   module Bundler
     module Helpers
-      V1 = "1"
-      V2 = "2"
+      V1 = "1.17.3"
+      V2 = "2.2.26"
       # If we are updating a project with no Gemfile.lock, we default to the
       # newest version we support
       DEFAULT = V2
@@ -31,7 +31,7 @@ module Dependabot
         if (matches = lockfile.content.match(BUNDLER_MAJOR_VERSION_REGEX))
           matches[:version]
         else
-          FAILOVER
+          "1"
         end
       end
     end

data/lib/dependabot/bundler/native_helpers.rb

@@ -8,17 +8,18 @@ module Dependabot
     module NativeHelpers
       def self.run_bundler_subprocess(function:, args:, bundler_version:)
         # Run helper suprocess with all bundler-related ENV variables removed
+        bundler_major_version = bundler_version.split(".").first
         ::Bundler.with_original_env do
           SharedHelpers.run_helper_subprocess(
-            command: helper_path(bundler_version: bundler_version),
+            command: helper_path(bundler_version: bundler_major_version),
             function: function,
             args: args,
             env: {
               # Bundler will pick the matching installed major version
               "BUNDLER_VERSION" => bundler_version,
-              "BUNDLE_GEMFILE" => File.join(versioned_helper_path(bundler_version: bundler_version), "Gemfile"),
+              "BUNDLE_GEMFILE" => File.join(versioned_helper_path(bundler_version: bundler_major_version), "Gemfile"),
               # Prevent the GEM_HOME from being set to a folder owned by root
-              "GEM_HOME" => File.join(versioned_helper_path(bundler_version: bundler_version), ".bundle")
+              "GEM_HOME" => File.join(versioned_helper_path(bundler_version: bundler_major_version), ".bundle")
             }
           )
         rescue SharedHelpers::HelperSubprocessFailed => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.159.2
+  version: 0.162.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-09-07 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.159.2
+        version: 0.162.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.159.2
+        version: 0.162.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement