kitchen-verifier-serverspec 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af4e89ecbc609a9ba0944edcd8528d88bcdf535c
-  data.tar.gz: aa4c1bada627e3fc20898f0533f11070ee110715
+  metadata.gz: 9986fb251543c01fe72b4f357912dff6782ef249
+  data.tar.gz: db06fc7b908cf0c7724160d47bf9b8b0444523ef
 SHA512:
-  metadata.gz: 2d73d358940682a99ca069d733f13faae331c1f915eebdfe5f6e2a086383e0df1adcff571e1ef93b8f9e82d45d131046bee0af99551c76efd7db4802dcdf8a8d
-  data.tar.gz: e1250dd68192b7f5c0a31a26201ab500764218424e7d06015e2869f3a1e3e3c235a7a6c6333e0878dd305eb7837025047c6b0a00ea4c5a67d700a186fe971fa8
+  metadata.gz: 8b121bb267bfc80b3b2855c9826f8d453a9c130c2619dcb6804ac6940dfc555dce7d463b9b568c42313e238ab5fc363ced2f3a0544be8b6a2504c12d69784b7d
+  data.tar.gz: 5ae8e9870d5dbfad4b8aa7f8a65826fb6adcfbfff605afc8d50ba9ea7ff8948502877933a8f2c0c93f754c3244a6ba86980fd50c3bb5c8c15da1c7ac5464f1d3

data/README.md

@@ -38,6 +38,14 @@ this allows extra dependencies to be specified and the version of serverspec spe
 
 ## Usage
 
+There are three ways to run verifier serverspec:
+  * Remotely directly on the server running serverspec in exec mode
+  * Remotely directly on the server running serverspec in ssh mode
+  * Locally on your workstation running serverspec in ssh mode
+
+## 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.
 
 An example of the verifier serverspec options in your `.kitchen.yml` file:
 
@@ -54,7 +62,32 @@ suites:
 
 See example [https://github.com/neillturner/puppet_repo](https://github.com/neillturner/puppet_repo)
 
-or with environment variables
+```yaml
+verifier:
+  name: serverspec
+
+suites:
+  - name: base
+    verifier:
+      patterns:
+      - roles/tomcat/spec/tomcat_spec.rb
+      bundler_path: '/usr/local/bin'
+      rspec_path: '/usr/local/bin'
+```
+
+See example [https://github.com/neillturner/ansible_repo](https://github.com/neillturner/ansible_repo)
+
+The spec/spec_helper.rb should contain
+
+```
+require 'serverspec'
+set :backend, :exec
+```
+
+
+## Remotely directly on the server running serverspec in ssh mode
+
+This allow testing of multiple remote servers. Typicaly used in conjunction with ansible using ssh connection.
 
 ```yaml
 verifier:
@@ -73,7 +106,31 @@ suites:
         SSH_KEY: 'spec/tomcat_private_key.pem'
 ```
 
-or run on your workstation
+The spec/spec_helper.rb should contain
+
+```
+require 'rubygems'
+require 'bundler/setup'
+
+require 'serverspec'
+require 'pathname'
+require 'net/ssh'
+
+RSpec.configure do |config|
+  set :host,  ENV['TARGET_HOST']
+  # ssh options at http://net-ssh.github.io/ssh/v1/chapter-2.html
+  # ssh via password, set :version to :debug for debugging
+  #set :ssh_options, :user => ENV['LOGIN_USER'], :paranoid => false, :verbose => :info, :password => ENV['LOGIN_PASSWORD'] if ENV['LOGIN_PASSWORD']
+  # ssh via ssh key
+  set :ssh_options, :user => ENV['LOGIN_USER'], :paranoid => false, :verbose => :error, :host_key => 'ssh-rsa', :keys => [ ENV['SSH_KEY'] ] if ENV['SSH_KEY']
+  set :backend, :ssh
+  set :request_pty, true
+end
+```
+
+## Locally on your workstation running serverspec in ssh mode
+
+This allows you not to have to install ruby and serverspec on the server being configured as serverspec is run on your workstation in ssh mode.
 
 ```yaml
 verifier:
@@ -95,6 +152,29 @@ suites:
         SSH_KEY: 'c:/repository/puppet_repo/private_key.pem'
 ```
 
+The spec/spec_helper.rb should contain
+
+```
+require 'rubygems'
+require 'bundler/setup'
+
+require 'serverspec'
+require 'pathname'
+require 'net/ssh'
+
+RSpec.configure do |config|
+  set :host,  ENV['TARGET_HOST']
+  # ssh options at http://net-ssh.github.io/ssh/v1/chapter-2.html
+  # ssh via password, set :version to :debug for debugging
+  #set :ssh_options, :user => ENV['LOGIN_USER'], :paranoid => false, :verbose => :info, :password => ENV['LOGIN_PASSWORD'] if ENV['LOGIN_PASSWORD']
+  # ssh via ssh key
+  set :ssh_options, :user => ENV['LOGIN_USER'], :paranoid => false, :verbose => :error, :host_key => 'ssh-rsa', :keys => [ ENV['SSH_KEY'] ] if ENV['SSH_KEY']
+  set :backend, :ssh
+  set :request_pty, true
+end
+```
+
+
 # Custom Runners
 
 Custon runners can be defined and run to provide further customization.
@@ -142,6 +222,7 @@ remove_default_path | false | remove the default_path after successful serverspe
 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 | nil | path for bundler command
 rspec_path | nil | path for rspec command

data/lib/kitchen/verifier/serverspec.rb

@@ -30,6 +30,7 @@ module Kitchen
       default_config :shellout_opts, {}
       default_config :live_stream, $stdout
       default_config :remote_exec, true
+      default_config :sudo_command, 'sudo -E -H'
       default_config :format, 'documentation'
       default_config :color, true
       default_config :default_path, '/tmp/kitchen'
@@ -184,7 +185,7 @@ module Kitchen
 
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def install_serverspec
-        bundler_cmd = "#{bundler_path}bundler"
+        bundler_cmd = "#{bundler_path}bundle"
         if config[:remote_exec]
           <<-INSTALL
               #{test_serverspec_installed}

data/lib/kitchen/verifier/serverspec_version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Verifier
-    SERVERSPEC_VERSION = '0.4.3'.freeze
+    SERVERSPEC_VERSION = '0.4.4'.freeze
   end
 end

metadata

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