chefspec 7.4.0 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 811f21e393d16be39c8162bbe17c1157d214ce0eb378e8d19e686683fad4160b
-  data.tar.gz: 764db71993cd015961d195d39dc1c99a74bda29311a3fc69210961e4482d6ba9
+  metadata.gz: c20bc92ebea039d7261547ec0e91686f1c4c83e57f7bd19e98f4a4e4fce13aa3
+  data.tar.gz: b6f4060d3844074dfffe298c3a5d0d75a766926abf41e80dbb7b95c2aa26500c
 SHA512:
-  metadata.gz: b7b68c00204307439f31270eb1ae14360d1750aabc7e7f87c2128337331fb29b6041858132f218fee76fd65c8d2903739816c1be4a8f268646c66fd10449b5a9
-  data.tar.gz: d25a404af72648245718dc0ee6519023754c0c6f111f87746edb611e6c17856571bc183e17fd1284b33709ddebd8a0ba36c91a0f4245403db49bbd0d7e2a09b3
+  metadata.gz: 8446ad09b864f601169c69f635ee93fd1089ca8c4031e43884d9c87495ce0a57c86d3620ad9de1c2ddb36ceb1d66074352eeacce862a11dd8e3c7303cc0c19f3
+  data.tar.gz: 8d4db22787020c88195ce7ea76bd517b94ab293463b2dddda47614dbd867d8d5490a6a8d77b794bdd273ceca2903d58f46151302482021767c5686f2c549a299

data/chefspec.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |s|
   s.files         = %w{LICENSE Rakefile Gemfile chefspec.gemspec} + Dir.glob("{lib,templates,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.3'
+  s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency 'chef',    '>= 13'
-  s.add_dependency 'fauxhai', '>= 6.11'
+  s.add_dependency 'chef',    '>= 14'
+  s.add_dependency 'chef-cli'
+  s.add_dependency 'fauxhai-ng', '>= 7.5'
   s.add_dependency 'rspec',   '~> 3.0'
 end

data/lib/chefspec/api.rb

@@ -3,6 +3,7 @@ module ChefSpec
     autoload :Core, 'chefspec/api/core'
     autoload :Described, 'chefspec/api/described'
     autoload :DoNothing, 'chefspec/api/do_nothing'
+    autoload :IncludeAnyRecipe, 'chefspec/api/include_any_recipe'
     autoload :IncludeRecipe, 'chefspec/api/include_recipe'
     autoload :Link, 'chefspec/api/link'
     autoload :Notifications, 'chefspec/api/notifications'
@@ -19,6 +20,7 @@ module ChefSpec
       klass.include(ChefSpec::API::Core)
       klass.include(ChefSpec::API::Described)
       klass.include(ChefSpec::API::DoNothing)
+      klass.include(ChefSpec::API::IncludeAnyRecipe)
       klass.include(ChefSpec::API::IncludeRecipe)
       klass.include(ChefSpec::API::DoNothing)
       klass.include(ChefSpec::API::RenderFile)

data/lib/chefspec/api/include_any_recipe.rb

@@ -0,0 +1,24 @@
+module ChefSpec
+  module API
+    module IncludeAnyRecipe
+      #
+      # Assert that a Chef run includes any recipe.
+      #
+      #     include_recipe 'apache2::default'
+      #
+      # The Examples section demonstrates the different ways to test an
+      # +include_any_recipe+ directive with ChefSpec.
+      #
+      # @example Assert the Chef run did not include any recipes
+      #   expect(chef_run).not_to include_any_recipe
+      #
+      #
+      # @return [ChefSpec::Matchers::IncludeAnyRecipeMatcher]
+      #
+      def include_any_recipe
+        ChefSpec::Matchers::IncludeAnyRecipeMatcher.new
+      end
+      alias_method :include_any_recipes, :include_any_recipe
+    end
+  end
+end

data/lib/chefspec/api/stubs_for.rb

@@ -35,7 +35,7 @@ module ChefSpec
       before do
         allow(StubsFor).to receive(:setup_stubs_for) do |object, type|
           type_stubs = _chefspec_stubs_for_registry[type]
-          resource_object = object.is_a?(Chef::Provider) ? object.new_resource : object
+          resource_object = object.respond_to?(:new_resource) ? object.new_resource : object
           stubs = type_stubs[nil] + type_stubs[resource_object.resource_name.to_s] + type_stubs[resource_object.to_s]
           stubs.each do |stub|
             instance_exec(object, &stub)
@@ -56,23 +56,25 @@ module ChefSpec
       #     expect(subject.some_method).to eq "asdf"
       #   end
       # @param target [String, nil] Resource name to inject, or nil for all resources.
-      # @param current_resource [Boolean] If true, also register stubs for current_resource objects on the same target.
+      # @param current_value [Boolean] If true, also register stubs for current_value objects on the same target.
       # @param block [Proc] A block taking the resource object as a parameter.
       # @return [void]
-      def stubs_for_resource(target=nil, current_resource: true, &block)
+      def stubs_for_resource(target=nil, current_value: true, current_resource: true, &block)
+        current_value = false if !current_resource
         _chefspec_stubs_for_registry[:resource][target] << block
-        stubs_for_current_resource(target, &block) if current_resource
+        stubs_for_current_value(target, &block) if current_value
       end
 
-      # Register stubs for current_resource objects.
+      # Register stubs for current_value objects.
       #
       # @see #stubs_for_resource
       # @param target [String, nil] Resource name to inject, or nil for all resources.
       # @param block [Proc] A block taking the resource object as a parameter.
       # @return [void]
-      def stubs_for_current_resource(target=nil, &block)
-        _chefspec_stubs_for_registry[:current_resource][target] << block
+      def stubs_for_current_value(target=nil, &block)
+        _chefspec_stubs_for_registry[:current_value][target] << block
       end
+      alias_method :stubs_for_current_resource, :stubs_for_current_value
 
       # Register stubs for provider objects.
       #
@@ -111,10 +113,11 @@ module ChefSpec
           before { stubs_for_resource(*args, &block) }
         end
 
-        # (see StubsFor#stubs_for_current_resource)
-        def stubs_for_current_resource(*args, &block)
-          before { stubs_for_current_resource(*args, &block) }
+        # (see StubsFor#stubs_for_current_value)
+        def stubs_for_current_value(*args, &block)
+          before { stubs_for_current_value(*args, &block) }
         end
+        alias_method :stubs_for_current_resource, :stubs_for_current_value
 
         # (see StubsFor#stubs_for_provider)
         def stubs_for_provider(*args, &block)

data/lib/chefspec/extensions.rb

@@ -18,3 +18,4 @@ require_relative 'extensions/chef/lwrp_base'
 require_relative 'extensions/chef/resource/freebsd_package'
 require_relative 'extensions/chef/run_context/cookbook_compiler'
 require_relative 'extensions/chef/cookbook_loader'
+require_relative 'extensions/ohai/system'

data/lib/chefspec/extensions/chef/cookbook/gem_installer.rb

@@ -25,7 +25,7 @@ Chef::Cookbook::GemInstaller.prepend(Module.new do
     gem_cmd = "gem install #{gem_name} --version '#{gem_requirements.join(', ')}'"
     gemfile_line = "gem '#{[gem_name, *gem_requirements].join('\', \'')}'"
     warn "No matching version found for '#{gem_name}' in your gem environment.\n" \
-         " - if you are using ChefDK, run the following command: \"chef #{gem_cmd}\"\n" \
+         " - if you are using Chef Workstation, run the following command: \"chef #{gem_cmd}\"\n" \
          " - if you are using bundler, append \"#{gemfile_line}\" to your Gemfile and run \"bundle install\"\n" \
          " - otherwise run: \"#{gem_cmd}\""
   end

data/lib/chefspec/extensions/chef/provider.rb

@@ -1,5 +1,5 @@
 require 'chef/provider'
-require 'chefspec/api'
+require_relative '../../api'
 
 Chef::Provider.prepend(Module.new do
   def self.name

data/lib/chefspec/extensions/chef/resource.rb

@@ -1,6 +1,6 @@
 require 'chef/resource'
 require 'chef/version'
-require 'chefspec/api'
+require_relative '../../api'
 
 #
 # Three concerns:
@@ -21,7 +21,8 @@ module ChefSpec::Extensions::Chef::Resource
       # If we're directly inside a `load_current_resource`, this is probably
       # something like `new_resource.class.new` so we want to call this a current_resource,
       # Otherwise it's probably a normal resource instantiation.
-      mode = caller[1].include?("`load_current_resource'") ? :current_resource : :resource
+      mode = :resource
+      mode = :current_value if caller.any? { |x| x.include?("`load_current_resource'") || x.include?("`load_after_resource'") }
       ChefSpec::API::StubsFor.setup_stubs_for(self, mode)
     end
   end
@@ -33,7 +34,7 @@ module ChefSpec::Extensions::Chef::Resource
     super.tap do |dup_resource|
       # We're directly inside a load_current_resource, which is probably via
       # the load_current_value DSL system, so call this a current resource.
-      ChefSpec::API::StubsFor.setup_stubs_for(dup_resource, :current_resource) if stack.first.include?("`load_current_resource'")
+      ChefSpec::API::StubsFor.setup_stubs_for(dup_resource, :current_value) if caller.any? { |x| x.include?("`load_current_resource'") || x.include?("`load_after_resource'") }
     end
   end
 
@@ -133,7 +134,7 @@ module ChefSpec::Extensions::Chef::Resource
       super
     end
 
-    def provides(name, *args, &block)
+    def provides(name, **options, &block)
       provides_names << name unless provides_names.include?(name)
       inject_actions(*allowed_actions)
       super

data/lib/chefspec/extensions/chef/run_context/cookbook_compiler.rb

@@ -22,6 +22,15 @@ Chef::RunContext::CookbookCompiler.prepend(Module.new do
     super
   end
 
+  def load_ohai_plugins_from_cookbook(cookbook)
+    return super unless $CHEFSPEC_MODE
+    $CHEFSPEC_OHAI_PRELOAD ||= {}
+    # Already loaded this once.
+    return if $CHEFSPEC_OHAI_PRELOAD[cookbook]
+    $CHEFSPEC_OHAI_PRELOAD[cookbook] = true
+    super
+  end
+
   def load_lwrps_from_cookbook(cookbook)
     return super unless $CHEFSPEC_MODE
     $CHEFSPEC_LWRP_PRELOAD ||= {}

data/lib/chefspec/extensions/ohai/system.rb

@@ -0,0 +1,11 @@
+require 'ohai/system'
+
+Ohai::System.prepend(Module.new do
+  # If an Ohai segment exists, don't actually pull data in for ohai.
+  # (we have fake data for that)
+  # @see Ohai::System#run_additional_plugins
+  def run_additional_plugins(plugin_path)
+    return super unless $CHEFSPEC_MODE
+    # noop
+  end
+end)

data/lib/chefspec/formatter.rb

@@ -133,6 +133,18 @@ module ChefSpec
     # Called when LWRPs are finished loading
     def lwrp_load_complete; end
 
+    # Called when an ohai plugin file loading starts
+    def ohai_plugin_load_start(file_count); end
+
+    # Called when an ohai plugin file has been loaded
+    def ohai_plugin_file_loaded(path); end
+
+    # Called when an ohai plugin file has an error on load.
+    def ohai_plugin_file_load_failed(path, exception); end
+
+    # Called when an ohai plugin file loading has finished
+    def ohai_plugin_load_complete; end
+
     # Called before attribute files are loaded
     def attribute_load_start(attribute_file_count); end
 

data/lib/chefspec/matchers.rb

@@ -1,6 +1,7 @@
 module ChefSpec
   module Matchers
     require_relative 'matchers/do_nothing_matcher'
+    require_relative 'matchers/include_any_recipe_matcher'
     require_relative 'matchers/include_recipe_matcher'
     require_relative 'matchers/link_to_matcher'
     require_relative 'matchers/notifications_matcher'

data/lib/chefspec/matchers/include_any_recipe_matcher.rb

@@ -0,0 +1,51 @@
+module ChefSpec::Matchers
+  class IncludeAnyRecipeMatcher
+    def matches?(runner)
+      @runner = runner
+      !(loaded_recipes - run_list_recipes).empty?
+    end
+
+    def description
+      'include any recipe'
+    end
+
+    def failure_message
+      'expected to include any recipe'
+    end
+
+    def failure_message_when_negated
+      'expected not to include any recipes'
+    end
+
+    private
+
+    #
+    # The list of run_list recipes on the Chef run (normalized)
+    #
+    # @return [Array<String>]
+    #
+    def run_list_recipes
+      @runner.run_context.node.run_list.run_list_items.map { |x| with_default(x.name) }
+    end
+
+    #
+    # Automatically appends "+::default+" to recipes that need them.
+    #
+    # @param [String] name
+    #
+    # @return [String]
+    #
+    def with_default(name)
+      name.include?('::') ? name : "#{name}::default"
+    end
+
+    #
+    # The list of loaded recipes on the Chef run (normalized)
+    #
+    # @return [Array<String>]
+    #
+    def loaded_recipes
+      @runner.run_context.loaded_recipes.map { |name| with_default(name) }
+    end
+  end
+end

data/lib/chefspec/policyfile.rb

@@ -1,8 +1,8 @@
 begin
-  require 'chef-dk/policyfile_services/export_repo'
-  require 'chef-dk/policyfile_services/install'
+  require 'chef-cli/policyfile_services/export_repo'
+  require 'chef-cli/policyfile_services/install'
 rescue LoadError
-  raise ChefSpec::Error::GemLoadError.new(gem: 'chef-dk', name: 'ChefDK')
+  raise ChefSpec::Error::GemLoadError.new(gem: 'chef-cli', name: 'ChefCLI')
 end
 
 module ChefSpec
@@ -27,14 +27,14 @@ module ChefSpec
         policyfile_path = File.join(Dir.pwd, 'Policyfile.rb')
       end
 
-      installer = ChefDK::PolicyfileServices::Install.new(
+      installer = ChefCLI::PolicyfileServices::Install.new(
         policyfile: policyfile_path,
-        ui: ChefDK::UI.null
+        ui: ChefCLI::UI.null
       )
 
       installer.run
 
-      exporter = ChefDK::PolicyfileServices::ExportRepo.new(
+      exporter = ChefCLI::PolicyfileServices::ExportRepo.new(
         policyfile: policyfile_path,
         export_dir: @tmpdir
       )

data/lib/chefspec/runner.rb

@@ -1,4 +1,4 @@
-require "chefspec/solo_runner"
+require_relative "solo_runner"
 
 module ChefSpec
   # As we start to migrate back to only SoloRunner, include this alias for now.

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '7.4.0'
+  VERSION = '9.2.0'
 end

data/spec/unit/matchers/include_any_recipe_matcher_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe ChefSpec::Matchers::IncludeAnyRecipeMatcher do
+  let(:node) { double('Chef::Node', run_list: run_list) }
+  let(:run_list) { double('Chef::RunList', run_list_items: run_list_items) }
+  let(:run_list_items) { [run_list_item_one] }
+  let(:run_list_item_one) { double('Chef::RunList::RunListItem', name: 'one') }
+  let(:run_list_item_two) { double('Chef::RunList::RunListItem', name: 'two') }
+  let(:loaded_recipes) { %w(one) }
+  let(:chef_run) { double('chef run', run_context: { loaded_recipes: loaded_recipes, node: node }) }
+
+  subject { described_class.new }
+
+  describe '#failure_message' do
+    it 'has the right value' do
+      subject.matches?(chef_run)
+      expect(subject.failure_message).to eq('expected to include any recipe')
+    end
+  end
+
+  describe '#failure_message_when_negated' do
+    it 'has the right value' do
+      subject.matches?(chef_run)
+      expect(subject.failure_message_when_negated).to eq('expected not to include any recipes')
+    end
+  end
+
+  describe '#description' do
+    it 'has the right value' do
+      subject.matches?(chef_run)
+      expect(subject.description).to eq('include any recipe')
+    end
+  end
+
+  describe '#matches?' do
+    context 'when 0 recipes are included' do
+      let(:loaded_recipes) { %w(one) }
+
+      it 'returns false' do
+        expect(subject.matches?(chef_run)).to be false
+      end
+    end
+
+    context 'when at least one recipe is included' do
+      let(:loaded_recipes) { %w(one two) }
+
+      it 'returns true' do
+        expect(subject.matches?(chef_run)).to be true
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 9.2.0
 platform: ruby
 authors:
 - Andrew Crump
 - Seth Vargo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -17,28 +17,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
 - !ruby/object:Gem::Dependency
-  name: fauxhai
+  name: chef-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.11'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.11'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fauxhai-ng
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +86,7 @@ files:
 - lib/chefspec/api/core.rb
 - lib/chefspec/api/described.rb
 - lib/chefspec/api/do_nothing.rb
+- lib/chefspec/api/include_any_recipe.rb
 - lib/chefspec/api/include_recipe.rb
 - lib/chefspec/api/link.rb
 - lib/chefspec/api/notifications.rb
@@ -104,11 +119,13 @@ files:
 - lib/chefspec/extensions/chef/resource/freebsd_package.rb
 - lib/chefspec/extensions/chef/run_context/cookbook_compiler.rb
 - lib/chefspec/extensions/chef/securable.rb
+- lib/chefspec/extensions/ohai/system.rb
 - lib/chefspec/file_cache_path_proxy.rb
 - lib/chefspec/formatter.rb
 - lib/chefspec/librarian.rb
 - lib/chefspec/matchers.rb
 - lib/chefspec/matchers/do_nothing_matcher.rb
+- lib/chefspec/matchers/include_any_recipe_matcher.rb
 - lib/chefspec/matchers/include_recipe_matcher.rb
 - lib/chefspec/matchers/link_to_matcher.rb
 - lib/chefspec/matchers/notifications_matcher.rb
@@ -147,6 +164,7 @@ files:
 - spec/unit/expect_exception_spec.rb
 - spec/unit/macros_spec.rb
 - spec/unit/matchers/do_nothing_matcher.rb
+- spec/unit/matchers/include_any_recipe_matcher_spec.rb
 - spec/unit/matchers/include_recipe_matcher_spec.rb
 - spec/unit/matchers/link_to_matcher_spec.rb
 - spec/unit/matchers/notifications_matcher_spec.rb
@@ -183,7 +201,7 @@ homepage: https://github.com/chefspec/chefspec
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,15 +209,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Write RSpec examples and generate coverage reports for Chef recipes!
 test_files: []