minitest-chef-handler 0.6.7 → 0.6.8

data/.gitignore

@@ -17,3 +17,6 @@ test/version_tmp
 tmp
 .vagrant
 examples/simple-solo/chef.log
+gemfile_chef_10.lock
+gemfile_chef_11.lock
+examples/simple-solo/cache

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.6.8 / 03-03-2013
+
+* 1 bug fix:
+
+  * Really really support auto-discovery of test paths under chef version 11.
+
 === 0.6.7 / 02-07-2013
 
 * 1 bug fix:

data/README.md

@@ -154,6 +154,24 @@ and be treated like any other error in the Chef execution.
 
 The instructions above have described how to use it in a Chef solo installation. If you want to distribute the handler to your Chef server check either the chef_handler cookbooks in the examples or [minitest-handler-cookbook](https://github.com/btm/minitest-handler-cookbook).
 
+## Development
+
+Minitest-chef-handler should work with versions 10.x and versions 11.x of Chef.
+
+There are just two commands that you need to know to hack on this library.
+
+1. Load both versions of Chef dependencies:
+
+```
+$ script/bootstrap
+```
+
+2. Run unit and integration tests agains both versions of Chef:
+
+```
+$ script/test
+```
+
 ## Copyright
 
 Copyright (c) 2012 David Calavera. See LICENSE for details.

data/Rakefile

@@ -2,16 +2,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-desc 'Verify that nothing is broken against the simple solo example'
-task :test do
-  Dir.chdir('./examples/simple-solo') do
-    sh 'ruby -I../../lib -S chef-solo -c solo.rb -j dna.json'
-  end
-end
-
 Rake::TestTask.new do |t|
   t.name = 'spec'
   t.pattern = 'spec/**/*_spec.rb'
 end
-
-task :default => [:spec, :test]

data/examples/simple-solo/solo.rb

@@ -1,7 +1,10 @@
 require 'minitest-chef-handler'
 
 path = File.expand_path('{test/test_*,spec/*_spec}.rb', File.dirname(__FILE__))
+cache = File.expand_path('cache', File.dirname(__FILE__))
 
 report_handlers << MiniTest::Chef::Handler.new(:path => path)
 cookbook_path File.expand_path('cookbooks', File.dirname(__FILE__))
 log_location 'chef.log'
+cache_options({ :path => cache, :skip_expires => true })
+file_cache_path cache

data/gemfile_chef_10

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+gemspec
+gem 'chef', '~> 10.8'

data/gemfile_chef_11

@@ -0,0 +1,4 @@
+source 'http://rubygems.org'
+gemspec
+gem 'chef', '~> 11'
+

data/lib/minitest-chef-handler.rb

@@ -28,20 +28,20 @@ module MiniTest
 
         MiniTest::Unit.output = ::Chef::Log
 
-        if @options[:ci_reports]
+        runner = if @options[:ci_reports]
           ENV['CI_REPORTS'] = @options[:ci_reports]
-          runner = CIRunner.new(run_status)
+          CIRunner.new(run_status)
         else
-          runner = Runner.new(run_status)
+          Runner.new(run_status)
         end
 
-        if custom_runner?
+        result = if custom_runner?
           runner._run(miniunit_options)
         else
           runner.run(miniunit_options)
         end
 
-        if runner.failures.nonzero? || runner.errors.nonzero?
+        if result.nonzero?
           ::Chef::Client.when_run_completes_successfully do |run_status|
             error_msg = "MiniTest failed with #{runner.failures} failure(s) and #{runner.errors} error(s).\n"
             error_msg << runner.report.sort.join("\n")

data/lib/minitest-chef-handler/lookup.rb

@@ -60,7 +60,8 @@ module MiniTest
         if recipes = run_status.node.run_state[:seen_recipes]
           recipes.keys
         else
-          run_status.node.run_list.select(&:recipe?).map(&:name)
+          # chef 11 - see http://docs.opscode.com/breaking_changes_chef_11.html#node-run-state-replaced
+          run_status.run_context.loaded_recipes
         end
       end
 

data/minitest-chef-handler.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "minitest-chef-handler"
   gem.require_paths = ["lib"]
-  gem.version       = '0.6.7'
+  gem.version       = '0.6.8'
 
   gem.add_dependency('minitest')
   gem.add_dependency('chef')

data/script/bootstrap

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+puts "-> Configuring Bundler with Chef 10 dependency."
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../../gemfile_chef_10', __FILE__)
+
+system "bundle", "install"
+
+puts "-> Configuring Bundler with Chef 11 dependency."
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../../gemfile_chef_11', __FILE__)
+
+system "bundle", "install"

data/script/test

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+ROOT = File.expand_path('../..', __FILE__)
+
+def test_all
+  Bundler.setup(:default)
+
+  system "bundle exec rake spec"
+
+  Dir.chdir('examples/simple-solo') do
+    system "bundle exec ruby -I#{File.expand_path('lib', ROOT)} -S chef-solo -c solo.rb -j dna.json"
+  end
+end
+
+puts '-> Testing with Chef 10'
+
+ENV['BUNDLE_GEMFILE'] = File.expand_path('gemfile_chef_10', ROOT)
+
+require "rubygems"
+require "bundler/setup"
+
+test_all
+
+puts '-> Testing with Chef 11'
+
+ENV['BUNDLE_GEMFILE'] = File.expand_path('gemfile_chef_11', ROOT)
+
+test_all

data/spec/minitest-chef-handler/lookup_spec.rb

@@ -22,7 +22,8 @@ describe MiniTest::Chef::Lookup do
 
   describe "#used_recipe_names" do
     before do
-      stubs(:run_status => stub(:node => stub(:run_state => {})))
+      stubs(:run_status => stub(:node => stub(:run_state => {}),
+              :run_context => {}))
     end
 
     it "uses seen_recipes if run_state is not empty" do
@@ -31,8 +32,9 @@ describe MiniTest::Chef::Lookup do
     end
 
     it "uses run_list if run_state is empty" do
-      run_status.node.stubs(:run_list => %w(recipe[foo] recipe[bar] role[someone]).map { |i| Chef::RunList::RunListItem.new(i) })
-      used_recipe_names.must_equal ["foo", "bar"]
+      expected = %w(recipe[foo] recipe[bar] role[someone]).map { |i| Chef::RunList::RunListItem.new(i) }
+      run_status.run_context.stubs(:loaded_recipes => expected)
+      used_recipe_names.must_equal expected
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-chef-handler
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -100,7 +100,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- Gemfile
 - History.txt
 - LICENSE
 - README.md
@@ -127,6 +126,8 @@ files:
 - examples/spec_examples/metadata.rb
 - examples/spec_examples/recipes/default.rb
 - examples/spec_examples/templates/default/foo.erb
+- gemfile_chef_10
+- gemfile_chef_11
 - lib/minitest-chef-handler.rb
 - lib/minitest-chef-handler/assertions.rb
 - lib/minitest-chef-handler/ci_runner.rb
@@ -139,6 +140,8 @@ files:
 - lib/minitest-chef-handler/spec.rb
 - lib/minitest-chef-handler/unit.rb
 - minitest-chef-handler.gemspec
+- script/bootstrap
+- script/test
 - spec/minitest-chef-handler/assertions_spec.rb
 - spec/minitest-chef-handler/infections_spec.rb
 - spec/minitest-chef-handler/lookup_spec.rb
@@ -157,18 +160,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -558242354881873270
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -558242354881873270
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/Gemfile

@@ -1,4 +0,0 @@
-source 'http://rubygems.org'
-
-# Specify your gem's dependencies in minitest-chef-handler.gemspec
-gemspec