chef-utils 16.1.0 → 16.1.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/chef-utils/dsl/architecture.rb +3 -3
- data/lib/chef-utils/dsl/platform_family.rb +1 -1
- data/lib/chef-utils/dsl/which.rb +4 -4
- data/lib/chef-utils/internal.rb +1 -1
- data/lib/chef-utils/version.rb +1 -1
- data/lib/chef-utils/version_string.rb +1 -1
- data/spec/unit/dsl/architecture_spec.rb +11 -0
- data/spec/unit/dsl/introspection_spec.rb +1 -1
- data/spec/unit/dsl/which_spec.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 34db2a53fc03eccff93242061306b81528cf323099f5af6e8d8246e3134adb46
|
4
|
+
data.tar.gz: b0da71e4d65b0c4ead8132c6edfb3473e246473555b39e48c20ba953f5206b9b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f983bba52a73d0adc54ec8ed44b2bb08fb9d758a47696fe581b7175e59fc5d572e67aabbbcd504439c035aaddbaceb1473941682a035596225007ccd83174a05
|
7
|
+
data.tar.gz: 55f688eb6b8be05ca6b09643504bb8ead66992732db2c50b6804f5456c34b94f8c13d96ba2315d86f87362459ccae6ce6a1b086422983fc42c472681bda98535
|
@@ -110,17 +110,17 @@ module ChefUtils
|
|
110
110
|
# @return [Boolean]
|
111
111
|
#
|
112
112
|
def arm?(node = __getnode)
|
113
|
-
%w{armhf aarch64 arm64 arch64}.include?(node["kernel"]["machine"])
|
113
|
+
%w{armv6l armv7l armhf aarch64 arm64 arch64}.include?(node["kernel"]["machine"])
|
114
114
|
end
|
115
115
|
|
116
|
-
# Determine if the current architecture is 32-bit ARM.
|
116
|
+
# Determine if the current architecture is 32-bit ARM hard float.
|
117
117
|
#
|
118
118
|
# @since 15.5
|
119
119
|
#
|
120
120
|
# @return [Boolean]
|
121
121
|
#
|
122
122
|
def armhf?(node = __getnode)
|
123
|
-
%w{armhf}.include?(node["kernel"]["machine"])
|
123
|
+
%w{armv6l armv7l armhf}.include?(node["kernel"]["machine"])
|
124
124
|
end
|
125
125
|
|
126
126
|
# Determine if the current architecture is s390x.
|
@@ -301,7 +301,7 @@ module ChefUtils
|
|
301
301
|
end
|
302
302
|
|
303
303
|
# RedHat distros -- fedora and rhel platform_families, nothing else. This is most likely not as useful as the
|
304
|
-
# "
|
304
|
+
# "fedora_derived?" helper.
|
305
305
|
#
|
306
306
|
# @param [Chef::Node] node the node to check
|
307
307
|
# @since 15.5
|
data/lib/chef-utils/dsl/which.rb
CHANGED
@@ -25,7 +25,7 @@ module ChefUtils
|
|
25
25
|
# Lookup an executable through the systems search PATH. Allows specifying an array
|
26
26
|
# of executables to look for. The first executable that is found, along any path entry,
|
27
27
|
# will be the preferred one and returned first. The extra_path will override any default
|
28
|
-
# extra_paths which are added (
|
28
|
+
# extra_paths which are added (allowing the user to pass an empty array to remove them).
|
29
29
|
#
|
30
30
|
# When passed a block the block will be called with the full pathname of any executables
|
31
31
|
# which are found, and the block should return truthy or falsey values to further filter
|
@@ -34,7 +34,7 @@ module ChefUtils
|
|
34
34
|
# This is syntactic sugar for `where(...).first`
|
35
35
|
#
|
36
36
|
# This helper can be used in target mode in chef or with train using the appropriate
|
37
|
-
# wiring
|
37
|
+
# wiring externally.
|
38
38
|
#
|
39
39
|
# @example Find the most appropriate python executable, searching through the system PATH
|
40
40
|
# plus additionally the "/usr/libexec" directory, which has the dnf libraries
|
@@ -55,14 +55,14 @@ module ChefUtils
|
|
55
55
|
# Lookup all the instances of an an executable that can be found through the systems search PATH.
|
56
56
|
# Allows specifying an array of executables to look for. All the instances of the first executable
|
57
57
|
# that is found will be returned first. The extra_path will override any default extra_paths
|
58
|
-
# which are added (
|
58
|
+
# which are added (allowing the user to pass an empty array to remove them).
|
59
59
|
#
|
60
60
|
# When passed a block the block will be called with the full pathname of any executables
|
61
61
|
# which are found, and the block should return truthy or falsey values to further filter
|
62
62
|
# the executable based on arbitrary criteria.
|
63
63
|
#
|
64
64
|
# This helper can be used in target mode in chef or with train using the appropriate
|
65
|
-
# wiring
|
65
|
+
# wiring externally.
|
66
66
|
#
|
67
67
|
# @example Find all the python executables, searching through the system PATH plus additionally
|
68
68
|
# the "/usr/libexec" directory, which have the dnf libraries installed and available.
|
data/lib/chef-utils/internal.rb
CHANGED
@@ -27,7 +27,7 @@ module ChefUtils
|
|
27
27
|
#
|
28
28
|
# This gem may be used by gems like mixlib-shellout which can be consumed by external non-Chef utilities,
|
29
29
|
# so including brittle code here which depends on the existence of the chef-client will cause broken
|
30
|
-
# behavior downstream. You must practice defensive coding, and not make assumptions about
|
30
|
+
# behavior downstream. You must practice defensive coding, and not make assumptions about running within chef-client.
|
31
31
|
#
|
32
32
|
# Other consumers may mix in the helper classes and then override the methods here and provide their own custom
|
33
33
|
# wiring and override what is provided here. They are marked as private because no downstream user should ever touch
|
data/lib/chef-utils/version.rb
CHANGED
@@ -131,6 +131,17 @@ RSpec.describe ChefUtils::DSL::Architecture do
|
|
131
131
|
|
132
132
|
arch_reports_true_for(:armhf?, :_32_bit?, :arm?)
|
133
133
|
end
|
134
|
+
context "on armv6l" do
|
135
|
+
let(:arch) { "armv6l" }
|
136
|
+
|
137
|
+
arch_reports_true_for(:armhf?, :_32_bit?, :arm?)
|
138
|
+
end
|
139
|
+
context "on armv7l" do
|
140
|
+
let(:arch) { "armv7l" }
|
141
|
+
|
142
|
+
arch_reports_true_for(:armhf?, :_32_bit?, :arm?)
|
143
|
+
end
|
144
|
+
|
134
145
|
context "on s390" do
|
135
146
|
let(:arch) { "s390" }
|
136
147
|
|
@@ -31,7 +31,7 @@ RSpec.describe ChefUtils::DSL::Introspection do
|
|
31
31
|
let(:test_instance) { IntrospectionTestClass.new(node) }
|
32
32
|
|
33
33
|
context "#docker?" do
|
34
|
-
# FIXME: use a real VividMash for these tests
|
34
|
+
# FIXME: use a real VividMash for these tests instead of stubbing
|
35
35
|
it "is false by default" do
|
36
36
|
expect(node).to receive(:read).with("virtualization", "systems", "docker").and_return(nil)
|
37
37
|
expect(ChefUtils.docker?(node)).to be false
|
data/spec/unit/dsl/which_spec.rb
CHANGED
@@ -78,7 +78,7 @@ RSpec.describe ChefUtils::DSL::Which do
|
|
78
78
|
end
|
79
79
|
|
80
80
|
context "with a block" do
|
81
|
-
test_which("
|
81
|
+
test_which("doesn't find it if its false", "foo1", others: [ "/dir1/foo1" ]) do |f|
|
82
82
|
false
|
83
83
|
end
|
84
84
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: chef-utils
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 16.1.
|
4
|
+
version: 16.1.16
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Chef Software, Inc
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-05-
|
11
|
+
date: 2020-05-27 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description:
|
14
14
|
email:
|