chef-utils 15.17.4 → 16.0.257

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c63cf36e52894706bb69cc46b832f6de68ac9e723add175c3c8e07914c7e903
-  data.tar.gz: 8b274d868da78c3427e4786b630770fb5761199553699291120f00e315e3fc1c
+  metadata.gz: 2392a6ca0ae1cdc3b3d28e3d67f91ce523fbc2a646fd820bbc2a85b1ae7909a6
+  data.tar.gz: 17920fff50553a5b998a29ff4e266863b89536795fc0242a9d416936077d1ee6
 SHA512:
-  metadata.gz: f9469abcdff8e386071e0384c17b3fbb9f54af6ba6c65e76b4662bc75ee752d47498ccad458da61eb357aedb8b27dba172f5c70cc7d819f001ba1566af828eea
-  data.tar.gz: '03884e36728e3e3cbbd242e7e9fee94191c4d776b3a526a4cb3e5ebb4cab8dcf4363d04b1ebf9affb4090a7eeb755c72d504666ccc08cc62acdc221f07f5a9e8'
+  metadata.gz: 2a3953269db596512b08c5c64b942594c0e8cda63744c79dfc20821074dff10485a7fe82865f83770893a3f1a5522a3699bd0ddbf75500bb6e90a9682264f41c
+  data.tar.gz: '0888b423c1cc56416191a4999ffac0bed59d4c36db79aa8f30e664dfed3fe3e0551b6b7daa67d08496d55695bbf87bf4cdcfee7f47f793fbd0ede586ea6413b9'

data/Rakefile

@@ -6,6 +6,7 @@ begin
   require "rspec/core/rake_task"
   desc "Run standard specs"
   RSpec::Core::RakeTask.new(:spec) do |t|
+    t.verbose = false
     t.pattern = FileList["spec/**/*_spec.rb"]
   end
 rescue LoadError

data/chef-utils.gemspec

@@ -1,4 +1,5 @@
-lib = File.expand_path("lib", __dir__)
+# coding: utf-8
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "chef-utils/version"
 

data/lib/chef-utils.rb

@@ -36,15 +36,14 @@ module ChefUtils
   include ChefUtils::DSL::Cloud
   include ChefUtils::DSL::Introspection
   include ChefUtils::DSL::OS
+  include ChefUtils::DSL::PathSanity
   include ChefUtils::DSL::Platform
   include ChefUtils::DSL::PlatformFamily
   include ChefUtils::DSL::PlatformVersion
   include ChefUtils::DSL::TrainHelpers
   include ChefUtils::DSL::Virtualization
+  include ChefUtils::DSL::Which
   include ChefUtils::DSL::Windows
-  # FIXME: include ChefUtils::DSL::Which in Chef 16.0
-  # FIXME: include ChefUtils::DSL::PathSanity in Chef 16.0
-  # FIXME: include ChefUtils::DSL::TrainHelpers in Chef 16.0
   # ChefUtils::DSL::Service is deliberately excluded
 
   CANARY = 1 # used as a guard for requires

data/lib/chef-utils/dsl/architecture.rb

@@ -110,17 +110,17 @@ module ChefUtils
       # @return [Boolean]
       #
       def arm?(node = __getnode)
-        %w{armv6l armv7l armhf aarch64 arm64 arch64}.include?(node["kernel"]["machine"])
+        %w{armhf aarch64 arm64 arch64}.include?(node["kernel"]["machine"])
       end
 
-      # Determine if the current architecture is 32-bit ARM hard float.
+      # Determine if the current architecture is 32-bit ARM.
       #
       # @since 15.5
       #
       # @return [Boolean]
       #
       def armhf?(node = __getnode)
-        %w{armv6l armv7l armhf}.include?(node["kernel"]["machine"])
+        %w{armhf}.include?(node["kernel"]["machine"])
       end
 
       # Determine if the current architecture is s390x.

data/lib/chef-utils/dsl/platform_family.rb

@@ -301,7 +301,7 @@ module ChefUtils
       end
 
       # RedHat distros -- fedora and rhel platform_families, nothing else. This is most likely not as useful as the
-      # "fedora_derived?" helper.
+      # "fedora_dervied?" helper.
       #
       # @param [Chef::Node] node the node to check
       # @since 15.5

data/lib/chef-utils/dsl/which.rb

@@ -25,7 +25,7 @@ module ChefUtils
       # Lookup an executable through the systems search PATH.  Allows specifying an array
       # of executables to look for.  The first executable that is found, along any path entry,
       # will be the preferred one and returned first.  The extra_path will override any default
-      # extra_paths which are added (allowing the user to pass an empty array to remove them).
+      # extra_paths which are added (allwing the user to pass an empty array to remove them).
       #
       # When passed a block the block will be called with the full pathname of any executables
       # which are found, and the block should return truthy or falsey values to further filter
@@ -34,7 +34,7 @@ module ChefUtils
       # This is syntactic sugar for `where(...).first`
       #
       # This helper can be used in target mode in chef or with train using the appropriate
-      # wiring externally.
+      # wiring extenerally.
       #
       # @example Find the most appropriate python executable, searching through the system PATH
       #          plus additionally the "/usr/libexec" directory, which has the dnf libraries
@@ -55,14 +55,14 @@ module ChefUtils
       # Lookup all the instances of an an executable that can be found through the systems search PATH.
       # Allows specifying an array of executables to look for.  All the instances of the first executable
       # that is found will be returned first.  The extra_path will override any default extra_paths
