dependabot-bundler 0.159.1 → 0.161.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bafc194dcbec62dc7b1cc4e246310c01583e18d60eef371fd679d5b2f4c9b71d
-  data.tar.gz: c3b6eb616bef55146816c8b7aebcb8930d4509927ffcec7a86527f6942058883
+  metadata.gz: '014832ac22eea20c716e79b1b0a26c398449d0f61e11bd9fb95d14c7fb71bddf'
+  data.tar.gz: e2aab25ac25c9f16067fa0e1925e91c8edfb571b914d25957aac7074934f9c9f
 SHA512:
-  metadata.gz: e5c72891dbef2b8ed8a3385c339870be714fa0353974c9874ad14e693af89da2615fbe2eb957dde4416a542ab088a9521de03de25f70791b227074f068d440c1
-  data.tar.gz: 1e30f7ea3ef10a36cd38379487f6aec93ed8c1fabedd192092591645bc59babc048ecc8c314f6ca6ffec240cbefec1da613b1e56a82dc468b848a366ad3b199f
+  metadata.gz: cd842792cc5d71ab552d3bc698f0f6ab9810c55f1587788639ccf1063c6d0f8bb3d468591380a70f1cf97fc80c4037c5a53e838c292a17510d03191cadb8d510
+  data.tar.gz: 3936d2e8c1e8f7a6a9f9522a6f269af7b89874f283f9b60365dc275178cb0d0ff5da4d3bb18d435ac84b7ea7d8b2b4c2804e2902919b1040aa04149e5f9cad3d

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