kitchen-habitat 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a53b0e7ecbcbd344079d5a0e3b57c6c1391724d34f4eea6676ad2dcda50551de
-  data.tar.gz: 2fe775cc541a35c9434642e325e379772c40231c6bdce06c24874851cf5a7b19
+  metadata.gz: d2a1fb8ade246aa6d678e6ef4e459204465a1d905933f3497edbf5c4f42f37ce
+  data.tar.gz: 3d4026a94857b3f551ca4a41cea0061796a4149e6ae559187c61c5e7505bac2a
 SHA512:
-  metadata.gz: a0788b1af617b81b2847b712c9500069eb8111b5443cb7a6af696fe1877eb00197f0719cb1cb9ccf81f086323c441f8f6c861b225c458cb15f2518f80c83da7f
-  data.tar.gz: 61752d3d8b85cb1e72267c911d69f51c07d30a4e599bfcab179c358b689714ba2bd155963b24730427f34678f16b4e26172584aab028a2d0dcfeef16763c8d72
+  metadata.gz: 15d2703d84279215547ca903670e43b8ed31551bf5a3fce94f460743a92cfb603fae10560f0b09c576fca7e571d476558e429853affe2aa09ec58d0b7ff58d0e
+  data.tar.gz: 136cacef506411b56e4e8b9cb97c781f8cb7b9ccee4bb741322b0ce85184e332ec5de66db52f256c4580586967d5ad8a5261a760ee11d50515a4ca9443793c25

data/lib/kitchen-habitat/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Habitat
-    VERSION = "0.10.0".freeze
+    VERSION = "0.11.0".freeze
   end
 end

data/lib/kitchen/provisioner/habitat.rb

@@ -17,6 +17,7 @@ module Kitchen
       kitchen_provisioner_api_version 2
 
       default_config :depot_url, nil
+      default_config :hab_version, "latest"
       default_config :hab_sup_origin, "core"
       default_config :hab_sup_name, "hab-sup"
       default_config :hab_sup_version, nil
@@ -78,13 +79,17 @@ module Kitchen
 
       def install_command
         raise "Need to fill in some implementation here." if instance.platform == "windows"
+
+        version = " -v #{config[:hab_version]}" unless config[:hab_version].eql?("latest")
+
         wrap_shell_code <<-BASH
         #{export_hab_bldr_url}
         if command -v hab >/dev/null 2>&1
         then
           echo "Habitat CLI already installed."
         else
-          curl 'https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh' | sudo -E bash
+          curl -o /tmp/install.sh 'https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh'
+          sudo -E bash /tmp/install.sh#{version}
         fi
         BASH
       end
@@ -154,6 +159,23 @@ module Kitchen
         EOH
       end
 
+      def sup_run_script
+        <<-SCRIPT
+cat > /tmp/sup-run.sh <<"END"
+#!/bin/bash
+
+while true
+do
+  COUNT=$(ps aux | grep hab | wc -l)
+  if [[ ${COUNT} -lt 2 ]]
+  then
+    sudo -E hab sup run #{supervisor_options} > ~/nohup.out & echo $! > /tmp/run.pid
+  fi
+done
+END
+SCRIPT
+      end
+
       def run_package_in_background
         if config[:use_screen]
           "sudo -E screen -mdS \"#{clean_package_name}\" hab start #{package_ident} #{supervisor_options}"
@@ -161,7 +183,12 @@ module Kitchen
           <<-RUN
           [ -f ./run.pid ] && rm -f run.pid
           [ -f ./nohup.out ] && rm -f nohup.out
-          nohup sudo -E hab sup run #{supervisor_options} & echo $! > run.pid
+
+          #{sup_run_script}
+
+          sudo -E chmod +x /tmp/sup-run.sh
+
+          nohup /tmp/sup-run.sh & > sup-run.out
 
           until sudo -E hab svc status
           do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-habitat
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen