dependabot-composer 0.131.0 → 0.131.1
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: a27e37a9dd38fbba7ee3b5f04245a78c9b755437ff765d1ad8b5ffd30bcc6f29
|
4
|
+
data.tar.gz: c15d4502a9fde9cfbf53fb4d84569a8a0fafd31872c366e8d18230c7f29e9153
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a63b59cc402d72fbcd07c8e66981c532aa3e905a0cba1322dc00720919aef5ba2ba121fcc0c57624dbcd797111fccbcda320a0aa99bac9796e3b39cfcb0a2974
|
7
|
+
data.tar.gz: 9979c7369a635deb4417baf201ab87a902ba93b1e5e3077ab2839ed0d0f05790badc768e78868159881795f3abe4b1fddeee6fd67d5ad7efe86b731952d2ce97
|
@@ -44,9 +44,9 @@ module Dependabot
|
|
44
44
|
|
45
45
|
if req_string.start_with?("*", "x") then ">= 0"
|
46
46
|
elsif req_string.include?("*") then convert_wildcard_req(req_string)
|
47
|
-
elsif req_string.include?(".x") then convert_wildcard_req(req_string)
|
48
|
-
elsif req_string.match?(/^~[^>]/) then convert_tilde_req(req_string)
|
49
47
|
elsif req_string.start_with?("^") then convert_caret_req(req_string)
|
48
|
+
elsif req_string.match?(/^~[^>]/) then convert_tilde_req(req_string)
|
49
|
+
elsif req_string.include?(".x") then convert_wildcard_req(req_string)
|
50
50
|
elsif req_string.match?(/\s-\s/) then convert_hyphen_req(req_string)
|
51
51
|
else req_string
|
52
52
|
end
|
@@ -68,7 +68,7 @@ module Dependabot
|
|
68
68
|
end
|
69
69
|
|
70
70
|
def convert_caret_req(req_string)
|
71
|
-
version = req_string.gsub(/^\^/, "")
|
71
|
+
version = req_string.gsub(/^\^/, "").gsub("x-dev", "0")
|
72
72
|
parts = version.split(".")
|
73
73
|
first_non_zero = parts.find { |d| d != "0" }
|
74
74
|
first_non_zero_index =
|
@@ -159,7 +159,7 @@ module Dependabot
|
|
159
159
|
json = JSON.parse(content)
|
160
160
|
|
161
161
|
composer_platform_extensions.each do |extension, requirements|
|
162
|
-
|
162
|
+
next unless version_for_reqs(requirements)
|
163
163
|
|
164
164
|
json["config"] ||= {}
|
165
165
|
json["config"]["platform"] ||= {}
|
@@ -254,9 +254,7 @@ module Dependabot
|
|
254
254
|
error.message.match(/Failed to clone (?<url>.*?) via/).
|
255
255
|
named_captures.fetch("url")
|
256
256
|
raise Dependabot::GitDependenciesNotReachable, dependency_url
|
257
|
-
elsif
|
258
|
-
error.message.include?("does not allow connections to http://") ||
|
259
|
-
error.message.match?(/The `url` supplied for the path .* does not exist/)
|
257
|
+
elsif unresolvable_error?(error)
|
260
258
|
raise Dependabot::DependencyFileNotResolvable, sanitized_message
|
261
259
|
elsif error.message.match?(MISSING_EXPLICIT_PLATFORM_REQ_REGEX)
|
262
260
|
# These errors occur when platform requirements declared explicitly
|
@@ -347,6 +345,13 @@ module Dependabot
|
|
347
345
|
# rubocop:enable Metrics/CyclomaticComplexity
|
348
346
|
# rubocop:enable Metrics/MethodLength
|
349
347
|
|
348
|
+
def unresolvable_error?(error)
|
349
|
+
error.message.start_with?("Could not parse version") ||
|
350
|
+
error.message.include?("does not allow connections to http://") ||
|
351
|
+
error.message.match?(/The `url` supplied for the path .* does not exist/) ||
|
352
|
+
error.message.start_with?("Invalid version string")
|
353
|
+
end
|
354
|
+
|
350
355
|
def library?
|
351
356
|
parsed_composer_file["type"] == "library"
|
352
357
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dependabot-composer
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.131.
|
4
|
+
version: 0.131.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dependabot
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-02-
|
11
|
+
date: 2021-02-05 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.131.
|
19
|
+
version: 0.131.1
|
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.131.
|
26
|
+
version: 0.131.1
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: byebug
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|