chefspec 4.2.0 → 4.3.0

data/lib/chefspec/coverage.rb

@@ -136,7 +136,7 @@ module ChefSpec
       puts erb.evaluate(report)
 
       # Ensure we exit correctly (#351)
-      exit(exit_status)
+      Kernel.exit(exit_status) if exit_status && exit_status > 0
     end
 
     private

data/lib/chefspec/coverage/filters.rb

@@ -71,7 +71,8 @@ module ChefSpec
 
       def matches?(resource)
         return true if resource.source_line.nil?
-        resource.source_line =~ /cookbooks\/(?!#{@metadatas.join('|')})/
+        normalized_source_line = resource.source_line.gsub("\\", "/")
+        normalized_source_line=~ /cookbooks\/(?!#{@metadatas.join('|')})/
       end
     end
   end

data/lib/chefspec/matchers/render_file_matcher.rb

@@ -15,8 +15,17 @@ module ChefSpec::Matchers
       end
     end
 
-    def with_content(expected_content)
-      @expected_content = expected_content
+    def with_content(expected_content = nil, &block)
+      if expected_content && block
+        raise ArgumentError, "Cannot specify expected content and a block!"
+      elsif expected_content
+        @expected_content = expected_content
+      elsif block
+        @expected_content = block
+      else
+        raise ArgumentError, "Must specify expected content or a block!"
+      end
+
       self
     end
 
@@ -64,6 +73,8 @@ module ChefSpec::Matchers
     def expected_content_message
       if RSpec::Matchers.is_a_matcher?(@expected_content) && @expected_content.respond_to?(:description)
         @expected_content.description
+      elsif @expected_content.is_a?(Proc)
+        "(the result of a proc)"
       else
         @expected_content.to_s
       end
@@ -104,6 +115,12 @@ module ChefSpec::Matchers
         @actual_content =~ @expected_content
       elsif RSpec::Matchers.is_a_matcher?(@expected_content)
         @expected_content.matches?(@actual_content)
+      elsif @expected_content.is_a?(Proc)
+        @expected_content.call(@actual_content)
+        # Weird RSpecish, but that block will return false for a negated check,
+        # so we always return true. The block will raise an exception if the
+        # assertion fails.
+        true
       else
         @actual_content.include?(@expected_content)
       end

data/lib/chefspec/mixins/normalize.rb

@@ -9,7 +9,13 @@ module ChefSpec
     # @return [Symbol]
     #
     def resource_name(thing)
-      name = thing.respond_to?(:resource_name) ? thing.resource_name : thing
+      if thing.respond_to?(:declared_type)
+        name = thing.declared_type
+      elsif thing.respond_to?(:resource_name)
+        name = thing.resource_name
+      else
+        name = thing
+      end
       name.to_s.gsub('-', '_').to_sym
     end
   end

data/lib/chefspec/renderer.rb

@@ -68,12 +68,10 @@ module ChefSpec
         template_context = Chef::Mixin::Template::TemplateContext.new([])
         template_context.update({
           :node => chef_run.node,
-          :template_finder => template_finder(chef_run, template.cookbook_name),
+          :template_finder => template_finder(chef_run, cookbook_name),
         }.merge(template.variables))
         if template.respond_to?(:helper_modules) # Chef 11.4+
-          template.helper_modules.each do |helper_module|
-            template_context.extend(helper_module)
-          end
+          template_context._extend_modules(template.helper_modules)
         end
         template_context.render_template(template_location)
       else

data/lib/chefspec/rspec.rb

@@ -12,6 +12,7 @@ RSpec.configure do |config|
   config.add_setting :cookbook_path
   config.add_setting :role_path
   config.add_setting :environment_path
+  config.add_setting :file_cache_path
   config.add_setting :log_level, default: :warn
   config.add_setting :path
   config.add_setting :platform

data/lib/chefspec/server_methods.rb

@@ -143,6 +143,7 @@ module ChefSpec
 
       load_data(name, 'nodes', data)
     end
+    alias_method :update_node, :create_node
 
     #
     # Shortcut method for loading data into Chef Zero.

data/lib/chefspec/solo_runner.rb

@@ -118,7 +118,10 @@ module ChefSpec
       yield if block_given?
 
       @converging = true
-      @client.converge(@run_context)
+      converge_val = @client.converge(@run_context)
+      if converge_val.is_a?(Exception)
+        raise converge_val
+      end
       self
     end
 
@@ -299,6 +302,7 @@ module ChefSpec
         cookbook_path: config.cookbook_path || calling_cookbook_path(caller),
         role_path:     config.role_path || default_role_path,
         environment_path: config.environment_path || default_environment_path,
+        file_cache_path: config.file_cache_path,
         log_level:     config.log_level,
         path:          config.path,
         platform:      config.platform,

data/lib/chefspec/version.rb

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

data/spec/unit/coverage/filters_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+# Note: These specs don't use Berkshelf code directly as this project doesn't
+# have a direct dependency on Berkshelf and loading it would impact the
+# perfance of these specs. While not ideal, the test doubles provide enough of
+# a standin for Berkshelf to exercise the `#matches?` behavior.
+describe ChefSpec::Coverage::BerkshelfFilter do
+  let(:dependencies) do
+    [double('Berkshelf::Dependency', metadata?: true, name: "cookbookery")]
+  end
+  let(:berksfile) { double('Berkshelf::Berksfile', dependencies: dependencies) }
+  let(:resource) { Chef::Resource.new('theone') }
+  subject { described_class.new(berksfile) }
+
+  describe '#matches?' do
+    it 'returns truthy if resource source_line is nil' do
+      expect(subject.matches?(resource)).to be_truthy
+    end
+
+    context 'when resource#source_line is under target cookbook' do
+      it 'normal unix path returns truthy' do
+        resource.source_line =
+          '/path/to/cookbooks/nope/recipes/default.rb:22'
+        expect(subject.matches?(resource)).to be_truthy
+      end
+
+      it 'normal windows path returns truthy' do
+        resource.source_line =
+          'C:\\path\\to\\cookbooks\\nope\\recipes\\default.rb:22'
+        expect(subject.matches?(resource)).to be_truthy
+      end
+
+      it 'mixed windows path returns truthy' do
+        resource.source_line =
+          'C:\\path\\to\\cookbooks/nope/recipes/default.rb:22'
+        expect(subject.matches?(resource)).to be_truthy
+      end
+    end
+
+    context 'when resource#source_line is not under target cookbook' do
+      it 'normal unix path returns falsey' do
+        resource.source_line =
+          '/path/to/cookbooks/cookbookery/recipes/default.rb:22'
+        expect(subject.matches?(resource)).to be_falsey
+      end
+
+      it 'normal windows path returns falsey' do
+        resource.source_line =
+          'C:\\path\\to\\cookbooks\\cookbookery\\recipes\\default.rb:22'
+        expect(subject.matches?(resource)).to be_falsey
+      end
+
+      it 'mixed windows path returns falsey' do
+        resource.source_line =
+          'C:\\path\\to\\cookbooks/cookbookery/recipes/default.rb:22'
+        expect(subject.matches?(resource)).to be_falsey
+      end
+    end
+  end
+end

data/spec/unit/renderer_spec.rb

@@ -9,8 +9,8 @@ describe ChefSpec::Renderer do
     end
   end
 
-  let(:chef_run) { double('chef_run') }
-  let(:resource) { double('resource') }
+  let(:chef_run) { double('chef_run', {node: 'node'}) }
+  let(:resource) { double('resource', {cookbook: 'cookbook', source: 'source', variables: {}}) }
   subject { described_class.new(chef_run, resource) }
 
   describe '#content' do
@@ -48,4 +48,22 @@ describe ChefSpec::Renderer do
       end
     end
   end
+
+  describe 'content_from_template' do
+    it 'renders the template by extending modules for rendering paritals within the template' do
+      cookbook_collection = {}
+      cookbook_collection['cookbook'] = double('', {preferred_filename_on_disk_location: "/template/location"} )
+      allow(subject).to receive(:cookbook_collection).with('node').and_return(cookbook_collection)
+      allow(subject).to receive(:template_finder)
+      
+      allow(resource).to receive(:helper_modules).and_return([Module.new])
+      allow(resource).to receive(:resource_name).and_return('template')
+
+      chef_template_context = double('context', {render_template: 'rendered template content',update: nil})
+      allow(Chef::Mixin::Template::TemplateContext).to receive(:new).and_return(chef_template_context)
+      
+      expect(chef_template_context).to receive(:_extend_modules).with(resource.helper_modules)
+      expect(subject.content).to eq('rendered template content')
+    end
+  end
 end

data/spec/unit/solo_runner_spec.rb

@@ -110,6 +110,7 @@ describe ChefSpec::SoloRunner do
       before do
         allow(RSpec.configuration).to receive(:cookbook_path).and_return('./path')
         allow(RSpec.configuration).to receive(:environment_path).and_return('./env-path')
+        allow(RSpec.configuration).to receive(:file_cache_path).and_return('./file-cache-path')
         allow(RSpec.configuration).to receive(:log_level).and_return(:fatal)
         allow(RSpec.configuration).to receive(:path).and_return('ohai.json')
         allow(RSpec.configuration).to receive(:platform).and_return('ubuntu')
@@ -120,6 +121,7 @@ describe ChefSpec::SoloRunner do
         options = described_class.new.options
         expect(options[:cookbook_path]).to eq('./path')
         expect(options[:environment_path]).to eq('./env-path')
+        expect(options[:file_cache_path]).to eq('./file-cache-path')
         expect(options[:log_level]).to eq(:fatal)
         expect(options[:path]).to eq('ohai.json')
         expect(options[:platform]).to eq('ubuntu')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-26 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -367,6 +367,12 @@ files:
 - examples/portage_package/spec/upgrade_spec.rb
 - examples/powershell_script/recipes/run.rb
 - examples/powershell_script/spec/run_spec.rb
+- examples/reboot/recipes/cancel.rb
+- examples/reboot/recipes/now.rb
+- examples/reboot/recipes/request.rb
+- examples/reboot/spec/cancel_spec.rb
+- examples/reboot/spec/now_spec.rb
+- examples/reboot/spec/request_spec.rb
 - examples/registry_key/recipes/create.rb
 - examples/registry_key/recipes/create_if_missing.rb
 - examples/registry_key/recipes/delete.rb
@@ -522,6 +528,20 @@ files:
 - examples/user/spec/modify_spec.rb
 - examples/user/spec/remove_spec.rb
 - examples/user/spec/unlock_spec.rb
+- examples/windows_service/recipes/configure_startup.rb
+- examples/windows_service/recipes/disable.rb
+- examples/windows_service/recipes/enable.rb
+- examples/windows_service/recipes/reload.rb
+- examples/windows_service/recipes/restart.rb
+- examples/windows_service/recipes/start.rb
+- examples/windows_service/recipes/stop.rb
+- examples/windows_service/spec/configure_startup_spec.rb
+- examples/windows_service/spec/disable_spec.rb
+- examples/windows_service/spec/enable_spec.rb
+- examples/windows_service/spec/reload_spec.rb
+- examples/windows_service/spec/restart_spec.rb
+- examples/windows_service/spec/start_spec.rb
+- examples/windows_service/spec/stop_spec.rb
 - examples/yum_package/recipes/install.rb
 - examples/yum_package/recipes/purge.rb
 - examples/yum_package/recipes/remove.rb
@@ -572,6 +592,7 @@ files:
 - features/pacman_package.feature
 - features/portage_package.feature
 - features/powershell_script.feature
+- features/reboot.feature
 - features/registry_key.feature
 - features/remote_directory.feature
 - features/remote_file.feature
@@ -600,11 +621,9 @@ files:
 - features/template.feature
 - features/use_inline_resources.feature
 - features/user.feature
+- features/windows_service.feature
 - features/yum_package.feature
-- gemfiles/chef-11.14.0.gemfile
-- gemfiles/chef-11.16.0.gemfile
-- gemfiles/chef-12.0.0.gemfile
-- gemfiles/chef-master.gemfile
+- gemfiles/chefspec.gemfile
 - lib/chefspec.rb
 - lib/chefspec/api.rb
 - lib/chefspec/api/apt_package.rb
@@ -640,6 +659,7 @@ files:
 - lib/chefspec/api/pacman_package.rb
 - lib/chefspec/api/portage_package.rb
 - lib/chefspec/api/powershell_script.rb
+- lib/chefspec/api/reboot.rb
 - lib/chefspec/api/registry_key.rb
 - lib/chefspec/api/remote_directory.rb
 - lib/chefspec/api/remote_file.rb
@@ -656,6 +676,7 @@ files:
 - lib/chefspec/api/subversion.rb
 - lib/chefspec/api/template.rb
 - lib/chefspec/api/user.rb
+- lib/chefspec/api/windows_service.rb
 - lib/chefspec/api/yum_package.rb
 - lib/chefspec/berkshelf.rb
 - lib/chefspec/cacher.rb
@@ -708,6 +729,7 @@ files:
 - spec/support/hash.rb
 - spec/unit/api_spec.rb
 - spec/unit/cacher_spec.rb
+- spec/unit/coverage/filters_spec.rb
 - spec/unit/deprecations_spec.rb
 - spec/unit/errors_spec.rb
 - spec/unit/expect_exception_spec.rb
@@ -738,7 +760,7 @@ files:
 - templates/errors/gem_load_error.erb
 - templates/errors/no_conversion_error.erb
 - templates/errors/not_stubbed.erb
-homepage: http://code.sethvargo.com/chefspec
+homepage: https://sethvargo.github.io/chefspec/
 licenses:
 - MIT
 metadata: {}
@@ -758,7 +780,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Write RSpec examples and generate coverage reports for Chef recipes!
@@ -805,6 +827,7 @@ test_files:
 - features/pacman_package.feature
 - features/portage_package.feature
 - features/powershell_script.feature
+- features/reboot.feature
 - features/registry_key.feature
 - features/remote_directory.feature
 - features/remote_file.feature
@@ -833,11 +856,13 @@ test_files:
 - features/template.feature
 - features/use_inline_resources.feature
 - features/user.feature
+- features/windows_service.feature
 - features/yum_package.feature
 - spec/spec_helper.rb
 - spec/support/hash.rb
 - spec/unit/api_spec.rb
 - spec/unit/cacher_spec.rb
+- spec/unit/coverage/filters_spec.rb
 - spec/unit/deprecations_spec.rb
 - spec/unit/errors_spec.rb
 - spec/unit/expect_exception_spec.rb

data/gemfiles/chef-11.14.0.gemfile

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

data/gemfiles/chef-11.16.0.gemfile

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

data/gemfiles/chef-12.0.0.gemfile

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

data/gemfiles/chef-master.gemfile

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