chefspec 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea0e7c6ed02f2b96fb4c08e4dd4e06af0c78ddc8
-  data.tar.gz: 153afc4930a9ce02084b4196caf01f73d8072a93
+  metadata.gz: 11a70e63e41d70878f57327c5ed4008b49901a78
+  data.tar.gz: 7cfbd1b0ed9431a5c0ecba7d2445679863d61afd
 SHA512:
-  metadata.gz: 0b672dcfb994f0e56022f024dac08344574ac51bb4b454ec34b373c95dd4e30248970bb8fc709e74c5a48534708303aebfc667f890dd7e1fd8d25ab328346959
-  data.tar.gz: '09db04b5da70480e38fc39886bc53782cca60a2fa24c604265e8d1dccb36b41a8eb4ac5271f0663502e3eb07810cc4fee1995e084edf9bf19f10a1a36328f4e7'
+  metadata.gz: 28874630542168cc116ab2a951a0254dc3eb7c23406c7dcffaf920a903948c09a32604d7c695254ee0065fc2ce3c345802cab5e78bb508206098069c490ab39d
+  data.tar.gz: 82d8a732f2d4a24b2c6350a0455a8d2bff1205d27f86ad65fed549f861460bf679152b650f6b50d5078eea42c3e40dc7b1d249193e9d6a9734d92f87cbbecc30

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG for ChefSpec
 
+## 6.2.0 (March 27, 2017)
+
+- Correctly handle the block form of search() when using stubs
+- Add support for alternative reporting output from Coverage.report!
+
 ## 6.1.0 (March 9, 2017)
 
 - Loosen the Fauxhai dependency to allow Fauxhai 4.0 This deprecates a large number of Ohai mocks for end of life platforms. See <https://github.com/customink/fauxhai/blob/master/PLATFORMS.md> for the current list of platforms supported by Fauxhai

data/README.md

@@ -815,6 +815,24 @@ ChefSpec::Coverage.start! do
 end
 ```
 
+If you would like to add alternative reporting for the Coverage.report! ouput, you can supply your own by calling add_output in the `ChefSepc::Coverage` block:
+Note the reportOutput has the following items in it: total, touched, coverage and collections of untouched_resources and all_resources
+
+```ruby
+ChefSpec::Coverage.start! do
+  add_output do |reportOutput|
+    File.open( "coverage.json","w" ) do |f|
+      f.puts(reportOutput[:total])
+      f.puts(reportOutput[:touched])
+      f.puts(reportOutput[:coverage])
+      f.puts(reportOutput[:untouched_resources])
+      f.puts(reportOutput[:all_resources])
+    end
+  end
+end
+```
+Note the above example outputs the raw data without applying formatting.
+
 ## Mocking Out Environments
 
 ### ServerRunner

data/examples/stub_search/recipes/block.rb

@@ -0,0 +1,3 @@
+hosts = []
+search(:node, 'roles:web') {|n| hosts << n['name'] }
+raise 'test failure' unless hosts.length == 1 && hosts[0] == 'example.com'

data/examples/stub_search/recipes/default.rb

@@ -1,5 +1,2 @@
-template '/tmp/specific_stub' do
-  variables(
-    nodes: search(:node, 'name:example.com')
-  )
-end
+hosts = search(:node, 'name:example.com')
+raise 'test failure' unless hosts.length == 1 && hosts[0]['name'] == 'example.com'

data/examples/stub_search/spec/block_spec.rb

@@ -0,0 +1,27 @@
+require 'chefspec'
+
+describe 'stub_search::block' do
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+
+  context 'when the search is not stubbed' do
+    it 'raises an exception' do
+      expect do
+        chef_run
+      end.to raise_error(ChefSpec::Error::SearchNotStubbed)
+    end
+  end
+
+  context 'as a String' do
+    it 'does not raise an exception' do
+      stub_search(:node, 'roles:web').and_return([{ name: 'example.com' }])
+      expect { chef_run }.to_not raise_error
+    end
+  end
+
+  context 'as a Regexp' do
+    it 'does not raise an exception' do
+      stub_search(:node, /roles:(.+)/).and_return([{ name: 'example.com' }])
+      expect { chef_run }.to_not raise_error
+    end
+  end
+end

data/features/stub_search.feature

@@ -3,5 +3,5 @@ Feature: The stub_search matcher
     * I am using the "stub_search" cookbook
 
   Scenario: Running specs
-    * I successfully run `rspec spec/default_spec.rb`
+    * I successfully run `rspec spec/default_spec.rb spec/block_spec.rb`
     * the output should contain "0 failures"

data/lib/chefspec/coverage.rb

@@ -28,6 +28,15 @@ module ChefSpec
     def initialize
       @collection = {}
       @filters    = {}
+      @outputs    = []
+      add_output do |report|
+        begin
+          erb = Erubis::Eruby.new(File.read(@template))
+          puts erb.evaluate(report)
+        rescue NameError => e
+          raise Error::ErbTemplateParseError.new(original_error: e.message)
+        end
+      end
       @template = ChefSpec.root.join('templates', 'coverage', 'human.erb')
     end
 
@@ -41,7 +50,7 @@ module ChefSpec
     end
 
     #
-    # Add a filter to the converage analysis.
+    # Add a filter to the coverage analysis.
     #
     # @param [Filter, String, Regexp] filter
     #   the filter to add
@@ -68,6 +77,18 @@ module ChefSpec
 
       true
     end
+
+    #
+    # Add an output to send the coverage results to.
+    # @param [Proc] block
+    #   the block to use as the output
+    #
+    # @return [true]
+    #
+    def add_output(&block)
+      @outputs << block
+    end
+
     #
     # Change the template for reporting of converage analysis.
     #
@@ -151,12 +172,9 @@ module ChefSpec
         resource unless resource.touched?
       end.compact
       report[:all_resources] = @collection.values
-      
-      begin
-        erb = Erubis::Eruby.new(File.read(@template))
-        puts erb.evaluate(report)
-      rescue NameError => e
-        raise Error::ErbTemplateParseError.new(original_error: e.message)
+
+      @outputs.each do |block|
+        self.instance_exec(report, &block)
       end
 
       # Ensure we exit correctly (#351)

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

@@ -14,7 +14,12 @@ module Chef::DSL::DataQuery
       raise ChefSpec::Error::SearchNotStubbed.new(args: [type, query])
     end
 
-    stub.result
+    if block
+      Array(stub.result).each {|r| block.call(r) }
+      true
+    else
+      stub.result
+    end
   end
 
   # @see Chef::DSL::DataQuery#data_bag

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '6.1.0'
+  VERSION = '6.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -582,7 +582,9 @@ files:
 - examples/stub_data_bag_item/spec/default_spec.rb
 - examples/stub_node/recipes/default.rb
 - examples/stub_node/spec/default_spec.rb
+- examples/stub_search/recipes/block.rb
 - examples/stub_search/recipes/default.rb
+- examples/stub_search/spec/block_spec.rb
 - examples/stub_search/spec/default_spec.rb
 - examples/subscribes/recipes/before.rb
 - examples/subscribes/recipes/chained.rb
@@ -973,7 +975,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Write RSpec examples and generate coverage reports for Chef recipes!