chefspec 4.2.0.beta.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68b2b322b2293fa631345ed68a61262d0f46d943
-  data.tar.gz: 99a905d8ea24d4c6d20f554c8bc0f42d5f60f14f
+  metadata.gz: 75d0edf1b239bc0e3f2925b5369b05446c94e5af
+  data.tar.gz: 05c29cdc3052844db10148b184b9b8476c88c016
 SHA512:
-  metadata.gz: 07409059ef229f4eb9e2e7f9fe3d4f1d9db2b9e859f0864fbc29df6ed89fddf1e60788e9d7808aae2c853d6ed52163be242ecb99b55ff410327a958b95310883
-  data.tar.gz: 7153ec068c65759290deadf4183d3a57693b092a531118ce4b3f1294f2fa4b2d056202ff2fa4f3c83397db7fc9bb5d2fb92c1a4f5b02fc502d612500c39a8c37
+  metadata.gz: fddcc55b0216f17d1d39eb0c8d5515a2efd09eb8f9db6e7ffc4affcc2c4c2f4c140d8e3a4abca91404b96040e8a3d5596dac00e5314fe617f7fd3c7df58fbe9d
+  data.tar.gz: 49e6647e765e13381955b457ac19df13f000f974344030648356afc589ee1c646676a40033bf667df0f1f274b4a62cb9e9eda38b48eadaf437628e962435be7e

data/.travis.yml

@@ -1,5 +1,6 @@
+sudo: false
+
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
 
@@ -16,12 +17,12 @@ notifications:
     template:
       - "%{message} (%{author}): %{build_url}"
 
-bundler_args: --jobs 7
+bundler_args: --jobs 7 --retry 3
 
 gemfile:
   - gemfiles/chef-11.14.0.gemfile
   - gemfiles/chef-11.16.0.gemfile
-  - gemfiles/chef-12.0.0.rc.gemfile
+  - gemfiles/chef-12.0.0.gemfile
   - gemfiles/chef-master.gemfile
 
 matrix:

data/CHANGELOG.md

@@ -1,7 +1,7 @@
 CHANGELOG for ChefSpec
 ======================
 
-## 4.2.0.beta.1 (November 5, 2014)
+## 4.2.0 (December 25, 2014)
 Bugfixes:
   - Updated README grep examples
   - Fix various typographical errors
@@ -10,6 +10,9 @@ Bugfixes:
 Improvements:
   - Add support for Chef 12
   - Added support for environments in Chef Solo
+  - Fix location definition for caching
+  - Allow passing `Chef::Config[:file_cache_path]` from outside
+  - Update support for Chef 12
 
 ## 4.1.1 (October 13, 2014)
 Bugfixes:

data/README.md

@@ -110,6 +110,12 @@ ChefSpec::SoloRunner.new(platform: 'centos', version: '5.10')
 # Specify a different cookbook_path
 ChefSpec::SoloRunner.new(cookbook_path: '/var/my/other/path', role_path: '/var/my/roles')
 
+# By default ChefSpec sets a new temporary directory for file caching in every run.
+# This can be overridden by passing the `file_cache_path` option.
+# Note: Resources containing `Chef::Config[:file_cache_path]` in their name or
+# attributes, will fail unless this option is specified.
+ChefSpec::SoloRunner.new(file_cache_path: '/var/chef/cache')
+
 # Add debug log output
 ChefSpec::SoloRunner.new(log_level: :debug).converge(described_recipe)
 ```

data/gemfiles/chef-11.14.0.gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gem 'chef', '~> 11.14.0'
 
-gemspec :path => '..'
+gemspec path: '..'

data/gemfiles/chef-11.16.0.gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gem 'chef', '~> 11.16.0'
 
-gemspec :path => '..'
+gemspec path: '..'

data/gemfiles/chef-12.0.0.gemfile

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

data/lib/chefspec/cacher.rb

@@ -34,7 +34,10 @@ module ChefSpec
     FINALIZER = lambda { |id| @@cache.delete(id) }
 
     def cached(name, &block)
-      location   = ancestors.first.metadata[:location]
+      location = ancestors.first.metadata[:location]
+      unless ancestors.first.metadata[:description].nil? || location.nil?
+        location += ancestors.first.metadata[:description]
+      end
       location ||= ancestors.first.metadata[:parent_example_group][:location]
 
       define_method(name) do

data/lib/chefspec/deprecations.rb

@@ -16,12 +16,12 @@ end
 
 module ChefSpec
   class Runner
-    # @deprecated {ChefSpec.define_runner_method} is deprecated. Please
-    #   use {ChefSpec.define_runner_method} instead.
+    # @deprecated {ChefSpec::Runner.define_runner_method} is deprecated. Please
+    #   use {ChefSpec.define_matcher} instead.
     def self.define_runner_method(resource_name)
-      deprecated "`ChefSpec::Runner.define_runner_method' is deprecated. " \
-        "It is being used in the #{resource_name} resource matcher." \
-        "Please use `ChefSpec.define_matcher' instead."
+      deprecated "`ChefSpec::Runner.define_runner_method' is deprecated." \
+        " It is being used in the #{resource_name} resource matcher." \
+        " Please use `ChefSpec.define_matcher' instead."
 
       ChefSpec.define_matcher(resource_name)
     end

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

@@ -1,3 +1,10 @@
+# Force loading Chef Config to fix a bad dependency tree. See
+# https://github.com/opscode/chef/issues/2703 for more information.
+require 'chef/config'
+
+# Providers has to be included before client... probably a weird
+# include missing in Chef-land, but we can make sure we get it right anyway.
+require 'chef/providers'
 require 'chef/client'
 
 # @private

data/lib/chefspec/renderer.rb

@@ -119,7 +119,9 @@ module ChefSpec
     #
     # @return [Array<Chef::Cookbook>]
     def cookbook_collection(node)
-      if node.respond_to?(:run_context)
+      if chef_run.respond_to?(:run_context)
+        chef_run.run_context.cookbook_collection # Chef 11.8+
+      elsif node.respond_to?(:run_context)
         node.run_context.cookbook_collection # Chef 11+
       else
         node.cookbook_collection # Chef 10

data/lib/chefspec/server_runner.rb

@@ -56,7 +56,14 @@ module ChefSpec
     # @see (SoloRunner#converge)
     def converge(*recipe_names)
       upload_cookbooks!
-      super
+
+      super do
+        yield if block_given?
+
+        # Save the node back to the server for searching purposes
+        client.register
+        node.save
+      end
     end
 
     private

data/lib/chefspec/solo_runner.rb

@@ -56,6 +56,8 @@ module ChefSpec
     #   Path of a json file that will be passed to fauxhai as :path option
     # @option options [Array<String>] :step_into
     #   The list of LWRPs to evaluate
+    # @option options String] :file_cache_path
+    #   File caching path, if absent ChefSpec will use a temporary directory generated on the fly
     #
     # @yield [node] Configuration block for Chef::Node
     #
@@ -71,7 +73,7 @@ module ChefSpec
       Chef::Config[:client_key]      = nil
       Chef::Config[:client_name]     = nil
       Chef::Config[:node_name]       = nil
-      Chef::Config[:file_cache_path] = file_cache_path
+      Chef::Config[:file_cache_path] = @options[:file_cache_path] || file_cache_path
       Chef::Config[:cookbook_path]   = Array(@options[:cookbook_path])
       Chef::Config[:no_lazy_load]    = true
       Chef::Config[:role_path]       = Array(@options[:role_path])
@@ -109,12 +111,6 @@ module ChefSpec
       # Expand the run_list
       expand_run_list!
 
-      # Save the node back to the server for searching purposes
-      unless Chef::Config[:solo]
-        client.register
-        node.save
-      end
-
       # Setup the run_context
       @run_context = client.setup_run_context
 

data/lib/chefspec/version.rb

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

data/spec/unit/deprecations_spec.rb

@@ -15,9 +15,9 @@ describe ChefSpec::Runner do
 
     it 'prints a deprecation' do
       expect(ChefSpec::Runner).to receive(:deprecated)
-        .with("`ChefSpec::Runner.define_runner_method' is deprecated. "\
-          "It is being used in the my_custom_resource resource matcher." \
-          "Please use `ChefSpec.define_matcher' instead.")
+        .with("`ChefSpec::Runner.define_runner_method' is deprecated."\
+          " It is being used in the my_custom_resource resource matcher." \
+          " Please use `ChefSpec.define_matcher' instead.")
       ChefSpec::Runner.define_runner_method(:my_custom_resource)
     end
 

data/spec/unit/solo_runner_spec.rb

@@ -60,6 +60,11 @@ describe ChefSpec::SoloRunner do
       expect(Chef::Config.cookbook_path).to eq(['/tmp/bacon'])
     end
 
+    it 'sets the file cache path' do
+      described_class.new( file_cache_path: '/tmp/pantoa')
+      expect(Chef::Config.file_cache_path).to eq('/tmp/pantoa')
+    end
+
     it 'sets the Chef::Config' do
       expect(Chef::Config.cache_type).to eq('Memory')
       expect(Chef::Config.force_logger).to be_truthy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -285,8 +285,6 @@ files:
 - examples/include_recipe/recipes/not.rb
 - examples/include_recipe/recipes/other.rb
 - examples/include_recipe/spec/default_spec.rb
-- examples/inherits/recipes/default.rb
-- examples/inherits/spec/default_spec.rb
 - examples/ips_package/recipes/install.rb
 - examples/ips_package/recipes/remove.rb
 - examples/ips_package/recipes/upgrade.rb
@@ -560,7 +558,6 @@ files:
 - features/http_request.feature
 - features/ifconfig.feature
 - features/include_recipe.feature
-- features/inherits.feature
 - features/ips_package.feature
 - features/link.feature
 - features/log.feature
@@ -606,7 +603,7 @@ files:
 - features/yum_package.feature
 - gemfiles/chef-11.14.0.gemfile
 - gemfiles/chef-11.16.0.gemfile
-- gemfiles/chef-12.0.0.rc.gemfile
+- gemfiles/chef-12.0.0.gemfile
 - gemfiles/chef-master.gemfile
 - lib/chefspec.rb
 - lib/chefspec/api.rb
@@ -756,9 +753,9 @@ 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.2.2
@@ -794,7 +791,6 @@ test_files:
 - features/http_request.feature
 - features/ifconfig.feature
 - features/include_recipe.feature
-- features/inherits.feature
 - features/ips_package.feature
 - features/link.feature
 - features/log.feature

data/examples/inherits/recipes/default.rb

@@ -1,5 +0,0 @@
-directory '/tmp/inherit'
-
-directory '/tmp/no_inherit' do
-  inherits false
-end

data/examples/inherits/spec/default_spec.rb

@@ -1,21 +0,0 @@
-require 'chefspec'
-
-describe 'inherits::default' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
-
-  it 'allows use of the `inherits` attribute even on non-Windows' do
-    expect {
-      chef_run
-    }.to_not raise_error
-  end
-
-  it 'matches on the default inherits attribute' do
-    expect(chef_run).to create_directory('/tmp/inherit')
-    expect(chef_run).to_not create_directory('/tmp/not_inherit')
-  end
-
-  it 'matches on the inherits attribute' do
-    expect(chef_run).to create_directory('/tmp/no_inherit').with(inherits: false)
-    expect(chef_run).to_not create_directory('/tmp/no_inherit').with(inherits: true)
-  end
-end

data/features/inherits.feature

@@ -1,8 +0,0 @@
-@not_chef_12_0_0_rc_0
-Feature: The inherits matcher
-  Background:
-    * I am using the "inherits" cookbook
-
-  Scenario: Running specs
-    * I successfully run `rspec spec/default_spec.rb`
-    * the output should contain "0 failures"

data/gemfiles/chef-12.0.0.rc.gemfile

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