kitchen-verifier-serverspec 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c6714cf2d0e9650191e995f574f04e41d82a93f
-  data.tar.gz: ff945273b667c74be626404334d7e84ec67b140a
+  metadata.gz: 31658d1ce8d109b50e8a0bd4fee136aaaff4ef05
+  data.tar.gz: e9a6e86d7281a6427415ebf39a90ebea247d029e
 SHA512:
-  metadata.gz: dff14d247fda8eb4f815aef042f94f4403f9b9cfeb6d797184d39f768d8c43f660b996163847a857cc8cdc8c6179e1d9a30536b7ec1cbbd65bd4235632fbba6f
-  data.tar.gz: 566bc642fc3b9e9f6fb147f0dab6136162bfe6853c364e310d9860c75b8c7ebb30a20bac74c18af97c8684eb5cbecd82c945481cf57b7b1aea0d8f408058f6b8
+  metadata.gz: 674d382c7fcaa9f73875e7cf3e46d51edb791e8da6c973d9c8c7d2f9bf66bcdc683a9054a92ee07be5dceb2e920a2b0b738e7c89f95237801738bc18a0399944
+  data.tar.gz: 1b72bb70e1754d7efc2989c5d69ac4c1b0179a26e724d3bb2f8c94d9c87904b0ebd5c25faf1a7e22e9cf14596b89d8e2bc369b075b7e731c20963a4c493d03b2

data/README.md

@@ -127,13 +127,15 @@ key | default value | Notes
 ----|---------------|--------
 sleep | 0 |
 remote_exec | true | specify false to run serverspec on workstation
-serverspec_command | nil | custom command to run serverspec
+custom_serverspec_command | nil | custom command to run serverspec. Can be multiline. See examples below.
+additional_serverspec_command | nil | additional command to run serverspec. Can be multiline. See examples below.
 format | 'documentation' | format of serverspec output
 color | true | enable color in the output
 default_path | '/tmp/kitchen' | Set the default path where serverspec looks for patterns
 patterns | [] | array of patterns for spec test files
 gemfile | nil | custom gemfile to use to install serverspec
 custom_install_commmand | nil | Custom shell command to be used at install stage. Can be multiline. See examples below.
+additional_install_commmand | nil | Additional shell command to be used at install stage. Can be multiline. See examples below.
 test_serverspec_installed | true | only run install_command if serverspec not installed
 extra_flags | nil | extra flags to add to ther serverspec command
 remove_default_path | false | remove the default_path after successful serverspec run

data/lib/kitchen/verifier/serverspec.rb

@@ -26,6 +26,8 @@ module Kitchen
 
       default_config :sleep, 0
       default_config :serverspec_command, nil
+      default_config :custom_serverspec_command, nil
+      default_config :additional_serverspec_command, nil
       default_config :shellout_opts, {}
       default_config :live_stream, $stdout
       default_config :remote_exec, true
@@ -35,6 +37,7 @@ module Kitchen
       default_config :patterns, []
       default_config :gemfile, nil
       default_config :custom_install_command, nil
+      default_config :additional_install_command, nil
       default_config :test_serverspec_installed, true
       default_config :extra_flags, nil
       default_config :remove_default_path, false
@@ -75,12 +78,13 @@ module Kitchen
 
       def serverspec_commands
         if config[:remote_exec]
-          if config[:serverspec_command]
+          if custom_serverspec_command
             <<-INSTALL
-            #{config[:serverspec_command]}
+            #{custom_serverspec_command}
             INSTALL
           else
             <<-INSTALL
+            #{config[:additional_serverspec_command]}
             if [ -d #{config[:default_path]} ]; then
               cd #{config[:default_path]}
               #{rspec_commands}
@@ -91,10 +95,15 @@ module Kitchen
             fi
             INSTALL
           end
-        elsif config[:serverspec_command]
-          info("Running command: #{config[:serverspec_command]}")
-          system config[:serverspec_command]
+        elsif custom_serverspec_command
+          info("Running command: #{custom_serverspec_command}")
+          system custom_serverspec_command
         else
+          if config[:additional_serverspec_command]
+            c = config[:additional_serverspec_command]
+            info("Running command: #{c}")
+            system c
+          end
           c = rspec_commands
           info("Running command: #{c}")
           system c
@@ -107,6 +116,7 @@ module Kitchen
         if config[:remote_exec]
           info('Installing ruby, bundler and serverspec remotely on server')
           <<-INSTALL
+            #{config[:additional_install_command]}
             if [ ! $(which ruby) ]; then
               echo '-----> Installing ruby, will try to determine platform os'
               if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ]; then
@@ -130,6 +140,11 @@ module Kitchen
           INSTALL
         else
           info('Installing bundler and serverspec locally on workstation')
+          if config[:additional_install_command]
+            c = config[:additional_install_command]
+            info("Running command: #{c}")
+            system c
+          end
           install_bundler
           install_serverspec
           install_runner
@@ -280,6 +295,11 @@ module Kitchen
         end
       end
 
+      def custom_serverspec_command
+        return config[:custom_serverspec_command] if config[:custom_serverspec_command]
+        config[:serverspec_command]
+      end
+
       def bundler_path
         config[:bundler_path] ? "#{config[:bundler_path]}/" : nil
       end

data/lib/kitchen/verifier/serverspec_version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Verifier
-    SERVERSPEC_VERSION = '0.3.1'.freeze
+    SERVERSPEC_VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-verifier-serverspec
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen