dependabot-bundler 0.154.0 → 0.154.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/helpers/v1/lib/functions/lockfile_updater.rb +2 -0
- data/helpers/v1/spec/functions/file_parser_spec.rb +5 -8
- data/helpers/v1/spec/functions/force_updater_spec.rb +58 -0
- data/helpers/v1/spec/functions/version_resolver_spec.rb +8 -0
- data/helpers/v2/lib/functions/lockfile_updater.rb +3 -1
- data/helpers/v2/spec/functions/file_parser_spec.rb +5 -8
- data/helpers/v2/spec/functions/force_updater_spec.rb +58 -0
- data/helpers/v2/spec/functions/version_resolver_spec.rb +8 -0
- data/helpers/v2/spec/functions_spec.rb +33 -0
- data/lib/dependabot/bundler/file_updater/ruby_requirement_setter.rb +3 -3
- data/lib/dependabot/bundler/update_checker/latest_version_finder.rb +3 -6
- data/lib/dependabot/bundler/update_checker/shared_bundler_helpers.rb +4 -1
- metadata +6 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8c15c3635a29c0dd195ae67588bb59a4d42ce3261c3c68e8b008866f4a365999
|
4
|
+
data.tar.gz: 9986126d3a630752d754c3f717b864af33b0ff3a538924a628ec9449fc6af5a3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8f5071311ad6d9c1d26a0630ed5aa1f696027fafdb23b1749a0f6ebc5c51541cf302b38174c5e3b9942bec5753dff336b5c92d7776220d6c0c117391e901b30b
|
7
|
+
data.tar.gz: 78a2e2f532722cba6bd2bd402eb58146413d9580545e6d5804cc1e7d3eab0dad632489b72d2cebdbb165e6e679f39c5d317a91113b05ededdff65434cedf7305
|
@@ -12,9 +12,9 @@ RSpec.describe Functions::FileParser do
|
|
12
12
|
)
|
13
13
|
end
|
14
14
|
|
15
|
-
let(:project_name) { "gemfile" }
|
16
|
-
|
17
15
|
describe "#parsed_gemfile" do
|
16
|
+
let(:project_name) { "gemfile" }
|
17
|
+
|
18
18
|
subject(:parsed_gemfile) do
|
19
19
|
in_tmp_folder do
|
20
20
|
dependency_source.parsed_gemfile(gemfile_name: "Gemfile")
|
@@ -43,14 +43,11 @@ RSpec.describe Functions::FileParser do
|
|
43
43
|
end
|
44
44
|
|
45
45
|
describe "#parsed_gemspec" do
|
46
|
-
let
|
47
|
-
fixture("ruby", "gemspecs", "exact")
|
48
|
-
end
|
46
|
+
let(:project_name) { "gemfile_exact" }
|
49
47
|
|
50
48
|
subject(:parsed_gemspec) do
|
51
|
-
in_tmp_folder do |
|
52
|
-
|
53
|
-
dependency_source.parsed_gemspec(gemspec_name: "test.gemspec")
|
49
|
+
in_tmp_folder do |_tmp_path|
|
50
|
+
dependency_source.parsed_gemspec(gemspec_name: "example.gemspec")
|
54
51
|
end
|
55
52
|
end
|
56
53
|
|
@@ -0,0 +1,58 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "native_spec_helper"
|
4
|
+
require "shared_contexts"
|
5
|
+
|
6
|
+
RSpec.describe Functions::ForceUpdater do
|
7
|
+
include_context "in a temporary bundler directory"
|
8
|
+
include_context "stub rubygems compact index"
|
9
|
+
|
10
|
+
let(:force_updater) do
|
11
|
+
described_class.new(
|
12
|
+
dependency_name: dependency_name,
|
13
|
+
target_version: target_version,
|
14
|
+
gemfile_name: gemfile_name,
|
15
|
+
lockfile_name: lockfile_name,
|
16
|
+
update_multiple_dependencies: update_multiple_dependencies
|
17
|
+
)
|
18
|
+
end
|
19
|
+
let(:gemfile_name) { "Gemfile" }
|
20
|
+
let(:lockfile_name) { "Gemfile.lock" }
|
21
|
+
let(:update_multiple_dependencies) { true }
|
22
|
+
|
23
|
+
describe "#run" do
|
24
|
+
subject(:force_update) do
|
25
|
+
in_tmp_folder { force_updater.run }
|
26
|
+
end
|
27
|
+
|
28
|
+
context "with a version conflict" do
|
29
|
+
let(:target_version) { "3.6.0" }
|
30
|
+
let(:dependency_name) { "rspec-support" }
|
31
|
+
let(:project_name) { "version_conflict" }
|
32
|
+
|
33
|
+
it "updates the conflicting dependencies" do
|
34
|
+
updated_deps, _specs = force_update
|
35
|
+
expect(updated_deps).to eq([{ name: "rspec-support" }, { name: "rspec-mocks" }])
|
36
|
+
end
|
37
|
+
|
38
|
+
context "when updating a single dependency" do
|
39
|
+
let(:update_multiple_dependencies) { false }
|
40
|
+
|
41
|
+
it { expect { force_update }.to raise_error(Bundler::VersionConflict) }
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
45
|
+
context "with a version conflict in gems rb" do
|
46
|
+
let(:target_version) { "3.6.0" }
|
47
|
+
let(:dependency_name) { "rspec-support" }
|
48
|
+
let(:project_name) { "version_conflict_gems_rb" }
|
49
|
+
let(:gemfile_name) { "gems.rb" }
|
50
|
+
let(:lockfile_name) { "gems.locked" }
|
51
|
+
|
52
|
+
it "updates the conflicting dependencies" do
|
53
|
+
updated_deps, _specs = force_update
|
54
|
+
expect(updated_deps).to eq([{ name: "rspec-support" }, { name: "rspec-mocks" }])
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
@@ -92,5 +92,13 @@ RSpec.describe Functions::VersionResolver do
|
|
92
92
|
its([:version]) { is_expected.to eq(Gem::Version.new("1.4.0")) }
|
93
93
|
its([:fetcher]) { is_expected.to eq("Bundler::Fetcher::Dependency") }
|
94
94
|
end
|
95
|
+
|
96
|
+
context "with no update possible due to a version conflict" do
|
97
|
+
let(:project_name) { "version_conflict_with_listed_subdep" }
|
98
|
+
let(:dependency_name) { "rspec-mocks" }
|
99
|
+
let(:requirement_string) { ">= 0" }
|
100
|
+
|
101
|
+
its([:version]) { is_expected.to eq(Gem::Version.new("3.6.0")) }
|
102
|
+
end
|
95
103
|
end
|
96
104
|
end
|
@@ -1,5 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require "fileutils"
|
4
|
+
|
3
5
|
module Functions
|
4
6
|
class LockfileUpdater
|
5
7
|
RETRYABLE_ERRORS = [Bundler::HTTPError].freeze
|
@@ -9,7 +11,7 @@ module Functions
|
|
9
11
|
not\sfind\s(?<name>[^\s]+)-\d|
|
10
12
|
has\s(?<name>[^\s]+)\slocked\sat
|
11
13
|
/x.freeze
|
12
|
-
|
14
|
+
DEPENDENCY_DROPPED = "_dependency_dropped_"
|
13
15
|
|
14
16
|
def initialize(gemfile_name:, lockfile_name:, dependencies:)
|
15
17
|
@gemfile_name = gemfile_name
|
@@ -12,9 +12,9 @@ RSpec.describe Functions::FileParser do
|
|
12
12
|
)
|
13
13
|
end
|
14
14
|
|
15
|
-
let(:project_name) { "gemfile" }
|
16
|
-
|
17
15
|
describe "#parsed_gemfile" do
|
16
|
+
let(:project_name) { "gemfile" }
|
17
|
+
|
18
18
|
subject(:parsed_gemfile) do
|
19
19
|
in_tmp_folder do
|
20
20
|
dependency_source.parsed_gemfile(gemfile_name: "Gemfile")
|
@@ -108,14 +108,11 @@ RSpec.describe Functions::FileParser do
|
|
108
108
|
end
|
109
109
|
|
110
110
|
describe "#parsed_gemspec" do
|
111
|
-
let
|
112
|
-
fixture("ruby", "gemspecs", "exact")
|
113
|
-
end
|
111
|
+
let(:project_name) { "gemfile_exact" }
|
114
112
|
|
115
113
|
subject(:parsed_gemspec) do
|
116
|
-
in_tmp_folder do |
|
117
|
-
|
118
|
-
dependency_source.parsed_gemspec(gemspec_name: "test.gemspec")
|
114
|
+
in_tmp_folder do |_tmp_path|
|
115
|
+
dependency_source.parsed_gemspec(gemspec_name: "example.gemspec")
|
119
116
|
end
|
120
117
|
end
|
121
118
|
|
@@ -0,0 +1,58 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "native_spec_helper"
|
4
|
+
require "shared_contexts"
|
5
|
+
|
6
|
+
RSpec.describe Functions::ForceUpdater do
|
7
|
+
include_context "in a temporary bundler directory"
|
8
|
+
include_context "stub rubygems compact index"
|
9
|
+
|
10
|
+
let(:force_updater) do
|
11
|
+
described_class.new(
|
12
|
+
dependency_name: dependency_name,
|
13
|
+
target_version: target_version,
|
14
|
+
gemfile_name: gemfile_name,
|
15
|
+
lockfile_name: lockfile_name,
|
16
|
+
update_multiple_dependencies: update_multiple_dependencies
|
17
|
+
)
|
18
|
+
end
|
19
|
+
let(:gemfile_name) { "Gemfile" }
|
20
|
+
let(:lockfile_name) { "Gemfile.lock" }
|
21
|
+
let(:update_multiple_dependencies) { true }
|
22
|
+
|
23
|
+
describe "#run" do
|
24
|
+
subject(:force_update) do
|
25
|
+
in_tmp_folder { force_updater.run }
|
26
|
+
end
|
27
|
+
|
28
|
+
context "with a version conflict" do
|
29
|
+
let(:target_version) { "3.6.0" }
|
30
|
+
let(:dependency_name) { "rspec-support" }
|
31
|
+
let(:project_name) { "version_conflict" }
|
32
|
+
|
33
|
+
it "updates the conflicting dependencies" do
|
34
|
+
updated_deps, _specs = force_update
|
35
|
+
expect(updated_deps).to eq([{ name: "rspec-support" }, { name: "rspec-mocks" }])
|
36
|
+
end
|
37
|
+
|
38
|
+
context "when updating a single dependency" do
|
39
|
+
let(:update_multiple_dependencies) { false }
|
40
|
+
|
41
|
+
it { expect { force_update }.to raise_error(Bundler::VersionConflict) }
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
45
|
+
context "with a version conflict in gems rb" do
|
46
|
+
let(:target_version) { "3.6.0" }
|
47
|
+
let(:dependency_name) { "rspec-support" }
|
48
|
+
let(:project_name) { "version_conflict_gems_rb" }
|
49
|
+
let(:gemfile_name) { "gems.rb" }
|
50
|
+
let(:lockfile_name) { "gems.locked" }
|
51
|
+
|
52
|
+
it "updates the conflicting dependencies" do
|
53
|
+
updated_deps, _specs = force_update
|
54
|
+
expect(updated_deps).to eq([{ name: "rspec-support" }, { name: "rspec-mocks" }])
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
@@ -92,5 +92,13 @@ RSpec.describe Functions::VersionResolver do
|
|
92
92
|
its([:version]) { is_expected.to eq(Gem::Version.new("1.4.0")) }
|
93
93
|
its([:fetcher]) { is_expected.to eq("Bundler::Fetcher::Dependency") }
|
94
94
|
end
|
95
|
+
|
96
|
+
context "with no update possible due to a version conflict" do
|
97
|
+
let(:project_name) { "version_conflict_with_listed_subdep" }
|
98
|
+
let(:dependency_name) { "rspec-mocks" }
|
99
|
+
let(:requirement_string) { ">= 0" }
|
100
|
+
|
101
|
+
its([:version]) { is_expected.to eq(Gem::Version.new("3.6.0")) }
|
102
|
+
end
|
95
103
|
end
|
96
104
|
end
|
@@ -21,4 +21,37 @@ RSpec.describe Functions do
|
|
21
21
|
end
|
22
22
|
end
|
23
23
|
end
|
24
|
+
|
25
|
+
describe "#git_specs" do
|
26
|
+
let(:project_name) { "git_source" }
|
27
|
+
subject(:git_specs) do
|
28
|
+
in_tmp_folder do
|
29
|
+
Functions.git_specs(
|
30
|
+
dir: tmp_path,
|
31
|
+
gemfile_name: "Gemfile",
|
32
|
+
credentials: {}
|
33
|
+
)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
def expect_specs(count)
|
38
|
+
expect(git_specs.size).to eq(count)
|
39
|
+
git_specs.each do |gs|
|
40
|
+
uri = URI.parse(gs[:auth_uri])
|
41
|
+
expect(uri.scheme).to(satisfy { |s| %w(http https).include?(s) })
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
45
|
+
it "returns git specs" do
|
46
|
+
expect_specs(4)
|
47
|
+
end
|
48
|
+
|
49
|
+
context "with github shorthand" do
|
50
|
+
let(:project_name) { "github_source" }
|
51
|
+
|
52
|
+
it "returns git specs" do
|
53
|
+
expect_specs(1)
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
24
57
|
end
|
@@ -50,10 +50,10 @@ module Dependabot
|
|
50
50
|
end
|
51
51
|
|
52
52
|
def ruby_version
|
53
|
-
requirement = if
|
54
|
-
Dependabot::Bundler::Requirement.new(ruby_requirement)
|
55
|
-
else
|
53
|
+
requirement = if ruby_requirement.is_a?(Gem::Requirement)
|
56
54
|
ruby_requirement
|
55
|
+
else
|
56
|
+
Dependabot::Bundler::Requirement.new(ruby_requirement)
|
57
57
|
end
|
58
58
|
|
59
59
|
ruby_version =
|
@@ -3,6 +3,7 @@
|
|
3
3
|
require "excon"
|
4
4
|
|
5
5
|
require "dependabot/bundler/update_checker"
|
6
|
+
require "dependabot/update_checkers/version_filters"
|
6
7
|
require "dependabot/bundler/requirement"
|
7
8
|
require "dependabot/shared_helpers"
|
8
9
|
require "dependabot/errors"
|
@@ -55,7 +56,8 @@ module Dependabot
|
|
55
56
|
|
56
57
|
relevant_versions = dependency_source.versions
|
57
58
|
relevant_versions = filter_prerelease_versions(relevant_versions)
|
58
|
-
relevant_versions = filter_vulnerable_versions(relevant_versions
|
59
|
+
relevant_versions = Dependabot::UpdateCheckers::VersionFilters.filter_vulnerable_versions(relevant_versions,
|
60
|
+
security_advisories)
|
59
61
|
relevant_versions = filter_ignored_versions(relevant_versions)
|
60
62
|
relevant_versions = filter_lower_versions(relevant_versions)
|
61
63
|
|
@@ -78,11 +80,6 @@ module Dependabot
|
|
78
80
|
filtered
|
79
81
|
end
|
80
82
|
|
81
|
-
def filter_vulnerable_versions(versions_array)
|
82
|
-
versions_array.
|
83
|
-
reject { |v| security_advisories.any? { |a| a.vulnerable?(v) } }
|
84
|
-
end
|
85
|
-
|
86
83
|
def filter_lower_versions(versions_array)
|
87
84
|
return versions_array unless dependency.version && Gem::Version.correct?(dependency.version)
|
88
85
|
|
@@ -174,8 +174,11 @@ module Dependabot
|
|
174
174
|
}
|
175
175
|
)
|
176
176
|
git_specs.reject do |spec|
|
177
|
+
uri = URI.parse(spec.fetch("auth_uri"))
|
178
|
+
next false unless %w(http https).include?(uri.scheme)
|
179
|
+
|
177
180
|
Excon.get(
|
178
|
-
|
181
|
+
uri.to_s,
|
179
182
|
idempotent: true,
|
180
183
|
**SharedHelpers.excon_defaults
|
181
184
|
).status == 200
|
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.154.
|
4
|
+
version: 0.154.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dependabot
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-06-
|
11
|
+
date: 2021-06-22 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.154.
|
19
|
+
version: 0.154.5
|
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.154.
|
26
|
+
version: 0.154.5
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: byebug
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -202,6 +202,7 @@ files:
|
|
202
202
|
- helpers/v1/spec/functions/conflicting_dependency_resolver_spec.rb
|
203
203
|
- helpers/v1/spec/functions/dependency_source_spec.rb
|
204
204
|
- helpers/v1/spec/functions/file_parser_spec.rb
|
205
|
+
- helpers/v1/spec/functions/force_updater_spec.rb
|
205
206
|
- helpers/v1/spec/functions/version_resolver_spec.rb
|
206
207
|
- helpers/v1/spec/native_spec_helper.rb
|
207
208
|
- helpers/v1/spec/shared_contexts.rb
|
@@ -222,6 +223,7 @@ files:
|
|
222
223
|
- helpers/v2/spec/functions/conflicting_dependency_resolver_spec.rb
|
223
224
|
- helpers/v2/spec/functions/dependency_source_spec.rb
|
224
225
|
- helpers/v2/spec/functions/file_parser_spec.rb
|
226
|
+
- helpers/v2/spec/functions/force_updater_spec.rb
|
225
227
|
- helpers/v2/spec/functions/version_resolver_spec.rb
|
226
228
|
- helpers/v2/spec/functions_spec.rb
|
227
229
|
- helpers/v2/spec/native_spec_helper.rb
|