kitchen-habitat 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0b84dae0b861602744e7e767c3c91d9dd4a02b9
-  data.tar.gz: c0eb37401e35966c040617ea2e3e02bfaf31a61b
+  metadata.gz: 2bae74a60049f0b9a93da4a8a4a94a0b22d96204
+  data.tar.gz: f03ca264521bdbddb44d70c221790830c562c535
 SHA512:
-  metadata.gz: 7d34284386219c9864287f75698e808c0c748497261172d53f69eec9e16a895e8e24fedd4f8a3b5a2d2e04b9af51349346e671a14d27d1f173071516dfefc1de
-  data.tar.gz: cc66535efabfe305037359c82ba304600934768a41d0ef0430a360105843faf5fbaed57ac4904ca4a969fec57077003dd6b0b671d5cf279a2f351be7ce8024cb
+  metadata.gz: 8ca4742c8f967de7dd00b184b2aba4bd23e50149049151e4952ca5a9dc2e6cbd70b0ae49def3c1e5e62e166c6ff08a3cdfa827ff78641b3d5a60d5a43259ecb1
+  data.tar.gz: 66bee9a35a38cb0d6465ca94c367be281700f408af40be5e2a7591b578d8caf25c0686d8a10cb213ee77bc30519c17b3b6dba8f7bd819170a4647063116d67a3

data/README.md

@@ -7,7 +7,7 @@ A Test Kitchen Provisioner for [Habitat](https://habitat.sh)
 
 
 ## Installation & Setup
-You'll need the test-kitchen & kitchen-habitat gems installed in your system, along with kitchen-vagrant or some other suitable driver for test-kitchen. 
+You'll need the test-kitchen & kitchen-habitat gems installed in your system, along with kitchen-vagrant or some other suitable driver for test-kitchen.
 
 ## Configuration Settings
 
@@ -34,7 +34,7 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
 * `hab_sup_artifact_name`
   * Artifact package name for a custom supervisor to run
   * Used to upload and test a local supervisor.
-  * Package should be located in the `results_directory` 
+  * Package should be located in the `results_directory`
   * Defaults to `nil
 * `hab_sup_listen_http`
   * Port for the supervisor's sidecar to listen on.
@@ -83,9 +83,13 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
 * `user_toml_name`
   * Name of the file to be used as the user.toml for the service under test.
   * Defaults to `user.toml`
+* `install_latest_artifact`
+  * Choose to install latest artifact.
+  * Must specify `artifact_name` or `package_origin` and `package_name`
+  * `package_version` and `package_release` will be ignored
+  * Defaults to `false`
 
-
-## Example 
+## Example
 
 ```yaml
 driver:

data/lib/kitchen-habitat/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Habitat
-    VERSION = "0.5.3".freeze
+    VERSION = "0.6.0".freeze
   end
 end

data/lib/kitchen/provisioner/habitat.rb

@@ -31,11 +31,10 @@ module Kitchen
       default_config :hab_sup_group, nil
 
       # hab-sup service options
+      default_config :install_latest_artifact, false
       default_config :artifact_name, nil
       default_config :package_origin, "core"
-      default_config :package_name do |provisioner|
-        provisioner.instance.suite.name
-      end
+      default_config :package_name
       default_config :package_version, nil
       default_config :package_release, nil
       default_config :service_topology, nil
@@ -51,10 +50,9 @@ module Kitchen
       default_config :use_screen, false
 
       def finalize_config!(instance)
-
         # Check to see if a package ident was specified for package name and be helpful
-        unless (config[:package_name] =~ /\//).nil?
-          config[:package_origin], config[:package_name], config[:package_version], config[:package_release] = config[:package_name].split('/')
+        unless  config[:package_name].nil? || (config[:package_name] =~ /\//).nil?
+          config[:package_origin], config[:package_name], config[:package_version], config[:package_release] = config[:package_name].split("/")
         end
 
         unless config[:hab_sup_artifact_name].nil?
@@ -76,7 +74,7 @@ module Kitchen
       end
 
       def install_command
-        raise 'Need to fill in some implementation here.' if instance.platform == 'windows'
+        raise "Need to fill in some implementation here." if instance.platform == "windows"
         wrap_shell_code <<-BASH
         #{export_hab_origin}
         if command -v hab >/dev/null 2>&1
@@ -91,8 +89,9 @@ module Kitchen
       def init_command
         wrap_shell_code <<-EOH
           id -u hab >/dev/null 2>&1 || sudo useradd hab >/dev/null 2>&1
+          rm -rf /tmp/kitchen
           mkdir -p /tmp/kitchen/results
-          mkdir -p /tmp/kitchen/config
+          #{'mkdir -p /tmp/kitchen/config' unless config[:override_package_config]}
         EOH
       end
 
@@ -100,6 +99,7 @@ module Kitchen
         super
         copy_results_to_sandbox
         copy_user_toml_to_sandbox
+        copy_package_config_from_override_to_sandbox
       end
 
       def prepare_command
@@ -179,12 +179,22 @@ module Kitchen
         end
       end
 
+      def copy_package_config_from_override_to_sandbox
+        return if config[:config_directory].nil?
+        return unless config[:override_package_config]
+        local_config_dir = File.join(config[:kitchen_root], config[:config_directory])
+        return unless Dir.exist?(local_config_dir)
+
+        sandbox_config_dir = File.join(sandbox_path, "config")
+        FileUtils.copy_entry(local_config_dir, sandbox_config_dir)
+      end
+
       def copy_results_to_sandbox
         results_dir = resolve_results_directory
         return if results_dir.nil?
         FileUtils.mkdir_p(File.join(sandbox_path, "results"))
-        FileUtils.cp_r(
-          results_dir,
+        FileUtils.cp(
+          File.join(results_dir, config[:install_latest_artifact] ? latest_artifact_name : config[:artifact_name]),
           File.join(sandbox_path, "results"),
           preserve: true
         )
@@ -207,8 +217,28 @@ module Kitchen
       end
 
       def install_service_package
-        return if config[:artifact_name].nil?
-        "sudo hab pkg install #{File.join(File.join(config[:root_path], 'results'), config[:artifact_name])}"
+        return unless config[:install_latest_artifact] || !config[:artifact_name].nil?
+
+        artifact_name = ""
+        if config[:install_latest_artifact]
+          artifact_name = latest_artifact_name
+        elsif !config[:install_latest_artifact] && !config[:artifact_name].nil?
+          artifact_name = config[:artifact_name]
+        else
+          return
+        end
+
+        artifact_path = File.join(File.join(config[:root_path], "results"), artifact_name)
+        "sudo hab pkg install #{artifact_path}"
+      end
+
+      def latest_artifact_name
+        results_dir = resolve_results_directory
+        return if results_dir.nil?
+
+        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

metadata

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