kitchen-habitat 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 321ed54954981ce9bcfa0d31cced155b68812dc7
-  data.tar.gz: a38cb707e5ad064a4fc0a10bb61e3dc8cc935fb1
+  metadata.gz: 8202421b33f9f01b1cf7a61ecb7000e8a76ff1ea
+  data.tar.gz: 15d2665a88e8692ab55c26e449c286949159c069
 SHA512:
-  metadata.gz: 4828aca661dfecceb7d5621a208380e10829d40b6dd642ba30ca91353b25f7ad4919c20221dfdc6e58a6d74a5f633409ecfdef41f6e6963ae69f1f7e909d8c19
-  data.tar.gz: ec60a9cef994028c90a27b97541eeea8d8633d43b1914d7b1939f76b1e1410f711a41586431b62fc27fc773af4c920a18c0e6097dee6f4706878b956b2e1beb7
+  metadata.gz: 2862f2e9904b5cd170657489cf334fe8ba5f7a54e35739524400bc2ded4cc3fa62d8c4e6184a16a0cf850cac3df0ed9810b8aad80262eb456b1a184e08c11173
+  data.tar.gz: 8d83f00b86b1289fc20077ee835f99fdd57e73ca16a6c9a1f614001d9b93f426b85d53bf9e5b28c09d98011c235b342941a3f1e6c6ce57c5d7b4ac086da7b65c

data/README.md

@@ -66,7 +66,7 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
 * `package_version`
   * Package version of the package to be run.
   * Defaults to `nil` or if `artifact_name` is supplied, the `package_version` will be parsed from the filename of the hart file.
-* `package_releae`
+* `package_release`
   * Package release of the package to be run.
   * Defaults to `nil` or if `artifact_name` is supplied, the `package_release` will be parsed from the filename of the hart file.
 * `service_topology`
@@ -88,11 +88,18 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
 ## Example 
 
 ```yaml
+driver:
+  name: vagrant
+
 provisioner:
-  - name: habitat
-    hab_sup: core/hab/0.16.0
-    
+  name: habitat
+  hab_sup: core/hab/0.16.0
+  package_origin: core
+  package_name: redis
+
+platforms:
+  - name: ubuntu-16.04
 
-suite:
-  - name: core/redis
+suites:
+  - name: default
 ```

data/lib/kitchen-habitat/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Habitat
-    VERSION = "0.4.0".freeze
+    VERSION = "0.5.0".freeze
   end
 end

data/lib/kitchen/provisioner/habitat.rb

@@ -51,6 +51,12 @@ 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('/')
+        end
+
         unless config[:hab_sup_artifact_name].nil?
           ident = artifact_name_to_package_ident_regex.match(config[:hab_sup_artifact_name])
           config[:hab_sup_origin] = ident["origin"]
@@ -70,23 +76,20 @@ module Kitchen
       end
 
       def install_command
-        if instance.platform == "windows"
-          raise "Need to fill in some implementation here."
+        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
+        then
+          echo "Habitat CLI already installed."
         else
-          wrap_shell_code <<-BASH
-          #{export_hab_origin}
-          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 bash
-          fi
-          BASH
-        end
+          curl 'https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh' | sudo bash
+        fi
+        BASH
       end
 
       def init_command
-        wrap_shell_code "id -u hab >/dev/null 2>&1 || sudo useradd hab >/dev/null 2>&1"
+        wrap_shell_code 'id -u hab >/dev/null 2>&1 || sudo useradd hab >/dev/null 2>&1'
       end
 
       def create_sandbox
@@ -190,7 +193,7 @@ module Kitchen
       def copy_user_toml_to_sandbox
         return if config[:config_directory].nil?
         FileUtils.mkdir_p(File.join(sandbox_path, "config"))
-        FileUtils.cp_r(File.join(config[:kitchen_root], config[:config_directory]), File.join(sandbox_path, "config"))
+        FileUtils.cp(full_user_toml_path, File.join(sandbox_path, "config/user.toml"))
       end
 
       def install_service_package
@@ -200,7 +203,10 @@ module Kitchen
 
       def copy_user_toml_to_service_directory
         return unless !config[:config_directory].nil? && File.exist?(full_user_toml_path)
-        "cp #{File.join(File.join(config[:root_path], 'config'), 'user.toml')} /hab/svc/#{config[:package_name]}/"
+        <<-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
+        EOH
       end
 
       def remove_previous_user_toml

metadata

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