chefspec 3.0.2 → 3.1.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c8e999b2df276e377b7c7939430db34e9ba082b
-  data.tar.gz: 08c074ed6d9633de4e7ea9b83c0f3709c7c91704
+  metadata.gz: ecd2e2844bf5859e413abf186d1f71ed0f5af281
+  data.tar.gz: 72f1818ef26032cc0cb039bf3f51923eaae47800
 SHA512:
-  metadata.gz: b7f58af30026df43e1c60515e1ba01e6d0dea37443878d3ea10bcec2e47aa4ea91e23c40db8ab8e2a5660255afd6fb6b559d98621bed48999d732bec641bfa2d
-  data.tar.gz: 1598aefcab47c574882ade3bb99a9f2a4241e26e0c86b791cdce0dabfc7a85a56a7383c148ec2e05568a8a585b865cd54aa69b8c0dac0894ff2998ade28c4701
+  metadata.gz: ac4ce6148c62de28889fd679ca8ba7306ec0f9be180b3bb81fbeb752c7103285fc47a7091865bbc4c28e27d608bd3d94d485caaeb56a2998b12727294c83c47b
+  data.tar.gz: ca086443be533996952f5dd17aa634bf520a8a46e4f972f0d1374481365642eca928915e1713c30cea40b92d4409c7183a314466f372d98e008ae6fc37913e77

data/lib/chefspec.rb

@@ -7,6 +7,8 @@ require_relative 'chefspec/extensions/chef/lwrp_base'
 require_relative 'chefspec/extensions/chef/resource'
 require_relative 'chefspec/extensions/chef/securable'
 
+require_relative 'chefspec/mixins/normalize'
+
 require_relative 'chefspec/stubs/command_registry'
 require_relative 'chefspec/stubs/command_stub'
 require_relative 'chefspec/stubs/data_bag_item_registry'
@@ -19,6 +21,7 @@ require_relative 'chefspec/stubs/search_registry'
 require_relative 'chefspec/stubs/search_stub'
 
 require_relative 'chefspec/api'
+require_relative 'chefspec/coverage'
 require_relative 'chefspec/errors'
 require_relative 'chefspec/expect_exception'
 require_relative 'chefspec/formatter'
@@ -28,7 +31,3 @@ require_relative 'chefspec/renderer'
 require_relative 'chefspec/rspec'
 require_relative 'chefspec/runner'
 require_relative 'chefspec/version'
-
-# Load deprecations module last, so it can monkey patch and print out nasty
-# deprecation warnings for us :)
-require_relative 'chefspec/deprecations'

data/lib/chefspec/cacher.rb

@@ -0,0 +1,59 @@
+module ChefSpec
+  #
+  # The cacher module allows for ultra-fast tests by caching the results of a
+  # CCR in memory across an example group. In testing, this can reduce the
+  # total testing time by a factor of 10x. This strategy is _not_ the default
+  # behavior, because it has implications surrounding stubbing and is _not_
+  # threadsafe!
+  #
+  # The credit for this approach and code belongs to Juri Timošin (DracoAter).
+  # Please see his original blog post below for an in-depth explanation of how
+  # and why this approach is faster.
+  #
+  # @example Using the Cacher module
+  #   First, require the Cacher module in your +spec_helper.rb+:
+  #
+  #     RSpec.configure do |config|
+  #       config.extend(ChefSpec::Cacher)
+  #     end
+  #
+  #   Next, change your +let+ blocks to +cached+ blocks:
+  #
+  #     let(:chef_run) { ... } #=> cached(:chef_run) { ... }
+  #
+  #   Finally, celebrate!
+  #
+  # @warn
+  #   This strategy is only recommended for advanced users, as it makes
+  #   stubbing slightly more difficult and indirect!
+  #
+  # @see http://dracoater.blogspot.com/2013/12/testing-chef-cookbooks-part-25-speeding.html
+  #
+  module Cacher
+    @@cache = {}
+    FINALIZER = lambda { |id| @@cache.delete(id) }
+
+    def cached(name, &block)
+      location = ancestors.first.metadata[:example_group][:location]
+
+      define_method(name) do
+        key = [location, name.to_s].join('.')
+        unless @@cache.has_key?(Thread.current.object_id)
+          ObjectSpace.define_finalizer(Thread.current, FINALIZER)
+        end
+        @@cache[Thread.current.object_id] ||= {}
+        @@cache[Thread.current.object_id][key] ||= instance_eval(&block)
+      end
+    end
+
+    def cached!(name, &block)
+      cached(name, &block)
+
+      before { send(name) }
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.extend(ChefSpec::Cacher)
+end

