test-kitchen 0.5.4 → 0.6.0

data/config/Cheffile

@@ -40,8 +40,7 @@ if env.project.respond_to?(:cookbook_path)
 end
 
 if env.project.run_list.include? 'recipe[minitest-handler]'
-  cookbook 'minitest-handler',
-    :git => 'git://github.com/kotiri/minitest-handler-cookbook.git'
+  cookbook 'minitest-handler'
 end
 
 # include user-provided cookbooks

data/config/Vagrantfile

@@ -96,6 +96,11 @@ project = tk_env.project
 
         vm_config.vm.provision :chef_solo do |chef|
           chef.cookbooks_path = tk_env.cookbook_paths
+
+          if project.data_bags_path && File.exists?(project.data_bags_path)
+            chef.data_bags_path = project.data_bags_path
+          end
+
           chef.run_list = project.run_list + build_run_list(tk_env.cookbook_paths, test_recipe_name)
           chef.json = chef_json
           chef.log_level = :debug

data/lib/test-kitchen/cli.rb

@@ -27,7 +27,8 @@ module TestKitchen
 
       option :platform,
         :long  => "--platform PLATFORM",
-        :description => "The platform to use. If not specified tests will be run against all platforms."
+        :description => "The platform to use. If not specified tests will be run against all platforms.",
+        :default => nil
 
       option :configuration,
         :long  => "--configuration CONFIG",

data/lib/test-kitchen/cli/test.rb

@@ -27,8 +27,14 @@ module TestKitchen
         banner "kitchen test (options)"
 
         def run
-          warn_for_non_buildable_platforms(env.platform_names)
-          env.project.each_build(env.platform_names,
+          if config[:platform]
+            test_platforms = [config[:platform]]
+          else
+            test_platforms = env.platform_names
+          end
+
+          warn_for_non_buildable_platforms(test_platforms)
+          env.project.each_build(test_platforms,
                              config[:configuration]) do |platform,configuration|
             runner = TestKitchen::Runner.for_platform(env,
               {:platform => platform, :configuration => configuration})

data/lib/test-kitchen/project/base.rb

@@ -33,6 +33,7 @@ module TestKitchen
         raise ArgumentError, "Project name must be specified" if name.nil? || name.empty?
         @name = name
         @parent = parent
+        @runtimes = parent.runtimes if parent
         @configurations = {}
         @exclusions = []
         @guest_source_root = '/test-kitchen/source'
@@ -85,12 +86,7 @@ module TestKitchen
       end
 
       def runtimes(arg=nil)
-        set_or_return(:runtimes, arg, :default =>
-          if language == 'ruby' || language == 'chef'
-            ['1.9.2']
-          else
-            []
-          end)
+        set_or_return(:runtimes, arg, :default => [])
       end
 
       def install(arg=nil)
@@ -138,6 +134,10 @@ module TestKitchen
         nil
       end
 
+      def data_bags_path
+        nil
+      end
+
       def install_command(runtime=nil)
         raise NotImplementedError
       end

data/lib/test-kitchen/project/cookbook.rb

@@ -25,6 +25,7 @@ module TestKitchen
 
       attr_writer :lint
       attr_writer :supported_platforms
+      attr_writer :data_bags_path
 
       def lint(arg=nil)
         set_or_return(:lint, arg, {:default => true})
@@ -46,6 +47,11 @@ module TestKitchen
           " && foodcritic -f ~FC007 -f correctness#{ignore_tags} #{root_path}")
       end
 
+      def data_bags_path(path = nil)
+        set_or_return(:data_bags_path, path,
+          { :default => root_path.join('test/kitchen/data_bags').to_s })
+      end
+
       def script(arg=nil)
         set_or_return(:script, arg, :default =>
           %Q{if [ -d "features" ]; then bundle exec cucumber -t @#{tests_tag} features; fi})

data/lib/test-kitchen/project/ruby.rb

@@ -22,14 +22,14 @@ module TestKitchen
 
       def install_command(runtime=nil, test_path=guest_test_root)
         cmd = "cd #{test_path}"
-        cmd << " && rvm use #{runtime}" if runtime
+        cmd << " && rvm use #{runtime}" if runtime && ! runtime.empty?
         cmd << " && gem install bundler"
         cmd << " && #{install}"
       end
 
       def test_command(runtime=nil, test_path=guest_test_root)
         cmd = "cd #{test_path}"
-        cmd << " && rvm use #{runtime}" if runtime
+        cmd << " && rvm use #{runtime}" if runtime && ! runtime.empty?
         cmd << " && #{script}"
       end
     end

data/lib/test-kitchen/version.rb

@@ -17,5 +17,5 @@
 #
 
 module TestKitchen
-  VERSION = "0.5.4"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foodcritic
@@ -180,18 +180,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3834866993864711664
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3834866993864711664
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23