chefspec 3.4.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db7a5ff46f8abc2437123170af409eee038f23bb
-  data.tar.gz: 37af4d6d9df0ec11b63c73c2ee4d5bb7735c0406
+  metadata.gz: fd833d7dcb6a3d973ccd35a43a0f606142244b8f
+  data.tar.gz: c2c2d2832263d9868c542d7cc005b4f626bfe863
 SHA512:
-  metadata.gz: 9e9f02d613fe796154fcec30b55d6f716ccb9851aca20a6dc9c632247280658fa88ad9adc13ce56417be0f7c67dd833fb3292260244b664c0156ce7ab36d7f2a
-  data.tar.gz: 785722986b2db643a6b4023b8c5d77562d1e91ca1d54df5e453f83bcb1dbc93d6776d4d5b7149652cc00fe10ac12ae7b7a4f55498caeb16ab922dc013041a401
+  metadata.gz: 02158758eeff60f14350d2084279b07046c1534e04f20f7392700471b79bd44316ddd57af76a21420e613ca7c115c33870fbcec3de4ea027e20a8575bef1e529
+  data.tar.gz: 62660485d2405c57a6e17a1b566f7a344ef86fad27fba8520a5aea451a304bd5429d5a72aab869c37c4c7cebd869b8e8f16a6311cdce9466826ee7b04ff03691

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
 
 branches:
   only:
@@ -19,27 +19,10 @@ notifications:
 bundler_args: --jobs 7
 
 gemfile:
-  - gemfiles/chef-11.0.0.gemfile
-  - gemfiles/chef-11.2.0.gemfile
-  - gemfiles/chef-11.4.4.gemfile
-  - gemfiles/chef-11.6.0.gemfile
-  - gemfiles/chef-11.8.0.gemfile
+  - gemfiles/chef-11.12.0.gemfile
   - gemfiles/chef-master.gemfile
 
 matrix:
   fast_finish: true
   allow_failures:
     - gemfile: gemfiles/chef-master.gemfile
-  exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/chef-11.0.0.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/chef-11.2.0.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/chef-11.4.4.gemfile
-    - rvm: 2.1.0
-      gemfile: gemfiles/chef-11.0.0.gemfile
-    - rvm: 2.1.0
-      gemfile: gemfiles/chef-11.2.0.gemfile
-    - rvm: 2.1.0
-      gemfile: gemfiles/chef-11.4.4.gemfile

data/CHANGELOG.md

@@ -1,7 +1,38 @@
 CHANGELOG for ChefSpec
 ======================
 
-## 3.3.2 (March 16, 2014)
+## 4.0.0 (June 2, 2014)
+Breaking Changes:
+  - **Upgraded to RSpec 3!** RSpec 3 brings many new API changes and syntaxes
+  - **Bump minimum required Chef version to 11.12!** Without this change, Chef Zero will blow up
+
+Bugfixes:
+  - Gracefully fail if a resource does not report it's source line in the reporter
+  - Pull the correct cookbook folder from the stack on Windows (88bfc6)
+  - Cover resources in render_file matchers for reporting
+  - Cover resources in link_to matchers for reporting
+  - Cover resources in do_nothing matchers for reporting
+  - Fix memory leak in LWRP Resource classes
+  - Restore the original `cookbook_path` when using librarian-chef
+  - Documentation fixes
+  - Disable lazy loading of cached resources
+  - Fix a bug that will happen in later Chef versions because FreeBSD is evil (13ff143)
+  - Do not pass local file paths to `preferred_filename_on_disk_location`
+
+Features:
+  - Add runner methods for all the bash, csh, perl, etc resources
+  - Upgraded fauxhai dependency and specs
+  - Upgrade Chef Zero for multi-org support
+
+Improvements:
+  - Improved documentation around the `define_runner_method` method
+  - Update badges to be all SVG
+  - Test on Ruby 2.1
+  - Use a randomly assigned port for Chef Zero
+  - Remove references to `.stub` from documentation
+
+
+## 3.4.0 (March 16, 2014)
 Bugfixes:
   - Restore Berkshelf 2 support (missing edge case)
   - Add negative failure message for subscribes/notifies matchers

data/CONTRIBUTING.md

@@ -19,7 +19,7 @@ Will Not Merge
 --------------
 This section details, specifically, Pull Requests or features that will _not_ be merged:
 
-1. Matchers for non-Chef core resources. ChefSpec 3.0 introduced a way for cookbook maintainers to [package matchers _with_ their cookbooks](https://github.com/sethvargo/chefspec/tree/unify_matchers#packaging-lwrp-matchers) at distribution time.
+1. Matchers for non-Chef core resources. ChefSpec 3.0 introduced a way for cookbook maintainers to [package matchers _with_ their cookbooks](https://github.com/sethvargo/chefspec#packaging-custom-matchers) at distribution time.
 2. New features without accompanying unit tests, cucumber tests, and documentation.
 
 

data/README.md

@@ -1,9 +1,16 @@
 ChefSpec
 ========
-[![Built on Travis](https://secure.travis-ci.org/sethvargo/chefspec.png?branch=master)](http://travis-ci.org/sethvargo/chefspec)
-[![Gem Version](https://badge.fury.io/rb/chefspec.png)](http://badge.fury.io/rb/chefspec)
-[![Dependency Status](https://gemnasium.com/sethvargo/chefspec.png)](https://gemnasium.com/sethvargo/chefspec)
-[![Code Climate](https://codeclimate.com/github/sethvargo/chefspec.png)](https://codeclimate.com/github/sethvargo/chefspec)
+[![Gem Version](http://img.shields.io/gem/v/chefspec.svg)][gem]
+[![Build Status](http://img.shields.io/travis/sethvargo/chefspec.svg)][travis]
+[![Dependency Status](http://img.shields.io/gemnasium/sethvargo/chefspec.svg)][gemnasium]
+[![Code Climate](http://img.shields.io/codeclimate/github/sethvargo/chefspec.svg)][codeclimate]
+[![Gittip](http://img.shields.io/gittip/sethvargo.svg)][gittip]
+
+[gem]: https://rubygems.org/gems/chefspec
+[travis]: http://travis-ci.org/sethvargo/chefspec
+[gemnasium]: https://gemnasium.com/sethvargo/chefspec
+[codeclimate]: https://codeclimate.com/github/sethvargo/chefspec
+[gittip]: https://www.gittip.com/sethvargo
 
 ChefSpec is a unit testing framework for testing Chef cookbooks. ChefSpec makes it easy to write examples and get fast feedback on cookbook changes without the need for virtual machines or cloud servers.
 
@@ -83,6 +90,9 @@ RSpec.configure do |config|
   # the location of the calling spec file])
   config.cookbook_path = '/var/cookbooks'
 
+  # Set the organization for Chef Zero (default: 'chefspec')
+  config.organization = 'sweetsauce'
+
   # Specify the path for Chef Solo to find roles (default: [ascending search])
   config.role_path = '/var/roles'
 
@@ -520,7 +530,7 @@ If you are using **Encrypted Data Bag Items**, you'll need to dive into the RSpe
 ```ruby
 describe 'example::default' do
   before do
-    Chef::EncryptedDataBagItem.stub(:load).with('users', 'svargo').and_return(...)
+    allow(Chef::EncryptedDataBagItem).to receive(:load).with('users', 'svargo').and_return(...)
   end
 end
 ```
@@ -636,7 +646,7 @@ class CustomFilter < ChefSpec::Coverage::Filter
   end
 end
 
-ChefSpec::Converage.start! do
+ChefSpec::Coverage.start! do
   add_filter CustomFilter.new('foo', :bar)
 end
 ```
@@ -664,10 +674,10 @@ let(:chef_run) do
     env.name 'staging'
 
     # Stub the node to return this environment
-    node.stub(:chef_environment).and_return(env.name)
+    allow(node).to receive(:chef_environment).and_return(env.name)
 
     # Stub any calls to Environment.load to return this environment
-    Chef::Environment.stub(:load).and_return(env)
+    allow(Chef::Environment).to receive(:load).and_return(env)
   end.converge('cookbook::recipe')
 end
 ```
@@ -788,6 +798,24 @@ require_relative 'support/matchers'
 
 Please use this as a _temporary_ solution. Consider sending a Pull Request to the LWRP author(s) packaging the custom resource matchers (see previous section).
 
+ChefSpec also provides a helper method to define a method on the Chef runner for locating a resource in the collection. This is helpful while asserting against custom resource notifications.
+
+```ruby
+# matchers.rb
+ChefSpec::Runner.define_runner_method :my_custom_resource
+```
+
+And then in your spec suite, you can obtain the custom resource for assertions:
+
+```ruby
+let(:chef_run) { ChefSpec::Runner.new('...') }
+
+it 'notifies the thing' do
+  custom = chef_run.my_custom_resource('name')
+  expect(custom).to notify('service[apache2]').to(:restart).immediately
+end
+```
+
 
 Expecting Exceptions
 --------------------
@@ -917,7 +945,7 @@ Next, convert all your `let` blocks to `cached`:
 
 ```ruby
 # before
-let(:chef_run) { ChefSpec::Runer.new }
+let(:chef_run) { ChefSpec::Runner.new }
 
 # after
 cached(:chef_run) { ChefSpec::Runner.new }

data/chefspec.gemspec

@@ -26,12 +26,11 @@ Gem::Specification.new do |s|
   # ChefSpec requires Ruby 1.9+
   s.required_ruby_version = '>= 1.9'
 
-  s.add_dependency 'chef',    '~> 11.0'
+  s.add_dependency 'chef',    '~> 11.12'
   s.add_dependency 'fauxhai', '~> 2.0'
-  s.add_dependency 'rspec',   '~> 2.14'
+  s.add_dependency 'rspec',   '~> 3.0'
 
   # Development Dependencies
-  s.add_development_dependency 'chef-zero', '~> 1.7'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'redcarpet', '~> 3.0'
   s.add_development_dependency 'yard',      '~> 0.8'

data/examples/render_file/spec/default_spec.rb

@@ -30,28 +30,43 @@ describe 'render_file::default' do
   end
 
   context 'cookbook_file' do
-    it 'renders the file' do
-      expect(chef_run).to render_file('/tmp/cookbook_file')
-      expect(chef_run).to_not render_file('/tmp/not_cookbook_file')
+    shared_examples 'renders file' do
+      it 'renders the file' do
+        expect(chef_run).to render_file('/tmp/cookbook_file')
+        expect(chef_run).to_not render_file('/tmp/not_cookbook_file')
+      end
+
+      it 'renders the file with content' do
+        expect(chef_run).to render_file('/tmp/cookbook_file').with_content('This is content!')
+        expect(chef_run).to_not render_file('/tmp/cookbook_file').with_content('This is not content!')
+      end
+
+      it 'renders the file with matching content' do
+        expect(chef_run).to render_file('/tmp/cookbook_file').with_content(/^This(.+)$/)
+        expect(chef_run).to_not render_file('/tmp/cookbook_file').with_content(/^Not(.+)$/)
+      end
+
+      it 'renders the file with content matching arbitrary matcher' do
+        expect(chef_run).to render_file('/tmp/cookbook_file').with_content(
+          start_with('This')
+        )
+        expect(chef_run).to_not render_file('/tmp/cookbook_file').with_content(
+          end_with('not')
+        )
+      end
     end
 
-    it 'renders the file with content' do
-      expect(chef_run).to render_file('/tmp/cookbook_file').with_content('This is content!')
-      expect(chef_run).to_not render_file('/tmp/cookbook_file').with_content('This is not content!')
+    context 'with a pristine filesystem' do
+      it_behaves_like 'renders file'
     end
 
-    it 'renders the file with matching content' do
-      expect(chef_run).to render_file('/tmp/cookbook_file').with_content(/^This(.+)$/)
-      expect(chef_run).to_not render_file('/tmp/cookbook_file').with_content(/^Not(.+)$/)
-    end
+    context 'with a same rendered file on filesystem' do
+      before do
+        allow(File).to receive(:read).and_call_original
+        allow(File).to receive(:read).with('/tmp/cookbook_file', 'rb').and_yield('This is content!')
+      end
 
-    it 'renders the file with content matching arbitrary matcher' do
-      expect(chef_run).to render_file('/tmp/cookbook_file').with_content(
-        start_with('This')
-      )
-      expect(chef_run).to_not render_file('/tmp/cookbook_file').with_content(
-        end_with('not')
-      )
+      it_behaves_like 'renders file'
     end
   end
 

data/examples/server/recipes/render_with_cached.rb

@@ -0,0 +1,3 @@
+file '/tmp/file' do
+  content 'This is content!'
+end

data/examples/server/spec/client_spec.rb

@@ -1,5 +1,5 @@
 require 'chefspec'
-load 'chefspec/server.rb'
+require 'chefspec/server'
 
 describe 'server::client' do
   let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }

data/examples/server/spec/data_bag_spec.rb

@@ -1,5 +1,5 @@
 require 'chefspec'
-load 'chefspec/server.rb'
+require 'chefspec/server'
 
 describe 'server::data_bag' do
   let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }

data/examples/server/spec/environment_spec.rb

@@ -1,5 +1,5 @@
 require 'chefspec'
-load 'chefspec/server.rb'
+require 'chefspec/server'
 
 describe 'server::environment' do
   let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }

data/examples/server/spec/node_spec.rb

@@ -35,6 +35,6 @@ describe 'server::node' do
     expect(ChefSpec::Server).to have_node('chefspec')
 
     node = ChefSpec::Server.node('chefspec')
-    expect(node['breakfast']['bacon']).to be_true
+    expect(node['breakfast']['bacon']).to be_truthy
   end
 end

data/examples/server/spec/render_with_cached_spec.rb

@@ -0,0 +1,16 @@
+require 'chefspec'
+require 'chefspec/cacher'
+require 'chefspec/server'
+
+RSpec.configure do |config|
+  config.extend(ChefSpec::Cacher)
+end
+
+describe 'server::render_with_cached' do
+  cached(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+
+  it 'does not cache file requests' do
+    expect(chef_run).to render_file('/tmp/file')
+    expect(chef_run).to render_file('/tmp/file').with_content('This is content!')
+  end
+end

data/examples/server/spec/role_spec.rb

@@ -1,5 +1,5 @@
 require 'chefspec'
-load 'chefspec/server.rb'
+require 'chefspec/server'
 
 describe 'server::role' do
   let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }

data/features/server.feature

@@ -1,9 +1,6 @@
-# We need to spawn a new process because requiring the server module changes
-# the default behavior of ChefSpec. Additionally, there's a bug in ChefZero
-# that doesn't work with Chef Chef 11.0.0 and 11.2.0.
+# Need to spawn a sub-process; otherwise future tests will fail because the
+# server is running
 @spawn
-@not_chef_11_0_0
-@not_chef_11_2_0
 Feature: The ChefSpec server
   Background:
     * I am using the "server" cookbook
@@ -12,10 +9,11 @@ Feature: The ChefSpec server
     * I successfully run `rspec spec/<Compontent>_spec.rb`
     * the output should contain "0 failures"
   Examples:
-    | Compontent  |
-    | client      |
-    | data_bag    |
-    | environment |
-    | node        |
-    | role        |
-    | search      |
+    | Compontent         |
+    | client             |
+    | data_bag           |
+    | environment        |
+    | node               |
+    | render_with_cached |
+    | role               |
+    | search             |

data/features/support/executor.rb

@@ -13,6 +13,8 @@ module ChefSpec
     def execute!
       exitstatus = RSpec::Core::Runner.run(@argv, @stderr, @stdout)
       @kernel.exit(exitstatus)
+    ensure
+      RSpec.reset
     end
   end
 end

data/gemfiles/{chef-11.0.0.gemfile → chef-11.12.0.gemfile}

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

data/gemfiles/chef-master.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'chef', :github => 'opscode/chef'
+gem 'chef', github: 'opscode/chef'
 
 gemspec :path => '..'

data/lib/chefspec.rb

@@ -6,6 +6,7 @@ require_relative 'chefspec/extensions/chef/data_query'
 require_relative 'chefspec/extensions/chef/lwrp_base'
 require_relative 'chefspec/extensions/chef/resource'
 require_relative 'chefspec/extensions/chef/securable'
+require_relative 'chefspec/extensions/chef/resource/freebsd_package'
 
 require_relative 'chefspec/mixins/normalize'
 

data/lib/chefspec/api/erl_call.rb

@@ -15,19 +15,19 @@ module ChefSpec::API
     # The Examples section demonstrates the different ways to test an
     # +erl_call+ resource with ChefSpec.
     #
-    # @example Assert that an +erl_call+ was runed
+    # @example Assert that an +erl_call+ was run
     #   expect(chef_run).to run_erl_call('net_adm:names()')
     #
-    # @example Assert that an +erl_call+ was runed with predicate matchers
+    # @example Assert that an +erl_call+ was run with predicate matchers
     #   expect(chef_run).to run_erl_call('net_adm:names()').with_node_name('example')
     #
-    # @example Assert that an +erl_call+ was runed with attributes
+    # @example Assert that an +erl_call+ was run with attributes
     #   expect(chef_run).to run_erl_call('net_adm:names()').with(node_name: 'example')
     #
-    # @example Assert that an +erl_call+ was runed using a regex
+    # @example Assert that an +erl_call+ was run using a regex
     #   expect(chef_run).to run_erl_call('net_adm:names()').with(node_name: /[a-z]+/)
     #
-    # @example Assert that an +erl_call+ was _not_ runed
+    # @example Assert that an +erl_call+ was _not_ run
     #   expect(chef_run).to_not run_erl_call('net_adm:names()')
     #
     #

data/lib/chefspec/api/execute.rb

@@ -15,19 +15,19 @@ module ChefSpec::API
     # The Examples section demonstrates the different ways to test an
     # +execute+ resource with ChefSpec.
     #
-    # @example Assert that an +execute+ was runed
+    # @example Assert that an +execute+ was run
     #   expect(chef_run).to run_execute('echo "hello"')
     #
-    # @example Assert that an +execute+ was runed with predicate matchers
+    # @example Assert that an +execute+ was run with predicate matchers
     #   expect(chef_run).to run_execute('echo "hello"').with_user('svargo')
     #
-    # @example Assert that an +execute+ was runed with attributes
+    # @example Assert that an +execute+ was run with attributes
     #   expect(chef_run).to run_execute('echo "hello"').with(user: 'svargo')
     #
-    # @example Assert that an +execute+ was runed using a regex
+    # @example Assert that an +execute+ was run using a regex
     #   expect(chef_run).to run_execute('echo "hello"').with(user: /sva(.+)/)
     #
-    # @example Assert that an +execute+ was _not_ runed
+    # @example Assert that an +execute+ was _not_ run
     #   expect(chef_run).to_not run_execute('echo "hello"')
     #
     #