chef-utils 16.4.41 → 16.5.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22e9368674749d297f6ddc69f87aad6871229b4e6cad5deb6bd54d8629d1afc3
-  data.tar.gz: 7a79e8318c6a952cea65281de9bc89e0ab21464d60cf48c498e46cbb34f54b6b
+  metadata.gz: 90f8941963c2b6152837982c8c4d22476a811e2119e29d4cd45aaf3244482193
+  data.tar.gz: 0fcf1e4dd6e03ad19511b1309af38063c326f1aa0a86fd1fc4bfdb9ce6f283c7
 SHA512:
-  metadata.gz: c9fb960d89c2b0457083ac9464e67d0562cb261a6d119332f9ea9fc2d5f5f7f636ea86834bf66f7082fb919bb58145887e311d07695be2fdf4cab38c2c787718
-  data.tar.gz: 84958551d7464979a536f9b352b8849820212f1425cc599395d4acb3355b14fb01ff37a30ec146444888f70e09a2ae53b98aeb355144ed62d1922afab3f91bb5
+  metadata.gz: 1db020268426245dd2648d2651d0ad07405bb9b2c5f52aec6cd167df5e14daaf957fa9282f27ba89c6531eff319043449430fa9fbdd865eec0ad6ee1ae726f56
+  data.tar.gz: 7bef545a2a343ea2d5145a8f2cfff87b27546c6d4a99af19b5de5e2adf38dc3055cc21a9ba7947c195234ccf08f2de848f3aa70dca8bdf542ccb218eec2cfb68

data/lib/chef-utils/dist.rb

@@ -0,0 +1,97 @@
+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".freeze
+
+      # The chef-apply binary
+      EXEC = "chef-apply".freeze
+    end
+
+    class Automate
+      # name of the automate product
+      PRODUCT = "Chef Automate".freeze
+    end
+
+    class Infra
+      # When referencing a product directly, like Chef (Now Chef Infra)
+      PRODUCT = "Chef Infra Client".freeze
+
+      # A short designation for the product, used in Windows event logs
+      # and some nomenclature.
+      SHORT = "chef".freeze
+
+      # The client's alias (chef-client)
+      CLIENT = "chef-client".freeze
+
+      # The chef executable, as in `chef gem install` or `chef generate cookbook`
+      EXEC = "chef".freeze
+
+      # The chef-shell executable
+      SHELL = "chef-shell".freeze
+
+      # Configuration related constants
+      # The chef-shell configuration file
+      SHELL_CONF = "chef_shell.rb".freeze
+
+      # The user's configuration directory
+      USER_CONF_DIR = ".chef".freeze
+
+      # The suffix for Chef's /etc/chef, /var/chef and C:\\Chef directories
+      # "chef" => /etc/cinc, /var/cinc, C:\\cinc
+      DIR_SUFFIX = "chef".freeze
+    end
+
+    class Org
+      # product Website address
+      WEBSITE = "https://chef.io".freeze
+
+      # The downloads site
+      DOWNLOADS_URL = "downloads.chef.io".freeze
+
+      # 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".freeze
+
+      # Enable forcing Chef EULA
+      ENFORCE_LICENSE = true
+
+      # product patents page
+      PATENTS = "https://www.chef.io/patents".freeze
+
+      # knife documentation page
+      KNIFE_DOCS = "https://docs.chef.io/workstation/knife/".freeze
+    end
+
+    class Server
+      # The name of the server product
+      PRODUCT = "Chef Infra Server".freeze
+
+      # The server's configuration directory
+      CONF_DIR = "/etc/chef-server".freeze
+
+      # The servers's alias (chef-server)
+      SERVER = "chef-server".freeze
+
+      # The server's configuration utility
+      SERVER_CTL = "chef-server-ctl".freeze
+    end
+
+    class Solo
+      # Chef-Solo's product name
+      PRODUCT = "Chef Infra Solo".freeze
+
+      # The chef-solo executable (legacy local mode)
+      EXEC = "chef-solo".freeze
+    end
+
+    class Zero
+      # chef-zero executable
+      PRODUCT = "Chef Infra Zero".freeze
+
+      # The chef-zero executable (local mode)
+      EXEC = "chef-zero".freeze
+    end
+  end
+end

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

@@ -25,8 +25,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 +62,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/which.rb

@@ -79,11 +79,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/version.rb

@@ -15,5 +15,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("..", __dir__)
-  VERSION = "16.4.41".freeze
+  VERSION = "16.5.64".freeze
 end

data/spec/unit/dsl/which_spec.rb

@@ -30,6 +30,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)
@@ -109,6 +110,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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-utils
 version: !ruby/object:Gem::Version
-  version: 16.4.41
+  version: 16.5.64
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-09-17 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