kitchen-verifier-serverspec 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f28dbeefc2392bb5afadee413abaead4a941d50
-  data.tar.gz: 0460d08331c873b405c1b2ec34a918cb636e19f3
+  metadata.gz: 043246681b786882e2a9a6cf4fb1229fc09e8e2e
+  data.tar.gz: 5a1ce432cdcabb18880f84ac20feca46a6252fc6
 SHA512:
-  metadata.gz: 2eb17ed87aa3e601e0e218b9568171f7373e697256039a721528f662f46467aebba6053c8a1119d4764d38769475ab3aefaa4d0b624f587cc1eef42732684de0
-  data.tar.gz: 701197a9b07e7ac5e39e13665f6ab062764b4a06056902953732e2906125e1c39907b93a3761d247ed1a2cfb12667aa0522b9fd7d2ccc9213348796f9709682b
+  metadata.gz: 850399866c291c374c1991773a2839a959a28d707cc3c0718add734a4c516c3e6da35cc6632eb5e6ca7ae272030b5c7fe8ba7af0ced45c098dd178b261769a89
+  data.tar.gz: a334b7323080ba0051800e06dd7501f26822b09cb1398bda3e9e8c3c4169f9387d59c02f56ce2475dd80776cd2f8924c7c57ede4769d46a00702101c2108f61a

data/README.md

@@ -36,6 +36,34 @@ gem 'serverspec'
 
 this allows extra dependencies to be specified and the version of serverspec specified.
 
+# Serverspec Verifier Options
+
+key | default value | Notes
+----|---------------|--------
+sleep | 0 |
+remote_exec | true | specify false to run serverspec on workstation
+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
+http_proxy | nil | use http proxy when installing ruby, serverspec and running serverspec
+https_proxy | nil | use https proxy when installing puppet, ruby, serverspec and running serverspec
+sudo | nil | use sudo to run commands
+sudo_command | 'sudo -E -H' | sudo command to run when sudo set to true
+env_vars | {} | environment variable to set for rspec
+bundler_path | | override path for bundler command
+rspec_path | | override path for rspec command
+runner_url | https://raw.githubusercontent.com /neillturner/serverspec-runners/ master/ansiblespec_runner.rb | url for custom runner
+require_runner | false | run the custom runner instead of rspec directly
+
 ## Usage
 
 There are three ways to run verifier serverspec:
@@ -43,6 +71,14 @@ There are three ways to run verifier serverspec:
   * Remotely directly on the server running serverspec in ssh mode
   * Locally on your workstation running serverspec in ssh mode
 
+Verifier Serverspec allows the serverspec files to be anywhere in the repository.This means that you can use spec files that follow ansiblespec or puppet beaker locations.
+
+### Spec File Location and Updating
+
+Verfier Serverspec does not copy the the serverspec files. They are assumed to be there in the repository and to have been copied to the server via the provisioner. This means if you change a spec file you need to run converge again to get the spec files copied to the server. Verifier Serverspec doesn't copy spec files in the test/integration directory like the busser serverspec that is supplied by chef.
+
+
+
 ## Remotely directly on server running serverspec in exec mode
 
 This allow testing directly on the server. Typicaly used in conjunction with ansible using local connection.
@@ -200,35 +236,6 @@ suites:
         SSH_KEY: 'spec/tomcat_private_key.pem'
 ```
 
-
-# Serverspec Verifier Options
-
-key | default value | Notes
-----|---------------|--------
-sleep | 0 |
-remote_exec | true | specify false to run serverspec on workstation
-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
-http_proxy | nil | use http proxy when installing ruby, serverspec and running serverspec
-https_proxy | nil | use https proxy when installing puppet, ruby, serverspec and running serverspec
-sudo | nil | use sudo to run commands
-sudo_command | 'sudo -E -H' | sudo command to run when sudo set to true
-env_vars | {} | environment variable to set for rspec
-bundler_path | '/usr/local/bin' | path for bundler command
-rspec_path | '/usr/local/bin' | path for rspec command
-runner_url | https://raw.githubusercontent.com /neillturner/serverspec-runners/ master/ansiblespec_runner.rb | url for custom runner
-require_runner | false | run the custom runner instead of rspec directly
-
 #### custom_install_command example usage
 
 * One liner

data/lib/kitchen/verifier/serverspec.rb

@@ -42,8 +42,8 @@ module Kitchen
       default_config :extra_flags, nil
       default_config :remove_default_path, false
       default_config :env_vars, {}
-      default_config :bundler_path, '/usr/local/bin'
-      default_config :rspec_path, '/usr/local/bin'
+      default_config :bundler_path, nil
+      default_config :rspec_path, nil
       default_config :require_runner, false
       default_config :runner_url, 'https://raw.githubusercontent.com/neillturner/serverspec-runners/master/ansiblespec_runner.rb'
 
@@ -87,6 +87,8 @@ module Kitchen
             #{config[:additional_serverspec_command]}
             if [ -d #{config[:default_path]} ]; then
               cd #{config[:default_path]}
+              RSPEC_CMD=#{rspec_bash_cmd}
+              echo $RSPEC_CMD
               #{rspec_commands}
               #{remove_default_path}
             else
@@ -185,12 +187,13 @@ module Kitchen
 
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def install_serverspec
-        bundler_cmd = "#{bundler_path}bundle"
         if config[:remote_exec]
           <<-INSTALL
               #{test_serverspec_installed}
               #{install_gemfile}
-              #{sudo_env(bundler_cmd)} install --gemfile=#{config[:default_path]}/Gemfile
+              BUNDLE_CMD=#{bundler_cmd}
+              echo $BUNDLE_CMD
+              #{sudo_env('')} $BUNDLE_CMD install --gemfile=#{config[:default_path]}/Gemfile
             #{fi_test_serverspec_installed}
           INSTALL
         else
@@ -210,7 +213,7 @@ module Kitchen
           end
           gemfile = config[:gemfile] if config[:gemfile]
           begin
-            system "#{bundler_cmd} install --gemfile=#{gemfile}"
+            system "#{bundler_local_cmd} install --gemfile=#{gemfile}"
           rescue
             raise ActionFailed, 'Serverspec install failed'
           end
@@ -260,6 +263,8 @@ module Kitchen
         info('Running Serverspec')
         if config[:require_runner]
           "#{env_vars} #{sudo_env(rspec_cmd)} #{color} -f #{config[:format]} --default-path  #{config[:default_path]} #{rspec_path_option} #{config[:extra_flags]}"
+        elsif config[:remote_exec]
+          config[:patterns].map { |s| "#{env_vars} #{sudo_env('')} $RSPEC_CMD #{color} -f #{config[:format]} --default-path  #{config[:default_path]} #{config[:extra_flags]} -P #{s}" }.join(';')
         else
           config[:patterns].map { |s| "#{env_vars} #{sudo_env(rspec_cmd)} #{color} -f #{config[:format]} --default-path  #{config[:default_path]} #{config[:extra_flags]} -P #{s}" }.join(';')
         end
@@ -300,8 +305,16 @@ module Kitchen
         config[:serverspec_command]
       end
 
-      def bundler_path
-        config[:bundler_path] ? "#{config[:bundler_path]}/" : nil
+      def bundler_cmd
+        config[:bundler_path] ? "#{config[:bundler_path]}/bundle" : '$(which bundle)'
+      end
+
+      def bundler_local_cmd
+        config[:bundler_path] ? "#{config[:bundler_path]}/bundle" : 'bundle'
+      end
+
+      def rspec_bash_cmd
+        config[:rspec_path] ? "#{config[:rspec_path]}/rspec" : '$(which rspec)'
       end
 
       def rspec_path

data/lib/kitchen/verifier/serverspec_version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Verifier
-    SERVERSPEC_VERSION = '0.4.5'.freeze
+    SERVERSPEC_VERSION = '0.4.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-verifier-serverspec
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen