kitchen-habitat 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec2df0fc73ebcc666ba789e36af7b7ec7217b7cb
-  data.tar.gz: 5b881fdc4787c722cdf27593ff59b3ecf8cdce8e
+  metadata.gz: 321ed54954981ce9bcfa0d31cced155b68812dc7
+  data.tar.gz: a38cb707e5ad064a4fc0a10bb61e3dc8cc935fb1
 SHA512:
-  metadata.gz: c8f77508af3af9d0fac492c105d2e1a3b6a4dbb2feaa31c1437ad57e9bc4bb79011e71ffb8a7221fefd1f7a1c4954641ecd4dc9ee4e4aa2089f3d8f8a5998a9d
-  data.tar.gz: 670a0c1a693878dea2fcc70a62630e08b826f323c1e05fbf93fd3229ea545653a8f47d4eaf379687bd65a052b0cf714b36abb198a7aca23e983300de25ac7da7
+  metadata.gz: 4828aca661dfecceb7d5621a208380e10829d40b6dd642ba30ca91353b25f7ad4919c20221dfdc6e58a6d74a5f633409ecfdef41f6e6963ae69f1f7e909d8c19
+  data.tar.gz: ec60a9cef994028c90a27b97541eeea8d8633d43b1914d7b1939f76b1e1410f711a41586431b62fc27fc773af4c920a18c0e6097dee6f4706878b956b2e1beb7

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 ther 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
 
@@ -28,9 +28,9 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
 * `hab_sup_version`
   * Version number of `hab-sup` to run
   * Defaults to `nil`, or, if `hab_sup_artifact_name` is supplied, the `hab_sup_version` will be parsed from the filename of the hart file.
-* `hab_sup_timestamp`
-  * Timestamp of the `hab-sup` package to run
-  * Defaults to `nil`, or, if `hab_sup_artifact_name` is supplied, the `hab_sup_timestamp` will be parsed from the filename of the hart file.
+* `hab_sup_release`
+  * Release of the `hab-sup` package to run
+  * Defaults to `nil`, or, if `hab_sup_artifact_name` is supplied, the `hab_sup_release` will be parsed from the filename of the hart file.
 * `hab_sup_artifact_name`
   * Artifact package name for a custom supervisor to run
   * Used to upload and test a local supervisor.
@@ -56,7 +56,7 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
   * Defaults to `nil`
 * `results_directory`
   * Directory (relative to the location of the .kitchen.yml) containing package artifacts (harts) to copy to the remote system
-  * Defaults to checking the local directory for a `results` directory, then its parent (`..\results`) and grandparent (`..\..\results`), which should accomodate most studio layouts.
+  * Defaults to checking the local directory for a `results` directory, then its parent (`../results`) and grandparent (`../../results`), which should accomodate most studio layouts.
 * `package_origin`
   * Origin for the package to run.
   * Defaults to `core`, or, if `artifact_name` is supplied, the `package_origin` will be parsed from the filename of the hart file.
@@ -66,9 +66,9 @@ 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_timestamp`
-  * Package timestamp of the package to be run.
-  * Defaults to `nil` or if `artifact_name` is supplied, the `package_timestamp` will be parsed from the filename of the hart file.
+* `package_releae`
+  * 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`
   * The topology for the service to run in.  Valid values are `nil`, `standalone`, `leader`
   * Defaults to `nil` which is `standalone`
@@ -95,4 +95,4 @@ provisioner:
 
 suite:
   - name: core/redis
-```
+```

data/lib/kitchen/provisioner/habitat.rb

@@ -20,7 +20,7 @@ module Kitchen
       default_config :hab_sup_origin, "core"
       default_config :hab_sup_name, "hab-sup"
       default_config :hab_sup_version, nil
-      default_config :hab_sup_timestamp, nil
+      default_config :hab_sup_release, nil
       default_config :hab_sup_artifact_name, nil
 
       # hab-sup manager options
@@ -37,7 +37,7 @@ module Kitchen
         provisioner.instance.suite.name
       end
       default_config :package_version, nil
-      default_config :package_timestamp, nil
+      default_config :package_release, nil
       default_config :service_topology, nil
       default_config :service_update_strategy, nil
 
@@ -56,7 +56,7 @@ module Kitchen
           config[:hab_sup_origin] = ident["origin"]
           config[:hab_sup_name] = ident["name"]
           config[:hab_sup_version] = ident["version"]
-          config[:hab_sup_timestamp] = ident["timestamp"]
+          config[:hab_sup_release] = ident["release"]
         end
 
         unless config[:artifact_name].nil?
@@ -64,7 +64,7 @@ module Kitchen
           config[:package_origin] = ident["origin"]
           config[:package_name] = ident["name"]
           config[:package_version] = ident["version"]
-          config[:package_timestamp] = ident["timestamp"]
+          config[:package_release] = ident["release"]
         end
         super(instance)
       end
@@ -225,14 +225,14 @@ module Kitchen
       end
 
       def artifact_name_to_package_ident_regex
-        /(?<origin>\w+)-(?<name>.*)-(?<version>(\d+)?(\.\d+)?(\.\d+)?(\.\d+)?)-(?<timestamp>\d+)-(?<target>.*)\.hart$/
+        /(?<origin>\w+)-(?<name>.*)-(?<version>(\d+)?(\.\d+)?(\.\d+)?(\.\d+)?)-(?<release>\d+)-(?<target>.*)\.hart$/
       end
 
       def hab_sup_ident
         ident = "#{config[:hab_sup_origin]}/" \
                 "#{config[:hab_sup_name]}/" \
                 "#{config[:hab_sup_version]}/" \
-                "#{config[:hab_sup_timestamp]}".chomp("/").chomp("/")
+                "#{config[:hab_sup_release]}".chomp("/").chomp("/")
         @sup_ident ||= ident
       end
 
@@ -240,7 +240,7 @@ module Kitchen
         ident = "#{config[:package_origin]}/" \
                 "#{config[:package_name]}/" \
                 "#{config[:package_version]}/" \
-                "#{config[:package_timestamp]}".chomp("/").chomp("/")
+                "#{config[:package_release]}".chomp("/").chomp("/")
         @pkg_ident ||= ident
       end
 

data/lib/kitchen-habitat/version.rb

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

metadata

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