dependabot-maven 0.143.0 → 0.143.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dependabot/maven/requirement.rb +13 -14
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 999a155b4286ad444b3ea6994f850c94eb17c3142f82513720e4184948ba80e6
|
4
|
+
data.tar.gz: 74e0aba3214a910154d3707bb54c9b720c6207e3b6bc2e8b10b967a23dd9a8ff
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fc80e0a1337850473d8057b8d7e0dc83e7b226218aa391bc22a19495bab903dc7563bba301a6fbbc4188368e3798fdd368e949f6cfcb2c6da2c12038b9407039
|
7
|
+
data.tar.gz: 3aba61db57419b4b321c51213c985977553226316324981663d4aa118966a937b8cfc7a7258727beda118e582c6f17d2c362df8b8d306327d02916182fbfbbc6
|
@@ -33,14 +33,7 @@ module Dependabot
|
|
33
33
|
|
34
34
|
def initialize(*requirements)
|
35
35
|
requirements = requirements.flatten.flat_map do |req_string|
|
36
|
-
|
37
|
-
# PR ignore conditions
|
38
|
-
version_reqs = req_string.split(",").map(&:strip)
|
39
|
-
if version_reqs.all? { |s| Gem::Requirement::PATTERN.match?(s) }
|
40
|
-
version_reqs
|
41
|
-
else
|
42
|
-
convert_java_constraint_to_ruby_constraint(req_string)
|
43
|
-
end
|
36
|
+
convert_java_constraint_to_ruby_constraint(req_string)
|
44
37
|
end
|
45
38
|
|
46
39
|
super(requirements)
|
@@ -72,9 +65,14 @@ module Dependabot
|
|
72
65
|
raise "Can't convert multiple Java reqs to a single Ruby one"
|
73
66
|
end
|
74
67
|
|
75
|
-
|
76
|
-
|
77
|
-
|
68
|
+
# NOTE: Support ruby-style version requirements that are created from
|
69
|
+
# PR ignore conditions
|
70
|
+
version_reqs = req_string.split(",").map(&:strip)
|
71
|
+
if req_string.include?(",") && !version_reqs.all? { |s| PATTERN.match?(s) }
|
72
|
+
convert_java_range_to_ruby_range(req_string) if req_string.include?(",")
|
73
|
+
else
|
74
|
+
version_reqs.map { |r| convert_java_equals_req_to_ruby(r) }
|
75
|
+
end
|
78
76
|
end
|
79
77
|
|
80
78
|
def convert_java_range_to_ruby_range(req_string)
|
@@ -105,10 +103,11 @@ module Dependabot
|
|
105
103
|
end
|
106
104
|
|
107
105
|
def convert_wildcard_req(req_string)
|
108
|
-
version = req_string.
|
109
|
-
return ">= 0" if version.empty?
|
106
|
+
version = req_string.split("+").first
|
107
|
+
return ">= 0" if version.nil? || version.empty?
|
110
108
|
|
111
|
-
"
|
109
|
+
version += "0" if version.end_with?(".")
|
110
|
+
"~> #{version}"
|
112
111
|
end
|
113
112
|
end
|
114
113
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dependabot-maven
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.143.
|
4
|
+
version: 0.143.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dependabot
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.143.
|
19
|
+
version: 0.143.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.143.
|
26
|
+
version: 0.143.1
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: byebug
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|