chefspec 3.0.0.beta.1 → 3.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 804fd5cc6af81945c28e0e0e65d94e935ff0bb82
-  data.tar.gz: d9d195301868641521b6159d67106e3ac7a6abd2
+  metadata.gz: 500cc20cbae81f4fe09ee9a0ad02d0910b30f901
+  data.tar.gz: 1fd9ab8312366fd9b755b6ce0b1ac7fa88d5befd
 SHA512:
-  metadata.gz: 5f951adb7cdac28459d0e0df5172e6a2e1124776a4335dcc62a6ff06c80264ca7b39290de15df21cea551b51528252e304249c2fcf45ad3888ec3fe67b2970f5
-  data.tar.gz: 7165b07393a29850245dd0fdff9d21f9222816acb723e9e381b5c195ff180f6e87be26e8013b9e5d99b73458fdde7861c510da479f7cd089f7cda21a327abf3a
+  metadata.gz: 9955d1c754d878ea7db155b89d79bd44e6868d0f1f8bf91fa2561ddf2bae1df303194dedb506a12d8c5dae87dbdebeaa6ddc9ae09d23c7422805093e3dc08de0
+  data.tar.gz: 6d9a11b65adec8e5910c7460a1aac740438bb005cc64070344ba2a939031f41e51c9b5196d7b1b169d92df63ff1608d947d2e7366c9d4e65d30e760f2af12cf6

data/lib/chefspec/berkshelf.rb

@@ -11,27 +11,43 @@ module ChefSpec
   class Berkshelf
     class << self
       extend Forwardable
-      def_delegators :instance, :setup!
+      def_delegators :instance, :setup!, :teardown!
     end
 
     include Singleton
 
     def initialize
-      setup!
+      @tmpdir = Dir.mktmpdir
     end
 
+    #
+    # Setup and install the necessary dependencies in the temporary directory.
+    #
     def setup!
-      tmpdir = Dir.mktmpdir
+      FileUtils.rm_rf(@tmpdir) # Berkshelf 3.0 requires the directory to be empty
+      FileUtils.mkdir_p(@tmpdir)
 
       ::Berkshelf.ui.mute do
-        ::Berkshelf::Berksfile.from_file('Berksfile').install(path: tmpdir)
+        if ::Berkshelf::Berksfile.method_defined?(:vendor)
+          ::Berkshelf::Berksfile.from_file('Berksfile').vendor(@tmpdir)
+        else
+          ::Berkshelf::Berksfile.from_file('Berksfile').install(path: @tmpdir)
+        end
       end
 
-      ::RSpec.configure do |config|
-        config.cookbook_path = tmpdir
-      end
+      ::RSpec.configure { |config| config.cookbook_path = @tmpdir }
+    end
+
+    #
+    # Destroy the installed Berkshelf at the temporary directory.
+    #
+    def teardown!
+      FileUtils.rm_rf(@tmpdir) if File.exists?(@tmpdir)
     end
   end
 end
 
-ChefSpec::Berkshelf.setup!
+RSpec.configure do |config|
+  config.before(:suite) { ChefSpec::Berkshelf.setup! }
+  config.after(:suite)  { ChefSpec::Berkshelf.teardown! }
+end

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

@@ -17,6 +17,10 @@ class Chef::Resource
       old_run_action(action, notification_type, notifying_resource)
     end
 
+    if node.runner.compiling?
+      @compile_time = true
+    end
+
     Chef::Log.info("Processing #{self} action #{action} (#{defined_at})")
 
     # Append the currently run action to the existing resource actions,
@@ -24,4 +28,15 @@ class Chef::Resource
     @action = [self.action, action].flatten.compact.map(&:to_sym).uniq
     node.runner.resources[self.to_s] ||= self
   end
+
+  #
+  # Determine if the current resource is a compile-time resource (as opposed
+  # to a converge time resource). Compile-time resources are executed with the
+  # +run_action+ command at load time, rather than at comverge time.
+  #
+  # @return [Boolean]
+  #
+  def compile_time?
+    !!@compile_time
+  end
 end

data/lib/chefspec/matchers/notifications_matcher.rb

@@ -55,6 +55,7 @@ module ChefSpec::Matchers
       message << ", but did not."
       message << "\n\n"
       message << "Other notifications were:\n#{format_notifications}"
+      message << "\n "
       message
     end
 

data/lib/chefspec/matchers/render_file_matcher.rb

@@ -20,13 +20,27 @@ module ChefSpec::Matchers
 
     def failure_message_for_should
       message = "expected Chef run to render '#{@path}'"
-      message << " with:\n\n#{@expected_content}\n\nbut got:\n\n#{@actual_content}" if @expected_content
+      if @expected_content
+        message << " with:"
+        message << "\n\n"
+        message << @expected_content
+        message << "\n\n"
+        message << "but got:"
+        message << "\n\n"
+        message << @actual_content
+        message << "\n "
+      end
       message
     end
 
     def failure_message_for_should_not
       message = "expected file '#{@path}'"
-      message << " with:\n\n#{@expected_content}\n\n" if @expected_content
+      if @expected_content
+        message << " with:"
+        message << "\n\n"
+        message << @expected_content
+        message << "\n\n"
+      end
       message << " to not be in Chef run"
     end
 

data/lib/chefspec/matchers/resource_matcher.rb

@@ -11,6 +11,18 @@ module ChefSpec::Matchers
       self
     end
 
+    def at_compile_time
+      raise ArgumentError, 'Cannot specify both .at_converge_time and .at_compile_time!' if @converge_time
+      @compile_time = true
+      self
+    end
+
+    def at_converge_time
+      raise ArgumentError, 'Cannot specify both .at_compile_time and .at_converge_time!' if @compile_time
+      @converge_time = true
+      self
+    end
+
     #
     # Allow users to specify fancy #with matchers.
     #
@@ -27,7 +39,7 @@ module ChefSpec::Matchers
       @runner = runner
 
       if resource
-        resource_actions.include?(@expected_action) && unmatched_parameters.empty?
+        resource_actions.include?(@expected_action) && unmatched_parameters.empty? && correct_phase?
       else
         false
       end
@@ -36,12 +48,19 @@ module ChefSpec::Matchers
     def failure_message_for_should
       if resource
         if resource_actions.include?(@expected_action)
-          "expected '#{resource.to_s}' to have parameters:" \
-          "\n\n" \
-          "  " + unmatched_parameters.collect { |parameter, h|
-            "#{parameter} #{h[:expected].inspect}, was #{h[:actual].inspect}"
-          }.join("\n  ")
-
+          if unmatched_parameters.empty?
+            if @compile_time
+              "expected '#{resource.to_s}' to be run at compile time, but was converge time"
+            else
+              "expected '#{resource.to_s}' to be run at converge time, but was compile time"
+            end
+          else
+            "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_actions.inspect}" \
           " to include ':#{@expected_action}'"
@@ -51,16 +70,20 @@ module ChefSpec::Matchers
         " action ':#{@expected_action}' to be in Chef run. Other" \
         " #{@resource_name} resources:" \
         "\n\n" \
-        "  " + similar_resources.map(&:to_s).join("\n  ")
+        "  " + similar_resources.map(&:to_s).join("\n  ") + "\n "
       end
     end
 
     def failure_message_for_should_not
       if resource
-        "expected '#{resource.to_s}' actions #{resource_actions.inspect} to not exist"
+        message = "expected '#{resource.to_s}' actions #{resource_actions.inspect} to not exist"
       else
-        "expected '#{resource.to_s}' to not exist"
+        message = "expected '#{resource.to_s}' to not exist"
       end
+
+      message << " at compile time" if @compile_time
+      message << " at converge time" if @converge_time
+      message
     end
 
     def description
@@ -94,6 +117,16 @@ module ChefSpec::Matchers
         end
       end
 
+      def correct_phase?
+        if @compile_time
+          resource.compile_time?
+        elsif @converge_time
+          !resource.compile_time?
+        else
+          true
+        end
+      end
+
       def safe_send(parameter)
         resource.send(parameter)
       rescue NoMethodError
@@ -107,7 +140,7 @@ module ChefSpec::Matchers
       # @return [Array<Chef::Resource>]
       #
       def similar_resources
-        @_similar_resources ||= @runner.find_resources(@resource_name)
+        @_similar_resources ||= @runner.find_resources(@resource_name).values
       end
 
       #

data/lib/chefspec/runner.rb

@@ -100,6 +100,9 @@ module ChefSpec
     #   A reference to the calling Runner (for chaining purposes)
     #
     def apply(*recipe_names)
+      # Start compiling
+      @compiling = true
+
       recipe_names.each do |recipe_name|
         cookbook, recipe = Chef::Recipe.parse_recipe_name(recipe_name)
         recipe_path = File.join(Dir.pwd, 'recipes', "#{recipe}.rb")
@@ -108,9 +111,18 @@ module ChefSpec
         recipe.from_file(recipe_path)
       end
 
+      # Reset the resource collection
       @resources = {}
+
+      # Expand the run_list
+      expand_run_list!
+
+      # Setup the run_context
       @run_context = Chef::RunContext.new(client.node, {}, client.events)
 
+      # We are done compiling now
+      @compiling = false
+
       Chef::Runner.new(@run_context).converge
       self
     end
@@ -133,6 +145,9 @@ module ChefSpec
     #   A reference to the calling Runner (for chaining purposes)
     #
     def converge(*recipe_names)
+      # Start compiling
+      @compiling = true
+
       node.run_list.reset!
       recipe_names.each { |recipe_name| node.run_list.add(recipe_name) }
 
@@ -141,9 +156,15 @@ module ChefSpec
       # Reset the resource collection
       @resources = {}
 
-      client.build_node
+      # Expand the run_list
+      expand_run_list!
+
+      # Setup the run_context
       @run_context = client.setup_run_context
 
+      # We are done compiling now
+      @compiling = false
+
       Chef::Runner.new(@run_context).converge
       self
     end
@@ -156,7 +177,7 @@ module ChefSpec
     def node
       return @node if @node
 
-      @node = client.node
+      @node = client.build_node
       @node.instance_variable_set(:@runner, self)
       @node.class.send(:attr_reader, :runner)
       @node
@@ -232,10 +253,22 @@ module ChefSpec
       !!options[:dry_run]
     end
 
+    #
+    # Boolean method to determine if the Runner is still compiling recipes.
+    # This is used by the +Resource+ class to determine if a resource was
+    # invoked at compile-time or converge-time.
+    #
+    # @return [Boolean]
+    #
+    def compiling?
+      !!@compiling
+    end
+
     #
     # This runner as a string.
     #
-    # @return [String] Currently includes the run_list. Format of the string may change between versions of this gem.
+    # @return [String] Currently includes the run_list. Format of the string
+    # may change between versions of this gem.
     #
     def to_s
       return "chef_run: #{node.run_list.to_s}" unless node.run_list.empty?
@@ -252,6 +285,14 @@ module ChefSpec
     end
 
     private
+      #
+      # The inferred path from the calling spec.
+      #
+      # @param [Array<String>] kaller
+      #   the calling trace
+      #
+      # @return [String]
+      #
       def calling_cookbook_path(kaller)
         calling_spec = kaller.find { |line| line =~ /\/spec/ }
         bits = calling_spec.split(':', 2).first.split(File::SEPARATOR)
@@ -260,6 +301,10 @@ module ChefSpec
         File.expand_path(File.join(bits.slice(0, spec_dir), '..'))
       end
 
+      #
+      # The +Chef::Client+ for this runner.
+      #
+      # @return [Chef::Runner]
       #
       def client
         return @client if @client
@@ -270,5 +315,19 @@ module ChefSpec
         @client.build_node
         @client
       end
+
+      #
+      # We really need a way to just expand the run_list, but that's done by
+      # +Chef::Client#build_node+. However, that same method also resets the
+      # automatic attributes, making it impossible to mock them. So we are
+      # stuck +instance_eval+ing against the client and manually expanding
+      # the mode object.
+      #
+      def expand_run_list!
+        client.instance_eval do
+          @run_list_expansion = @node.expand!('disk')
+          @expanded_run_list_with_versions = @run_list_expansion.recipes.with_version_constraints_strings
+        end
+      end
   end
 end

data/lib/chefspec/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.1
+  version: 3.0.0.beta.2
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -219,6 +219,6 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: chefspec-3.0.0.beta.1
+summary: chefspec-3.0.0.beta.2
 test_files: []
 has_rdoc: