chef-utils 16.4.41 → 16.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22e9368674749d297f6ddc69f87aad6871229b4e6cad5deb6bd54d8629d1afc3
-  data.tar.gz: 7a79e8318c6a952cea65281de9bc89e0ab21464d60cf48c498e46cbb34f54b6b
+  metadata.gz: 03f8f0fc1ebf2fc1eff0929b7c2661b9317d86ac2c9ea040cda4529324975020
+  data.tar.gz: 00a2c20fbaee0e10c1b39d7de50ac172034453a6b08894c8e8049a75f05e68df
 SHA512:
-  metadata.gz: c9fb960d89c2b0457083ac9464e67d0562cb261a6d119332f9ea9fc2d5f5f7f636ea86834bf66f7082fb919bb58145887e311d07695be2fdf4cab38c2c787718
-  data.tar.gz: 84958551d7464979a536f9b352b8849820212f1425cc599395d4acb3355b14fb01ff37a30ec146444888f70e09a2ae53b98aeb355144ed62d1922afab3f91bb5
+  metadata.gz: 5aac3637b017c7238a8b1ba1441ee689c8eda83a645334cd044413fc6706d0a1b6ba301f6aa4239e456b820a9d9ac02a1dccde1479f8fa7607cb337ea3988d84
+  data.tar.gz: 8ce954861b4e9fa28f5882900ce665344730ffc398a8abe3a332fe7ef3c63af012fd00802049159fca09e1371729ea4ed1a720a70a5bb0f2ce84db342b5e8e3a

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/gem_tasks"
 
 task default: :spec

data/chef-utils.gemspec

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "chef-utils/version"
@@ -8,13 +9,15 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Chef Software, Inc"]
   spec.email         = ["oss@chef.io"]
 
-  spec.summary       = %q{Basic utility functions for Core Chef development}
+  spec.summary       = %q{Basic utility functions for Core Chef Infra development}
   spec.homepage      = "https://github.com/chef/chef/tree/master/chef-utils"
   spec.license       = "Apache-2.0"
 
+  spec.required_ruby_version = ">= 2.6.0"
+
   spec.metadata = {
     "bug_tracker_uri" => "https://github.com/chef/chef/issues",
-    "changelog_uri" => "https://github.com/chef/chef/CHANGELOG.md",
+    "changelog_uri" => "https://github.com/chef/chef/blob/master/CHANGELOG.md",
     "documentation_uri" => "https://github.com/chef/chef/tree/master/chef-utils/README.md",
     "homepage_uri" => "https://github.com/chef/chef/tree/master/chef-utils",
     "source_code_uri" => "https://github.com/chef/chef/tree/master/chef-utils",
@@ -40,7 +43,4 @@ Gem::Specification.new do |spec|
 
   spec.files = %w{Rakefile LICENSE} + Dir.glob("*.gemspec") +
     Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
-
-  spec.bindir        = "bin"
-  spec.executables   = []
 end

data/lib/chef-utils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/lib/chef-utils/dist.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+module ChefUtils
+  # This class is not fully implemented, depending on it is not recommended!
+  module Dist
+    class Apply
+      # The chef-apply product name
+      PRODUCT = "Chef Infra Apply"
+
+      # The chef-apply binary
+      EXEC = "chef-apply"
+    end
+
+    class Automate
+      # name of the automate product
+      PRODUCT = "Chef Automate"
+    end
+
+    class Infra
+      # When referencing a product directly, like Chef (Now Chef Infra)
+      PRODUCT = "Chef Infra Client"
+
+      # A short designation for the product, used in Windows event logs
+      # and some nomenclature.
+      SHORT = "chef"
+
+      # The client's alias (chef-client)
+      CLIENT = "chef-client"
+
+      # The chef executable, as in `chef gem install` or `chef generate cookbook`
+      EXEC = "chef"
+
+      # The chef-shell executable
+      SHELL = "chef-shell"
+
+      # Configuration related constants
+      # The chef-shell configuration file
+      SHELL_CONF = "chef_shell.rb"
+
+      # The user's configuration directory
+      USER_CONF_DIR = ".chef"
+
+      # The suffix for Chef's /etc/chef, /var/chef and C:\\Chef directories
+      # "chef" => /etc/cinc, /var/cinc, C:\\cinc
+      DIR_SUFFIX = "chef"
+    end
+
+    class Org
+      # product Website address
+      WEBSITE = "https://chef.io"
+
+      # The downloads site
+      DOWNLOADS_URL = "downloads.chef.io"
+
+      # The legacy conf folder: C:/opscode/chef. Specifically the "opscode" part
+      # DIR_SUFFIX is appended to it in code where relevant
+      LEGACY_CONF_DIR = "opscode"
+
+      # Enable forcing Chef EULA
+      ENFORCE_LICENSE = true
+
+      # product patents page
+      PATENTS = "https://www.chef.io/patents"
+
+      # knife documentation page
+      KNIFE_DOCS = "https://docs.chef.io/workstation/knife/"
+    end
+
+    class Server
+      # The name of the server product
+      PRODUCT = "Chef Infra Server"
+
+      # The server's configuration directory
+      CONF_DIR = "/etc/chef-server"
+
+      # The servers's alias (chef-server)
+      SERVER = "chef-server"
+
+      # The server's configuration utility
+      SERVER_CTL = "chef-server-ctl"
+    end
+
+    class Solo
+      # Chef-Solo's product name
+      PRODUCT = "Chef Infra Solo"
+
+      # The chef-solo executable (legacy local mode)
+      EXEC = "chef-solo"
+    end
+
+    class Zero
+      # chef-zero executable
+      PRODUCT = "Chef Infra Zero"
+
+      # The chef-zero executable (local mode)
+      EXEC = "chef-zero"
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
@@ -235,19 +236,6 @@ module ChefUtils
       # chef-sugar backcompat method
       alias_method :openindiana?, :openindiana_platform?
 
-      # Determine if the current node is Nexenta Core Platform aka Nexenta OS.
-      #
-      # @param [Chef::Node] node the node to check
-      # @since 15.5
-      #
-      # @return [Boolean]
-      #
-      def nexentacore_platform?(node = __getnode)
-        node["platform"] == "nexentacore"
-      end
-      # chef-sugar backcompat method
-      alias_method :nexentacore?, :nexentacore_platform?
-
       # Determine if the current node is AIX.
       #
       # @param [Chef::Node] node the node to check

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
@@ -320,7 +321,7 @@ module ChefUtils
       # @return [Boolean]
       #
       def solaris_based?(node = __getnode)
-        %w{solaris2 smartos omnios openindiana opensolaris nexentacore}.include?(node["platform"])
+        %w{solaris2 smartos omnios openindiana}.include?(node["platform"])
       end
 
       # All of the BSD-lineage.

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
@@ -25,8 +26,13 @@ module ChefUtils
       #
       # FIXME: generally these helpers all use the pattern of checking for target_mode?
       # and then if it is we use train.  That approach should likely be flipped so that
-      # even when we're running without target mode we still use inspec in its local
-      # mode.
+      # even when we're running without target mode we still use train in its local
+      # mode.  A prerequisite for that will be better CI testing of train against
+      # chef-client though, and ensuring that the APIs are entirely compatible.  This
+      # will be particularly problematic for shell_out APIs and eventual file-creating
+      # APIs which are unlikely to be as sophisticated as the exiting code in chef-client
+      # for locally shelling out and creating files, and just dropping inspec local mode
+      # into chef-client would break the world.
       #
 
       # Train wrapper around File.exist? to make it local mode aware.
@@ -57,6 +63,24 @@ module ChefUtils
         end
       end
 
+      # Alias to easily convert IO.read / File.read to file_read
+      def file_read(path)
+        file_open(path).read
+      end
+
+      def file_directory?(path)
+        if __transport_connection
+          __transport_connection.file(filename).directory?
+        else
+          File.directory?(path)
+        end
+      end
+
+      # Alias to easily convert Dir.exist to dir_exist
+      def dir_exist?(path)
+        file_directory?(path)
+      end
+
       extend self
     end
   end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
@@ -79,11 +80,15 @@ module ChefUtils
         extra_path ||= __extra_path
         paths = __env_path.split(File::PATH_SEPARATOR) + Array(extra_path)
         paths.uniq!
+        exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : []
+        exts.unshift("")
         cmds.map do |cmd|
           paths.map do |path|
-            filename = File.join(path, cmd)
-            filename if __valid_executable?(filename, &block)
-          end.compact
+            exts.map do |ext|
+              filename = File.join(path, "#{cmd}#{ext}")
+              filename if __valid_executable?(filename, &block)
+            end.compact
+          end
         end.flatten
       end
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/lib/chef-utils/internal.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/lib/chef-utils/mash.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright 2009-2016, Dan Kubb
 
 # Permission is hereby granted, free of charge, to any person obtaining

data/lib/chef-utils/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
@@ -15,5 +16,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("..", __dir__)
-  VERSION = "16.4.41".freeze
+  VERSION = "16.8.9"
 end

data/lib/chef-utils/version_string.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright:: Copyright 2017, Noah Kantrowitz
 # License:: Apache License, Version 2.0
 #
@@ -27,7 +28,7 @@ module ChefUtils
     #
     # @param val [String] Version string to parse.
     def initialize(val)
-      val = "" unless val
+      val ||= ""
       super(val)
       begin
         @parsed_version = ::Gem::Version.create(self)

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "chef-utils"
 
 # FIXME: dynamically generate this for accuracy

data/spec/unit/dsl/architecture_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/dsl/cloud_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/dsl/dsl_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/dsl/introspection_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/dsl/os_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/dsl/path_sanity_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/dsl/platform_family_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/dsl/platform_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/dsl/service_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/dsl/virtualization_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/dsl/which_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
@@ -30,6 +31,7 @@ RSpec.describe ChefUtils::DSL::Which do
       it description do
         # stub the ENV['PATH']
         expect(ENV).to receive(:[]).with("PATH").and_return(path)
+        expect(ENV).to receive(:[]).with("PATHEXT").and_return(nil)
 
         # most files should not be found
         allow(File).to receive(:executable?).and_return(false)
@@ -93,7 +95,7 @@ RSpec.describe ChefUtils::DSL::Which do
       end
 
       test_which("arrays with blocks", "foo1", "foo2", finds: "/dir2/foo1", others: [ "/dir1/foo2" ]) do |f|
-        raise "bad arg to block" unless f == "/dir2/foo1" || f == "/dir1/foo2"
+        raise "bad arg to block" unless ["/dir2/foo1", "/dir1/foo2"].include?(f)
 
         true
       end
@@ -109,6 +111,7 @@ RSpec.describe ChefUtils::DSL::Which do
       it description do
         # stub the ENV['PATH']
         expect(ENV).to receive(:[]).with("PATH").and_return(path)
+        expect(ENV).to receive(:[]).with("PATHEXT").and_return(nil)
 
         # most files should not be found
         allow(File).to receive(:executable?).and_return(false)

data/spec/unit/dsl/windows_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/mash_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Matthew Kent (<mkent@magoazul.com>)
 # Copyright:: Copyright (c) Chef Software Inc.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-utils
 version: !ruby/object:Gem::Version
-  version: 16.4.41
+  version: 16.8.9
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -21,6 +21,7 @@ files:
 - Rakefile
 - chef-utils.gemspec
 - lib/chef-utils.rb
+- lib/chef-utils/dist.rb
 - lib/chef-utils/dsl/architecture.rb
 - lib/chef-utils/dsl/cloud.rb
 - lib/chef-utils/dsl/default_paths.rb
@@ -58,7 +59,7 @@ licenses:
 - Apache-2.0
 metadata:
   bug_tracker_uri: https://github.com/chef/chef/issues
-  changelog_uri: https://github.com/chef/chef/CHANGELOG.md
+  changelog_uri: https://github.com/chef/chef/blob/master/CHANGELOG.md
   documentation_uri: https://github.com/chef/chef/tree/master/chef-utils/README.md
   homepage_uri: https://github.com/chef/chef/tree/master/chef-utils
   source_code_uri: https://github.com/chef/chef/tree/master/chef-utils
@@ -70,15 +71,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Basic utility functions for Core Chef development
+summary: Basic utility functions for Core Chef Infra development
 test_files: []