chef 12.21.12-universal-mingw32 → 12.21.14-universal-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 51d5d3c4ee24daa9e4c7b3724365abeaed6819ed
4
- data.tar.gz: 73274ba7a430f3164a100801c0bbc2ef47cc1b1b
3
+ metadata.gz: aa8afdf8ff2a200af3c6c0ee7204158d0a80e631
4
+ data.tar.gz: 07ef2ec6d60ca183435a4601b4eebe19186cc869
5
5
  SHA512:
6
- metadata.gz: c66db182d5932a1cd93d8cb853b836570cd366b548a32f9f7ee84a3425b97298677751469c724e59c42d965bc5ed00e5d8ff651bc6af1cc7d316a6bbb70780df
7
- data.tar.gz: 4f433acd72fbd8eaf5ddd2e0211e1939f6f4de53a56c9432884a6015092db7645169e84bb36ee94fc93e2aac31d76ad5b4a09d50c09d8432de4621333dfd75af
6
+ metadata.gz: 0a1d169eb5a77d775c8b169893bdd2955e3091a90639356ab45223f0061c19f72adf767e202c42d444f0a931f4723b5ad3f351315f70973bd325c387440035a1
7
+ data.tar.gz: '0296ed11facff4c78e4d88abaee1e74693bf3e6ecaca40e694c34bd0730813fa7f1beb90a6e17d1ad3a4879e33217e14d763e02a232a4f4e78d47b7bb25371fe'
data/VERSION CHANGED
@@ -1 +1 @@
1
- 12.21.12
1
+ 12.21.14
@@ -31,6 +31,9 @@ class Chef
31
31
  include Chef::Mixin::ShellOut
32
32
  extend Chef::Mixin::Which
33
33
 
34
+ LIST_APT_KEYS = "apt-key list".freeze
35
+ LIST_APT_KEY_FINGERPRINTS = "apt-key adv --list-public-keys --with-fingerprint --with-colons".freeze
36
+
34
37
  provides :apt_repository do
35
38
  which("apt-get")
36
39
  end
@@ -149,7 +152,7 @@ class Chef
149
152
  def no_new_keys?(file)
150
153
  # Now we are using the option --with-colons that works across old os versions
151
154
  # as well as the latest (16.10). This for both `apt-key` and `gpg` commands
152
- installed_keys = extract_fingerprints_from_cmd("apt-key adv --list-public-keys --with-fingerprint --with-colons")
155
+ installed_keys = extract_fingerprints_from_cmd(LIST_APT_KEY_FINGERPRINTS)
153
156
  proposed_keys = extract_fingerprints_from_cmd("gpg --with-fingerprint --with-colons #{file}")
154
157
  (installed_keys & proposed_keys).sort == proposed_keys.sort
155
158
  end
@@ -200,15 +203,15 @@ class Chef
200
203
  command cmd
201
204
  sensitive new_resource.sensitive
202
205
  not_if do
203
- present = extract_fingerprints_from_cmd("apt-key finger").any? do |fp|
206
+ present = extract_fingerprints_from_cmd(LIST_APT_KEY_FINGERPRINTS).any? do |fp|
204
207
  fp.end_with? key.upcase
205
208
  end
206
- present && key_is_valid?("apt-key list", key.upcase)
209
+ present && key_is_valid?(LIST_APT_KEYS, key.upcase)
207
210
  end
208
211
  notifies :run, "execute[apt-cache gencaches]", :immediately
209
212
  end
210
213
 
211
- raise "The key #{key} is invalid and cannot be used to verify an apt repository." unless key_is_valid?("apt-key list", key.upcase)
214
+ raise "The key #{key} is invalid and cannot be used to verify an apt repository." unless key_is_valid?(LIST_APT_KEYS, key.upcase)
212
215
  end
213
216
 
214
217
  def install_ppa_key(owner, repo)
@@ -21,7 +21,7 @@
21
21
 
22
22
  class Chef
23
23
  CHEF_ROOT = File.expand_path("../..", __FILE__)
24
- VERSION = "12.21.12"
24
+ VERSION = "12.21.14"
25
25
  end
26
26
 
27
27
  #
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef
3
3
  version: !ruby/object:Gem::Version
4
- version: 12.21.12
4
+ version: 12.21.14
5
5
  platform: universal-mingw32
6
6
  authors:
7
7
  - Adam Jacob
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-09-14 00:00:00.000000000 Z
11
+ date: 2017-09-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: chef-config
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 12.21.12
19
+ version: 12.21.14
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: 12.21.12
26
+ version: 12.21.14
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: mixlib-cli
29
29
  requirement: !ruby/object:Gem::Requirement