kitchen-salt 0.0.19 → 0.0.20

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzBmNWJhY2U4OWMwMDliZTg4MTEwYjBmM2FhY2QyYTdkZjBiYjJmNg==
-  data.tar.gz: !binary |-
-    ZjM1MDFiYTE2MzE4Y2ZiYzkwOTFhZTQwYjg0ZDgyNjMzYzM0YjE2NA==
+SHA1:
+  metadata.gz: 12fa6805423ded99c3c23c988daf11e1f4a5cded
+  data.tar.gz: 3e31aff1ed3d5da8aff8891dc991706e3ff75631
 SHA512:
-  metadata.gz: !binary |-
-    MjIwMGI4MTI2MmRkNjNlODZlN2ZkNDlkNjVjNjdhODg5MGNkOTI3ZDI0Yjcw
-    NDE3YzljYTc5YjY4OWVkYWQ4MDRhNmExYjVhZjAwYTFmNmNjNzk5ZGU1ODIw
-    NTI0ZWRmNzBkZTNjM2M4ZWIzZDkzZGIwNDY0ZTIwM2ViYzhjYTY=
-  data.tar.gz: !binary |-
-    NzRkMzYxNzYzODU1NDRmZmU4MzhiOWYyYjE0NTZmNGExNTMyNWQ3Y2RjODQ5
-    MzI1ZGE3ZTA4MjAzZjFiZjc0MzI2NDQwOTVjMzUxYjk1Y2UxZjI2YTc3NTVj
-    Yjk0OGFiODkxOTFmY2M5MjdkNmYyODdiYjNmZDNmOGY3ZjdkMzM=
+  metadata.gz: 67aa2eaf7794942a0a97c79f1a6594f979d371429ad5090c3d67eef53f51540a2d4b72fe0f0701fa864cc98a796c6d8a2e5baaeba2fcd8706438dde016c6176a
+  data.tar.gz: 966af886ee52d978bf8c0fa3d019029da0198bf56e4018cdd8648773aacadd3c716fca46b8990c4f5beec99aa371f3408555ab2f4f31ebac4359751917c6f949

data/lib/kitchen-salt/version.rb

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

data/lib/kitchen/provisioner/salt_solo.rb

@@ -56,7 +56,9 @@ module Kitchen
       default_config :salt_copy_filter, []
       default_config :is_file_root, false
 
-      default_config :dependancies, []
+      default_config :dependencies, []
+      default_config :vendor_path, ""
+      default_config :omnibus_cachier, false
 
       # salt-call version that supports the undocumented --retcode-passthrough command
       RETCODE_VERSION = '0.17.5'
@@ -81,6 +83,8 @@ module Kitchen
         salt_apt_repo = config[:salt_apt_repo]
         salt_apt_repo_key = config[:salt_apt_repo_key]
 
+        omnibus_download_dir = config[:omnibus_cachier] ? "/tmp/vagrant-cache/omnibus_chef" : "/tmp"
+
         <<-INSTALL
           sh -c '
           #{Util.shell_helpers}
@@ -130,15 +134,15 @@ module Kitchen
             exit 2
           fi
 
-          # install chef omnibus so that busser works :(
-          # TODO: work out how to install enough ruby
-          # and set busser: { :ruby_bindir => '/usr/bin/ruby' } so that we dont need the
-          # whole chef client
           if [ ! -d "/opt/chef" ]
           then
             echo "-----> Installing Chef Omnibus"
-            do_download #{chef_url} /tmp/install.sh
-            #{sudo('sh')} /tmp/install.sh
+            mkdir -p #{omnibus_download_dir}
+            if [ ! -x #{omnibus_download_dir}/install.sh ]
+            then
+              do_download #{chef_url} #{omnibus_download_dir}/install.sh
+            fi
+            #{sudo('sh')} #{omnibus_download_dir}/install.sh -d #{omnibus_download_dir}
           fi
 
           '
@@ -157,7 +161,17 @@ module Kitchen
         else
           prepare_formula config[:kitchen_root], config[:formula]
 
-          config[:dependancies].each do |formula|
+          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)
+          end
+
+          config[:dependencies].each do |formula|
             prepare_formula formula[:path], formula[:name]
           end
         end
@@ -410,14 +424,22 @@ module Kitchen
             target = source.sub(/^#{source_path}/, target_path)
             debug("cp_r_with_filter:source = #{source}")
             debug("cp_r_with_filter:target = #{target}")
+            filtered = filter.include?(File.basename(source))
             if File.directory? source
-              if filter.include?(File.basename(source))
+              if filtered
                 debug("Found #{source} in #{filter}, pruning it from the Find")
                 Find.prune
               end
               FileUtils.mkdir target unless File.exists? target
+              if File.symlink? source
+                FileUtils.cp_r "#{source}/.", target
+              end
             else
-              FileUtils.copy source, target
+              if filtered
+                debug("Found #{source} in #{filter}, not copying file")
+              else
+                FileUtils.copy source, target
+              end
             end
           end
         end

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Simon McCartney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
-dependencies: []
+date: 2015-07-02 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'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: salt provisioner for test-kitchen
 email:
 - simon@mccartney.ie
@@ -28,17 +84,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ! '[none]'
-rubygems_version: 2.2.2
+rubyforge_project: "[none]"
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: salt provisioner for test-kitchen