chefspec 3.0.0.beta.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6569c7801bd9192460934175605ba237962958
-  data.tar.gz: 005ba7b59b0d660be5b71565c4a8fa0c0edeb719
+  metadata.gz: 5868a82ecd4f7dd2ae15c73f08bdd3f407873b33
+  data.tar.gz: 442370c544b95393e0e615a991417a4e1ecc253d
 SHA512:
-  metadata.gz: b17504fd6a5fc2642a43a47a720cfedaac7cc0553efe9c0b243c3aac2cf0fc41c962807eb1e9531981bb89728535823f72d7c4375662900c6849b166cb7149db
-  data.tar.gz: cec924c49870eb6afb3fc9756fc7e4acf8cf5d44a8da80b7034e91f236ef05e26e334023ec7058058f47bf1f7b83fda23b4600f7e78b2e2404d26c4d52d27793
+  metadata.gz: 64e63ea25673e6c2634069474f565b15db07e6d03cf05494e312ff61a426b35854d7842e3d8264c492a598309e967b799537c4b117889dfeacc89ab2bbfb3885
+  data.tar.gz: de9ba082834b7e5ad26ae9e5bf7f2ae91af39dafb6cfb4d6109112dcb1e52e22d0179492098e0cf8b307c78cf2ae1ddac90301a11d06b88c633cdd8a7545c18b

data/lib/chefspec/matchers/include_recipe_matcher.rb

@@ -10,15 +10,15 @@ module ChefSpec::Matchers
     end
 
     def description
-      "include recipe '#{@recipe_name}'"
+      %Q{include recipe "#{@recipe_name}"}
     end
 
     def failure_message_for_should