data/lib/chefspec/coverage.rb

@@ -0,0 +1,144 @@
+module ChefSpec
+  class Coverage
+    class << self
+      extend Forwardable
+      def_delegators :instance, :add, :cover!, :report!
+    end
+
+    include Singleton
+
+    #
+    # Create a new coverage object singleton.
+    #
+    def initialize
+      @collection = {}
+    end
+
+    #
+    # Add a resource to the resource collection.
+    #
+    # @param [Chef::Resource] resource
+    #
+    def add(resource)
+      @collection[resource.to_s] = ResourceWrapper.new(resource)
+    end
+
+    #
+    # Called when a resource is matched to indicate it has been tested.
+    #
+    # @param [Chef::Resource] resource
+    #
+    def cover!(resource)
+      if wrapper = find(resource)
+        wrapper.touch!
+      end
+    end
+
+    #
+    # Generate a coverage report. This report **must** be generated +at_exit+
+    # or else the entire resource collection may not be complete!
+    #
+    # @example Generating a report
+    #
+    #   at_exit { ChefSpec::Coverage.report! }
+    #
+    # @example Generating a custom report without announcing
+    #
+    #   at_exit { ChefSpec::Coverage.report!('/custom/path', false) }
+    #
+    #
+    # @param [String] output
+    #   the path to output the report on disk (default: '.coverage/results.json')
+    # @param [Boolean] announce
+    #   print the results to standard out
+    #
+    def report!(output = '.coverage/results.json', announce = true)
+      report = {}
+
+      report[:total] = @collection.size
+      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)
+
+      report[:detailed] = Hash[*@collection.map do |name, wrapper|
+        [name, wrapper.to_hash]
+      end.flatten]
+
+      output = File.expand_path(output)
+      FileUtils.mkdir_p(File.dirname(output))
+      File.open(File.join(output), 'w') do |f|
+        f.write(JSON.pretty_generate(report) + "\n")
+      end
+
+      if announce
+        puts <<-EOH.gsub(/^ {10}/, '')
+
+          WARNING: ChefSpec Coverage reporting is in beta. Please use with caution.
+
+          ChefSpec Coverage report generated at '#{output}':
+
+            Total Resources:   #{report[:total]}
+            Touched Resources: #{report[:touched]}
+            Touch Coverage:    #{report[:coverage]}%
+
+          Untouched Resources:
+
+          #{
+            report[:detailed]
+              .select { |_, resource| !resource[:touched] }
+              .sort_by { |_, resource| [resource[:source][:file], resource[:source][:line]] }
+              .map do |name, resource|
+                "  #{name} #{resource[:source][:file]}:#{resource[:source][:line]}"
+              end
+              .flatten
+              .join("\n")
+          }
+
+        EOH
+      end
+    end
+
+    private
+
+      def find(resource)
+        @collection[resource.to_s]
+      end
+
+      class ResourceWrapper
+        attr_reader :resource
+
+        def initialize(resource = nil)
+          @resource = resource
+        end
+
+        def to_s
+          @resource.to_s
+        end
+
+        def source
+          return {} unless @resource.source_line
+          file, line, *_ = @resource.source_line.split(':')
+
+          {
+            file: file,
+            line: line.to_i,
+          }
+        end
+
+        def to_hash
+          {
+            source: source,
+            touched: touched?,
+          }
+        end
+
+        def touch!
+          @touched = true
+        end
+
+        def touched?
+          !!@touched
+        end
+      end
+  end
+end

data/lib/chefspec/deprecations.rb

@@ -50,6 +50,9 @@ module ChefSpec
 end
 
 module ChefSpec::API
+  #
+  # @todo Remove in v4.0.0
+  #
   module DeprecatedMatchers
     def be_owned_by(user, group)
       deprecated "The `be_owned_by` matcher is deprecated. Please use:" \

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

@@ -2,7 +2,10 @@ require 'chef/dsl/data_query'
 
 module Chef::DSL::DataQuery
   # @see Chef::DSL::DataQuery#search
+  alias_method :old_search, :search
   def search(*args, &block)
+    return old_search(*args, &block) unless Chef::Config[:solo]
+
     type  = args[0]
     query = args[1] || '*:*'
     stub = ChefSpec::Stubs::SearchRegistry.stub_for(type, query)
@@ -12,7 +15,10 @@ module Chef::DSL::DataQuery
   end
 
   # @see Chef::DSL::DataQuery#data_bag
+  alias_method :old_data_bag, :data_bag
   def data_bag(bag)
+    return old_data_bag(bag) unless Chef::Config[:solo]
+
     stub = ChefSpec::Stubs::DataBagRegistry.stub_for(bag)
     raise ChefSpec::DataBagNotStubbedError.new(bag) if stub.nil?
 
@@ -20,7 +26,10 @@ module Chef::DSL::DataQuery
   end
 
   # @see Chef::DSL::DataQuery#data_bag_item
+  alias_method :old_data_bag_item, :data_bag_item
   def data_bag_item(bag, id)
+    return old_data_bag_item(bag, id) unless Chef::Config[:solo]
+
     stub = ChefSpec::Stubs::DataBagItemRegistry.stub_for(bag, id)
     raise ChefSpec::DataBagItemNotStubbedError.new(bag, id) if stub.nil?
 

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

@@ -1,46 +1,54 @@
 # Override Chef LWRP creation to remove existing class to avoid redefinition warnings.
 class Chef
-  class Provider
-    # Chef provider for a resource
-    class LWRPBase < Provider
-      class << self
-        alias_method :old_build_from_file, :build_from_file
+  module RemoveExistingLWRP
+    def self.extended(klass)
+      class << klass
+        alias_method :build_from_file_without_removal, :build_from_file
+        alias_method :build_from_file, :build_from_file_with_removal
+      end
+    end
 
-        #
-        # Override Opscode provider to remove any existing LWRPs to suppress
-        # constant re-definition warnings.
-        #
-        # @param [String] cookbook_name
-        #   the name of the cookbook
-        # @param [String] filename
-        #   file to load as a LWRP
-        # @param [Chef::RunContext] run_context
-        #   context of a Chef Run
-        #
-        # @return [Chef::Provider]
-        #
-        def build_from_file(cookbook_name, filename, run_context)
-          provider_name = filename_to_qualified_string(cookbook_name, filename)
-          class_name    = convert_to_class_name(provider_name)
+    #
+    # Override Opscode provider to remove any existing LWRPs to suppress
+    # constant re-definition warnings.
+    #
+    # @param [String] cookbook_name
+    #   the name of the cookbook
+    # @param [String] filename
+    #   file to load as a LWRP
+    # @param [Chef::RunContext] run_context
+    #   context of a Chef Run
+    #
+    # @return [Chef::Provider]
+    #
+    def build_from_file_with_removal(cookbook_name, filename, run_context)
+      provider_name = filename_to_qualified_string(cookbook_name, filename)
+      class_name    = convert_to_class_name(provider_name)
 
-          remove_existing_lwrp(class_name)
-          old_build_from_file(cookbook_name, filename, run_context)
-        end
+      remove_existing_lwrp(class_name)
+      build_from_file_without_removal(cookbook_name, filename, run_context)
+    end
 
-        #
-        # Remove any existing Chef provider or resource with the specified name.
-        #
-        # @param [String] class_name
-        #   The class name. Must be a valid constant name.
-        #
-        def remove_existing_lwrp(class_name)
-          [Chef::Resource::LWRPBase, Chef::Provider::LWRPBase, Chef::Resource, Chef::Provider].each do |resource_holder|
-            if resource_holder.const_defined? class_name, false
-              resource_holder.send(:remove_const, class_name)
-            end
-          end
+    #
+    # Remove any existing Chef provider or resource with the specified name.
+    #
+    # @param [String] class_name
+    #   The class name. Must be a valid constant name.
+    #
+    def remove_existing_lwrp(class_name)
+      [self, superclass].each do |resource_holder|
+        look_in_parents = false
+        if resource_holder.const_defined?(class_name, look_in_parents)
+          resource_holder.send(:remove_const, class_name)
         end
       end
+    end
+  end
+
+  class Provider
+    # Chef provider for a resource
+    class LWRPBase < Provider
+      extend RemoveExistingLWRP
 
       module InlineResources
         module ClassMethods
@@ -60,4 +68,11 @@ class Chef
       end
     end
   end
+
+  class Resource
+    # Chef provider for a resource
+    class LWRPBase < Resource
+      extend RemoveExistingLWRP
+    end
+  end
 end

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

@@ -14,6 +14,8 @@ class Chef::Resource
 
     Chef::Log.info("Processing #{self} action #{action} (#{defined_at})")
 
+    ChefSpec::Coverage.add(self)
+
     unless should_skip?(action)
       if node.runner.step_into?(self)
         instance_eval { @not_if = []; @only_if = [] }

data/lib/chefspec/librarian.rb

@@ -0,0 +1,49 @@
+begin
+  require 'librarian/chef/environment'
+  require 'librarian/action/resolve'
+  require 'librarian/action/install'
+rescue LoadError
+  raise RuntimeError, "Librarian not found! You must have the librarian-chef" \
+    " gem installed on your system before requiring chefspec/librarian." \
+    " Install it by running:\n\n  gem install librarian-chef\n\nor add" \
+    " Librarian to your Gemfile:\n\n  gem 'librarian-chef'\n\n"
+end
+
+module ChefSpec
+  class Librarian
+    class << self
+      extend Forwardable
+      def_delegators :instance, :setup!, :teardown!
+    end
+
+    include Singleton
+
+    def initialize
+      @tmpdir = Dir.mktmpdir
+    end
+
+    #
+    # Setup and install the necessary dependencies in the temporary directory.
+    #
+    def setup!
+      env = ::Librarian::Chef::Environment.new(project_path: Dir.pwd)
+      env.config_db.local['path'] = @tmpdir
+      ::Librarian::Action::Resolve.new(env).run
+      ::Librarian::Action::Install.new(env).run
+
+      ::RSpec.configure { |config| config.cookbook_path = @tmpdir }
+    end
+
+    #
+    # Remove the temporary directory.
+    #
+    def teardown!
+      FileUtils.rm_rf(@tmpdir) if File.exists?(@tmpdir)
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before(:suite) { ChefSpec::Librarian.setup! }
+  config.after(:suite)  { ChefSpec::Librarian.teardown! }
+end

data/lib/chefspec/matchers/notifications_matcher.rb

@@ -1,5 +1,7 @@
 module ChefSpec::Matchers
   class NotificationsMatcher
