chef-utils 15.7.32 → 15.11.8

data/lib/chef-utils/version.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,5 +15,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "15.7.32".freeze
+  VERSION = "15.11.8".freeze
 end

data/lib/chef-utils/version_string.rb

@@ -139,5 +139,11 @@ module ChefUtils
       end
     end
 
+    # Back-compat API for chef-sugar.  The other APIs are preferable.
+    #
+    # @api private
+    def satisfies?(*constraints)
+      Gem::Requirement.new(*constraints).satisfied_by?(@parsed_version)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -3,21 +3,25 @@ require "chef-utils"
 # FIXME: dynamically generate this for accuracy
 HELPER_MODULES = [
   ChefUtils::DSL::Architecture,
+  ChefUtils::DSL::Cloud,
   ChefUtils::DSL::Introspection,
   ChefUtils::DSL::OS,
   ChefUtils::DSL::PathSanity,
   ChefUtils::DSL::Platform,
   ChefUtils::DSL::PlatformFamily,
   ChefUtils::DSL::Service,
+  ChefUtils::DSL::Virtualization,
   ChefUtils::DSL::Which,
   ChefUtils::DSL::Windows,
 ].freeze
 
 ARCH_HELPERS = (ChefUtils::DSL::Architecture.methods - Module.methods).freeze
+CLOUD_HELPERS = (ChefUtils::DSL::Cloud.methods - Module.methods).freeze
+INTROSPECTION_HELPERS = (ChefUtils::DSL::Introspection.methods - Module.methods).freeze
 OS_HELPERS = (ChefUtils::DSL::OS.methods - Module.methods).freeze
-PLATFORM_HELPERS = (ChefUtils::DSL::Platform.methods - Module.methods).freeze
 PLATFORM_FAMILY_HELPERS = (ChefUtils::DSL::PlatformFamily.methods - Module.methods).freeze
-INTROSPECTION_HELPERS = (ChefUtils::DSL::Introspection.methods - Module.methods).freeze
+PLATFORM_HELPERS = (ChefUtils::DSL::Platform.methods - Module.methods).freeze
+VIRTUALIZATION_HELPERS = (ChefUtils::DSL::Virtualization.methods - Module.methods).freeze
 WINDOWS_HELPERS = (ChefUtils::DSL::Windows.methods - Module.methods).freeze
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration

data/spec/unit/dsl/architecture_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -84,17 +84,17 @@ RSpec.describe ChefUtils::DSL::Architecture do
   context "on aarch64" do
     let(:arch) { "aarch64" }
 
-    arch_reports_true_for(:_64_bit?)
+    arch_reports_true_for(:_64_bit?, :arm?)
   end
   context "on arch64" do
     let(:arch) { "arch64" }
 
-    arch_reports_true_for(:_64_bit?)
+    arch_reports_true_for(:_64_bit?, :arm?)
   end
   context "on arm64" do
     let(:arch) { "arm64" }
 
-    arch_reports_true_for(:_64_bit?)
+    arch_reports_true_for(:_64_bit?, :arm?)
   end
   context "on sun4v" do
     let(:arch) { "sun4v" }
@@ -129,8 +129,19 @@ RSpec.describe ChefUtils::DSL::Architecture do
   context "on armhf" do
     let(:arch) { "armhf" }
 
-    arch_reports_true_for(:armhf?, :_32_bit?)
+    arch_reports_true_for(:armhf?, :_32_bit?, :arm?)
+  end
+  context "on armv6l" do
+    let(:arch) { "armv6l" }
+
+    arch_reports_true_for(:armhf?, :_32_bit?, :arm?)
+  end
+  context "on armv7l" do
+    let(:arch) { "armv7l" }
+
+    arch_reports_true_for(:armhf?, :_32_bit?, :arm?)
   end
+
   context "on s390" do
     let(:arch) { "s390" }
 

data/spec/unit/dsl/cloud_spec.rb

@@ -0,0 +1,88 @@
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+require "fauxhai"
+
+def cloud_reports_true_for(*args, node:)
+  args.each do |method|
+    it "reports true for #{method}" do
+      expect(described_class.send(method, node)).to be true
+    end
+  end
+  (CLOUD_HELPERS - args).each do |method|
+    it "reports false for #{method}" do
+      expect(described_class.send(method, node)).to be false
+    end
+  end
+end
+
+RSpec.describe ChefUtils::DSL::Cloud do
+  ( HELPER_MODULES - [ described_class ] ).each do |klass|
+    it "does not have methods that collide with #{klass}" do
+      expect((klass.methods - Module.methods) & CLOUD_HELPERS).to be_empty
+    end
+  end
+
+  CLOUD_HELPERS.each do |helper|
+    it "has the #{helper} in the ChefUtils module" do
+      expect(ChefUtils).to respond_to(helper)
+    end
+  end
+
+  context "on ec2" do
+    cloud_reports_true_for(:cloud?, :ec2?, node: { "ec2" => {}, "cloud" => {} })
+  end
+
+  context "on gce" do
+    cloud_reports_true_for(:cloud?, :gce?, node: { "gce" => {}, "cloud" => {} })
+  end
+
+  context "on rackspace" do
+    cloud_reports_true_for(:cloud?, :rackspace?, node: { "rackspace" => {}, "cloud" => {} })
+  end
+
+  context "on eucalyptus" do
+    cloud_reports_true_for(:cloud?, :eucalyptus?, :euca?, node: { "eucalyptus" => {}, "cloud" => {} })
+  end
+
+  context "on linode" do
+    cloud_reports_true_for(:cloud?, :linode?, node: { "linode" => {}, "cloud" => {} })
+  end
+
+  context "on openstack" do
+    cloud_reports_true_for(:cloud?, :openstack?, node: { "openstack" => {}, "cloud" => {} })
+  end
+
+  context "on azure" do
+    cloud_reports_true_for(:cloud?, :azure?, node: { "azure" => {}, "cloud" => {} })
+  end
+
+  context "on digital_ocean" do
+    cloud_reports_true_for(:cloud?, :digital_ocean?, :digitalocean?, node: { "digital_ocean" => {}, "cloud" => {} })
+  end
+
+  context "on softlayer" do
+    cloud_reports_true_for(:cloud?, :softlayer?, node: { "softlayer" => {}, "cloud" => {} })
+  end
+
+  context "on virtualbox" do
+    it "does not return true for cloud?" do
+      expect(described_class.cloud?({ "virtualbox" => {}, "cloud" => nil })).to be false
+    end
+  end
+end

data/spec/unit/dsl/dsl_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/dsl/introspection_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -165,4 +165,23 @@ RSpec.describe ChefUtils::DSL::Introspection do
       end
     end
   end
+
+  context "#include_recipe?" do
+    it "is true when the recipe has been seen by the node" do
+      expect(node).to receive(:recipe?).with("myrecipe").and_return(true)
+      expect(ChefUtils.include_recipe?("myrecipe", node)).to be true
+    end
+    it "is false when the recipe has not been seen by the node" do
+      expect(node).to receive(:recipe?).with("myrecipe").and_return(false)
+      expect(ChefUtils.include_recipe?("myrecipe", node)).to be false
+    end
+    it "the alias is true when the recipe has been seen by the node" do
+      expect(node).to receive(:recipe?).with("myrecipe").and_return(true)
+      expect(ChefUtils.includes_recipe?("myrecipe", node)).to be true
+    end
+    it "the alias is false when the recipe has not been seen by the node" do
+      expect(node).to receive(:recipe?).with("myrecipe").and_return(false)
+      expect(ChefUtils.includes_recipe?("myrecipe", node)).to be false
+    end
+  end
 end

data/spec/unit/dsl/os_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/dsl/path_sanity_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/dsl/platform_family_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/dsl/platform_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/dsl/service_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/dsl/virtualization_spec.rb

@@ -0,0 +1,74 @@
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+require "fauxhai"
+
+def virtualization_reports_true_for(*args, node:)
+  args.each do |method|
+    it "reports true for #{method}" do
+      expect(described_class.send(method, node)).to be true
+    end
+  end
+  (VIRTUALIZATION_HELPERS - args).each do |method|
+    it "reports false for #{method}" do
+      expect(described_class.send(method, node)).to be false
+    end
+  end
+end
+
+RSpec.describe ChefUtils::DSL::Virtualization do
+  ( HELPER_MODULES - [ described_class ] ).each do |klass|
+    it "does not have methods that collide with #{klass}" do
+      expect((klass.methods - Module.methods) & VIRTUALIZATION_HELPERS).to be_empty
+    end
+  end
+
+  VIRTUALIZATION_HELPERS.each do |helper|
+    it "has the #{helper} in the ChefUtils module" do
+      expect(ChefUtils).to respond_to(helper)
+    end
+  end
+
+  context "on kvm" do
+    virtualization_reports_true_for(:guest?, :virtual?, :kvm?, node: { "virtualization" => { "system" => "kvm",  "role" => "guest" } })
+    virtualization_reports_true_for(:hypervisor?, :physical?, :kvm_host?, node: { "virtualization" => { "system" => "kvm", "role" => "host" } })
+  end
+  context "on lxc" do
+    virtualization_reports_true_for(:guest?, :virtual?, :lxc?, node: { "virtualization" => { "system" => "lxc", "role" => "guest" } })
+    virtualization_reports_true_for(:hypervisor?, :physical?, :lxc_host?, node: { "virtualization" => { "system" => "lxc", "role" => "host" } })
+  end
+  context "on parallels" do
+    virtualization_reports_true_for(:guest?, :virtual?, :parallels?, node: { "virtualization" => { "system" => "parallels", "role" => "guest" } })
+    virtualization_reports_true_for(:hypervisor?, :physical?, :parallels_host?, node: { "virtualization" => { "system" => "parallels", "role" => "host" } })
+  end
+  context "on virtualbox" do
+    virtualization_reports_true_for(:guest?, :virtual?, :virtualbox?, :vbox?, node: { "virtualization" => { "system" => "vbox", "role" => "guest" } })
+    virtualization_reports_true_for(:hypervisor?, :physical?, :vbox_host?, node: { "virtualization" => { "system" => "vbox", "role" => "host" } })
+  end
+  context "on vmware" do
+    virtualization_reports_true_for(:guest?, :virtual?, :vmware?, node: { "virtualization" => { "system" => "vmware", "role" => "guest" } })
+    virtualization_reports_true_for(:hypervisor?, :physical?, :vmware_host?, node: { "virtualization" => { "system" => "vmware", "role" => "host" } })
+  end
+  context "on openvz" do
+    virtualization_reports_true_for(:guest?, :virtual?, :openvz?, node: { "virtualization" => { "system" => "openvz", "role" => "guest" } })
+    virtualization_reports_true_for(:hypervisor?, :physical?, :openvz_host?, node: { "virtualization" => { "system" => "openvz", "role" => "host" } })
+  end
+  context "on metal which is not a virt host" do
+    virtualization_reports_true_for(:physical?, node: {} )
+  end
+end

data/spec/unit/dsl/which_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/dsl/windows_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2020, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,13 +17,15 @@
 
 require "spec_helper"
 
+WINDOWS_BOOL_HELPERS = %i{windows_server_core? windows_server? windows_workstation?}.freeze
+
 def windows_reports_true_for(*args)
   args.each do |method|
     it "reports true for #{method}" do
       expect(described_class.send(method, node)).to be true
     end
   end
-  (WINDOWS_HELPERS - args).each do |method|
+  (WINDOWS_BOOL_HELPERS - args).each do |method|
     it "reports false for #{method}" do
       expect(described_class.send(method, node)).to be false
     end
@@ -43,21 +45,39 @@ RSpec.describe ChefUtils::DSL::Windows do
     end
   end
 
-  context "on Windows Server Core" do
-    let(:node) { { "kernel" => { "server_core" => true } } }
+  context "windows boolean helpers" do
+    context "on Windows Server Core" do
+      let(:node) { { "kernel" => { "server_core" => true } } }
 
-    windows_reports_true_for(:windows_server_core?)
-  end
+      windows_reports_true_for(:windows_server_core?)
+    end
+
+    context "on Windows Workstation" do
+      let(:node) { { "kernel" => { "product_type" => "Workstation" } } }
+
+      windows_reports_true_for(:windows_workstation?)
+    end
 
-  context "on Windows Workstation" do
-    let(:node) { { "kernel" => { "product_type" => "Workstation" } } }
+    context "on Windows Server" do
+      let(:node) { { "kernel" => { "product_type" => "Server" } } }
 
-    windows_reports_true_for(:windows_workstation?)
+      windows_reports_true_for(:windows_server?)
+    end
   end
 
-  context "on Windows Server" do
-    let(:node) { { "kernel" => { "product_type" => "Server" } } }
+  context "#windows_nt_version on Windows Server 2012 R2" do
+    let(:node) { { "os_version" => "6.3.9600" } }
+    it "it returns a ChefUtils::VersionString object with 6.3.9600" do
+      expect(described_class.send(:windows_nt_version, node)).to eq "6.3.9600"
+      expect(described_class.send(:windows_nt_version, node)).to be_a_kind_of ChefUtils::VersionString
+    end
+  end
 
-    windows_reports_true_for(:windows_server?)
+  context "#powershell_version on Windows Server 2012 R2" do
+    let(:node) { { "languages" => { "powershell" => { "version" => "4.0" } } } }
+    it "it returns a ChefUtils::VersionString object with 4.0" do
+      expect(described_class.send(:powershell_version, node)).to eq "4.0"
+      expect(described_class.send(:powershell_version, node)).to be_a_kind_of ChefUtils::VersionString
+    end
   end
 end

data/spec/unit/mash_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Matthew Kent (<mkent@magoazul.com>)
-# Copyright:: Copyright 2011-2016, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-utils
 version: !ruby/object:Gem::Version
-  version: 15.7.32
+  version: 15.11.8
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -22,13 +22,16 @@ files:
 - chef-utils.gemspec
 - lib/chef-utils.rb
 - lib/chef-utils/dsl/architecture.rb
+- lib/chef-utils/dsl/cloud.rb
 - lib/chef-utils/dsl/introspection.rb
 - lib/chef-utils/dsl/os.rb
 - lib/chef-utils/dsl/path_sanity.rb
 - lib/chef-utils/dsl/platform.rb
 - lib/chef-utils/dsl/platform_family.rb
+- lib/chef-utils/dsl/platform_version.rb
 - lib/chef-utils/dsl/service.rb
 - lib/chef-utils/dsl/train_helpers.rb
+- lib/chef-utils/dsl/virtualization.rb
 - lib/chef-utils/dsl/which.rb
 - lib/chef-utils/dsl/windows.rb
 - lib/chef-utils/internal.rb
@@ -37,6 +40,7 @@ files:
 - lib/chef-utils/version_string.rb
 - spec/spec_helper.rb
 - spec/unit/dsl/architecture_spec.rb
+- spec/unit/dsl/cloud_spec.rb
 - spec/unit/dsl/dsl_spec.rb
 - spec/unit/dsl/introspection_spec.rb
 - spec/unit/dsl/os_spec.rb
@@ -44,6 +48,7 @@ files:
 - spec/unit/dsl/platform_family_spec.rb
 - spec/unit/dsl/platform_spec.rb
 - spec/unit/dsl/service_spec.rb
+- spec/unit/dsl/virtualization_spec.rb
 - spec/unit/dsl/which_spec.rb
 - spec/unit/dsl/windows_spec.rb
 - spec/unit/mash_spec.rb