chefspec 9.0.0 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff6016043eff72a6e5cd9ad5a0d4353f0cbf35f6d19cdf3de1526d190b2c6b39
-  data.tar.gz: 14a9e18d8e502b03ca663c764530ae865540453b8cabbb3d8551ed97db472a22
+  metadata.gz: 96c39db8c598b7a40e7fd080c65db3a073a1e8e95f59a2628682587e5de4db56
+  data.tar.gz: a0bc37df1322446f83af4488fa1def9124d821478c0364a40fcce138c10f63cf
 SHA512:
-  metadata.gz: 2b8bc62a06445982b3375d6e2595e6815c8e8c7795ee78872f975150a0fcaa24a82f0976c65b20b124d1cb85b98add161bb9761ec72e3f56931e9caeab72c33f
-  data.tar.gz: d15ef2c9f388af788500318ebfb929cabeb2ed42bfd831888f3a3b69ff4d65a2232a54b91e7f74ae9ee9d7ba35252813cb4451f5fc943ca610243e6cda4aacd5
+  metadata.gz: 354c875c5eb0890aea76c9bb7593dfec11d122157c42ca79842ff8a4264766e6a230fb57a14dfdd6c87887e7c4ba147ee388465e5c2b1fa782ed77a912145844
+  data.tar.gz: 64ff73a7906b1e4ba085a9d5d9182903de2965c9ea4c979ad95363b45677d083868e0f64c30c2637ee7beed85333d309cbe42c26024c6fc7fddc0f6b3b08861d

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)

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:

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/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 = '9.0.0'
+  VERSION = '9.1.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.1.0
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -86,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
@@ -123,6 +124,7 @@ files:
 - 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
@@ -161,6 +163,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