kitchen-salt 0.0.16 → 0.0.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTY3N2RkMmU0ZTBlODEwNTVlNzdkYjQ0NDc5ZDJmYjUwODIxZGE5Mg==
+    ZWQxMDZhMzQ4YmZiZjZkYzU5ZDUxZGFkODc2ZDBkMmNiMTY5MjRlYQ==
   data.tar.gz: !binary |-
-    ZjA2NjQzMDkyNmUzOTU4Mzc2OGFlYzRiNTg1ZjI2NDE3OGIwMDEwYw==
+    ZTY2ODFjOTQ5ODAwNDdjMmY1ZjA1MGUyZDYzYTgzNWY5MzlkMGQ0NA==
 SHA512:
   metadata.gz: !binary |-
-    ZTU1OTVjMGM0NjE3OWVhNjk1YjZhNGI1ODFjOGFiYmQ3NmI1ODQ0Y2FlZTYz
-    ODQ3ZDFmNmNiNjU2MDY0Yjc1OTE5N2QzYTdmMGQ1YWUxYWQ2YzI4ZjgxZWQ0
-    MTc4NzEyNTk5ODhmZTgxZDA1NjE3NWU2ZDhkNDRlNDA5YTUyNTQ=
+    YTJlOWJjMmY0YjIzZjJmNzQ2ZDY1ODMxZTI3NTZkMWM5YzMyNjczYWM4OTc0
+    N2I0ZGUyMzZkNWQxYTNmMGNlMDRmNTczM2ZmZWQ3NzM4ZDNiY2E3YTQ3MzE4
+    ZGI5NjZjZDk4YTJmYmZmMzk1MDBjYWMzZmVhMzYyYWNkYzBlYTY=
   data.tar.gz: !binary |-
-    YjE5YTJiOGRhNWJlNTI1NzI2MTMxMDQ3MzVkNWY1NzZjZTk4YzRkNjg1YWJj
-    ODAwZWUxZmQ2ODI0OTdkMGU3YWY2Nzg5ZTVlNWEzZTJhMjA0ZWMyM2NhMjQ4
-    MDM0OWRjODY5YTFkNGFkMjZmNjU5NDY0MmZkYTZiODZiOTc0MjE=
+    OWQzNzZlYzk1ODA3YTVmNjQ5NGYxY2U0MWU1N2NmMmJjOWU2OWI0YmM2OGQx
+    ZDI2ODlhOWU5OTQxZTY4NmRhYWU2OGQzNWU4YmZkOGQ3YjYwMzIwYjZkZmE0
+    ZDAxNGU3MDIyYWI1MmU5ODEyZGY0ZmRlZWM0M2I5ZWM2NDJlN2M=

data/lib/kitchen/provisioner/salt_solo.rb

@@ -49,6 +49,7 @@ module Kitchen
       default_config :salt_state_top, "/srv/salt/top.sls"
       default_config :state_collection, false
       default_config :state_top, {}
+      default_config :state_top_from_file, false
       default_config :salt_run_highstate, true
 
       # salt-call version that supports the undocumented --retcode-passthrough command
@@ -243,13 +244,21 @@ module Kitchen
       def prepare_state_top
         info("Preparing state_top")
 
-        # we get a hash with all the keys converted to symbols, salt doesn't like this
-        # to convert all the keys back to strings again
-        state_top_content = unsymbolize(config[:state_top]).to_yaml
-        # .to_yaml will produce ! '*' for a key, Salt doesn't like this either
-        state_top_content.gsub!(/(!\s'\*')/, "'*'")
         sandbox_state_top_path = File.join(sandbox_path, config[:salt_state_top])
 
+        if (config[:state_top_from_file] == false)
+          # use the top.sls embedded in .kitchen.yml
+
+          # we get a hash with all the keys converted to symbols, salt doesn't like this
+          # to convert all the keys back to strings again
+          state_top_content = unsymbolize(config[:state_top]).to_yaml
+          # .to_yaml will produce ! '*' for a key, Salt doesn't like this either
+          state_top_content.gsub!(/(!\s'\*')/, "'*'")
+        else
+          # load a top.sls from disk
+          state_top_content = File.read("top.sls")
+        end
+
         # create the directory & drop the file in
         FileUtils.mkdir_p(File.dirname(sandbox_state_top_path))
         File.open(sandbox_state_top_path, "wb") do |file|

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = "0.0.16"
+    VERSION = "0.0.17"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Simon McCartney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies: []
 description: salt provisioner for test-kitchen
 email: