kitchen-salt 0.0.18 → 0.0.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmZkODE1Yjg1ZDI3NGE3ZDRmOTRmMzdjM2E1NzdlODc4ZTlhNjA2MA==
+    MzBmNWJhY2U4OWMwMDliZTg4MTEwYjBmM2FhY2QyYTdkZjBiYjJmNg==
   data.tar.gz: !binary |-
-    ZDI5ZTVjMjg4ZGQxZmUwMDRjOGYyZTljNTdmZDY0MTQzOGI2NzA1OQ==
+    ZjM1MDFiYTE2MzE4Y2ZiYzkwOTFhZTQwYjg0ZDgyNjMzYzM0YjE2NA==
 SHA512:
   metadata.gz: !binary |-
-    ODgxZDY3NjY1ODMyM2E4OGRlMTBjMmMyNjMxNDVjOGI2ODI4NmM1NzllMGYw
-    NmM0ZjA2ZTAxOWFlZTU3YWNlZTg3ZTU3M2JkYTAwOGUzZjBhNGFiZDgyYzY5
-    OTg5M2E4Mjg5YjRkYmFiOGIwMDYxZjc1NjYxNzFiMmVjZmI5MzY=
+    MjIwMGI4MTI2MmRkNjNlODZlN2ZkNDlkNjVjNjdhODg5MGNkOTI3ZDI0Yjcw
+    NDE3YzljYTc5YjY4OWVkYWQ4MDRhNmExYjVhZjAwYTFmNmNjNzk5ZGU1ODIw
+    NTI0ZWRmNzBkZTNjM2M4ZWIzZDkzZGIwNDY0ZTIwM2ViYzhjYTY=
   data.tar.gz: !binary |-
-    YzMzMmExODUzMDkzYzdhYzNjNzJmOGZkMTViZGI2NzVkOGE5NTA5ZWI2MDVm
-    Y2ZjM2FkMzc1ZGE3YjU1YzExMzllMGEwMTgzNDU0YTNiYjNkN2FhNjFhYjM1
-    NjMxYjUzNmNlMGY2ZmIyNTEwODNhMmNjZjM0YjJkYWJhYTcwNWM=
+    NzRkMzYxNzYzODU1NDRmZmU4MzhiOWYyYjE0NTZmNGExNTMyNWQ3Y2RjODQ5
+    MzI1ZGE3ZTA4MjAzZjFiZjc0MzI2NDQwOTVjMzUxYjk1Y2UxZjI2YTc3NTVj
+    Yjk0OGFiODkxOTFmY2M5MjdkNmYyODdiYjNmZDNmOGY3ZjdkMzM=

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = "0.0.18"
+    VERSION = "0.0.19"
   end
 end

data/lib/kitchen/provisioner/salt_solo.rb

@@ -56,6 +56,7 @@ module Kitchen
       default_config :salt_copy_filter, []
       default_config :is_file_root, false
 
+      default_config :dependancies, []
 
       # salt-call version that supports the undocumented --retcode-passthrough command
       RETCODE_VERSION = '0.17.5'
@@ -154,7 +155,11 @@ module Kitchen
         if config[:state_collection] || config[:is_file_root]
           prepare_state_collection
         else
-          prepare_formula
+          prepare_formula config[:kitchen_root], config[:formula]
+
+          config[:dependancies].each do |formula|
+            prepare_formula formula[:path], formula[:name]
+          end
         end
       end
 
@@ -348,18 +353,17 @@ module Kitchen
         end
       end
 
-      def prepare_formula
-        info("Preparing formula")
+      def prepare_formula(path, formula)
+        info("Preparing formula: #{formula} from #{path}")
         debug("Using config #{config}")
 
-        formula_dir = File.join(sandbox_path, config[:salt_file_root], config[:formula])
+        formula_dir = File.join(sandbox_path, config[:salt_file_root], formula)
         FileUtils.mkdir_p(formula_dir)
-        #FileUtils.cp_r(Dir.glob(File.join(config[:kitchen_root], config[:formula], "*")), formula_dir)
-        cp_r_with_filter(File.join(config[:kitchen_root], config[:formula]), formula_dir, config[:salt_copy_filter])
+        cp_r_with_filter(File.join(path, formula), formula_dir, config[:salt_copy_filter])
 
         # copy across the _modules etc directories for python implementation
         ['_modules', '_states', '_grains', '_renderers', '_returners'].each do |extrapath|
-          src = File.join(config[:kitchen_root], extrapath)
+          src = File.join(path, extrapath)
 
           if (File.directory?(src))
             debug("prepare_formula: #{src} exists, copying..")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Simon McCartney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies: []
 description: salt provisioner for test-kitchen
 email: