minitest-chef-handler 0.4.0 → 0.5.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.5.0 / 05-02-2012
+
+* 1 new feature:
+
+  * Load tests and specs automatically according to the seen recipes.
+
 === 0.4.0 / 04-20-2012
 
 * 2 new features:

data/lib/minitest-chef-handler.rb

@@ -11,9 +11,6 @@ module MiniTest
   module Chef
     class Handler < ::Chef::Handler
       def initialize(options = {})
-        path = options.delete(:path) || './test/test_*.rb'
-        Dir.glob(path).each {|test_suite| require test_suite}
-
         @options = options
       end
 
@@ -21,6 +18,7 @@ module MiniTest
         # do not run tests if chef failed
         return if failed?
 
+        require_test_suites
         runner = Runner.new(run_status)
 
         if custom_runner?
@@ -32,6 +30,56 @@ module MiniTest
 
       private
 
+      #
+      # Load the test suites.
+      # If the option "path" is specified we use it to load the tests from it.
+      # The option can be a string or an array of paths.
+      # Otherwise we load the tests according to the recipes seen.
+      #
+      def require_test_suites
+        paths = @options.delete(:path) || seen_recipes_paths
+        Array(paths).each do |path|
+          Dir.glob(path).each {|test_suite| require test_suite}
+        end
+      end
+
+      #
+      # Collect test paths based in the recipes ran.
+      # It loads the tests based in the name of the cookbook and the name of the recipe.
+      # The tests must be under the cookbooks directory.
+      #
+      # Examples:
+      #
+      # If the seen recipes includes the recipe "foo" we try to load tests from:
+      #
+      #   cookbooks/foo/tests/default_test.rb
+      #   cookbooks/foo/tests/default/*_test.rb
+      #
+      #   cookbooks/foo/specs/default_spec.rb
+      #   cookbooks/foo/specs/default/*_spec.rb
+      #
+      # If the seen recipes includes the recipe "foo::install" we try to load tests from:
+      #
+      #   cookbooks/foo/tests/install_test.rb
+      #   cookbooks/foo/tests/install/*_test.rb
+      #
+      #   cookbooks/foo/specs/install_spec.rb
+      #   cookbooks/foo/specs/install/*_spec.rb
+      #
+      def seen_recipes_paths
+        run_status.node.run_state[:seen_recipes].keys.map do |recipe_name|
+          cookbook_name, recipe_short_name = ::Chef::Recipe.parse_recipe_name(recipe_name)
+          base_path = ::Chef::Config[:cookbook_path]
+
+          file_test_pattern = "%s/%s/tests/%s_test.rb" % [base_path, cookbook_name, recipe_short_name]
+          dir_test_pattern  = "%s/%s/tests/%s/*_test.rb" % [base_path, cookbook_name, recipe_short_name]
+          file_spec_pattern = "%s/%s/specs/%s_spec.rb" % [base_path, cookbook_name, recipe_short_name]
+          dir_spec_pattern  = "%s/%s/specs/%s/*_spec.rb" % [base_path, cookbook_name, recipe_short_name]
+
+          [file_test_pattern, dir_test_pattern, file_spec_pattern, dir_spec_pattern]
+        end.flatten
+      end
+
       def miniunit_options
         options = []
         options << ['-n', @options[:filter]] if @options[:filter]

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.4.0'
+  gem.version       = '0.5.0'
 
   gem.add_dependency('chef')
   gem.add_development_dependency('rake')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-chef-handler
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &2164305860 !ruby/object:Gem::Requirement
+  requirement: &70284019403120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164305860
+  version_requirements: *70284019403120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164304620 !ruby/object:Gem::Requirement
+  requirement: &70284019401500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164304620
+  version_requirements: *70284019401500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164303800 !ruby/object:Gem::Requirement
+  requirement: &70284019400800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164303800
+  version_requirements: *70284019400800
 description: Run Minitest suites as Chef report handlers
 email:
 - david.calavera@gmail.com
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4192483900398886253
+      hash: -3992918998714058940
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,10 +115,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4192483900398886253
+      hash: -3992918998714058940
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Run Minitest suites as Chef report handlers