dependabot-bundler 0.160.0 → 0.160.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0764b4f91a6505836f8a4351e9370e79b8a13e7cfeaf870d27e07f1efecc99e7
-  data.tar.gz: 65b74101e5c82dc23a2ef0bf3de0b1f34266ffe0557c9143ff5de7550d1c8f36
+  metadata.gz: 191a073daaf7e5c9cc46184bfa27aa32985f5fd099a7ac51d7e5d391a65011b3
+  data.tar.gz: c1ed1bb33e2162b8af47b0ff829d1d9c43d5545e3ab5535418fc7900bb3c26db
 SHA512:
-  metadata.gz: 2c1ebdf14094b10c3b330f5e75f1ed8d2db93646ffbbe714cb22c4a5aad5c4ef784b5ca9428e792c982d5d6b0451dbcc70fa8cfd7c9543bc8669217bf6ec3861
-  data.tar.gz: 3f46ed39c6e90bb48a1e59710b0fc09e32d3f609ce078334d314beea310101bbb08e698d36a8716210fb8d8a9795a72af2d4da0b0ae58205ef869e9ff347efd9
+  metadata.gz: 58c2220e977f068febcf8df6f637489a3201718ee210716301ead513497900b181c7c2d67845e3a2fb3b8e3e5b86cf04db1b545f7bb96f4d9d1f8ce6135c614a
+  data.tar.gz: 429998c47da50a554324ad1cd7bf238f810547260a4e83232924c42df8beba23de9065fb9a22655d0463c6102f4c98d6eb8d19f7bf7dff8486bc174f91b42f96

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.160.0
+  version: 0.160.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-08-26 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.160.0
+        version: 0.160.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.160.0
+        version: 0.160.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement