kitchen-verifier-serverspec 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a15d723ec9a15097cd9937d8903374c30408438
-  data.tar.gz: f2201b8fa6d7621adb32f48f472341ed009b71a9
+  metadata.gz: 9ebc99abf783948176f30b6938dcd298a74a4ace
+  data.tar.gz: 05f588ddbd0119ecebf5b29a0534052122a09991
 SHA512:
-  metadata.gz: f48925f82a68c43bbf635c13e452433633a03fc4daca10e2ca662ea23e5c55b1c1bd7ea192b77980d6ad10d78417f05518979c88c08ce2e8664e0975088446df
-  data.tar.gz: a19a8ac674eba1cc0fd7e636c5d0ec018da585fce00e1fac76b4f138bf113c07f5cad6776463a17c5a9b9030bef1909ea888a144bb6c6c61602d9a07eaf5793e
+  metadata.gz: ef57b1eeb3b051359b865c77ecf65f2bd2145b0bfea07198410fa19f5d7dd99f5278b718c5ba6707c2f547078fb695a8cfc1c149e35ceda568ad96ff47c9efdb
+  data.tar.gz: 485b3b455ae5840f0dab7e740b9090991a1bc2958cf6fc13725e1ea890290345152c31309679380b83e847787b778babc990e8bd6dd21bbb2e0dfa08013cea95

data/README.md

@@ -95,6 +95,32 @@ suites:
         SSH_KEY: 'c:/repository/puppet_repo/private_key.pem'
 ```
 
+# Custom Runners
+
+Custon runners can be defined and run to provide further customization. 
+There is a runner that automatically runs the ansiblespec files for all the hosts from the 
+ansible provisioner. 
+
+This can be run by specifying in the kitchen yml file:
+
+```yaml
+verifier:
+  name: serverspec
+
+suites:
+  - name: base
+    verifier:
+      runner_url: https://raw.githubusercontent.com/neillturner/serverspec-runners/master/ansiblespec_runner.rb
+      require_runner: true
+      bundler_path: '/usr/local/bin'
+      rspec_path: '/home/vagrant/bin'
+      env_vars:
+        TARGET_HOST: 172.28.128.7
+        LOGIN_USER: vagrant
+        SSH_KEY: 'spec/tomcat_private_key.pem'
+```
+
+
 # Serverspec Verifier Options
 
 key | default value | Notes
@@ -117,7 +143,8 @@ sudo | nil | use sudo to run commands
 env_vars | {} | environment variable to set for rspec
 bundle_path | nil | path for bundler command
 rspec_path | nil | 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 
 
 ## Contributing
 

data/lib/kitchen/verifier/serverspec.rb

@@ -41,6 +41,8 @@ module Kitchen
       default_config :env_vars, {}
       default_config :bundle_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'
 
       # (see Base#call)
       def call(state)
@@ -120,6 +122,7 @@ module Kitchen
             #{install_bundler}
             if [ -d #{config[:default_path]} ]; then
               #{install_serverspec}
+              #{install_runner}
             else
               echo "ERROR: Default path '#{config[:default_path]}' does not exist"
               exit 1
@@ -129,6 +132,7 @@ module Kitchen
           info('Installing bundler and serverspec')
           install_bundler
           install_serverspec
+          install_runner
         end
       end
 
@@ -148,6 +152,20 @@ module Kitchen
         end
       end
 
+      def install_runner
+        if config[:require_runner]
+          if config[:remote_exec]
+            <<-INSTALL
+              if [ ! -f #{config[:default_path]}/#{runner_filename} ]; then
+                #{sudo_env('curl')} -o #{config[:default_path]}/#{runner_filename} #{config[:runner_url]}
+              fi
+            INSTALL
+          else
+            raise ActionFailed, 'Serverspec Runners only for remote execution'
+          end
+        end
+      end
+
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def install_serverspec
         if config[:remote_exec]
@@ -222,9 +240,16 @@ module Kitchen
       end
 
       def rspec_commands
-        rspec_cmd = "#{rspec_path}rspec"
         info('Running Serverspec')
-        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('\n')
+        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]}"
+        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('\n')
+        end
+      end
+
+      def rspec_cmd
+        config[:require_runner] ? "ruby #{config[:default_path]}/#{runner_filename}" : "#{rspec_path}rspec"
       end
 
       def env_vars
@@ -261,6 +286,14 @@ module Kitchen
         config[:rspec_path] ? "#{config[:rspec_path]}/" : nil
       end
 
+      def rspec_path_option
+        config[:rspec_path] ? "--rspec-path #{config[:rspec_path]}/" : nil
+      end
+
+      def runner_filename
+        File.basename(config[:runner_url])
+      end
+
       def http_proxy
         config[:http_proxy]
       end

data/lib/kitchen/verifier/serverspec_version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Verifier
-    SERVERSPEC_VERSION = '0.2.0'.freeze
+    SERVERSPEC_VERSION = '0.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-verifier-serverspec
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen