kitchen-salt 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79f494f3ba503351c7a4e3890f982d3b0aef0999422771af07ce99999f3dcff6
-  data.tar.gz: e7142e9c9ec1859b247ab7828b890a88237007f93d82d19cf8caacb0c8e40cb2
+  metadata.gz: c37b796e056dcc14db8725ccd88b8e0e2cc9f121f114360a9a19efda8446bdc5
+  data.tar.gz: f1a3d9bb0207b05471a22244337ecf2a2734c022b6880dd60b2e9d7a860c19cc
 SHA512:
-  metadata.gz: c296038cf76c93edc5879c0917a82e7322b03bd535809ea5154ae08eb725b97c4b3ef939b2f11f3b9409040ed87c1cbcd611e734f9bccf38c447f46a176cd6d5
-  data.tar.gz: 5e139be4561ad12bfa213dfb322eed2b55c68ae7dbe1a3e651645af8248e7b3f229fd57858afcac31cb348e31d76624c7274d16e61b8dc4e4b9074318c18ac13
+  metadata.gz: 6e3a6116b1608d75e2136c4a2502527494b854c3ad790db928d6118130e9d1422cf6b471608ef8a37685698cc194088772984d69401899670e5f95a11c434f56
+  data.tar.gz: 66f41fc7628ae53f0ed402a71d6f18cf4e0ee779e3cf1d27c38c69593a9f58d94a6eee954b351a868f12d0ff2fe6d2f360d29a706dfb794cdd6c858c7dc7c71f

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = '0.2.3'.freeze
+    VERSION = '0.2.4'.freeze
   end
 end

data/lib/kitchen/provisioner/install.erb

@@ -39,6 +39,8 @@ then
   #{sudo('sh')} $BOOTSTRAP #{bootstrap_options}
 elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "pip" ]
 then
+  echo "Makesure setuptools is new enough"
+  #{sudo(salt_pip_bin)} install "setuptools>=30"
   echo #{sudo(salt_pip_bin)} #{salt_pip_install_command} #{salt_pip_pkg}
   #{sudo(salt_pip_bin)} #{salt_pip_install_command} #{salt_pip_pkg}
 elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "apt" ]

data/lib/kitchen/provisioner/salt_solo.rb

@@ -37,6 +37,7 @@ module Kitchen
 
       DEFAULT_CONFIG = {
         bootstrap_url: 'https://raw.githubusercontent.com/saltstack/kitchen-salt/master/assets/install.sh',
+        cache_commands: [],
         chef_bootstrap_url: 'https://www.chef.io/chef/install.sh',
         dependencies: [],
         dry_run: false,
@@ -197,6 +198,7 @@ module Kitchen
         prepare_grains
         prepare_states
         prepare_state_top
+        prepare_cache_commands
         # upload scripts, cached formulas, and setup system repositories
         prepare_dependencies
       end
@@ -268,7 +270,7 @@ module Kitchen
         cmd << " --id=#{config[:salt_minion_id]}" if config[:salt_minion_id]
         cmd << " test=#{config[:dry_run]}" if config[:dry_run]
         cmd << ' --force-color' if config[:salt_force_color]
-        if salt_version > RETCODE_VERSION || salt_version == 'latest'
+        if "#{salt_version}" > RETCODE_VERSION || salt_version == 'latest'
           # hope for the best and hope it works eventually
           cmd << ' --retcode-passthrough'
         end
@@ -285,7 +287,7 @@ module Kitchen
         #  https://github.com/saltstack/salt/pull/11337
         # Unless we know we have a version that supports --retcode-passthrough
         # attempt to scan the output for signs of failure
-        if config[:salt_version] <= RETCODE_VERSION
+        if "#{config[:salt_version]}" <= RETCODE_VERSION
           # scan the output for signs of failure, there is a risk of false negatives
           fail_grep = 'grep -e Result.*False -e Data.failed.to.compile -e No.matching.sls.found.for'
           # capture any non-zero exit codes from the salt-call | tee pipe
@@ -416,6 +418,24 @@ module Kitchen
         dependencies_content = ERB.new(File.read(dependencies_script)).result(binding)
         write_raw_file(File.join(sandbox_path, 'dependencies.sh'), dependencies_content)
       end
+
+      def prepare_cache_commands
+        ctx = to_hash
+        config[:cache_commands].each do |cmd|
+          system(cmd % ctx)
+          if $?.exitstatus.nonzero?
+            raise ActionFailed,
+              "cache_command '#{cmd}' failed to execute (exit status #{$?.exitstatus})"
+          end
+        end
+      end
+
+      def to_hash
+        hash = Hash.new
+        instance_variables.each {|var| hash[var[1..-1]] = instance_variable_get(var) }
+        hash.map{|k,v| [k.to_s.to_sym,v]}.to_h
+      end
+
     end
   end
 end

data/lib/kitchen/verifier/runtests.rb

@@ -32,7 +32,7 @@ module Kitchen
           File.join(root_path, config[:testingdir], '/tests/runtests.py'),
           '--sysinfo',
           '--output-columns=80',
-          (config[:windows] ? "--names-file=#{root_path}\\testing\\tests\\whitelist.txt" : ''),
+          (config[:windows] && config[:tests].empty? ? "--names-file=#{root_path}\\testing\\tests\\whitelist.txt" : ''),
           (config[:transport] ? "--transport=#{config[:transport]}" : ''),
           (config[:verbose] ? '-vv' : '-v'),
           (config[:run_destructive] ? "--run-destructive" : ''),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - SaltStack Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie