dependabot-nuget 0.101.1 → 0.101.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/dependabot/nuget/file_parser/project_file_parser.rb +10 -6
  3. data/lib/dependabot/nuget/file_updater/project_file_declaration_finder.rb +9 -2
  4. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a05ad3d401a8f5da9094973661aecdaefb65ae9dc20e9818f10d875e92a02f6a
4
- data.tar.gz: 6649bb6ccaeb636317410dc7889527ded969e1e4b645a2a9efac6c64330a7c4d
3
+ metadata.gz: '09412b9184870aa31a75215b009e252fa5453381bad8e4f2f76b7976c03cc1b7'
4
+ data.tar.gz: 0d7d9f15aad18c8c09c46ac25e2b6e2ea207abb5d5886258150cd11924072fb1
5
5
  SHA512:
6
- metadata.gz: 1b9ea561d7cfe0e6bceffaff9ddcf789dd09495a6c5f1776ff2fe5fc295a6a1c8c62ff89eb4e762ad4059a7cca85faf9cf89f354c4efacc24bf1c07dff8ee4d7
7
- data.tar.gz: 58e7e45fde82502ec9c3f733ec2b561049ea0bbad8cfc62b7a2f743dbd5a6e2e43cfd350842ef9798672c91fe266d45637bcf16868d41a45a9670c53ff48097a
6
+ metadata.gz: 20c94e5657a78cd31bdcca64a75c0b24bd13bc7c7f401565f5861e358882eee001e56b0883080af05d8cd2d2077940f40d98a75de0170b1be73d07f409e2d86d
7
+ data.tar.gz: 0d871d22e3ddc16e879a35c2c2663efc84a75ab8e9cf9dd790a412f4013554fe326523341fa3c2b0a104bef7e479820854c291ae370b39b394daacf85816d56c
data/lib/dependabot/nuget/file_parser/project_file_parser.rb CHANGED
@@ -86,9 +86,7 @@ module Dependabot
86
86
  end
87
87
 
88
88
  def dependency_requirement(dependency_node, project_file)
89
- raw_requirement =
90
- dependency_node.attribute("Version")&.value&.strip ||
91
- dependency_node.at_xpath("./Version")&.content&.strip
89
+ raw_requirement = get_node_version_value(dependency_node)
92
90
  return unless raw_requirement
93
91
 
94
92
  evaluated_value(raw_requirement, project_file)
@@ -110,9 +108,7 @@ module Dependabot
110
108
  end
111
109
 
112
110
  def req_property_name(dependency_node)
113
- raw_requirement =
114
- dependency_node.attribute("Version")&.value&.strip ||
115
- dependency_node.at_xpath("./Version")&.content&.strip
111
+ raw_requirement = get_node_version_value(dependency_node)
116
112
  return unless raw_requirement
117
113
 
118
114
  return unless raw_requirement.match?(PROPERTY_REGEX)
@@ -122,6 +118,14 @@ module Dependabot
122
118
  named_captures.fetch("property")
123
119
  end
124
120
 
121
+ def get_node_version_value(node)
122
+ attribute = "Version"
123
+ node.attribute(attribute)&.value&.strip ||
124
+ node.at_xpath("./#{attribute}")&.content&.strip ||
125
+ node.attribute(attribute.downcase)&.value&.strip ||
126
+ node.at_xpath("./#{attribute.downcase}")&.content&.strip
127
+ end
128
+
125
129
  def evaluated_value(value, project_file)
126
130
  return value unless value.match?(PROPERTY_REGEX)
127
131
 
data/lib/dependabot/nuget/file_updater/project_file_declaration_finder.rb CHANGED
@@ -51,12 +51,19 @@ module Dependabot
51
51
  node.at_xpath("./Include")&.content&.strip
52
52
  next false unless node_name&.downcase == dependency_name&.downcase
53
53
 
54
- node_requirement = node.attribute("Version")&.value&.strip ||
55
- node.at_xpath("./Version")&.content&.strip
54
+ node_requirement = get_node_version_value(node)
56
55
  node_requirement == declaring_requirement.fetch(:requirement)
57
56
  end
58
57
  end
59
58
 
59
+ def get_node_version_value(node)
60
+ attribute = "Version"
61
+ node.attribute(attribute)&.value&.strip ||
62
+ node.at_xpath("./#{attribute}")&.content&.strip ||
63
+ node.attribute(attribute.downcase)&.value&.strip ||
64
+ node.at_xpath("./#{attribute.downcase}")&.content&.strip
65
+ end
66
+
60
67
  def deep_find_declarations(string)
61
68
  string.scan(DECLARATION_REGEX).flat_map do |matching_node|
62
69
  [matching_node, *deep_find_declarations(matching_node[0..-2])]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dependabot-nuget
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.101.1
4
+ version: 0.101.2
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.101.1
19
+ version: 0.101.2
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.101.1
26
+ version: 0.101.2
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: byebug
29
29
  requirement: !ruby/object:Gem::Requirement