Merge pull request #30 from skylerto/version

install specific version of habitat
test-kitchen · Sep 28, 2018 · 9c44e71 · 9c44e71
2 parents 8ae8032 + 914ee0d
commit 9c44e71
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/lib/kitchen-habitat/version.rb b/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
diff --git a/lib/kitchen/provisioner/habitat.rb b/lib/kitchen/provisioner/habitat.rb
@@ -17,6 +17,7 @@ class Habitat < Base
       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 @@ def finalize_config!(instance)
 
       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
@@ -161,6 +166,7 @@ def run_package_in_background
           <<-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
 
           until sudo -E hab svc status

diff --git a/spec/kitchen/provisioner/habitat_spec.rb b/spec/kitchen/provisioner/habitat_spec.rb
@@ -71,7 +71,8 @@ def wrap_command(code, left_pad_length = 10)
         "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",
         "fi"
       ]
       expect(install_command).to eq(wrap_command(expected_code, 8))