-      "expected #{loaded_recipes} to include '#{@recipe_name}'"
+      %Q{expected #{loaded_recipes.inspect} to include "#{@recipe_name}"}
     end
 
     def failure_message_for_should_not
-      "expected '#{@recipe_name}' to not be included"
+      %Q{expected "#{@recipe_name}" to not be included}
     end
 
     private

data/lib/chefspec/matchers/link_to_matcher.rb

@@ -13,19 +13,19 @@ module ChefSpec::Matchers
     end
 
     def description
-      "link to '#{@path}'"
+      %Q{link to "#{@path}"}
     end
 
     def failure_message_for_should
       if @link.nil?
-        "expected 'link[#{@path}]' with action ':create' to be in Chef run"
+        %Q{expected "link[#{@path}]" with action :create to be in Chef run}
       else
-        "expected '#{@link}' to link to '#{@path}' but was '#{@link.to}'"
+        %Q{expected "#{@link}" to link to "#{@path}" but was "#{@link.to}"}
       end
     end
 
     def failure_message_for_should_not
-      "expected '#{@link}' to not link to '#{@path}'"
+      %Q{expected "#{@link}" to not link to "#{@path}"}
     end
   end
 end

data/lib/chefspec/matchers/notifications_matcher.rb

@@ -42,8 +42,8 @@ module ChefSpec::Matchers
     end
 
     def description
-      message = "notify #{@expected_resource_type}[#{@expected_resource_name}]"
-      message << " with action #{@action.inspect}" if @action
+      message = %Q{notify "#{@expected_resource_type}[#{@expected_resource_name}]"}
+      message << " with action :#{@action}" if @action
       message << " immediately" if @immediately
       message << " delayed" if @delayed
       message
@@ -51,8 +51,8 @@ module ChefSpec::Matchers
 
     def failure_message_for_should
       if @resource
-        message = "expected '#{@resource.resource_name}[#{@resource.name}]' to notify '#{@expected_resource_type}[#{@expected_resource_name}]'"
-        message << " with action #{@action.inspect}" if @action
+        message = %Q{expected "#{@resource.resource_name}[#{@resource.name}]" to notify "#{@expected_resource_type}[#{@expected_resource_name}]"}
+        message << " with action :#{@action}" if @action
         message << " immediately" if @immediately
         message << " delayed" if @delayed
         message << ", but did not."
@@ -61,8 +61,8 @@ module ChefSpec::Matchers
         message << "\n "
         message
       else
-        message = "expected _something_ to notify '#{@expected_resource_type}[#{@expected_resource_name}]"
-        message << " with action #{@action.inspect}" if @action
+        message = %Q{expected _something_ to notify "#{@expected_resource_type}[#{@expected_resource_name}]"}
+        message << " with action :#{@action}" if @action
         message << " immediately" if @immediately
         message << " delayed" if @delayed
         message << ", but the _something_ you gave me was nil! If you are running a test like:"
@@ -98,7 +98,7 @@ module ChefSpec::Matchers
         resource = notification.resource
         type = notification.notifying_resource.immediate_notifications.include?(notification) ? :immediately : :delayed
 
-        "  #{notifying_resource.to_s} notifies '#{resource.resource_name}[#{resource.name}]' to :#{notification.action}, :#{type}"
+        %Q{  "#{notifying_resource.to_s}" notifies "#{resource.resource_name}[#{resource.name}]" to :#{notification.action}, :#{type}}
       end
 
       def format_notifications

data/lib/chefspec/matchers/render_file_matcher.rb

@@ -15,11 +15,19 @@ module ChefSpec::Matchers
     end
 
     def description
-      "render file '#{@path}'"
+      message = %Q{render file "#{@path}"}
+      if @expected_content
+        if @expected_content.include?("\n")
+          message << " with content <suppressed>"
+        else
+          message << " with content #{@expected_content.inspect}"
+        end
+      end
+      message
     end
 
     def failure_message_for_should
-      message = "expected Chef run to render '#{@path}'"
+      message = %Q{expected Chef run to render "#{@path}"}
       if @expected_content
         message << " with:"
         message << "\n\n"
@@ -34,7 +42,7 @@ module ChefSpec::Matchers
     end
 
     def failure_message_for_should_not
-      message = "expected file '#{@path}'"
+      message = %Q{expected file "#{@path}"}
       if @expected_content
         message << " with:"
         message << "\n\n"
@@ -42,6 +50,7 @@ module ChefSpec::Matchers
         message << "\n\n"
       end
       message << " to not be in Chef run"
+      message
     end
 
     private

data/lib/chefspec/matchers/resource_matcher.rb

@@ -35,6 +35,10 @@ module ChefSpec::Matchers
       end
     end
 
+    def description
+      %Q{#{@expected_action} #{@resource_name} "#{@expected_identity}"}
+    end
+
     def matches?(runner)
       @runner = runner
 
@@ -50,24 +54,24 @@ module ChefSpec::Matchers
         if resource.performed_action?(@expected_action)
           if unmatched_parameters.empty?
             if @compile_time
-              "expected '#{resource.to_s}' to be run at compile time, but was converge time"
+              %Q{expected "#{resource.to_s}" to be run at compile time}
             else
-              "expected '#{resource.to_s}' to be run at converge time, but was compile time"
+              %Q{expected "#{resource.to_s}" to be run at converge time}
             end
           else
-            "expected '#{resource.to_s}' to have parameters:" \
+            %Q{expected "#{resource.to_s}" to have parameters:} \
             "\n\n" \
             "  " + unmatched_parameters.collect { |parameter, h|
               "#{parameter} #{h[:expected].inspect}, was #{h[:actual].inspect}"
             }.join("\n  ")
           end
         else
-          "expected '#{resource.to_s}' actions #{resource.performed_actions.inspect}" \
-          " to include ':#{@expected_action}'"
+          %Q{expected "#{resource.to_s}" actions #{resource.performed_actions.inspect}} \
+          " to include :#{@expected_action}"
         end
       else
-        "expected '#{@resource_name}[#{@expected_identity}]' with" \
-        " action ':#{@expected_action}' to be in Chef run. Other" \
+        %Q{expected "#{@resource_name}[#{@expected_identity}] with"} \
+        " action :#{@expected_action} to be in Chef run. Other" \
         " #{@resource_name} resources:" \
         "\n\n" \
         "  " + similar_resources.map(&:to_s).join("\n  ") + "\n "
@@ -76,20 +80,16 @@ module ChefSpec::Matchers
 
     def failure_message_for_should_not
       if resource
-        message = "expected '#{resource.to_s}' actions #{resource.performed_actions.inspect} to not exist"
+        message = %Q{expected "#{resource.to_s}" actions #{resource.performed_actions.inspect} to not exist}
       else
-        message = "expected '#{resource.to_s}' to not exist"
+        message = %Q{expected "#{resource.to_s}" to not exist}
       end
 
-      message << " at compile time" if @compile_time
+      message << " at compile time"  if @compile_time
       message << " at converge time" if @converge_time
       message
     end
 
-    def description
-      "#{@expected_action} #{@resource_name}"
-    end
-
     private
       def unmatched_parameters
         return @_unmatched_parameters if @_unmatched_parameters

data/lib/chefspec/rspec.rb

@@ -10,6 +10,7 @@ RSpec.configure do |config|
   end
 
   config.add_setting :cookbook_path
+  config.add_setting :role_path
   config.add_setting :log_level, default: :warn
   config.add_setting :path
   config.add_setting :platform

data/lib/chefspec/runner.rb

@@ -63,6 +63,7 @@ module ChefSpec
     def initialize(options = {}, &block)
       @options = options = {
         cookbook_path: RSpec.configuration.cookbook_path || calling_cookbook_path(caller),
+        role_path:     RSpec.configuration.role_path || default_role_path,
         log_level:     RSpec.configuration.log_level,
         path:          RSpec.configuration.path,
         platform:      RSpec.configuration.platform,
@@ -77,6 +78,7 @@ module ChefSpec
       Chef::Config[:cache_type]     = 'Memory'
       Chef::Config[:client_key]     = nil
       Chef::Config[:cookbook_path]  = Array(options[:cookbook_path])
+      Chef::Config[:role_path]      = Array(options[:role_path])
       Chef::Config[:force_logger]   = true
       Chef::Config[:solo]           = true
 
@@ -293,6 +295,20 @@ module ChefSpec
         File.expand_path(File.join(bits.slice(0, spec_dir), '..'))
       end
 
+      #
+      # The inferred path to roles.
+      #
+      # @return [String, nil]
+      #
+      def default_role_path
+        Pathname.new(Dir.pwd).ascend do |path|
+          possible = File.join(path, 'roles')
+          return possible if File.exists?(possible)
+        end
+
+        nil
+      end
+
       #
       # The +Chef::Client+ for this runner.
       #

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '3.0.0.beta.4'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -211,14 +211,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: chefspec-3.0.0.beta.4
+summary: chefspec-3.0.0
 test_files: []
 has_rdoc: