chef-utils 17.0.242 → 17.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b28b0dd9a34f1242fdeca73f39924515befdec0a2990e4bd56d4d94f071c2aa
-  data.tar.gz: 49cb4691092f6b0db0567a8975e72c3905682208ff0c089fe3149ef8ee8da4d0
+  metadata.gz: b255035b3817144f6c775e50ca8a3b13804c7b72a34d72ff7a305e3f64bba4ac
+  data.tar.gz: 1234d2266cbf5852177c8d7cd9aeb85d47de8329fed42990a32be24ef8a602fb
 SHA512:
-  metadata.gz: 16f7f528de5d5fb631552951cef5f0e763bffce0c52bb2fb563f8d1cebd16269027dc3a2daf1f151bc58d5901adfb2309d93ecc3b6868e29f75be14b5538511b
-  data.tar.gz: 705ddfa785ecb1a7448a95f342a3718e5f90996131fe2678c6cd15875f3eee5d5cc7d5b7d38fabfa1500c07df26eac804261360cd13b205a7a24435a8a4ee922
+  metadata.gz: 7b92929d90e896090ec0910fb191bfb1705f65df2264170dae8f086d69e9136d173c6a047f1739c70870d1ae811868155e83bfbb64ee5d003f512f20145e77a5
+  data.tar.gz: 36a66c072c2bae578b5d618d5e3c355c29caeebca6eaba6887042b07926b7b15c4692ec2fd1b2a499a773d509a0f3897e0d4db5b5d36f270dd4b4af1c9a6ff12

data/lib/chef-utils/dist.rb

@@ -15,6 +15,25 @@ module ChefUtils
       PRODUCT = "Chef Automate"
     end
 
+    class Cli
+      # the chef-cli product name
+      PRODUCT = "Chef CLI"
+
+      # the chef-cli gem
+      GEM = "chef-cli"
+    end
+
+    class Habitat
+      # name of the Habitat product
+      PRODUCT = "Chef Habitat"
+
+      # A short designation for the product
+      SHORT = "habitat"
+
+      # The hab cli binary
+      EXEC = "hab"
+    end
+
     class Infra
       # When referencing a product directly, like Chef (Now Chef Infra)
       PRODUCT = "Chef Infra Client"
@@ -42,6 +61,17 @@ module ChefUtils
       # The suffix for Chef's /etc/chef, /var/chef and C:\\Chef directories
       # "chef" => /etc/cinc, /var/cinc, C:\\cinc
       DIR_SUFFIX = "chef"
+
+      # The client's gem
+      GEM = "chef"
+    end
+
+    class Inspec
+      # The InSpec product name
+      PRODUCT = "Chef InSpec"
+
+      # The inspec binary
+      EXEC = "inspec"
     end
 
     class Org
@@ -63,6 +93,9 @@ module ChefUtils
 
       # knife documentation page
       KNIFE_DOCS = "https://docs.chef.io/workstation/knife/"
+
+      # the name of the overall infra product
+      PRODUCT = "Chef Infra"
     end
 
     class Server
@@ -88,8 +121,14 @@ module ChefUtils
     end
 
     class Workstation
+      # The full marketing name of the product
+      PRODUCT = "Chef Workstation"
+
       # The suffix for Chef Workstation's /opt/chef-workstation or C:\\opscode\chef-workstation
       DIR_SUFFIX = "chef-workstation"
+
+      # Workstation banner/help text
+      DOCS = "https://docs.chef.io/workstation/"
     end
 
     class Zero

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

@@ -77,7 +77,7 @@ module ChefUtils
       # @return [Boolean]
       #
       def macos?(node = __getnode)
-        node["platform_family"] == "mac_os_x"
+        node ? node["platform_family"] == "mac_os_x" : macos_ruby?
       end
       # chef-sugar backcompat method
       alias_method :osx?, :macos?
@@ -86,6 +86,17 @@ module ChefUtils
       # chef-sugar backcompat method
       alias_method :mac_os_x?, :macos?
 
+      # Determine if the Ruby VM is currently running on a Mac node (This is useful primarily for internal use
+      # by Chef Infra Client before the node object exists).
+      #
+      # @since 17.3
+      #
+      # @return [Boolean]
+      #
+      def macos_ruby?
+        !!(RUBY_PLATFORM =~ /darwin/)
+      end
+
       # Determine if the current node is a member of the 'rhel' platform family (Red Hat, CentOS, Oracle or Scientific Linux, but NOT Amazon Linux or Fedora).
       #
       # @param [Chef::Node] node the node to check

data/lib/chef-utils/internal.rb

@@ -70,7 +70,7 @@ module ChefUtils
     #
     def __env_path
       if __transport_connection
-        __transport_connection.run_command("echo $PATH").stdout || ""
+        __transport_connection.run_command("echo $PATH").stdout.chomp || ""
       else
         ENV["PATH"] || ""
       end

data/lib/chef-utils/parallel_map.rb

@@ -45,7 +45,7 @@ module ChefUtils
         pool ||= ChefUtils::DefaultThreadPool.instance.pool
 
         futures = map do |item|
-          future = Concurrent::Future.execute(executor: pool) do
+          Concurrent::Future.execute(executor: pool) do
             yield item
           end
         end

data/lib/chef-utils/version.rb

@@ -16,5 +16,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("..", __dir__)
-  VERSION = "17.0.242"
+  VERSION = "17.4.25"
 end

data/spec/unit/dsl/platform_family_spec.rb

@@ -25,7 +25,7 @@ def pf_reports_true_for(*args)
       expect(described_class.send(method, node)).to be true
     end
   end
-  (PLATFORM_FAMILY_HELPERS - [ :windows_ruby? ] - args).each do |method|
+  (PLATFORM_FAMILY_HELPERS - %i{windows_ruby? macos_ruby?} - args).each do |method|
     it "reports false for #{method}" do
       expect(described_class.send(method, node)).to be false
     end
@@ -41,7 +41,7 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do
     end
   end
 
-  ( PLATFORM_FAMILY_HELPERS - [ :windows_ruby? ]).each do |helper|
+  ( PLATFORM_FAMILY_HELPERS - %i{windows_ruby? macos_ruby?}).each do |helper|
     it "has the #{helper} in the ChefUtils module" do
       expect(ChefUtils).to respond_to(helper)
     end
@@ -220,4 +220,16 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do
       end
     end
   end
+
+  context "node-independent mac APIs" do
+    if RUBY_PLATFORM.match?(/darwin/)
+      it "reports true for :macos_ruby?" do
+        expect(described_class.macos_ruby?).to be true
+      end
+    else
+      it "reports false for :macos_ruby?" do
+        expect(described_class.macos_ruby?).to be false
+      end
+    end
+  end
 end

data/spec/unit/parallel_map_spec.rb

@@ -112,7 +112,7 @@ RSpec.describe ChefUtils::ParallelMap do
     end
 
     it "recursive parallel_each will not deadlock" do
-      ans = Timeout.timeout(30) do
+      Timeout.timeout(30) do
         (1..2).parallel_each { |i| (1..2).parallel_each { |i| i } }
       end
     end
@@ -125,7 +125,7 @@ RSpec.describe ChefUtils::ParallelMap do
     end
 
     it "parallel_each is lazy" do
-      ans = Timeout.timeout(30) do
+      Timeout.timeout(30) do
         (1..).lazy.parallel_each { |i| i }.first(5)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-utils
 version: !ruby/object:Gem::Version
-  version: 17.0.242
+  version: 17.4.25
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Basic utility functions for Core Chef Infra development