kitchen-salt 0.0.15 → 0.0.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWY5MDg5ZjQ0MzIyNzZlZmYxYzgyYWQxZjMxYTAyZmJkZTYzZGEyMw==
+    MTY3N2RkMmU0ZTBlODEwNTVlNzdkYjQ0NDc5ZDJmYjUwODIxZGE5Mg==
   data.tar.gz: !binary |-
-    YmM2NzNkNTgwZTM0ODAwYzBkMDYyODg3MTQ3ZDQzMGYyZjVmOGQ4YQ==
+    ZjA2NjQzMDkyNmUzOTU4Mzc2OGFlYzRiNTg1ZjI2NDE3OGIwMDEwYw==
 SHA512:
   metadata.gz: !binary |-
-    MmZmZjFiMTIwZWY1YWFkNzc2ZGFiYWRhMDZhZDhjZmE0MjIyM2VjNDFiMzQx
-    YzdmODIwNjc5YWQ5MzY3MzNjMTBiYWZkYWNhNDdjYjJlNzE1MTdiODc0NzM3
-    NWY2MDViOGZiMjhlMzJlMTYwYzdmZjNkNjNkZGQ4NjMwNmYzNzg=
+    ZTU1OTVjMGM0NjE3OWVhNjk1YjZhNGI1ODFjOGFiYmQ3NmI1ODQ0Y2FlZTYz
+    ODQ3ZDFmNmNiNjU2MDY0Yjc1OTE5N2QzYTdmMGQ1YWUxYWQ2YzI4ZjgxZWQ0
+    MTc4NzEyNTk5ODhmZTgxZDA1NjE3NWU2ZDhkNDRlNDA5YTUyNTQ=
   data.tar.gz: !binary |-
-    NjcwYTA4ZmYzMmUzYTBiZmFhMjk3MDg2MjJkYmE3ZDIwNTllODc5MDllYTll
-    MzlmNzVjNGM0MjQ4YTg5Nzg4Y2ZlZTg2YjUxNmQ3NThmODgzMWQ4MmRiODc3
-    MDNmYTg3Y2ExYTc4MmYwMzdiNjk5NzU1NWVjODM4YWYyOWY4YWY=
+    YjE5YTJiOGRhNWJlNTI1NzI2MTMxMDQ3MzVkNWY1NzZjZTk4YzRkNjg1YWJj
+    ODAwZWUxZmQ2ODI0OTdkMGU3YWY2Nzg5ZTVlNWEzZTJhMjA0ZWMyM2NhMjQ4
+    MDM0OWRjODY5YTFkNGFkMjZmNjU5NDY0MmZkYTZiODZiOTc0MjE=

data/lib/kitchen-salt/version.rb

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

data/lib/kitchen/provisioner/salt_solo.rb

@@ -350,13 +350,25 @@ module Kitchen
       end
 
       def prepare_state_collection
-        info("Preparing state collection (get with it! this should be a formula already!)")
+        info("Preparing state collection")
         debug("Using config #{config}")
 
-        file_root = File.join(sandbox_path, config[:salt_file_root])
-        formula_dir = File.join(sandbox_path, config[:salt_file_root], config[:formula])
-        FileUtils.mkdir_p(formula_dir)
-        FileUtils.cp_r(Dir.glob(File.join(config[:kitchen_root], "*")), formula_dir)
+        if config[:collection_name].nil? and config[:formula].nil?
+          error("neither collection_name or formula have been set!")
+          exit(2)
+        else
+          if config[:collection_name].nil?
+            debug("collection_name not set, using #{config[:formula]}")
+            config[:collection_name] = config[:formula]
+          end
+        end
+
+        debug("sandbox_path = #{sandbox_path}")
+        debug("salt_file_root = #{config[:salt_file_root]}")
+        debug("collection_name = #{config[:collection_name]}")
+        collection_dir = File.join(sandbox_path, config[:salt_file_root], config[:collection_name])
+        FileUtils.mkdir_p(collection_dir)
+        FileUtils.cp_r(Dir.glob(File.join(config[:kitchen_root], "*")), collection_dir)
 
       end
     end

metadata

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