chefspec 3.1.4 → 3.2.0

data/gemfiles/chef-11.2.0.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'chef', '11.2.0'
+
+gemspec :path => '..'

data/gemfiles/chef-11.4.4.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'chef', '11.4.4'
+
+gemspec :path => '..'

data/gemfiles/chef-11.6.0.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'chef', '11.6.0'
+
+gemspec :path => '..'

data/gemfiles/chef-11.8.0.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'chef', '11.8.0'
+
+gemspec :path => '..'

data/gemfiles/chef-master.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'chef', :github => 'opscode/chef'
+
+gemspec :path => '..'

data/lib/chefspec/api.rb

@@ -11,17 +11,18 @@ module ChefSpec
     end
 
     private
-      #
-      # WARNING: This is metaprogramming madness. Find all modules who are
-      # nested beneath this module.
-      #
-      # @return [Array<Module>]
-      #
-      def submodules
-        self.constants
-          .map { |name| const_get(name) }
-          .select { |const| const.class == Module }
-      end
+
+    #
+    # WARNING: This is metaprogramming madness. Find all modules who are
+    # nested beneath this module.
+    #
+    # @return [Array<Module>]
+    #
+    def submodules
+      self.constants
+        .map { |name| const_get(name) }
+        .select { |const| const.class == Module }
+    end
   end
 end
 
@@ -69,6 +70,7 @@ require_relative 'api/service'
 require_relative 'api/smartos_package'
 require_relative 'api/solaris_package'
 require_relative 'api/state_attrs'
+require_relative 'api/subscriptions'
 require_relative 'api/subversion'
 require_relative 'api/template'
 require_relative 'api/user'

data/lib/chefspec/api/notifications.rb

@@ -5,12 +5,12 @@ module ChefSpec::API
     # Assert that a resource notifies another. Given a Chef Recipe that
     # notifies a template resource to restart apache:
     #
-    #     ifconfig '10.0.0.1' do
-    #       action :add
+    #     template '/etc/apache2/config' do
+    #       notifies :restart, 'service[apache2]'
     #     end
     #
     # The Examples section demonstrates the different ways to test an
-    # +ifconfig+ resource with ChefSpec.
+    # notifications on a resource with ChefSpec.
     #
     # @example Assert the template notifies apache of something
     #   template = chef_run.template('/etc/apache2.conf')

data/lib/chefspec/api/subscriptions.rb

@@ -0,0 +1,35 @@
+module ChefSpec::API
+  # @since 3.2.0
+  module SubscriptionsMatchers
+    #
+    # Assert that a resource subscribes to another. Given a Chef Recipe that
+    # subscribes a template resource to restart apache:
+    #
+    #     service 'apache2' do
+    #       subscribes :create, 'template[/etc/apache2/config]'
+    #     end
+    #
+    # The Examples section demonstrates the different ways to test a
+    # subscription on a resource with ChefSpec.
+    #
+    # @example Assert a basic subscription
+    #   service = chef_run.service('apache2')
+    #   expect(service).to subscribe_to('template[/etc/apache2/config]')
+    #
+    # @example Assert a subscription with specified action
+    #   expect(service).to subscribe_to('template[/etc/apache2/config]').on(:restart)
+    #
+    # @example Assert a subscription with specified action and timing
+    #   expect(service).to subscribe_to('template[/etc/apache2/config]').on(:restart).immediately
+    #
+    #
+    # @param [String] signature
+    #   the signature of the notification to match
+    #
+    # @return [ChefSpec::Matchers::NotificationsMatcher]
+    #
+    def subscribe_to(signature)
+      ChefSpec::Matchers::SubscribesMatcher.new(signature)
+    end
+  end
+end

data/lib/chefspec/coverage.rb

@@ -74,6 +74,12 @@ module ChefSpec
       report = {}
 
       report[:total] = @collection.size
+
+      if report[:total] == 0
+        puts 'No resources found, skipping coverage calculation'
+        return
+      end
+
       report[:touched] = @collection.count { |_, resource| resource.touched? }
       report[:untouched] = report[:total] - report[:touched]
       report[:coverage] = ((report[:touched].to_f/report[:total].to_f)*100).round(2)
@@ -118,49 +124,49 @@ module ChefSpec
 
     private
 
-      def find(resource)
-        @collection[resource.to_s]
-      end
+    def find(resource)
+      @collection[resource.to_s]
+    end
 
-      def exists?(resource)
-        !find(resource).nil?
-      end
+    def exists?(resource)
+      !find(resource).nil?
+    end
 
-      class ResourceWrapper
-        attr_reader :resource
+    class ResourceWrapper
+      attr_reader :resource
 
-        def initialize(resource = nil)
-          @resource = resource
-        end
+      def initialize(resource = nil)
+        @resource = resource
+      end
 
-        def to_s
-          @resource.to_s
-        end
+      def to_s
+        @resource.to_s
+      end
 
-        def source
-          return {} unless @resource.source_line
-          file, line, *_ = @resource.source_line.split(':')
+      def source
+        return {} unless @resource.source_line
+        file, line, *_ = @resource.source_line.split(':')
 
-          {
-            file: file,
-            line: line.to_i,
-          }
-        end
+        {
+          file: file,
+          line: line.to_i,
+        }
+      end
 
-        def to_hash
-          {
-            source: source,
-            touched: touched?,
-          }
-        end
+      def to_hash
+        {
+          source: source,
+          touched: touched?,
+        }
+      end
 
-        def touch!
-          @touched = true
-        end
+      def touch!
+        @touched = true
+      end
 
-        def touched?
-          !!@touched
-        end
+      def touched?
+        !!@touched
       end
+    end
   end
 end

data/lib/chefspec/expect_exception.rb

@@ -26,20 +26,21 @@ module ChefSpec
     end
 
     private
-      def exception_matched?
-        @formatter_exception == @matcher.expected_error ||
-        @matcher.expected_error === @formatter_exception
-      end
 
-      def message_matched?
-        case @formatter_message
-        when nil
-          true
-        when Regexp
-          @matcher.expected_message =~ @formatter_message
-        else
-          @matcher.expected_message == @formatter_message
-        end
+    def exception_matched?
+      @formatter_exception == @matcher.expected_error ||
+      @matcher.expected_error === @formatter_exception
+    end
+
+    def message_matched?
+      case @formatter_message
+      when nil
+        true
+      when Regexp
+        @matcher.expected_message =~ @formatter_message
+      else
+        @matcher.expected_message == @formatter_message
       end
+    end
   end
 end

data/lib/chefspec/formatter.rb

@@ -255,16 +255,16 @@ module ChefSpec
     def msg(message); end
 
     private
-      def file_load_failed(path, exception)
-        expecting_exception(exception) do
-          description = Chef::Formatters::ErrorMapper.file_load_failed(path, exception)
-          display_error(description)
-        end
-      end
 
-      def expecting_exception(exception, &block)
-        yield unless ChefSpec::ExpectException.new(exception).expected?
+    def file_load_failed(path, exception)
+      expecting_exception(exception) do
+        description = Chef::Formatters::ErrorMapper.file_load_failed(path, exception)
+        display_error(description)
       end
+    end
 
+    def expecting_exception(exception, &block)
+      yield unless ChefSpec::ExpectException.new(exception).expected?
+    end
   end
 end

data/lib/chefspec/matchers.rb

@@ -6,5 +6,6 @@ module ChefSpec
     require_relative 'matchers/render_file_matcher'
     require_relative 'matchers/resource_matcher'
     require_relative 'matchers/state_attrs_matcher'
+    require_relative 'matchers/subscribes_matcher'
   end
 end

data/lib/chefspec/matchers/include_recipe_matcher.rb

@@ -22,24 +22,25 @@ module ChefSpec::Matchers
     end
 
     private
-      #
-      # 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
+    #
+    # 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/matchers/notifications_matcher.rb

@@ -78,35 +78,36 @@ module ChefSpec::Matchers
     end
 
     private
-      def all_notifications
-        immediate_notifications + delayed_notifications
-      end
 
-      def immediate_notifications
-        @resource.immediate_notifications
-      end
+    def all_notifications
+      immediate_notifications + delayed_notifications
+    end
 
-      def delayed_notifications
-        @resource.delayed_notifications
-      end
+    def immediate_notifications
+      @resource.immediate_notifications
+    end
 
-      def matches_action?(notification)
-        return true if @action.nil?
-        @action == notification.action.to_sym
-      end
+    def delayed_notifications
+      @resource.delayed_notifications
+    end
 
-      def format_notification(notification)
-        notifying_resource = notification.notifying_resource
-        resource = notification.resource
-        type = notification.notifying_resource.immediate_notifications.include?(notification) ? :immediately : :delayed
+    def matches_action?(notification)
+      return true if @action.nil?
+      @action == notification.action.to_sym
+    end
 
-        %Q{  "#{notifying_resource.to_s}" notifies "#{resource_name(resource)}[#{resource.name}]" to :#{notification.action}, :#{type}}
-      end
+    def format_notification(notification)
+      notifying_resource = notification.notifying_resource
+      resource = notification.resource
+      type = notification.notifying_resource.immediate_notifications.include?(notification) ? :immediately : :delayed
 
-      def format_notifications
-        all_notifications.map do |notification|
-          '  ' + format_notification(notification)
-        end.join("\n")
-      end
+      %Q{  "#{notifying_resource.to_s}" notifies "#{resource_name(resource)}[#{resource.name}]" to :#{notification.action}, :#{type}}
+    end
+
+    def format_notifications
+      all_notifications.map do |notification|
+        '  ' + format_notification(notification)
+      end.join("\n")
+    end
   end
 end

data/lib/chefspec/matchers/render_file_matcher.rb

@@ -54,42 +54,43 @@ module ChefSpec::Matchers
     end
 
     private
-      def resource
-        @resource ||= @runner.find_resource(:cookbook_file, @path) ||
-                      @runner.find_resource(:file, @path) ||
-                      @runner.find_resource(:template, @path)
-      end
 
-      #
-      # Determines if the given resource has a create-like action.
-      #
-      # @param [Chef::Resource] resource
-      #
-      # @return [Boolean]
-      #
-      def has_create_action?
-        [:create, :create_if_missing].any? { |action| resource.performed_action?(action) }
-      end
+    def resource
+      @resource ||= @runner.find_resource(:cookbook_file, @path) ||
+                    @runner.find_resource(:file, @path) ||
+                    @runner.find_resource(:template, @path)
+    end
+
+    #
+    # Determines if the given resource has a create-like action.
+    #
+    # @param [Chef::Resource] resource
+    #
+    # @return [Boolean]
+    #
+    def has_create_action?
+      [:create, :create_if_missing].any? { |action| resource.performed_action?(action) }
+    end
 
-      #
-      # Determines if the resources content matches the expected content.
-      #
-      # @param [Chef::Resource] resource
-      #
-      # @return [Boolean]
-      #
-      def matches_content?
-        return true if @expected_content.nil?
+    #
+    # Determines if the resources content matches the expected content.
+    #
+    # @param [Chef::Resource] resource
+    #
+    # @return [Boolean]
+    #
+    def matches_content?
+      return true if @expected_content.nil?
 
-        @actual_content = ChefSpec::Renderer.new(@runner, resource).content
+      @actual_content = ChefSpec::Renderer.new(@runner, resource).content
 
-        return false if @actual_content.nil?
+      return false if @actual_content.nil?
 
-        if @expected_content.is_a?(Regexp)
-          @actual_content =~ @expected_content
-        else
-          @actual_content.include?(@expected_content)
-        end
+      if @expected_content.is_a?(Regexp)
+        @actual_content =~ @expected_content
+      else
+        @actual_content.include?(@expected_content)
       end
+    end
   end
 end