kitchen-salt 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 556fefc16103a90cd25a9a0dbec608557d602269
-  data.tar.gz: 0b55f89351ebc5a26d9f17b9c1057b6974e7fcc6
+  metadata.gz: f1db2002d5d7dfee0718dc6f0ae1f99252e54341
+  data.tar.gz: 1bf8811fd88757cb82b30f890391f13fc323e85b
 SHA512:
-  metadata.gz: 488736974faf1a30c0d285a6dcd9d37d86b6ca433d3e78419ecec17d3df26373ac945fc560b296c034a0776981d1d70890fe118454cee4a6ba325d1067457236
-  data.tar.gz: 11b31f89fec95162580d10fb161afa1c37c3b69a978b4d3473c3a9d1f36354cd1b52a2a7ba3af31b71cc68eafa96dab55aa460f8f2a34a83e54c5dea719f09c6
+  metadata.gz: ec56857a6c915a47f56680cd3d55e6abb2d71f631d47d554bc2e24e910c9228f65db56a959954b96e2379ca5ad10c2606075b79274d48a240e69b3cfc01f7455
+  data.tar.gz: f29ec622183a4b2a35a764b7db314e5a4e6a3ea1514496d1fa17a9f873cddb7ac0a2e2e9459c2f8ddcc9307bda00e761fe5d033585594c434ee408857f20a810

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = "0.0.21"
+    VERSION = "0.0.22"
   end
 end

data/lib/kitchen/provisioner/salt_solo.rb

@@ -57,7 +57,7 @@ module Kitchen
       default_config :is_file_root, false
 
       default_config :dependencies, []
-      default_config :vendor_path, ""
+      default_config :vendor_path, nil
       default_config :omnibus_cachier, false
 
       # salt-call version that supports the undocumented --retcode-passthrough command
@@ -156,19 +156,27 @@ module Kitchen
         prepare_state_top
         prepare_pillars
         prepare_grains
+
         if config[:state_collection] || config[:is_file_root]
           prepare_state_collection
         else
           prepare_formula config[:kitchen_root], config[:formula]
 
-          deps = if Pathname.new(config[:vendor_path]).absolute?
-            Dir["#{config[:vendor_path]}/*"]
-          else
-            Dir["#{config[:kitchen_root]}/#{config[:vendor_path]}/*"]
-          end
+          unless config[:vendor_path].nil?
+            if Pathname.new(config[:vendor_path]).exist?
+              deps = if Pathname.new(config[:vendor_path]).absolute?
+                Dir["#{config[:vendor_path]}/*"]
+              else
+                Dir["#{config[:kitchen_root]}/#{config[:vendor_path]}/*"]
+              end
 
-          deps.each do |d|
-            prepare_formula "#{config[:kitchen_root]}/#{config[:vendor_path]}", File.basename(d)
+              deps.each do |d|
+                prepare_formula "#{config[:kitchen_root]}/#{config[:vendor_path]}", File.basename(d)
+              end
+            else
+              # :vendor_path was set, but not valid
+              raise UserError, "kitchen-salt: Invalid vendor_path set: #{config[:vendor_path]}"
+            end
           end
 
           config[:dependencies].each do |formula|
@@ -296,8 +304,6 @@ module Kitchen
 
         return if config[:pillars].nil? && config[:'pillars-from-files'].nil?
 
-
-
         # 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
         pillars = unsymbolize(config[:pillars])

metadata

@@ -1,72 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Simon McCartney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: salt provisioner for test-kitchen
+        version: 0.7.3
+description: salt provisioner for test-kitchen so that you can test all the things
 email:
 - simon@mccartney.ie
 executables: []
@@ -76,7 +76,8 @@ files:
 - lib/kitchen-salt/version.rb
 - lib/kitchen/provisioner/salt_solo.rb
 homepage: https://github.com//kitchen-salt
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []