dependabot-bundler 0.99.3 → 0.99.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dependabot/bundler/file_parser.rb +4 -4
- data/lib/dependabot/bundler/file_updater/lockfile_updater.rb +2 -2
- data/lib/dependabot/bundler/update_checker/force_updater.rb +2 -2
- data/lib/dependabot/bundler/update_checker/shared_bundler_helpers.rb +3 -3
- data/lib/dependabot/bundler/update_checker/version_resolver.rb +4 -4
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7eebb7faa794471c5784883f65f3fb38a202929f1cea2b26e76b62915ecc2aa3
|
4
|
+
data.tar.gz: db2bf200da82207bb6613a817769159790e1dfdc289eb447a97b1f7ad37ca5ca
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 353b129c2e2a7af87f128d03414eae1645d7aba595b63b694a122d25e7d8530c562cd16774a1b09512cb76767c8334acf5397cafd1e3fedc3e0c996ed876f9d2
|
7
|
+
data.tar.gz: ad5cd89d6b5f1c7edb907a8c70c4ce618dac92bea88bb9fbe93344efb038edc98d38a2dfa6746e66d80bdc02cec92e9f968669b0220b6065583a4d5bf16ec94d
|
@@ -129,11 +129,11 @@ module Dependabot
|
|
129
129
|
reject { |dep| dep.source.is_a?(::Bundler::Source::Gemspec) }
|
130
130
|
end
|
131
131
|
end
|
132
|
-
rescue SharedHelpers::ChildProcessFailed, ArgumentError =>
|
133
|
-
handle_marshall_error(
|
132
|
+
rescue SharedHelpers::ChildProcessFailed, ArgumentError => e
|
133
|
+
handle_marshall_error(e) if e.is_a?(ArgumentError)
|
134
134
|
|
135
|
-
msg =
|
136
|
-
|
135
|
+
msg = e.error_class + " with message: " +
|
136
|
+
e.error_message.force_encoding("UTF-8").encode
|
137
137
|
raise Dependabot::DependencyFileNotEvaluatable, msg
|
138
138
|
end
|
139
139
|
|
@@ -94,8 +94,8 @@ module Dependabot
|
|
94
94
|
end
|
95
95
|
end
|
96
96
|
post_process_lockfile(lockfile_body)
|
97
|
-
rescue Dependabot::DependencyFileNotResolvable =>
|
98
|
-
raise unless ruby_lock_error?(
|
97
|
+
rescue Dependabot::DependencyFileNotResolvable => e
|
98
|
+
raise unless ruby_lock_error?(e)
|
99
99
|
|
100
100
|
@dont_lock_ruby_version = true
|
101
101
|
retry
|
@@ -42,11 +42,11 @@ module Dependabot
|
|
42
42
|
definition.resolve_remotely!
|
43
43
|
specs = definition.resolve
|
44
44
|
dependencies_from([dependency] + other_updates, specs)
|
45
|
-
rescue ::Bundler::VersionConflict =>
|
45
|
+
rescue ::Bundler::VersionConflict => e
|
46
46
|
# TODO: Not sure this won't unlock way too many things...
|
47
47
|
new_dependencies_to_unlock =
|
48
48
|
new_dependencies_to_unlock_from(
|
49
|
-
error:
|
49
|
+
error: e,
|
50
50
|
already_unlocked: other_updates
|
51
51
|
)
|
52
52
|
|
@@ -61,17 +61,17 @@ module Dependabot
|
|
61
61
|
yield
|
62
62
|
end
|
63
63
|
end
|
64
|
-
rescue SharedHelpers::ChildProcessFailed, ArgumentError =>
|
64
|
+
rescue SharedHelpers::ChildProcessFailed, ArgumentError => e
|
65
65
|
retry_count ||= 0
|
66
66
|
retry_count += 1
|
67
|
-
if retryable_error?(
|
67
|
+
if retryable_error?(e) && retry_count <= 2
|
68
68
|
sleep(rand(1.0..5.0)) && retry
|
69
69
|
end
|
70
70
|
|
71
71
|
raise unless error_handling
|
72
72
|
|
73
73
|
# Raise more descriptive errors
|
74
|
-
handle_bundler_errors(
|
74
|
+
handle_bundler_errors(e)
|
75
75
|
end
|
76
76
|
|
77
77
|
def retryable_error?(error)
|
@@ -107,10 +107,10 @@ module Dependabot
|
|
107
107
|
details
|
108
108
|
end
|
109
109
|
end
|
110
|
-
rescue Dependabot::DependencyFileNotResolvable =>
|
111
|
-
return if error_due_to_restrictive_upper_bound?(
|
112
|
-
return if circular_dependency_at_new_version?(
|
113
|
-
raise unless ruby_lock_error?(
|
110
|
+
rescue Dependabot::DependencyFileNotResolvable => e
|
111
|
+
return if error_due_to_restrictive_upper_bound?(e)
|
112
|
+
return if circular_dependency_at_new_version?(e)
|
113
|
+
raise unless ruby_lock_error?(e)
|
114
114
|
|
115
115
|
@gemspec_ruby_unlocked = true
|
116
116
|
regenerate_dependency_files_without_ruby_lock && retry
|
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.99.
|
4
|
+
version: 0.99.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dependabot
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-04-
|
11
|
+
date: 2019-04-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.99.
|
19
|
+
version: 0.99.4
|
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.99.
|
26
|
+
version: 0.99.4
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: byebug
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -100,14 +100,14 @@ dependencies:
|
|
100
100
|
requirements:
|
101
101
|
- - "~>"
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: 0.
|
103
|
+
version: 0.67.2
|
104
104
|
type: :development
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
108
|
- - "~>"
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version: 0.
|
110
|
+
version: 0.67.2
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: vcr
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|