test-kitchen 0.5.2 → 0.5.4

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

@@ -33,8 +33,10 @@ module TestKitchen
             runner = TestKitchen::Runner.for_platform(env,
               {:platform => platform, :configuration => configuration})
             runner.preflight_check
+            runner.prepare
             begin
-              runner.provision
+              runner.create
+              runner.converge
               runner.test
             rescue
               raise

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

@@ -37,9 +37,13 @@ module TestKitchen
       def preflight_command(cmd = nil)
         return nil unless lint
         parent_dir = File.join(root_path, '..')
+        ignore_tags = ''
+        if lint.respond_to?(:has_key?) && lint[:ignore].respond_to?(:join)
+          ignore_tags = " -t ~#{lint[:ignore].join(' -t ~')}"
+        end
         set_or_return(:preflight_command, cmd, :default =>
           "knife cookbook test -o #{parent_dir} #{name}" +
-          " && foodcritic -f ~FC007 -f correctness #{root_path}")
+          " && foodcritic -f ~FC007 -f correctness#{ignore_tags} #{root_path}")
       end
 
       def script(arg=nil)

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

@@ -34,10 +34,18 @@ module TestKitchen
         @configuration = options[:configuration]
       end
 
-      def provision
+      def prepare
         assemble_cookbooks!
       end
 
+      def create
+        raise NotImplementedError
+      end
+
+      def converge
+        raise NotImplementedError
+      end
+
       def run_list
         ['test-kitchen::default']
       end

data/lib/test-kitchen/runner/vagrant.rb

@@ -27,9 +27,12 @@ module TestKitchen
         @env, @options = env, options
       end
 
-      def provision
-        super
-        vagrant_env.cli(vagrant_cli_argv('up'))
+      def create
+        vagrant_env.cli(vagrant_cli_argv(['up', '--no-provision']))
+      end
+
+      def converge
+        vagrant_env.cli(vagrant_cli_argv('provision'))
       end
 
       def status

data/lib/test-kitchen/scaffold.rb

@@ -36,7 +36,7 @@ module TestKitchen
         <<-eos
           source :rubygems
 
-          gem 'test-kitchen', :git => 'git@github.com:opscode/test-kitchen.git'
+          gem 'test-kitchen'
         eos
 
       scaffold_file 'test/kitchen/Kitchenfile',

data/lib/test-kitchen/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-18 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foodcritic
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: hashr
   requirement: !ruby/object:Gem::Requirement
@@ -180,12 +180,18 @@ 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