-      # which are added (allowing the user to pass an empty array to remove them).
+      # which are added (allwing the user to pass an empty array to remove them).
       #
       # When passed a block the block will be called with the full pathname of any executables
       # which are found, and the block should return truthy or falsey values to further filter
       # the executable based on arbitrary criteria.
       #
       # This helper can be used in target mode in chef or with train using the appropriate
-      # wiring externally.
+      # wiring extenerally.
       #
       # @example Find all the python executables, searching through the system PATH plus additionally
       #          the "/usr/libexec" directory, which have the dnf libraries installed and available.

data/lib/chef-utils/dsl/windows.rb

@@ -20,7 +20,7 @@ require_relative "../internal"
 module ChefUtils
   module DSL
     module Windows
-      require "chef-utils/version_string"
+      require_relative "../version_string"
 
       include Internal
 

data/lib/chef-utils/internal.rb

@@ -27,7 +27,7 @@ module ChefUtils
   #
   # This gem may be used by gems like mixlib-shellout which can be consumed by external non-Chef utilities,
   # so including brittle code here which depends on the existence of the chef-client will cause broken
-  # behavior downstream.  You must practice defensive coding, and not make assumptions about running within chef-client.
+  # behavior downstream.  You must practice defensive coding, and not make assumptions about runnign within chef-client.
   #
   # Other consumers may mix in the helper classes and then override the methods here and provide their own custom
   # 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

@@ -14,6 +14,6 @@
 # limitations under the License.
 
 module ChefUtils
-  CHEFUTILS_ROOT = File.expand_path("..", __dir__)
-  VERSION = "15.17.4".freeze
+  CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
+  VERSION = "16.0.257".freeze
 end

data/lib/chef-utils/version_string.rb

@@ -27,8 +27,13 @@ module ChefUtils
     #
     # @param val [String] Version string to parse.
     def initialize(val)
-      super
-      @parsed_version = ::Gem::Version.create(self)
+      val = "" unless val
+      super(val)
+      begin
+        @parsed_version = ::Gem::Version.create(self)
+      rescue ArgumentError
+        @parsed_version = nil
+      end
     end
 
     # @!group Compat wrappers for String
@@ -135,7 +140,12 @@ module ChefUtils
       when Regexp
         super
       else
-        Gem::Requirement.create(other) =~ parsed_version
+        begin
+          Gem::Requirement.create(other) =~ parsed_version
+        rescue ArgumentError
+          # one side of the comparison wasn't parseable
+          super
+        end
       end
     end
 

data/spec/unit/dsl/architecture_spec.rb

@@ -131,17 +131,6 @@ RSpec.describe ChefUtils::DSL::Architecture do
 
     arch_reports_true_for(:armhf?, :_32_bit?, :arm?)
   end
-  context "on armv6l" do
-    let(:arch) { "armv6l" }
-
-    arch_reports_true_for(:armhf?, :_32_bit?, :arm?)
-  end
-  context "on armv7l" do
-    let(:arch) { "armv7l" }
-
-    arch_reports_true_for(:armhf?, :_32_bit?, :arm?)
-  end
-
   context "on s390" do
     let(:arch) { "s390" }
 

data/spec/unit/dsl/introspection_spec.rb

@@ -21,7 +21,6 @@ RSpec.describe ChefUtils::DSL::Introspection do
   class IntrospectionTestClass
     include ChefUtils::DSL::Introspection
     attr_accessor :node
-
     def initialize(node)
       @node = node
     end
@@ -32,7 +31,7 @@ RSpec.describe ChefUtils::DSL::Introspection do
   let(:test_instance) { IntrospectionTestClass.new(node) }
 
   context "#docker?" do
-    # FIXME: use a real VividMash for these tests instead of stubbing
+    # FIXME: use a real VividMash for these tests insted of stubbing
     it "is false by default" do
       expect(node).to receive(:read).with("virtualization", "systems", "docker").and_return(nil)
       expect(ChefUtils.docker?(node)).to be false

data/spec/unit/dsl/platform_family_spec.rb

@@ -89,7 +89,7 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do
   end
 
   context "on centos6" do
-    let(:options) { { platform: "centos", version: "6.9" } }
+    let(:options) { { platform: "centos", version: "6.10" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?)
   end
@@ -167,7 +167,7 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do
   end
 
   context "on redhat6" do
-    let(:options) { { platform: "redhat", version: "6.9" } }
+    let(:options) { { platform: "redhat", version: "6.10" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?)
   end

data/spec/unit/dsl/platform_spec.rb

@@ -58,7 +58,6 @@ RSpec.describe ChefUtils::DSL::Platform do
   class ThingWithANode
     include ChefUtils::DSL::Platform
     attr_accessor :node
-
     def initialize(node)
       @node = node
     end
@@ -70,7 +69,6 @@ RSpec.describe ChefUtils::DSL::Platform do
       attr_accessor :node
     end
     attr_accessor :run_context
-
     def initialize(node)
       @run_context = RunContext.new
       run_context.node = node
@@ -80,7 +78,6 @@ RSpec.describe ChefUtils::DSL::Platform do
   class ThingWithTheDSL
     include ChefUtils
     attr_accessor :node
-
     def initialize(node)
       @node = node
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-utils
 version: !ruby/object:Gem::Version
-  version: 15.17.4
+  version: 16.0.257
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Basic utility functions for Core Chef development