dependabot-bundler 0.204.0 → 0.205.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e8c4209abf6a050827c67d7f0eff05c2625aa5759aecc3c30ca4c56071de698
-  data.tar.gz: 00c25ba4206cae7a3e34164a651910f1b010be5a78f3ddc09632d6c1722127ac
+  metadata.gz: 03c990f83c04d4ed7920ef28352206cd89255c1790dbfcdc1007bb660cc5cd4f
+  data.tar.gz: ee6a5f051811f1d1a240a1fdae4505e53a8e740afb422bf03c3fc486f6e65a04
 SHA512:
-  metadata.gz: 2eb8f447e0fd5d43ec261195d106d9ab9c42675c83e59d8eabcfcf452bfeab0948f8a25e37936381e4d2fd79609b7d690c6e5564ad8499a1a8a1ffd29c053c4b
-  data.tar.gz: 6f186e0ffd40f4232b406cc83c2b18c99682246a607eff6a05319793e203346833bb6039a48d12b1883b6e6bce027dcc16b9e52b4ef2f657574157ad868bb951
+  metadata.gz: 0032bf9ed2e45d78293b844e85a8b478bb0451a4f447815d58338c92579d041114139452699901133ab1614f75ef25350c24e65a43e0be63ae31e28f8f1632af
+  data.tar.gz: 4fc5e9510d792ac820db0dacaf4d5903711cf02a28d7c721a96b33501154b62c3e3cd80fd784d251c7f49bb44468403f99e653ac6600b0694d9e02d74ae2a136

data/helpers/v1/run.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require "bundler"
+gem "bundler", "~> 1.17"
+require "bundler/setup"
 require "json"
 
 $LOAD_PATH.unshift(File.expand_path("./lib", __dir__))

data/helpers/v2/build

@@ -20,8 +20,6 @@ cp -r \
 
 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.18 bundle config --local path ".bundle"
-BUNDLER_VERSION=2.3.18 bundle config --local without "test"
-BUNDLER_VERSION=2.3.18 bundle install
+bundle config --local path ".bundle"
+bundle config --local without "test"
+bundle install

data/helpers/v2/run.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require "bundler"
+gem "bundler", "~> 2.3"
+require "bundler/setup"
 require "json"
 
 $LOAD_PATH.unshift(File.expand_path("./lib", __dir__))

data/lib/dependabot/bundler/helpers.rb

@@ -3,8 +3,8 @@
 module Dependabot
   module Bundler
     module Helpers
-      V1 = "1.17.3"
-      V2 = "2.3.18"
+      V1 = "1"
+      V2 = "2"
       # 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

@@ -15,7 +15,7 @@ module Dependabot
         end
 
         def build(script)
-          [timeout_command, :bundle, :exec, :ruby, script].compact.join(" ")
+          [timeout_command, :ruby, script].compact.join(" ")
         end
 
         private
@@ -35,8 +35,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_major_version)
+        helpers_path = versioned_helper_path(bundler_version)
         ::Bundler.with_original_env do
           command = BundleCommand.
                     new(options[:timeout_per_operation_seconds]).
@@ -46,8 +45,6 @@ module Dependabot
             function: function,
             args: args,
             env: {
-              # Bundler will pick the matching installed major 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")
@@ -65,13 +62,6 @@ module Dependabot
         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
         helpers_root = ENV["DEPENDABOT_NATIVE_HELPERS_PATH"]
         return File.join(helpers_root, "bundler") unless helpers_root.nil?

metadata

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