+    include ChefSpec::Normalize
+
     def initialize(signature)
       signature.match(/^([^\[]*)\[(.*)\]$/)
       @expected_resource_type = $1
@@ -11,7 +13,7 @@ module ChefSpec::Matchers
 
       if @resource
         block = Proc.new do |notified|
-          notified.resource.resource_name.to_s == @expected_resource_type &&
+          resource_name(notified.resource).to_s == @expected_resource_type &&
           (@expected_resource_name === notified.resource.identity.to_s || @expected_resource_name === notified.resource.name.to_s) &&
           matches_action?(notified)
         end
@@ -51,7 +53,7 @@ module ChefSpec::Matchers
 
     def failure_message_for_should
       if @resource
-        message = %Q{expected "#{@resource.resource_name}[#{@resource.name}]" to notify "#{@expected_resource_type}[#{@expected_resource_name}]"}
+        message = %Q{expected "#{resource_name(@resource)}[#{@resource.name}]" to notify "#{@expected_resource_type}[#{@expected_resource_name}]"}
         message << " with action :#{@action}" if @action
         message << " immediately" if @immediately
         message << " delayed" if @delayed
@@ -98,7 +100,7 @@ module ChefSpec::Matchers
         resource = notification.resource
         type = notification.notifying_resource.immediate_notifications.include?(notification) ? :immediately : :delayed
 
-        %Q{  "#{notifying_resource.to_s}" notifies "#{resource.resource_name}[#{resource.name}]" to :#{notification.action}, :#{type}}
+        %Q{  "#{notifying_resource.to_s}" notifies "#{resource_name(resource)}[#{resource.name}]" to :#{notification.action}, :#{type}}
       end
 
       def format_notifications

data/lib/chefspec/matchers/resource_matcher.rb

@@ -43,6 +43,7 @@ module ChefSpec::Matchers
       @runner = runner
 
       if resource
+        ChefSpec::Coverage.cover!(resource)
         resource.performed_action?(@expected_action) && unmatched_parameters.empty? && correct_phase?
       else
         false

data/lib/chefspec/mixins/normalize.rb

@@ -0,0 +1,16 @@
+module ChefSpec
+  module Normalize
+    #
+    # Calculate the name of a resource, replacing dashes with underscores
+    # and converting symbols to strings and back again.
+    #
+    # @param [String, Chef::Resource] thing
+    #
+    # @return [Symbol]
+    #
+    def resource_name(thing)
+      name = thing.respond_to?(:resource_name) ? thing.resource_name : thing
+      name.to_s.gsub('-', '_').to_sym
+    end
+  end
+end

data/lib/chefspec/renderer.rb

@@ -6,6 +6,8 @@ end
 
 module ChefSpec
   class Renderer
+    include ChefSpec::Normalize
+
     # @return [Chef::Runner]
     attr_reader :chef_run
 
@@ -34,12 +36,12 @@ module ChefSpec
     #   does not contain or respond to a content renderer.
     #
     def content
-      case resource.resource_name.to_s
-      when 'template'
+      case resource_name(resource)
+      when :template
         content_from_template(chef_run, resource)
-      when 'file'
+      when :file
         content_from_file(chef_run, resource)
-      when 'cookbook_file'
+      when :cookbook_file
         content_from_cookbook_file(chef_run, resource)
       else
         nil

data/lib/chefspec/runner.rb

@@ -6,6 +6,8 @@ require 'chef/resources'
 
 module ChefSpec
   class Runner
+    include ChefSpec::Normalize
+
     #
     # Defines a new runner method on the +ChefSpec::Runner+.
     #
@@ -149,8 +151,12 @@ module ChefSpec
       expand_run_list!
 
       # Setup the run_context
+      client.register unless Chef::Config[:solo]
       @run_context = client.setup_run_context
 
+      # Allow stubbing/mocking after the cookbook has been compiled but before the converge
+      yield if block_given?
+
       @converging = true
       @client.converge(@run_context)
       self
@@ -201,7 +207,7 @@ module ChefSpec
       rescue Chef::Exceptions::ResourceNotFound; end
 
       resource_collection.all_resources.find do |resource|
-        resource.resource_name.to_sym == type && (name === resource.identity || name === resource.name)
+        resource_name(resource) == type && (name === resource.identity || name === resource.name)
       end
     end
 
@@ -209,7 +215,7 @@ module ChefSpec
     # Find the resource with the declared type.
     #
     # @example Find all template resources
-    #   chef_run.find_resources('template') #=> [#<Chef::Resource::Template>, #...]
+    #   chef_run.find_resources(:template) #=> [#<Chef::Resource::Template>, #...]
     #
     #
     # @param [Symbol] type
@@ -220,7 +226,7 @@ module ChefSpec
     #
     def find_resources(type)
       resource_collection.all_resources.select do |resource|
-        resource.resource_name.to_s == type.to_s
+        resource_name(resource) == type.to_sym
       end
     end
 
@@ -249,8 +255,8 @@ module ChefSpec
     # @return [Boolean]
     #
     def step_into?(resource)
-      key = resource.resource_name.to_s.gsub('-', '_').to_sym
-      Array(options[:step_into]).map(&:to_sym).include?(key)
+      key = resource_name(resource)
+      Array(options[:step_into]).map(&method(:resource_name)).include?(key)
     end
 
     #

data/lib/chefspec/server.rb

@@ -0,0 +1,200 @@
+begin
+  require 'chef_zero/server'
+rescue LoadError
+  raise RuntimeError, "chef-zero not found! You must have the chef-zero gem" \
+    " installed on your system before requiring chefspec/server. Install" \
+    " Chef Zero by running:\n\n  gem install chef-zero\n\nor add Chef Zero" \
+    " to your Gemfile:\n\n  gem 'chef-zero'\n\n"
+end
+
+require 'chef/cookbook_loader'
+require 'chef/cookbook_uploader'
+
+class Chef::CookbookUploader
+  #
+  # Don't validate uploaded cookbooks. Validating a cookbook takes *forever*
+  # to complete. It's just not worth it...
+  #
+  def validate_cookbooks
+    # noop
+  end
+end
+
+class ChefSpec::Runner
+  alias_method :old_initialize, :initialize
+
+  #
+  # Override the existing initialize method, setting the appropriate
+  # configuration to use a real Chef Server instead.
+  #
+  # @see ChefSpec::Runner#initialize
+  #
+  def initialize(options = {}, &block)
+    old_initialize(options, &block)
+
+    Chef::Config[:client_key]      = ChefSpec::Server.client_key
+    Chef::Config[:client_name]     = 'chefspec'
+    Chef::Config[:node_name]       = 'chefspec'
+    Chef::Config[:file_cache_path] = Dir.mktmpdir
+    Chef::Config[:solo]            = false
+
+    upload_cookbooks!
+  end
+
+  private
+
+    #
+    # Upload the cookbooks to the Chef Server.
+    #
+    def upload_cookbooks!
+      loader = Chef::CookbookLoader.new(Chef::Config[:cookbook_path])
+      loader.load_cookbooks
+
+      uploader = Chef::CookbookUploader.new(loader.cookbooks, loader.cookbook_paths)
+      uploader.upload_cookbooks
+    end
+end
+
+module ChefSpec
+  class Server
+    #
+    # Delegate all methods to the singleton instance.
+    #
+    def self.method_missing(m, *args, &block)
+      instance.send(m, *args, &block)
+    end
+
+    include Singleton
+
+    attr_reader :server
+
+    #
+    # Create a new instance of the +ChefSpec::Server+ singleton. This method
+    # also starts the Chef Zero server in the background.
+    #
+    def initialize
+      @server = ChefZero::Server.new(
+        log_level:  RSpec.configuration.log_level || :warn,
+      )
+    end
+
+    #
+    # The path to the insecure Chef Zero private key on disk. Because Chef
+    # requires the path to a file instead of the contents of the key (why),
+    # this method dynamically writes the +ChefZero::PRIVATE_KEY+ to disk and
+    # then returns that path.
+    #
+    # @return [String]
+    #   the path to the client key on disk
+    #
+    def client_key
+      @client_key ||= begin
+        path = File.join(cache_dir, 'client.pem')
+        File.open(path, 'w') { |f| f.write(ChefZero::PRIVATE_KEY) }
+        path
+      end
+    end
+
+    #
+    # Start the Chef Zero server in the background, updating the +Chef::Config+
+    # with the proper +chef_server_url+.
+    #
+    def start!
+      unless @server.running?
+        @server.start_background
+        Chef::Config[:chef_server_url] = @server.url
+      end
+    end
+
+    #
+    # Clear the contents of the server (used between examples)
+    #
+    def reset!
+      @server.clear_data
+    end
+
+    #
+    # Stop the Chef Zero server, if it is running. This method also runs any
+    # cleanup hooks, such as clearing the cache directories.
+    #
+    def stop!
+      @server.stop if @server.running?
+      FileUtils.rm_rf(cache_dir)
+    end
+
+    #
+    # Create a client on the Chef Server.
+    #
+    def create_client(name, data = {})
+      load_data(:clients, name, data)
+    end
+
+    #
+    # Create a data_bag on the Chef Server.
+    #
+    def create_data_bag(name, data = {})
+      @server.load_data('data' => { name => data })
+    end
+
+    #
+    # Create an environment on the Chef Server.
+    #
+    def create_environment(name, data = {})
+      load_data(:environments, name, data)
+    end
+
+    #
+    # Create a node on the Chef Server.
+    #
+    # @note
+    #   The current node (chefspec) is automatically registered and added to
+    #   the Chef Server
+    #
+    def create_node(name, data = {})
+      load_data(:nodes, name, data)
+    end
+
+    #
+    # Create a role on the Chef Server.
+    #
+    def create_role(name, data = {})
+      load_data(:roles, name, data)
+    end
+
+    private
+
+      #
+      # The directory where any cache information (such as private keys) should
+      # be stored. This cache is destroyed at the end of the run.
+      #
+      # @return [String]
+      #   the path to the cache directory on disk
+      #
+      def cache_dir
+        @cache_dir ||= Dir.mktmpdir(['chefspec', 'cache'])
+      end
+
+      #
+      # Shortcut method for loading data into Chef Zero.
+      #
+      # @param [String, Symbol] key
+      #   the key to load
+      # @param [String] name
+      #   the name or id of the item to load
+      # @param [Hash] data
+      #   the data for the object, which will be converted to JSON and uploaded
+      #   to the server
+      #
+      def load_data(key, name, data = {})
+        @server.load_data(key.to_s => { name => JSON.fast_generate(data) })
+      end
+  end
+end
+
+ChefSpec::Server.start!
+
+RSpec.configure do |config|
+  config.after(:each)   { ChefSpec::Server.reset! }
+end
+
+at_exit { ChefSpec::Server.stop! }

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '3.0.2'
+  VERSION = '3.1.0.beta.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0.beta.1
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -53,6 +53,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: chef-zero
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +179,8 @@ files:
 - lib/chefspec/api/yum_package.rb
 - lib/chefspec/api.rb
 - lib/chefspec/berkshelf.rb
+- lib/chefspec/cacher.rb
+- lib/chefspec/coverage.rb
 - lib/chefspec/deprecations.rb
 - lib/chefspec/errors.rb
 - lib/chefspec/expect_exception.rb
@@ -175,6 +191,7 @@ files:
 - lib/chefspec/extensions/chef/resource.rb
 - lib/chefspec/extensions/chef/securable.rb
 - lib/chefspec/formatter.rb
+- lib/chefspec/librarian.rb
 - lib/chefspec/macros.rb
 - lib/chefspec/matchers/include_recipe_matcher.rb
 - lib/chefspec/matchers/link_to_matcher.rb
@@ -183,9 +200,11 @@ files:
 - lib/chefspec/matchers/resource_matcher.rb
 - lib/chefspec/matchers/state_attrs_matcher.rb
 - lib/chefspec/matchers.rb
+- lib/chefspec/mixins/normalize.rb
 - lib/chefspec/renderer.rb
 - lib/chefspec/rspec.rb
 - lib/chefspec/runner.rb
+- lib/chefspec/server.rb
 - lib/chefspec/stubs/command_registry.rb
 - lib/chefspec/stubs/command_stub.rb
 - lib/chefspec/stubs/data_bag_item_registry.rb
@@ -213,14 +232,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
-summary: chefspec-3.0.2
+summary: chefspec-3.1.0.beta.1
 test_files: []
 has_rdoc: