dependabot-nuget 0.178.0 → 0.180.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/dependabot/nuget/version.rb +21 -22
  3. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4826d277b24af7a5cb9ef78e4092b0e743fc8b283860b101bcf033343fc4f3c6
4
- data.tar.gz: 611e1c48bffb25ff2b7c6b809a05d18c441e4fcec572536a3e613e4361d61e7d
3
+ metadata.gz: 7a780eaa66d7c13725db1a57ab973089fc503d5940f4eb2e32ed03efaaa31b7a
4
+ data.tar.gz: 41b0a12b4f17aef0cf5f8501ee16e9a557a5913c8fbea52d4a1b6b3eaab318b0
5
5
  SHA512:
6
- metadata.gz: 8677987b3158e0ec8b136f0d186faa1808da2bb78d4a38a4251d9bd45041d8806ed87d17bfa01e8f883553ad300a6708f8c871c55ed2ef67e100e5effdc66395
7
- data.tar.gz: 7562e8209b3521826bd2841a4849c5d6fb31514d4e3aacab73acbbb3f714744d8432ab40110925628c0b5a2643dbb1648680494d35b5ffc2726b4f88733aebf5
6
+ metadata.gz: ed5950167c92acc5eec81a0724d4543598e440b3ddc94db697ca5ee9172846251553773fb29511ec3aa4d40681dbcd1cc64b80fe45b67b8f3000c66d5b6574f7
7
+ data.tar.gz: 3db1fefd7f1fe58b5de4f88b46b682c382fb2b0167678ebb3de0a8509e9f0ce4fc1937595817ebd75956ae9470bdfc0081aa8d62d51b8ddd97592db5169e08e4
@@ -10,8 +10,6 @@ require "rubygems_version_patch"
10
10
  module Dependabot
11
11
  module Nuget
12
12
  class Version < Gem::Version
13
- attr_reader :build_info
14
-
15
13
  VERSION_PATTERN = Gem::Version::VERSION_PATTERN + '(\+[0-9a-zA-Z\-.]+)?'
16
14
  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/.freeze
17
15
 
@@ -24,7 +22,7 @@ module Dependabot
24
22
  def initialize(version)
25
23
  @version_string = version.to_s
26
24
 
27
- version, @build_info = version.to_s.split("+") if version.to_s.include?("+")
25
+ version = version.to_s.split("+").first if version.to_s.include?("+")
28
26
 
29
27
  super
30
28
  end
@@ -41,10 +39,7 @@ module Dependabot
41
39
  version_comparison = compare_release(other)
42
40
  return version_comparison unless version_comparison.zero?
43
41
 
44
- version_comparison = compare_prerelease_part(other)
45
- return version_comparison unless version_comparison.zero?
46
-
47
- compare_build_info(other)
42
+ compare_prerelease_part(other)
48
43
  end
49
44
 
50
45
  def compare_release(other)
@@ -55,6 +50,8 @@ module Dependabot
55
50
  end
56
51
 
57
52
  # rubocop:disable Metrics/PerceivedComplexity
53
+ # rubocop:disable Metrics/CyclomaticComplexity
54
+ # rubocop:disable Metrics/AbcSize
58
55
  def compare_prerelease_part(other)
59
56
  release_str = @version_string.split("-").first&.split("+")&.first || ""
60
57
  prerelease_string = @version_string.
@@ -74,28 +71,30 @@ module Dependabot
74
71
 
75
72
  return -1 if prerelease_string && !other_prerelease_string
76
73
  return 1 if !prerelease_string && other_prerelease_string
74
+ return 0 if !prerelease_string && !other_prerelease_string
77
75
 
78
- prerelease_string.<=>(other_prerelease_string)
79
- end
80
-
81
- # rubocop:enable Metrics/PerceivedComplexity
76
+ split_prerelease_string = prerelease_string.split(".")
77
+ other_split_prerelease_string = other_prerelease_string.split(".")
82
78
 
83
- def compare_build_info(other)
84
- return build_info.nil? ? 0 : 1 unless other.is_a?(Nuget::Version)
79
+ split_prerelease_string.zip(other_split_prerelease_string).each do |lhs, rhs|
80
+ result = compare_dot_separated_part(lhs, rhs)
81
+ return result unless result.zero?
82
+ end
85
83
 
86
- # Build information comparison
87
- lhsegments = build_info.to_s.split(".").map(&:downcase)
88
- rhsegments = other.build_info.to_s.split(".").map(&:downcase)
89
- limit = [lhsegments.count, rhsegments.count].min
84
+ 0
85
+ end
90
86
 
91
- lhs = ["1", *lhsegments.first(limit)].join(".")
92
- rhs = ["1", *rhsegments.first(limit)].join(".")
87
+ # rubocop:enable Metrics/PerceivedComplexity
88
+ # rubocop:enable Metrics/CyclomaticComplexity
89
+ # rubocop:enable Metrics/AbcSize
93
90
 
94
- local_comparison = Gem::Version.new(lhs) <=> Gem::Version.new(rhs)
91
+ def compare_dot_separated_part(lhs, rhs)
92
+ return -1 if lhs.nil?
93
+ return 1 if rhs.nil?
95
94
 
96
- return local_comparison unless local_comparison.zero?
95
+ return lhs.to_i <=> rhs.to_i if lhs.match?(/^\d+$/) && rhs.match?(/^\d+$/)
97
96
 
98
- lhsegments.count <=> rhsegments.count
97
+ lhs.upcase <=> rhs.upcase
99
98
  end
100
99
  end
101
100
  end
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.178.0
4
+ version: 0.180.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dependabot
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-03-10 00:00:00.000000000 Z
11
+ date: 2022-03-18 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.178.0
19
+ version: 0.180.0
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.178.0
26
+ version: 0.180.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: debug
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
156
156
  requirements:
157
157
  - - '='
158
158
  - !ruby/object:Gem::Version
159
- version: 6.0.0
159
+ version: 6.1.0
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - '='
165
165
  - !ruby/object:Gem::Version
166
- version: 6.0.0
166
+ version: 6.1.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: webmock
169
169
  requirement: !ruby/object:Gem::Requirement
@@ -218,12 +218,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
218
218
  requirements:
219
219
  - - ">="
220
220
  - !ruby/object:Gem::Version
221
- version: 2.5.0
221
+ version: 2.7.0
222
222
  required_rubygems_version: !ruby/object:Gem::Requirement
223
223
  requirements:
224
224
  - - ">="
225
225
  - !ruby/object:Gem::Version
226
- version: 2.5.0
226
+ version: 2.7.0
227
227
  requirements: []
228
228
  rubygems_version: 3.2.32
229
229
  signing_key: