jackal-kitchen 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d226c76d54712b52e6c65bd61c088c17b784286c
-  data.tar.gz: 9bb59b0be25e5cb108dc1a0d2aaabf94df69a9c0
+  metadata.gz: 8db32bb5a094463ef9b831ce269aa49c1ece5251
+  data.tar.gz: 377afbeca4b98319ce323057611f42824da6b5a2
 SHA512:
-  metadata.gz: f1cd57f4ef6381fed5963b2bf91ee5e3765b6f4f738670384f8b77cf397701deaf1fbb64cb88934402aee1101af73ff1d5242636f04ef6130620145840da62b4
-  data.tar.gz: fe5c54f0c7f94010abc8034acc30093547492aa49888444ab8956dcfac8ab589a6f631b3c49cc44d4e6ae275a2f5513b73b59348bd76fdd7d1cc226cd16e68a4
+  metadata.gz: a7f8364e3758a1732dc655c38e103d31964e576828362f0c52abd5a606fe4488a7319e18f3098f934940d1fc20e5ec91dca8007c8d6b0b834ada2594b0b5493d
+  data.tar.gz: eba823497bf372af71dba9fd192c988ce79e3f6d30433584c41eec124e9589ee563f6bd69843422301059cf3eaa71a1d4d9ce23f0b49ed5f0013a7e54980c725

data/lib/jackal-kitchen/tester.rb

@@ -33,14 +33,16 @@ module Jackal
           working_dir = working_path = Dir.mktmpdir
           begin
             maybe_clean_bundle do
-              setup_command("git clone #{repo} cookbook", working_path, payload)
+              run_command("git clone #{repo} cookbook", working_path, payload)
               working_path = File.join(working_path, 'cookbook')
-              setup_command("git checkout #{ref}", working_path, payload)
-              setup_command("bundle install", working_path, payload)
-              kitchen_command("bundle exec kitchen test", working_path, payload)
+              run_command("git checkout #{ref}", working_path, payload)
+              insert_kitchen_lxc(working_path)
+              insert_kitchen_local(working_path)
+              run_command("bundle install --path /tmp/.kitchen-jackal-vendor", working_path, payload)
+              run_command("bundle exec kitchen test", working_path, payload)
             end
           rescue => e
-            raise
+            error "Command failed! #{e.class}: #{e}"
           ensure
             FileUtils.rm_rf(working_dir)
           end
@@ -48,34 +50,41 @@ module Jackal
         end
       end
 
+      def insert_kitchen_local(path)
+        File.open(File.join(path, '.kitchen.local.yml'), 'w') do |file|
+          file.puts '---'
+          file.puts 'driver:'
+          file.puts '  name: lxc'
+          file.puts '  use_sudo: false'
+          if(config[:ssh_key])
+            file.puts "  ssh_key: #{config[:ssh_key]}"
+          end
+        end
+      end
+
+      # Update gemfile to include kitchen-lxc driver
+      #
+      # @param path [String] working directory
+      def insert_kitchen_lxc(path)
+        gemfile = File.join(path, 'Gemfile')
+        if(File.exists?(gemfile))
+          content = File.readlines(gemfile)
+        else
+          content = ['source "https://rubygems.org"']
+        end
+        content << 'gem "kitchen-lxc"'
+        File.open(gemfile, 'w') do |file|
+          file.puts content.join("\n")
+        end
+      end
+
       # Run a command
       #
       # @param command [String] command to execute
       # @param working_path [String] local working path
       # @param payload [Smash] current payload
       # @return [TrueClass]
-      def setup_command(command, working_path, payload)
-        cmd_input = Shellwords.shellsplit(command)
-        process = ChildProcess.build(*cmd_input)
-        stdout = File.open(File.join(working_path, 'stdout'), 'w+')
-        stderr = File.open(File.join(working_path, 'stderr'), 'w+')
-        process.io.stdout = stdout
-        process.io.stderr = stderr
-        process.cwd = working_path
-        process.start
-        status = process.wait
-        if status == 0
-          info "Setup command '#{command}' completed sucessfully"
-          payload.set(:data, :kitchen, :result, command, :success)
-          true
-        else
-          error "Command '#{command}' failed"
-          payload.set(:data, :kitchen, :result, command, :fail)
-          raise "Failed to execute setup command '#{command}'"
-        end
-      end
-
-      def kitchen_command(command, working_path, payload)
+      def run_command(command, working_path, payload)
         cmd_input = Shellwords.shellsplit(command)
         process = ChildProcess.build(*cmd_input)
         stdout = File.open(File.join(working_path, 'stdout'), 'w+')
@@ -91,8 +100,12 @@ module Jackal
           true
         else
           error "Command '#{command}' failed"
+          stderr.rewind
           payload.set(:data, :kitchen, :result, command, :fail)
-          raise "Failed to execute command '#{command}'"
+          payload.set(:data, :kitchen, :error, stderr.read)
+          stdout.rewind
+          stderr.rewind
+          raise "Command failure! (#{command}). STDOUT: #{stdout.read} STDERR: #{stderr.read}"
         end
       end
 

data/lib/jackal-kitchen/version.rb

@@ -1,5 +1,5 @@
 module Jackal
   module Kitchen
-    VERSION = Gem::Version.new('0.1.0')
+    VERSION = Gem::Version.new('0.1.2')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackal-kitchen
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Anthony Goddard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jackal