minitest-chef-handler 0.5.2 → 0.5.3

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.5.3 / 07-10-2012
+
+* 1 bub fix:
+
+  * Fix cookbook's path lookup when Chef's cookbook_path is an Array instead of a String.
+
 === 0.5.2 / 06-25-2012
 
 * 1 bug fix:

data/lib/minitest-chef-handler.rb

@@ -7,9 +7,13 @@ require 'minitest-chef-handler/runner'
 require 'minitest-chef-handler/assertions'
 require 'minitest-chef-handler/infections'
 
+require 'minitest-chef-handler/lookup'
+
 module MiniTest
   module Chef
     class Handler < ::Chef::Handler
+      include Lookup
+
       def initialize(options = {})
         @options = options
       end
@@ -18,7 +22,7 @@ module MiniTest
         # do not run tests if chef failed
         return if failed?
 
-        require_test_suites
+        require_test_suites(@options.delete(:path))
         runner = Runner.new(run_status)
 
         if custom_runner?
@@ -34,58 +38,6 @@ module MiniTest
         end
       end
 
-      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/lib/minitest-chef-handler/lookup.rb

@@ -0,0 +1,73 @@
+module MiniTest
+  module Chef
+    module Lookup
+
+      # 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(options_path)
+        paths = options_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]
+
+          cookbook_paths = lookup_cookbook(base_path, cookbook_name)
+
+          cookbook_paths.map do |path|
+            file_test_pattern = "%s/tests/%s_test.rb" % [path, recipe_short_name]
+            dir_test_pattern  = "%s/tests/%s/*_test.rb" % [path, recipe_short_name]
+            file_spec_pattern = "%s/specs/%s_spec.rb" % [path, recipe_short_name]
+            dir_spec_pattern  = "%s/specs/%s/*_spec.rb" % [path, recipe_short_name]
+
+            [file_test_pattern, dir_test_pattern, file_spec_pattern, dir_spec_pattern]
+          end.flatten
+        end.flatten
+      end
+
+      # Internal - look for the right path to the cookbook given one or
+      # several base paths.
+      #
+      # Path: String or Array representing the recipes base paths.
+      # Name: Name of the cookbook
+      #
+      # Returns paths founded for the speficied cookbook.
+      def lookup_cookbook(path, name)
+        path_expr = Array(path).join(',')
+
+        Dir.glob("{%s}/$%s" % [path_expr, name])
+      end
+    end
+  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.5.2'
+  gem.version       = '0.5.3'
 
   gem.add_dependency('minitest')
   gem.add_dependency('chef')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-chef-handler
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70277779223160 !ruby/object:Gem::Requirement
+  requirement: &70309173979160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277779223160
+  version_requirements: *70309173979160
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70277779222700 !ruby/object:Gem::Requirement
+  requirement: &70309173978700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277779222700
+  version_requirements: *70309173978700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70277779222260 !ruby/object:Gem::Requirement
+  requirement: &70309173978280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277779222260
+  version_requirements: *70309173978280
 description: Run Minitest suites as Chef report handlers
 email:
 - david.calavera@gmail.com
@@ -83,6 +83,7 @@ files:
 - lib/minitest-chef-handler/assertions.rb
 - lib/minitest-chef-handler/context.rb
 - lib/minitest-chef-handler/infections.rb
+- lib/minitest-chef-handler/lookup.rb
 - lib/minitest-chef-handler/resources.rb
 - lib/minitest-chef-handler/runner.rb
 - lib/minitest-chef-handler/spec.rb
@@ -106,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4169045649435813440
+      hash: 3961635280245186970
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4169045649435813440
+      hash: 3961635280245186970
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11