dependabot-cargo 0.213.0 → 0.215.0

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: 21dc0ea4001940fffbf43b581315b2e20337f869b9e8722d824b8d90fe30e37e
4
- data.tar.gz: 9bc652359e629859f89b7f834a31f93371f3a30b243c750d76baff85b1f3c91d
3
+ metadata.gz: 322b4102293bdccc915642ebbf828d55d4f5e49d5312c67ff2f3e6466b76ebf9
4
+ data.tar.gz: c4711a27f467f9954f465e31a333c656e709e9362f14dc17db821892b6b7f643
5
5
  SHA512:
6
- metadata.gz: 1387ae679d92f01f1bf8009319f6ebd82db3e2c5bb2edc720ffcabed443be538e50cdf212853e6a593afe8e64bfdef48870925a268bc1ea4769446124a6bcf80
7
- data.tar.gz: ceff9213f82e10d6ccb40435bd955c4f988cbf153b256a837dbdca23c100d82d812b5e623a742bfa41e6fb3f1b6fefb915318b623046cfd1ec0b356b1ab1821c
6
+ metadata.gz: ec0dc79fdc36411beed867c33ef0e04b64dd72783a40ecbb6831b9eddd5bd2ae0b77da32227c1fc5074accb7173156ca2e458ca2f4dee6e4e3f4a4044df2c97f
7
+ data.tar.gz: cea99ee29388a4edc86fa3191c4e5a9c271cab9b473f2e897133edc8e7748eb0f4fe7f6b46529fa30fe594f81083746bfd7b73ad71b3254b91141ecf1a8572e6
@@ -32,7 +32,7 @@ module Dependabot
32
32
  SharedHelpers.with_git_configured(credentials: credentials) do
33
33
  # Shell out to Cargo, which handles everything for us, and does
34
34
  # so without doing an install (so it's fast).
35
- run_shell_command("cargo update -p #{dependency_spec}")
35
+ run_shell_command("cargo update -p #{dependency_spec}", fingerprint: "cargo update -p <dependency_spec>")
36
36
  end
37
37
 
38
38
  updated_lockfile = File.read("Cargo.lock")
@@ -135,7 +135,7 @@ module Dependabot
135
135
  %(name = "#{dependency.name}"\nversion = "#{dependency.version}")
136
136
  end
137
137
 
138
- def run_shell_command(command)
138
+ def run_shell_command(command, fingerprint:)
139
139
  start = Time.now
140
140
  command = SharedHelpers.escape_command(command)
141
141
  stdout, process = Open3.capture2e(command)
@@ -149,6 +149,7 @@ module Dependabot
149
149
  message: stdout,
150
150
  error_context: {
151
151
  command: command,
152
+ fingerprint: fingerprint,
152
153
  time_taken: time_taken,
153
154
  process_exit_value: process.to_s
154
155
  }
@@ -68,10 +68,10 @@ module Dependabot
68
68
  end
69
69
 
70
70
  def filter_lower_versions(versions_array)
71
- return versions_array unless dependency.version && version_class.correct?(dependency.version)
71
+ return versions_array unless dependency.numeric_version
72
72
 
73
73
  versions_array.
74
- select { |version| version > version_class.new(dependency.version) }
74
+ select { |version| version > dependency.numeric_version }
75
75
  end
76
76
 
77
77
  def available_versions
@@ -89,10 +89,7 @@ module Dependabot
89
89
  end
90
90
 
91
91
  def wants_prerelease?
92
- if dependency.version &&
93
- version_class.new(dependency.version).prerelease?
94
- return true
95
- end
92
+ return true if dependency.numeric_version&.prerelease?
96
93
 
97
94
  dependency.requirements.any? do |req|
98
95
  reqs = (req.fetch(:requirement) || "").split(",").map(&:strip)
@@ -43,9 +43,7 @@ module Dependabot
43
43
  write_temporary_dependency_files
44
44
 
45
45
  SharedHelpers.with_git_configured(credentials: credentials) do
46
- # Shell out to Cargo, which handles everything for us, and does
47
- # so without doing an install (so it's fast).
48
- run_cargo_command("cargo update -p #{dependency_spec} --verbose")
46
+ run_cargo_update_command
49
47
  end
50
48
 
51
49
  updated_version = fetch_version_from_new_lockfile
@@ -132,7 +130,16 @@ module Dependabot
132
130
  spec
133
131
  end
134
132
 
135
- def run_cargo_command(command)
133
+ # Shell out to Cargo, which handles everything for us, and does
134
+ # so without doing an install (so it's fast).
135
+ def run_cargo_update_command
136
+ run_cargo_command(
137
+ "cargo update -p #{dependency_spec} --verbose",
138
+ fingerprint: "cargo update -p <dependency_spec> --verbose"
139
+ )
140
+ end
141
+
142
+ def run_cargo_command(command, fingerprint: nil)
136
143
  start = Time.now
137
144
  command = SharedHelpers.escape_command(command)
138
145
  stdout, process = Open3.capture2e(command)
@@ -146,6 +153,7 @@ module Dependabot
146
153
  message: stdout,
147
154
  error_context: {
148
155
  command: command,
156
+ fingerprint: fingerprint,
149
157
  time_taken: time_taken,
150
158
  process_exit_value: process.to_s
151
159
  }
@@ -185,8 +193,6 @@ module Dependabot
185
193
  end
186
194
 
187
195
  if error.message.include?("authenticate when downloading repo") ||
188
- # TODO: stop catching this 200 error: https://github.com/dependabot/dependabot-core/pull/5332#discussion_r936888624
189
- error.message.include?("HTTP 200 response: got 401") ||
190
196
  error.message.include?("fatal: Authentication failed for")
191
197
  # Check all dependencies for reachability (so that we raise a
192
198
  # consistent error)
@@ -293,7 +299,7 @@ module Dependabot
293
299
  write_temporary_dependency_files(prepared: false)
294
300
 
295
301
  SharedHelpers.with_git_configured(credentials: credentials) do
296
- run_cargo_command("cargo update -p #{dependency_spec} --verbose")
302
+ run_cargo_update_command
297
303
  end
298
304
  end
299
305
 
@@ -12,7 +12,7 @@ module Dependabot
12
12
  class Version < Gem::Version
13
13
  VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*' \
14
14
  '(-[0-9A-Za-z-]+(\.[0-9a-zA-Z-]+)*)?' \
15
- '(\+[0-9a-zA-Z]+(\.[0-9a-zA-Z]+)*)?'
15
+ '(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?'
16
16
  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/
17
17
 
18
18
  def initialize(version)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dependabot-cargo
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.213.0
4
+ version: 0.215.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-10-31 00:00:00.000000000 Z
11
+ date: 2022-12-07 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.213.0
19
+ version: 0.215.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.213.0
26
+ version: 0.215.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: debug
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 3.13.0
61
+ version: 4.0.0
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 3.13.0
68
+ version: 4.0.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 1.37.1
117
+ version: 1.39.0
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 1.37.1
124
+ version: 1.39.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rubocop-performance
127
127
  requirement: !ruby/object:Gem::Requirement