dependabot-nuget 0.118.5 → 0.118.11

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: 5425e1672ba07fbc7213dcbd0ec99ff2294b9f56555f1a044cb615f1e7945151
4
- data.tar.gz: da1835d1b6d231769925a2035612c7100dd508aea2d62fcc7101c9112d7fa631
3
+ metadata.gz: 6a87c899fa45d7ecc2253dbaa6cbd0b0ec7d397eb5cb24ad32767a05ad52d18c
4
+ data.tar.gz: f55f0cd1d501dbf121a09c9a78869a387622b4608ccb8109acc8bd95db5cb77c
5
5
  SHA512:
6
- metadata.gz: 33e1250c94957af6cff204f57271b7f78ebf676655c8cab08005b2ac71bc1808dbd7b2e30f2cdf86f2e04cc8d7d361fd97663f890b386ce1494489b73f8a4948
7
- data.tar.gz: 9e2fb44b50dc9cacff9edecda258d6ff16a48a70764c88fba76b1a6b3b05f80a4b5524e8e1bf9ceb716e005fa270c9fd8265ea4c2b9855a00067f3a54b3203c7
6
+ metadata.gz: a8d300039a8005bbd311b9001afb43febf457751201b9ae80f957f8ce783b2c07b47ba364a2615fd85674c2bc29e98cff74b77225f718b33cf38865264e5defc
7
+ data.tar.gz: cd147a40b676ea0df1dcf52d74c36bc9f2a891a05752f0fd37c28ece4cc075560642c28dc9b93cd17c76047b9a4edd33bd239e631ebfef018f74bd7627643913
@@ -46,10 +46,12 @@ module Dependabot
46
46
  def get_element_from_node(node)
47
47
  node.at_xpath("/PackageReference") ||
48
48
  node.at_xpath("/GlobalPackageReference") ||
49
+ node.at_xpath("/PackageVersion") ||
49
50
  node.at_xpath("/Dependency") ||
50
51
  node.at_xpath("/DevelopmentDependency")
51
52
  end
52
53
 
54
+ # rubocop:disable Metrics/CyclomaticComplexity
53
55
  def fetch_declaration_strings
54
56
  deep_find_declarations(declaring_file.content).select do |nd|
55
57
  node = Nokogiri::XML(nd)
@@ -66,6 +68,7 @@ module Dependabot
66
68
  node_requirement == declaring_requirement.fetch(:requirement)
67
69
  end
68
70
  end
71
+ # rubocop:enable Metrics/CyclomaticComplexity
69
72
 
70
73
  def get_node_version_value(node)
71
74
  attribute = "Version"
@@ -147,6 +147,7 @@ module Dependabot
147
147
  config_files.flat_map { |file| repos_from_config_file(file) }
148
148
  end
149
149
 
150
+ # rubocop:disable Metrics/CyclomaticComplexity
150
151
  def repos_from_config_file(config_file)
151
152
  doc = Nokogiri::XML(config_file.content)
152
153
  doc.remove_namespaces!
@@ -178,6 +179,7 @@ module Dependabot
178
179
 
179
180
  sources
180
181
  end
182
+ # rubocop:enable Metrics/CyclomaticComplexity
181
183
 
182
184
  def default_repository_details
183
185
  {
@@ -14,6 +14,8 @@ module Dependabot
14
14
  class VersionFinder
15
15
  require_relative "repository_finder"
16
16
 
17
+ NUGET_RANGE_REGEX = /[\(\[].*,.*[\)\]]/.freeze
18
+
17
19
  def initialize(dependency:, dependency_files:, credentials:,
18
20
  ignored_versions:, raise_on_ignored: false,
19
21
  security_advisories:)
@@ -67,7 +69,7 @@ module Dependabot
67
69
  filtered = possible_versions
68
70
 
69
71
  ignored_versions.each do |req|
70
- ignore_req = requirement_class.new(req.split(","))
72
+ ignore_req = requirement_class.new(parse_requirement_string(req))
71
73
  filtered =
72
74
  filtered.
73
75
  reject { |v| ignore_req.satisfied_by?(v.fetch(:version)) }
@@ -98,6 +100,12 @@ module Dependabot
98
100
  end
99
101
  end
100
102
 
103
+ def parse_requirement_string(string)
104
+ return string if string.match?(NUGET_RANGE_REGEX)
105
+
106
+ string.split(",").map(&:strip)
107
+ end
108
+
101
109
  def available_v3_versions
102
110
  v3_nuget_listings.flat_map do |listing|
103
111
  listing.
@@ -169,7 +177,7 @@ module Dependabot
169
177
  end
170
178
 
171
179
  dependency.requirements.any? do |req|
172
- reqs = (req.fetch(:requirement) || "").split(",").map(&:strip)
180
+ reqs = parse_requirement_string(req.fetch(:requirement) || "")
173
181
  next unless reqs.any? { |r| r.include?("-") }
174
182
 
175
183
  requirement_class.
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dependabot-nuget
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.118.5
4
+ version: 0.118.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dependabot
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-06-24 00:00:00.000000000 Z
11
+ date: 2020-08-06 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.118.5
19
+ version: 0.118.11
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.118.5
26
+ version: 0.118.11
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: byebug
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -94,34 +94,20 @@ dependencies:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: '1.2'
97
- - !ruby/object:Gem::Dependency
98
- name: rspec_junit_formatter
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - "~>"
102
- - !ruby/object:Gem::Version
103
- version: '0.4'
104
- type: :development
105
- prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
108
- - - "~>"
109
- - !ruby/object:Gem::Version
110
- version: '0.4'
111
97
  - !ruby/object:Gem::Dependency
112
98
  name: rubocop
113
99
  requirement: !ruby/object:Gem::Requirement
114
100
  requirements:
115
101
  - - "~>"
116
102
  - !ruby/object:Gem::Version
117
- version: 0.85.0
103
+ version: 0.88.0
118
104
  type: :development
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
107
  requirements:
122
108
  - - "~>"
123
109
  - !ruby/object:Gem::Version
124
- version: 0.85.0
110
+ version: 0.88.0
125
111
  - !ruby/object:Gem::Dependency
126
112
  name: vcr
127
113
  requirement: !ruby/object:Gem::Requirement
@@ -197,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
197
183
  - !ruby/object:Gem::Version
198
184
  version: 2.5.0
199
185
  requirements: []
200
- rubygems_version: 3.0.3
186
+ rubygems_version: 3.1.2
201
187
  signing_key:
202
188
  specification_version: 4
203
189
  summary: ".NET (NuGet) support for dependabot"