kitchen-salt 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjQxYzczMjEzMzI5OTNiYWMzN2RmNTAxOWMzOGFmYTg4ZWU5NGZmNg==
+  data.tar.gz: !binary |-
+    MmRmZDZmNzNmZjI5YTJjNTk5NjNhOGY1OWRkZjljNmU2NzY5OGE5Nw==
+SHA512:
+  metadata.gz: !binary |-
+    NjNhNzgxZjFiOWFlOGEzMDdjZDQ1YmMyZDY1ZjI2OTAzMGY4MGEwMGFiZmI5
+    NjU2YWY0NDM0YTQ3YjM5MDg2NTk3ZWJiYjcxYWY1OTk3M2Q4MWM2ZTE0Mjkw
+    ZDQ1Y2YwNGQ4NTI5Y2IyNDA2NTI5NmM1YjU5YTc3N2FkYjE3MWE=
+  data.tar.gz: !binary |-
+    YmU0MWE0MzBiYjgwZGZmNWFmMTY0MWY1YTNmNjVjY2FlNDFlNDRjNjIxYWQ2
+    YmUxY2FiNDk5ZWEyM2QzZGMzMDk1MjQ5MDRlMTQ3MTQwOWEwN2M1YjA3YzRj
+    ZmNmMDI0MTExNmJiYTAxOTFkZmE4M2Y2ZTcyZDkxM2U0YzQyMDM=

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/kitchen/provisioner/salt_solo.rb

@@ -35,7 +35,7 @@ module Kitchen
       default_config :salt_bootstrap_options, ""
 
       # alternative method of installing salt
-      default_config :salt_version, "0.16.2"
+      default_config :salt_version, "latest"
       default_config :salt_apt_repo, "http://apt.mccartney.ie"
       default_config :salt_apt_repo_key, "http://apt.mccartney.ie/KEY"
 
@@ -46,10 +46,14 @@ module Kitchen
       default_config :salt_file_root, "/srv/salt"
       default_config :salt_pillar_root, "/srv/pillar"
       default_config :salt_state_top, "/srv/salt/top.sls"
+      default_config :state_collection, false
       default_config :pillars, {}
       default_config :state_top, {}
       default_config :salt_run_highstate, true
 
+      # salt-call version that supports the undocumented --retcode-passthrough command
+      RETCODE_VERSION = '0.17.5'
+
       def install_command
         debug(diagnose())
         salt_install = config[:salt_install]
@@ -89,7 +93,7 @@ module Kitchen
           then
             echo "No salt-minion installed and I do not know how to install one!"
             exit 2
-          elif [ "${SALT_VERSION}" = "#{salt_version}" ]
+          elif [ "${SALT_VERSION}" = "#{salt_version}" -o "#{salt_version}" = "latest" ]
           then
             echo "You asked for #{salt_version} and you have already got ${SALT_VERSION} installed, sweet!"
           elif [ ! -z "${SALT_VERSION}" -a "#{salt_install}" = "bootstrap" ]
@@ -121,7 +125,11 @@ module Kitchen
         prepare_minion
         prepare_state_top
         prepare_pillars
-        prepare_formula
+        if config[:state_collection]
+          prepare_state_collection
+        else
+          prepare_formula
+        end
       end
 
       def init_command
@@ -135,8 +143,20 @@ module Kitchen
         # sudo(File.join(config[:root_path], File.basename(config[:script])))
         debug(diagnose())
         if config[:salt_run_highstate]
-          sudo("salt-call --config-dir=#{File.join(config[:root_path], config[:salt_config])} --local state.highstate")
+          cmd = sudo("salt-call --config-dir=#{File.join(config[:root_path], config[:salt_config])} --local state.highstate")
         end
+
+        cmd << " --log-level=#{config[:log_level]}"
+
+        # config[:salt_version] can be 'latest' or 'x.y.z'
+        if config[:salt_version] >= RETCODE_VERSION
+          debug("Skipping the ropey --retcode-passthrough argument")
+          # cmd = cmd + " --retcode-passthrough"
+        else
+          cmd << " | tee /tmp/salt-call-output ; grep -e ERROR -e CRITICAL /tmp/salt-call-output ; [ $? -eq 0 ] && exit 1 ; [ $? -eq 1 ] && exit 0 "
+        end
+
+        cmd
       end
 
       protected
@@ -247,6 +267,17 @@ module Kitchen
         FileUtils.cp_r(Dir.glob(File.join(config[:kitchen_root], config[:formula], "*")), formula_dir)
 
       end
+
+      def prepare_state_collection
+        info("Preparing state collection (get with it! this should be a formula already!)")
+        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)
+
+      end
     end
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Simon McCartney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies: []
 description: salt provisioner for test-kitchen
 email:
@@ -22,26 +21,25 @@ files:
 - lib/kitchen/provisioner/salt_solo.rb
 homepage: https://github.com//kitchen-salt
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: salt provisioner for test-kitchen
 test_files: []