dependabot-bundler 0.95.83 → 0.95.84
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:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6be24c89abe782ac06df1a91e08a06e35aa016fed4ed877e5a608c7550e93f72
|
|
4
|
+
data.tar.gz: 3bbf30aeb3ff6b8510fa0434ebab5f830e52a4fa5682a724e76a2d86bda0d3ce
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3756b1616b796f3c4feebe111f047870553c75a7b5fa3ef5a25eca57ba669f589dc962385406243c96f7a2bf7bc74b13dd43f7febcb27fa64828f83c34a4293c
|
|
7
|
+
data.tar.gz: db428966b0a2b1df9956e330b39e88bafb76ecdcfbce483d0e9c6eb2fe4790212d126489f6b52579214c697309806cfd363ba22ee3204b31996f47021eab9f13
|
|
@@ -124,7 +124,7 @@ module Dependabot
|
|
|
124
124
|
# We don't have access to one of repos required
|
|
125
125
|
raise Dependabot::GitDependenciesNotReachable, bad_uris
|
|
126
126
|
when "Bundler::GemNotFound", "Gem::InvalidSpecificationException",
|
|
127
|
-
"Bundler::VersionConflict"
|
|
127
|
+
"Bundler::VersionConflict", "Bundler::CyclicDependencyError"
|
|
128
128
|
# Bundler threw an error during resolution. Any of:
|
|
129
129
|
# - the gem doesn't exist in any of the specified sources
|
|
130
130
|
# - the gem wasn't specified properly
|
|
@@ -104,6 +104,7 @@ module Dependabot
|
|
|
104
104
|
end
|
|
105
105
|
rescue Dependabot::DependencyFileNotResolvable => error
|
|
106
106
|
return if ignored_versions.any? && !dependency.appears_in_lockfile?
|
|
107
|
+
return if circular_dependency_at_new_version?(error)
|
|
107
108
|
raise unless ruby_lock_error?(error)
|
|
108
109
|
|
|
109
110
|
@gemspec_ruby_unlocked = true
|
|
@@ -112,6 +113,12 @@ module Dependabot
|
|
|
112
113
|
# rubocop:enable Metrics/CyclomaticComplexity
|
|
113
114
|
# rubocop:enable Metrics/PerceivedComplexity
|
|
114
115
|
|
|
116
|
+
def circular_dependency_at_new_version?(error)
|
|
117
|
+
return false unless error.message.include?("CyclicDependencyError")
|
|
118
|
+
|
|
119
|
+
error.message.include?("'#{dependency.name}'")
|
|
120
|
+
end
|
|
121
|
+
|
|
115
122
|
def ruby_lock_error?(error)
|
|
116
123
|
return false unless error.message.include?(" for gem \"ruby\0\"")
|
|
117
124
|
return false if @gemspec_ruby_unlocked
|
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.95.
|
|
4
|
+
version: 0.95.84
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dependabot
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-02
|
|
11
|
+
date: 2019-03-02 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.95.
|
|
19
|
+
version: 0.95.84
|
|
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.95.
|
|
26
|
+
version: 0.95.84
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: byebug
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|