chef-utils 16.4.35 → 16.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaacc4bea17c095d76f0dbd99ec09b047165f3d539983d24c42c543521c8a429
-  data.tar.gz: ccca36f7bbac0c4a2e00fba9bef1748e54b986833ec211bccf4e6431728005e8
+  metadata.gz: a587eedbc11c7d6303849337232b54ff403db11fd67cc9a3580f6e98ee7f22ff
+  data.tar.gz: e7b4d963d6aac00d674442f572518403c596348baa07213d513ee2cdda790e41
 SHA512:
-  metadata.gz: 6cd7bf0b94558dd330247e7fcb6b1fc10d88fdb3343764173a5402b49fd0d634ea24becd9ba85b55b7cf77c6da4515ebe43505f38c83b8b86e71676bae85633a
-  data.tar.gz: a88ef927cf9b7e426e270577e507d0b9167c23d63edd9b729ce6868e80590aebc96583a99bfb87976763cce87ac417859f2b1b1df4dbdab88b1ade7c4d468646
+  metadata.gz: 72f228dedb23688756e3ec17c601ef7607fc1824108f2dfa629072d8128d62811f4de4ae40ff3ff2a855a65f9db20f50d2358e0f3135486d4dc18692e22b3294
+  data.tar.gz: a1cc265b90539062c8c758dc47ddbe7600df874613261fec735008c442b4ec2ea4cb4a8d1609b357581b65317eab371fcb7db6bb2f6728dcfedbb278770016c3

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.35".freeze
+  VERSION = "16.6.14".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.35
+  version: 16.6.14
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-10-14 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
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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