dependabot-bundler 0.203.0 → 0.205.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc07f831a46b49acc8b63d27c3d70d3192c181d8c7263244ae166289f00c7c89
-  data.tar.gz: 60fd456a830c09f7a6d328e61f136b8ba98050aa3660379a56bb090d137097c1
+  metadata.gz: cefb763d020cf79b9e0cd1fe5c773ec412e8ed13c83f950a8d3ea6898d1d55ba
+  data.tar.gz: 5a08557ae145a4f567a8fee5cb4bbd05c58ea53f3c1eccb16605e60c57c062f0
 SHA512:
-  metadata.gz: bfe276d92e9429ccb276df4118ababb912c856b1d3e415d964d98dd48d5c636d4520a32a79a271ee9c4f8ea2b7ddcb40df5426b70ffb44927732515a575478f9
-  data.tar.gz: 8462fe675456569962ded19045aca0cbe8dbfedc8361fcb6cc2426d1b56708e4bebaa209e7fb386f35b626c890ca9e76612ef75fab2d865fe5a02239a557661b
+  metadata.gz: a5889169ef3afc44072851edd796affccc2cd4ae818e0c4961e475d4a2d78efe7358f9e882871cc2874c4a6beee27817c6fadbc1ecca73c64347888453378dad
+  data.tar.gz: 6413f38b2697dc60a1e0f673dc76b9f6319b1d78d1d28556f95eb4d5524cf5440be7a7a9e3a731fe2faad790f75e8f386466962a15e08c5277dd828167cc8c7d

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.203.0
+  version: 0.205.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-08-08 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.203.0
+        version: 0.205.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.203.0
+        version: 0.205.1
 - !ruby/object:Gem::Dependency
   name: debase
   requirement: !ruby/object:Gem::Requirement
@@ -324,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.7.0
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby (bundler) support for dependabot