kitchen-habitat 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24e28546bbe3eb127598d6f93d8c283770a2ceb6
-  data.tar.gz: fb278ba7a725265367e588ff3e522ac17016c3c5
+  metadata.gz: f200f91d0c7bde6766da07d73786157e6e8411a7
+  data.tar.gz: 480d7f26a3eaa96a26ef3bc3cc8d5ef4024f2e04
 SHA512:
-  metadata.gz: 54e12cd0a926b6e7c978134000db2f33f8b5e15284f61fbec38fe6a71d7bc7549a9e5027ae20aba70b450407ef1e0e35a3a25642f2ea4f20cf46ec107c70c88b
-  data.tar.gz: 1cd47e9aee9bdee8179cae232627d3402787a7b2dc29c67692cb9f0358dfd882471bbd35888b33f3c22a47eac040a4b6ecd2c8e95518feeffd521eb48e6fff5d
+  metadata.gz: 6a51d73ed9e043222f030b3816bd7284cc5a64a43d3ac208c4ad81c8dadd8ca64fc64095c41b673263747f435b17331e446691349678c0f1442eaefcf40827cc
+  data.tar.gz: d86d2b14dff2b18685b59e2fad715ce0968f9736fbb1f4b978a0770d506f2d82e82f1587d4993950f8b4016225969e1bca6a3b3b580f2ae58bb6232b252ccc89

data/lib/kitchen-habitat/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Habitat
-    VERSION = "0.7.0".freeze
+    VERSION = "0.8.0".freeze
   end
 end

data/lib/kitchen/provisioner/habitat.rb

@@ -82,14 +82,14 @@ module Kitchen
         then
           echo "Habitat CLI already installed."
         else
-          curl 'https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh' | sudo bash
+          curl 'https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh' | sudo -E bash
         fi
         BASH
       end
 
       def init_command
         wrap_shell_code <<-EOH
-          id -u hab >/dev/null 2>&1 || sudo useradd hab >/dev/null 2>&1
+          id -u hab >/dev/null 2>&1 || sudo -E useradd hab >/dev/null 2>&1
           rm -rf /tmp/kitchen
           mkdir -p /tmp/kitchen/results
           #{'mkdir -p /tmp/kitchen/config' unless config[:override_package_config]}
@@ -131,12 +131,12 @@ module Kitchen
       def clean_up_screen_sessions
         return unless config[:use_screen]
         <<-CLEAN
-        if sudo screen -ls | grep -q #{clean_package_name}
+        if sudo -E screen -ls | grep -q #{clean_package_name}
           then
             echo "Killing previous supervisor session."
-            sudo screen -S \"#{clean_package_name}\" -X quit > /dev/null
+            sudo -E screen -S \"#{clean_package_name}\" -X quit > /dev/null
             echo "Removing dead session."
-            sudo screen -wipe > /dev/null
+            sudo -E screen -wipe > /dev/null
         fi
         CLEAN
       end
@@ -144,29 +144,31 @@ module Kitchen
       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 ] && echo "Removing previous supervisor and unloading package. "
+        [ -f ./run.pid ] && sudo -E hab svc unload #{package_ident}
+        [ -f ./run.pid ] && sleep 5
+        [ -f ./run.pid ] && sudo -E 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 start #{package_ident} #{supervisor_options}"
+          "sudo -E screen -mdS \"#{clean_package_name}\" hab start #{package_ident} #{supervisor_options}"
         else
           <<-RUN
           [ -f ./run.pid ] && rm -f run.pid
           [ -f ./nohup.out ] && rm -f nohup.out
-          nohup sudo hab sup run & echo $! > run.pid
+          nohup sudo -E hab sup run #{supervisor_options} & echo $! > run.pid
 
-          until hab svc status
+          until sudo -E hab svc status
           do
             sleep 1
           done
 
-          sudo hab start #{package_ident} #{supervisor_options}
-          
-          until hab svc status | grep #{package_ident}
+          sudo -E hab svc load #{package_ident} #{service_options}
+
+          until sudo -E hab svc status | grep #{package_ident}
           do
             sleep 1
           done
@@ -241,9 +243,14 @@ module Kitchen
         else
           return
         end
+        parsed_name = artifact_name.split("-")
+        config[:package_origin] = parsed_name[0]
+        config[:package_name] = parsed_name[1]
+        config[:package_version] = parsed_name[2]
+        config[:package_release] = parsed_name[3]
 
         artifact_path = File.join(File.join(config[:root_path], "results"), artifact_name)
-        "sudo hab pkg install #{artifact_path}"
+        "sudo -E hab pkg install #{artifact_path}"
       end
 
       def latest_artifact_name
@@ -252,21 +259,22 @@ module Kitchen
 
         artifact_path = Dir.glob(File.join(results_dir, "#{config[:package_origin]}-#{config[:package_name]}-*.hart")).max_by { |f| File.mtime(f) }
 
+
         File.basename(artifact_path)
       end
 
       def copy_user_toml_to_service_directory
         return unless !config[:config_directory].nil? && File.exist?(full_user_toml_path)
         <<-EOH
-          sudo mkdir -p /hab/svc/#{config[:package_name]}
-          sudo cp #{File.join(File.join(config[:root_path], 'config'), 'user.toml')} /hab/svc/#{config[:package_name]}/user.toml
+          sudo -E mkdir -p /hab/svc/#{config[:package_name]}
+          sudo -E cp #{File.join(File.join(config[:root_path], 'config'), 'user.toml')} /hab/svc/#{config[:package_name]}/user.toml
         EOH
       end
 
       def remove_previous_user_toml
         <<-REMOVE
         if [ -d "/hab/svc/#{config[:package_name]}" ]; then
-          sudo find /hab/svc/#{config[:package_name]} -name user.toml -delete
+          sudo -E find /hab/svc/#{config[:package_name]} -name user.toml -delete
         fi
         REMOVE
       end
@@ -277,11 +285,11 @@ module Kitchen
       end
 
       def install_supervisor_command
-        "sudo hab pkg install #{hab_sup_ident}"
+        "sudo -E hab pkg install #{hab_sup_ident}"
       end
 
       def binlink_supervisor_command
-        "sudo hab pkg binlink #{hab_sup_ident} hab-sup"
+        "sudo -E hab pkg binlink #{hab_sup_ident} hab-sup"
       end
 
       def artifact_name_to_package_ident_regex
@@ -301,7 +309,7 @@ module Kitchen
                 "#{config[:package_name]}/" \
                 "#{config[:package_version]}/" \
                 "#{config[:package_release]}".chomp("/").chomp("/")
-        @pkg_ident ||= ident
+        @pkg_ident = ident
       end
 
       def clean_package_name
@@ -321,6 +329,17 @@ module Kitchen
 
         options
       end
+
+      def service_options
+        options = ""
+        options += config[:hab_sup_bind].map { |b| " --bind #{b}" }.join(" ") if config[:hab_sup_bind].any?
+        options += " --group #{config[:hab_sup_group]}" unless config[:hab_sup_group].nil?
+        options += " --topology #{config[:service_topology]}" unless config[:service_topology].nil?
+        options += " --strategy #{config[:service_update_strategy]}" unless config[:service_update_strategy].nil?
+        options += " --channel #{config[:channel]}" unless config[:channel].nil?
+
+        options
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-habitat
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Habitat provisioner for test-kitchen