kitchen-habitat 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3cfd87a1c1b1560550515c1ebf90f1bb8cdcd6d
-  data.tar.gz: 0684ac8b206395fc06d5121d1ad94e3729e5ebab
+  metadata.gz: f8f5bd09f9be9941cb4fbb5854d6e190133ac755
+  data.tar.gz: d282775cb109380519f3163f053f3586afa4db62
 SHA512:
-  metadata.gz: 98dd5a5ad196817c5b2d6e98ae5080f67472514ea11fbdfa8d87ebd2a29e0dadd3afbaeea9084f18ecb5dfe5acb9a4c6a5a2ddf6bb8ad28db816b3c1f262f736
-  data.tar.gz: 27deaca029a46bc1f921ec28334f17a724f14a2b5e7a36f29f16572b5ac01a74235744260c576f0cea969c60548602974826f421e01d2c0e8c12595f57f7725d
+  metadata.gz: 5697def2efc706d739ae06182d8b430e623405a5e0e488817a8c8f076ea84075d81e52d88606ad5ff6ecf64e7e18205067bfac90556b2502081293ef8aac76b0
+  data.tar.gz: 70a4508a072c3f752082be170ec8d8d1db45c4357ed51edefc99bbcfe6cba0d2e1511190e5c0ee34f6db3e15a192699bf4cf4c667945220daca9c741aa4a86cc

data/lib/kitchen/provisioner/habitat.rb

@@ -105,12 +105,11 @@ module Kitchen
 
       def run_command
         run = <<-RUN
-        #{clean_up_screen_sessions}
         #{export_hab_origin}
+        #{clean_up_screen_sessions}
+        #{clean_up_previous_supervisor}
         echo "Running #{package_ident}."
-
         #{run_package_in_background}
-        sleep 5
         RUN
 
         wrap_shell_code run
@@ -131,11 +130,26 @@ module Kitchen
         CLEAN
       end
 
+      def clean_up_previous_supervisor
+        return if config[:use_screen]
+        <<-EOH
+        [ -f ./run.pid ] && echo "Removing previous supervisor. "
+        [ -f ./run.pid ] && sudo kill $(cat run.pid)
+        [ -f ./run.pid ] && sleep 5
+        EOH
+      end
+
       def run_package_in_background
         if config[:use_screen]
           "sudo screen -mdS \"#{clean_package_name}\" hab-sup start #{package_ident} #{supervisor_options}"
         else
-          "nohup sudo hab-sup start #{package_ident} #{supervisor_options} & echo $! > run.pid"
+          <<-RUN
+          [ -f ./run.pid ] && rm -f run.pid
+          [ -f ./nohup.out ] && rm -f nohup.out 
+          nohup sudo hab-sup start #{package_ident} #{supervisor_options} & echo $! > run.pid
+          sleep 5
+          [ -f ./nohup.out ] && cat nohup.out || (echo "Failed to start the supervisor." && exit 1)
+          RUN
         end
       end
 

data/lib/kitchen-habitat/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Habitat
-    VERSION = "0.2.1".freeze
+    VERSION = "0.2.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-habitat
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen