dependabot-bundler 0.204.0 → 0.206.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9e8c4209abf6a050827c67d7f0eff05c2625aa5759aecc3c30ca4c56071de698
4
- data.tar.gz: 00c25ba4206cae7a3e34164a651910f1b010be5a78f3ddc09632d6c1722127ac
3
+ metadata.gz: b16dd945a2a652080c9b02c86874696262337129b6f329265d66cf693b1d3dad
4
+ data.tar.gz: 65e2dcd35fd85f14a23a4c4f87b421b1212e870b2b0c3e783124337e5e0bc632
5
5
  SHA512:
6
- metadata.gz: 2eb8f447e0fd5d43ec261195d106d9ab9c42675c83e59d8eabcfcf452bfeab0948f8a25e37936381e4d2fd79609b7d690c6e5564ad8499a1a8a1ffd29c053c4b
7
- data.tar.gz: 6f186e0ffd40f4232b406cc83c2b18c99682246a607eff6a05319793e203346833bb6039a48d12b1883b6e6bce027dcc16b9e52b4ef2f657574157ad868bb951
6
+ metadata.gz: f6090bd9378682f20d42b5bf773cff077bb2e709236e9ecf4f9c61421c5546f44942a4cf6af3a994d86671308e4eaa29636c0315418830e0aca86c13c67f565c
7
+ data.tar.gz: d1d5e114bbc3957f1992f59aa85fb893af66aaeaeb6ea14a57016c8cbe9ad003d46502752f6ea5ba97bbb5195851c90e239eab56a45b1c92a2199d516fa655d8
data/helpers/v1/run.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "bundler"
3
+ gem "bundler", "~> 1.17"
4
+ require "bundler/setup"
4
5
  require "json"
5
6
 
6
7
  $LOAD_PATH.unshift(File.expand_path("./lib", __dir__))
data/helpers/v2/build CHANGED
@@ -20,8 +20,6 @@ cp -r \
20
20
 
21
21
  cd "$install_dir"
22
22
 
23
- # NOTE: Sets `BUNDLED WITH` to match the installed v2 version in Gemfile.lock
24
- # forcing specs and native helpers to run with the same version
25
- BUNDLER_VERSION=2.3.18 bundle config --local path ".bundle"
26
- BUNDLER_VERSION=2.3.18 bundle config --local without "test"
27
- BUNDLER_VERSION=2.3.18 bundle install
23
+ bundle config --local path ".bundle"
24
+ bundle config --local without "test"
25
+ bundle install
data/helpers/v2/run.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "bundler"
3
+ gem "bundler", "~> 2.3"
4
+ require "bundler/setup"
4
5
  require "json"
5
6
 
6
7
  $LOAD_PATH.unshift(File.expand_path("./lib", __dir__))
@@ -3,8 +3,8 @@
3
3
  module Dependabot
4
4
  module Bundler
5
5
  module Helpers
6
- V1 = "1.17.3"
7
- V2 = "2.3.18"
6
+ V1 = "1"
7
+ V2 = "2"
8
8
  # If we are updating a project with no Gemfile.lock, we default to the
9
9
  # newest version we support
10
10
  DEFAULT = V2
@@ -15,7 +15,7 @@ module Dependabot
15
15
  end
16
16
 
17
17
  def build(script)
18
- [timeout_command, :bundle, :exec, :ruby, script].compact.join(" ")
18
+ [timeout_command, :ruby, script].compact.join(" ")
19
19
  end
20
20
 
21
21
  private
@@ -35,8 +35,7 @@ module Dependabot
35
35
 
36
36
  def self.run_bundler_subprocess(function:, args:, bundler_version:, options: {})
37
37
  # Run helper suprocess with all bundler-related ENV variables removed
38
- bundler_major_version = bundler_version.split(".").first
39
- helpers_path = versioned_helper_path(bundler_major_version)
38
+ helpers_path = versioned_helper_path(bundler_version)
40
39
  ::Bundler.with_original_env do
41
40
  command = BundleCommand.
42
41
  new(options[:timeout_per_operation_seconds]).
@@ -46,8 +45,6 @@ module Dependabot
46
45
  function: function,
47
46
  args: args,
48
47
  env: {
49
- # Bundler will pick the matching installed major version
50
- "BUNDLER_VERSION" => installed_bundler_version(bundler_major_version),
51
48
  "BUNDLE_GEMFILE" => File.join(helpers_path, "Gemfile"),
52
49
  # Prevent the GEM_HOME from being set to a folder owned by root
53
50
  "GEM_HOME" => File.join(helpers_path, ".bundle")
@@ -65,13 +62,6 @@ module Dependabot
65
62
  File.join(native_helpers_root, "v#{bundler_major_version}")
66
63
  end
67
64
 
68
- # Maps the major version unto the specific version we have installed
69
- def self.installed_bundler_version(bundler_major_version)
70
- return Helpers::V1 if bundler_major_version == "1"
71
-
72
- Helpers::V2
73
- end
74
-
75
65
  def self.native_helpers_root
76
66
  helpers_root = ENV["DEPENDABOT_NATIVE_HELPERS_PATH"]
77
67
  return File.join(helpers_root, "bundler") unless helpers_root.nil?
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dependabot-bundler
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.204.0
4
+ version: 0.206.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dependabot
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-08-03 00:00:00.000000000 Z
11
+ date: 2022-08-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.204.0
19
+ version: 0.206.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.204.0
26
+ version: 0.206.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: debase
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.31.2
131
+ version: 1.33.0
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.31.2
138
+ version: 1.33.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: ruby-debug-ide
141
141
  requirement: !ruby/object:Gem::Requirement
@@ -324,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
324
324
  - !ruby/object:Gem::Version
325
325
  version: 2.7.0
326
326
  requirements: []
327
- rubygems_version: 3.3.7
327
+ rubygems_version: 3.1.6
328
328
  signing_key:
329
329
  specification_version: 4
330
330
  summary: Ruby (bundler) support for dependabot