chef-utils 15.11.3 → 16.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0c75c95baf0a557d351149a747a6afacfadbabbe963f95cf5f7c5de04dc9661
-  data.tar.gz: 318102046034b8ca50b9de2ac8e76648a7e31474eab8bc694f4dca11331911ee
+  metadata.gz: 34db2a53fc03eccff93242061306b81528cf323099f5af6e8d8246e3134adb46
+  data.tar.gz: b0da71e4d65b0c4ead8132c6edfb3473e246473555b39e48c20ba953f5206b9b
 SHA512:
-  metadata.gz: d67a41101576028ceeafc46d3ba35684e24e1ea4752823983c2910a1c9511929f15b69a47557378c9bc651d4242ecc2222b27d62b7ed184117943387c9787c25
-  data.tar.gz: e551f1c077834e16f352677751b41eb5b1d8ca8f4b85b605edc983d74032f74d72b7960534b6d556d2b164bdbfe2c4b4332382b652fa1bdfc939c85a10fbd46d
+  metadata.gz: f983bba52a73d0adc54ec8ed44b2bb08fb9d758a47696fe581b7175e59fc5d572e67aabbbcd504439c035aaddbaceb1473941682a035596225007ccd83174a05
+  data.tar.gz: 55f688eb6b8be05ca6b09643504bb8ead66992732db2c50b6804f5456c34b94f8c13d96ba2315d86f87362459ccae6ce6a1b086422983fc42c472681bda98535

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/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/introspection.rb

@@ -31,7 +31,7 @@ module ChefUtils
       # Determine if the node is a docker container.
       #
       # @param [Chef::Node] node the node to check
-      # @since 15.5
+      # @since 12.11
       #
       # @return [Boolean]
       #

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

@@ -349,7 +349,7 @@ module ChefUtils
         node["platform"] == "suse"
       end
 
-      # Determine if the current node is OpenSUSE.
+      # Determine if the current node is openSUSE.
       #
       # @param [Chef::Node] node the node to check
       # @since 15.5

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_dervied?" helper.
+      # "fedora_derived?" helper.
       #
       # @param [Chef::Node] node the node to check
       # @since 15.5

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

@@ -161,7 +161,7 @@ module ChefUtils
         node.dig("virtualization", "system") == "openvz" && node.dig("virtualization", "role") == "host"
       end
 
-      # Determine if the current node is running under any virutalization environment
+      # Determine if the current node is running under any virtualization environment
       #
       # @param [Chef::Node] node
       # @since 15.8

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 (allwing the user to pass an empty array to remove them).
+      # extra_paths which are added (allowing 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 extenerally.
+      # wiring externally.
       #
       # @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 (allwing the user to pass an empty array to remove them).
+      # which are added (allowing 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 extenerally.
+      # wiring externally.
       #
       # @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 runnign within chef-client.
+  # behavior downstream.  You must practice defensive coding, and not make assumptions about running 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

@@ -15,5 +15,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "15.11.3".freeze
+  VERSION = "16.1.16".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 parsable
+          super
+        end
       end
     end
 

data/spec/unit/dsl/introspection_spec.rb

@@ -31,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 insted of stubbing
+    # FIXME: use a real VividMash for these tests instead 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/which_spec.rb

@@ -78,7 +78,7 @@ RSpec.describe ChefUtils::DSL::Which do
     end
 
     context "with a block" do
-      test_which("doesnt find it if its false", "foo1", others: [ "/dir1/foo1" ]) do |f|
+      test_which("doesn't find it if its false", "foo1", others: [ "/dir1/foo1" ]) do |f|
         false
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-utils
 version: !ruby/object:Gem::Version
-  version: 15.11.3
+  version: 16.1.16
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-05-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
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Basic utility functions for Core Chef development