chefspec 1.3.0 → 1.3.1

data/lib/chefspec/chef_runner.rb

@@ -34,8 +34,12 @@ module ChefSpec
     # @option options [String] :ohai_data_path Path of a json file that will be passed to fauxhai as :path option
     # @yield [node] Configuration block for Chef::Node
     def initialize(options={})
+      # Because we evaluate the "caller" in this method, we need to call
+      # it first so that the path is correctly calculated.
+      @default_cookbook_path = default_cookbook_path
+
       defaults = {
-        :cookbook_path => default_cookbook_path,
+        :cookbook_path => cookbook_paths,
         :log_level => :warn,
         :dry_run => false,
         :step_into => [],
@@ -114,7 +118,7 @@ module ChefSpec
       Chef::Config[:cache_type] = "Memory"
       Chef::Config[:cache_options] = { :path => File.join(File.expand_path('~'), '.chef', 'checksums') }
       Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest) }
-      Chef::Config[:cookbook_path] = cookbook_paths
+      Chef::Config[:cookbook_path] = Array(@options[:cookbook_path])
       Chef::Config[:client_key] = nil
 
       # it should be saved to an instance variable to prevent automatic
@@ -247,7 +251,7 @@ module ChefSpec
       test_path   = File.expand_path(File.join('test', 'cookbooks'))
       spec_path   = File.expand_path(File.join('spec', 'cookbooks'))
 
-      Array(@options[:cookbook_path]).
+      Array(@default_cookbook_path).
         push(vendor_path).
         push(test_path).
         push(spec_path).

data/lib/chefspec/version.rb

@@ -1,4 +1,4 @@
 module ChefSpec
   # The gem version
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -201,31 +201,31 @@ extra_rdoc_files: []
 files:
 - lib/chef/formatters/chefspec.rb
 - lib/chef/knife/cookbook_create_specs.rb
-- lib/chefspec.rb
 - lib/chefspec/chef_runner.rb
 - lib/chefspec/helpers/describe.rb
-- lib/chefspec/minitest.rb
-- lib/chefspec/monkey_patches/lwrp_base.rb
-- lib/chefspec/monkey_patches/hash.rb
-- lib/chefspec/monkey_patches/conditional.rb
-- lib/chefspec/monkey_patches/provider.rb
-- lib/chefspec/version.rb
-- lib/chefspec/matchers/file_content.rb
-- lib/chefspec/matchers/ruby_block.rb
-- lib/chefspec/matchers/execute.rb
 - lib/chefspec/matchers/cron.rb
-- lib/chefspec/matchers/link.rb
-- lib/chefspec/matchers/user.rb
 - lib/chefspec/matchers/env.rb
-- lib/chefspec/matchers/script.rb
-- lib/chefspec/matchers/package.rb
+- lib/chefspec/matchers/execute.rb
 - lib/chefspec/matchers/file.rb
+- lib/chefspec/matchers/file_content.rb
+- lib/chefspec/matchers/group.rb
 - lib/chefspec/matchers/include_recipe.rb
+- lib/chefspec/matchers/link.rb
 - lib/chefspec/matchers/log.rb
+- lib/chefspec/matchers/notifications.rb
+- lib/chefspec/matchers/package.rb
+- lib/chefspec/matchers/ruby_block.rb
+- lib/chefspec/matchers/script.rb
 - lib/chefspec/matchers/service.rb
 - lib/chefspec/matchers/shared.rb
-- lib/chefspec/matchers/group.rb
-- lib/chefspec/matchers/notifications.rb
+- lib/chefspec/matchers/user.rb
+- lib/chefspec/minitest.rb
+- lib/chefspec/monkey_patches/conditional.rb
+- lib/chefspec/monkey_patches/hash.rb
+- lib/chefspec/monkey_patches/lwrp_base.rb
+- lib/chefspec/monkey_patches/provider.rb
+- lib/chefspec/version.rb
+- lib/chefspec.rb
 homepage: http://acrmp.github.com/chefspec
 licenses:
 - MIT
@@ -241,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 768299270690559200
+      hash: 1265930440020953415
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -250,12 +250,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 768299270690559200
+      hash: 1265930440020953415
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: chefspec-1.3.0
+summary: chefspec-1.3.1
 test_files: []
 has_rdoc: