chef-utils 18.0.172 → 18.0.185

data/lib/chef-utils.rb

@@ -1,53 +1,53 @@
-# frozen_string_literal: true
-#
-# 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_relative "chef-utils/dsl/architecture"
-require_relative "chef-utils/dsl/cloud"
-require_relative "chef-utils/dsl/introspection"
-require_relative "chef-utils/dsl/os"
-require_relative "chef-utils/dsl/default_paths"
-require_relative "chef-utils/dsl/path_sanity"
-require_relative "chef-utils/dsl/platform"
-require_relative "chef-utils/dsl/platform_family"
-require_relative "chef-utils/dsl/platform_version"
-require_relative "chef-utils/dsl/service"
-require_relative "chef-utils/dsl/train_helpers"
-require_relative "chef-utils/dsl/virtualization"
-require_relative "chef-utils/dsl/which"
-require_relative "chef-utils/dsl/windows"
-require_relative "chef-utils/mash"
-
-# This is the Chef Infra Client DSL, not everything needs to go in here
-module ChefUtils
-  include ChefUtils::DSL::Architecture
-  include ChefUtils::DSL::Cloud
-  include ChefUtils::DSL::DefaultPaths
-  include ChefUtils::DSL::Introspection
-  include ChefUtils::DSL::OS
-  include ChefUtils::DSL::Platform
-  include ChefUtils::DSL::PlatformFamily
-  include ChefUtils::DSL::PlatformVersion
-  include ChefUtils::DSL::TrainHelpers
-  include ChefUtils::DSL::Virtualization
-  include ChefUtils::DSL::Which
-  include ChefUtils::DSL::Windows
-  # ChefUtils::DSL::Service is deliberately excluded
-
-  CANARY = 1 # used as a guard for requires
-  extend self
-end
+# frozen_string_literal: true
+#
+# 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_relative "chef-utils/dsl/architecture"
+require_relative "chef-utils/dsl/cloud"
+require_relative "chef-utils/dsl/introspection"
+require_relative "chef-utils/dsl/os"
+require_relative "chef-utils/dsl/default_paths"
+require_relative "chef-utils/dsl/path_sanity"
+require_relative "chef-utils/dsl/platform"
+require_relative "chef-utils/dsl/platform_family"
+require_relative "chef-utils/dsl/platform_version"
+require_relative "chef-utils/dsl/service"
+require_relative "chef-utils/dsl/train_helpers"
+require_relative "chef-utils/dsl/virtualization"
+require_relative "chef-utils/dsl/which"
+require_relative "chef-utils/dsl/windows"
+require_relative "chef-utils/mash"
+
+# This is the Chef Infra Client DSL, not everything needs to go in here
+module ChefUtils
+  include ChefUtils::DSL::Architecture
+  include ChefUtils::DSL::Cloud
+  include ChefUtils::DSL::DefaultPaths
+  include ChefUtils::DSL::Introspection
+  include ChefUtils::DSL::OS
+  include ChefUtils::DSL::Platform
+  include ChefUtils::DSL::PlatformFamily
+  include ChefUtils::DSL::PlatformVersion
+  include ChefUtils::DSL::TrainHelpers
+  include ChefUtils::DSL::Virtualization
+  include ChefUtils::DSL::Which
+  include ChefUtils::DSL::Windows
+  # ChefUtils::DSL::Service is deliberately excluded
+
+  CANARY = 1 # used as a guard for requires
+  extend self
+end

data/spec/spec_helper.rb

@@ -1,100 +1,100 @@
-# frozen_string_literal: true
-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::DefaultPaths,
-  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_FAMILY_HELPERS = (ChefUtils::DSL::PlatformFamily.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
-RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  config.filter_run_excluding windows_only: true unless ChefUtils.windows?
-  config.filter_run_excluding unix_only: true if ChefUtils.windows?
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = "doc"
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  # config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-end
+# frozen_string_literal: true
+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::DefaultPaths,
+  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_FAMILY_HELPERS = (ChefUtils::DSL::PlatformFamily.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
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  config.filter_run_excluding windows_only: true unless ChefUtils.windows?
+  config.filter_run_excluding unix_only: true if ChefUtils.windows?
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  # config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+end

data/spec/unit/dsl/architecture_spec.rb

@@ -1,151 +1,151 @@
-# frozen_string_literal: true
-#
-# 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"
-
-def arch_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
-  (ARCH_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::Architecture do
-  let(:node) { { "kernel" => { "machine" => arch } } }
-
-  ( HELPER_MODULES - [ described_class ] ).each do |klass|
-    it "does not have methods that collide with #{klass}" do
-      expect((klass.methods - Module.methods) & ARCH_HELPERS).to be_empty
-    end
-  end
-
-  ARCH_HELPERS.each do |helper|
-    it "has the #{helper} in the ChefUtils module" do
-      expect(ChefUtils).to respond_to(helper)
-    end
-  end
-
-  context "on x86_64" do
-    let(:arch) { "x86_64" }
-
-    arch_reports_true_for(:intel?, :_64_bit?)
-  end
-
-  context "on amd64" do
-    let(:arch) { "amd64" }
-
-    arch_reports_true_for(:intel?, :_64_bit?)
-  end
-  context "on ppc64" do
-    let(:arch) { "ppc64" }
-
-    arch_reports_true_for(:ppc64?, :_64_bit?)
-  end
-  context "on ppc64le" do
-    let(:arch) { "ppc64le" }
-
-    arch_reports_true_for(:ppc64le?, :_64_bit?)
-  end
-  context "on s390x" do
-    let(:arch) { "s390x" }
-
-    arch_reports_true_for(:s390x?, :_64_bit?)
-  end
-  context "on ia64" do
-    let(:arch) { "ia64" }
-
-    arch_reports_true_for(:_64_bit?)
-  end
-  context "on sparc64" do
-    let(:arch) { "sparc64" }
-
-    arch_reports_true_for(:_64_bit?)
-  end
-  context "on aarch64" do
-    let(:arch) { "aarch64" }
-
-    arch_reports_true_for(:_64_bit?, :arm?)
-  end
-  context "on arch64" do
-    let(:arch) { "arch64" }
-
-    arch_reports_true_for(:_64_bit?, :arm?)
-  end
-  context "on arm64" do
-    let(:arch) { "arm64" }
-
-    arch_reports_true_for(:_64_bit?, :arm?)
-  end
-  context "on sun4v" do
-    let(:arch) { "sun4v" }
-
-    arch_reports_true_for(:sparc?, :_64_bit?)
-  end
-  context "on sun4u" do
-    let(:arch) { "sun4u" }
-
-    arch_reports_true_for(:sparc?, :_64_bit?)
-  end
-  context "on i86pc" do
-    let(:arch) { "i86pc" }
-
-    arch_reports_true_for(:i386?, :intel?, :_32_bit?)
-  end
-  context "on i386" do
-    let(:arch) { "i386" }
-
-    arch_reports_true_for(:i386?, :intel?, :_32_bit?)
-  end
-  context "on i686" do
-    let(:arch) { "i686" }
-
-    arch_reports_true_for(:i386?, :intel?, :_32_bit?)
-  end
-  context "on powerpc" do
-    let(:arch) { "powerpc" }
-
-    arch_reports_true_for(:powerpc?, :_32_bit?)
-  end
-  context "on armhf" do
-    let(:arch) { "armhf" }
-
-    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" }
-
-    arch_reports_true_for(:s390?, :_32_bit?)
-  end
-end
+# frozen_string_literal: true
+#
+# 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"
+
+def arch_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
+  (ARCH_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::Architecture do
+  let(:node) { { "kernel" => { "machine" => arch } } }
+
+  ( HELPER_MODULES - [ described_class ] ).each do |klass|
+    it "does not have methods that collide with #{klass}" do
+      expect((klass.methods - Module.methods) & ARCH_HELPERS).to be_empty
+    end
+  end
+
+  ARCH_HELPERS.each do |helper|
+    it "has the #{helper} in the ChefUtils module" do
+      expect(ChefUtils).to respond_to(helper)
+    end
+  end
+
+  context "on x86_64" do
+    let(:arch) { "x86_64" }
+
+    arch_reports_true_for(:intel?, :_64_bit?)
+  end
+
+  context "on amd64" do
+    let(:arch) { "amd64" }
+
+    arch_reports_true_for(:intel?, :_64_bit?)
+  end
+  context "on ppc64" do
+    let(:arch) { "ppc64" }
+
+    arch_reports_true_for(:ppc64?, :_64_bit?)
+  end
+  context "on ppc64le" do
+    let(:arch) { "ppc64le" }
+
+    arch_reports_true_for(:ppc64le?, :_64_bit?)
+  end
+  context "on s390x" do
+    let(:arch) { "s390x" }
+
+    arch_reports_true_for(:s390x?, :_64_bit?)
+  end
+  context "on ia64" do
+    let(:arch) { "ia64" }
+
+    arch_reports_true_for(:_64_bit?)
+  end
+  context "on sparc64" do
+    let(:arch) { "sparc64" }
+
+    arch_reports_true_for(:_64_bit?)
+  end
+  context "on aarch64" do
+    let(:arch) { "aarch64" }
+
+    arch_reports_true_for(:_64_bit?, :arm?)
+  end
+  context "on arch64" do
+    let(:arch) { "arch64" }
+
+    arch_reports_true_for(:_64_bit?, :arm?)
+  end
+  context "on arm64" do
+    let(:arch) { "arm64" }
+
+    arch_reports_true_for(:_64_bit?, :arm?)
+  end
+  context "on sun4v" do
+    let(:arch) { "sun4v" }
+
+    arch_reports_true_for(:sparc?, :_64_bit?)
+  end
+  context "on sun4u" do
+    let(:arch) { "sun4u" }
+
+    arch_reports_true_for(:sparc?, :_64_bit?)
+  end
+  context "on i86pc" do
+    let(:arch) { "i86pc" }
+
+    arch_reports_true_for(:i386?, :intel?, :_32_bit?)
+  end
+  context "on i386" do
+    let(:arch) { "i386" }
+
+    arch_reports_true_for(:i386?, :intel?, :_32_bit?)
+  end
+  context "on i686" do
+    let(:arch) { "i686" }
+
+    arch_reports_true_for(:i386?, :intel?, :_32_bit?)
+  end
+  context "on powerpc" do
+    let(:arch) { "powerpc" }
+
+    arch_reports_true_for(:powerpc?, :_32_bit?)
+  end
+  context "on armhf" do
+    let(:arch) { "armhf" }
+
+    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" }
+
+    arch_reports_true_for(:s390?, :_32_bit?)
+  end
+end