chef-utils 16.11.7 → 16.15.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aba5cf4ef0af21548b2a6b1d01d08ce830bf347216ef11f610ddcc847711f2c
-  data.tar.gz: a11924b8feac484b4bcf879866ebd19553c2824737acbdd4e252a8e1d5db3985
+  metadata.gz: 02b3d17737a1fb80f52c833ed8325ee7f792533f6cd9f00d77ef37537147bc72
+  data.tar.gz: ba4cec969cb0026629120ffd820f8a18829989006ebade149dd56b19bf047a99
 SHA512:
-  metadata.gz: 227c1cbfe22df9c754d4b72ca919e980d5ac30448a6bbc1640fcc6a45e105b132da1783a6e15fe5b8b068e1cc4d418099289e3505c17095cc71530fa01bb3998
-  data.tar.gz: 6c8b4dede11e400fa60e9ab4a4ff2cf23da091c9b939f830fd9051e54fe2f1e1e5f760c85b01805916fc97fc98c65fcae7c22efb39fd8a3ab9b1685a44bfb41e
+  metadata.gz: 3aad945ef32f409ac07ce4f50ae5597ebb77ef19927b421dd059fe0f1e6db8e1372c2ab27827d53f2c7656b7fb48bda1a0f9e5125884407cbb94da7b3cb3f387
+  data.tar.gz: 97bd4fbc60d5cfee5688910238d2a2626fa67ded2c6156f939f52c191a4a946b79a03b6673a3be4bcdbf1b9dcb952fae4d1fde47a231be0712cc3ccfb31bce26

data/lib/chef-utils/dist.rb

@@ -87,6 +87,11 @@ module ChefUtils
       EXEC = "chef-solo"
     end
 
+    class Workstation
+      # The suffix for Chef Workstation's /opt/chef-workstation or C:\\opscode\chef-workstation
+      DIR_SUFFIX = "chef-workstation"
+    end
+
     class Zero
       # chef-zero executable
       PRODUCT = "Chef Infra Zero"

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

@@ -123,6 +123,21 @@ module ChefUtils
       # chef-sugar backcompat method
       alias_method :centos?, :centos_platform?
 
+      # Determine if the current node is CentOS Stream.
+      #
+      # @param [Chef::Node] node the node to check
+      # @since 16.13
+      #
+      # @return [Boolean]
+      #
+      def centos_stream_platform?(node = __getnode)
+        if node["os_release"]
+          node.dig("os_release", "name") == "CentOS Stream"
+        else
+          node.dig("lsb", "id") == "CentOSStream"
+        end
+      end
+
       # Determine if the current node is Oracle Linux.
       #
       # @param [Chef::Node] node the node to check

data/lib/chef-utils/version.rb

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

data/spec/unit/dsl/platform_family_spec.rb

@@ -90,13 +90,13 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do
   end
 
   context "on centos6" do
-    let(:options) { { platform: "centos", version: "6.10" } }
+    let(:options) { { platform: "centos", version: "6" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?)
   end
 
   context "on centos7" do
-    let(:options) { { platform: "centos", version: "7.7.1908" } }
+    let(:options) { { platform: "centos", version: "7" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?)
   end
@@ -108,7 +108,7 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do
   end
 
   context "on clearos7" do
-    let(:options) { { platform: "clearos", version: "7.4" } }
+    let(:options) { { platform: "clearos", version: "7" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?)
   end
@@ -156,25 +156,25 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do
   end
 
   context "on oracle6" do
-    let(:options) { { platform: "oracle", version: "6.10" } }
+    let(:options) { { platform: "oracle", version: "6" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?)
   end
 
   context "on oracle7" do
-    let(:options) { { platform: "oracle", version: "7.6" } }
+    let(:options) { { platform: "oracle", version: "7" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?)
   end
 
   context "on redhat6" do
-    let(:options) { { platform: "redhat", version: "6.10" } }
+    let(:options) { { platform: "redhat", version: "6" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?)
   end
 
   context "on redhat7" do
-    let(:options) { { platform: "redhat", version: "7.6" } }
+    let(:options) { { platform: "redhat", version: "7" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?)
   end

data/spec/unit/dsl/platform_spec.rb

@@ -145,6 +145,20 @@ RSpec.describe ChefUtils::DSL::Platform do
     platform_reports_true_for(:centos?, :centos_platform?)
   end
 
+  context "on centos stream w/o os_release" do
+    let(:options) { { platform: "centos" } }
+    let(:node) { { "platform" => "centos", "platform_version" => "8", "platform_family" => "rhel", "os" => "linux", "lsb" => { "id" => "CentOSStream" }, "os_release" => nil } }
+
+    platform_reports_true_for(:centos?, :centos_platform?, :centos_stream_platform?)
+  end
+
+  context "on centos stream w/ os_release" do
+    let(:options) { { platform: "centos" } }
+    let(:node) { { "platform" => "centos", "platform_version" => "8", "platform_family" => "rhel", "os" => "linux", "os_release" => { "name" => "CentOS Stream" } } }
+
+    platform_reports_true_for(:centos?, :centos_platform?, :centos_stream_platform?)
+  end
+
   context "on clearos" do
     let(:options) { { platform: "clearos" } }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-utils
 version: !ruby/object:Gem::Version
-  version: 16.11.7
+  version: 16.15.22
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Basic utility functions for Core Chef Infra development