kitchen-verifier-serverspec 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 043246681b786882e2a9a6cf4fb1229fc09e8e2e
-  data.tar.gz: 5a1ce432cdcabb18880f84ac20feca46a6252fc6
+  metadata.gz: 92eee699a25b9858785c62afe6b1229adefb4d84
+  data.tar.gz: 773c55c6a518ea01a19f26ef9875ef81ebd48795
 SHA512:
-  metadata.gz: 850399866c291c374c1991773a2839a959a28d707cc3c0718add734a4c516c3e6da35cc6632eb5e6ca7ae272030b5c7fe8ba7af0ced45c098dd178b261769a89
-  data.tar.gz: a334b7323080ba0051800e06dd7501f26822b09cb1398bda3e9e8c3c4169f9387d59c02f56ce2475dd80776cd2f8924c7c57ede4769d46a00702101c2108f61a
+  metadata.gz: c727e4cd38e374726343e416224e4114cd6ad54e2c4e29d800e51fe39c34c1ded8999c39e28fcd71ee45224d0f2fedcc0e24743ba654d995f30dc246157f927a
+  data.tar.gz: 5c122fc233630fdc5ea867dde2c46353a1efff38f8081558364205467ee14232a7452d69474b1ad861937252aa996431bd35132169283f7d9bfa0bd4c6a3c8b8

data/README.md

@@ -58,7 +58,7 @@ http_proxy | nil | use http proxy when installing ruby, serverspec and running s
 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
+env_vars | {} | environment variable to set for rspec and can be used in the spec_helper. It will automatically pickup any environment variables set with a KITCHEN_ prefix.
 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
@@ -167,7 +167,6 @@ 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:
   name: serverspec
@@ -181,11 +180,20 @@ suites:
     verifier:
       patterns:
       - modules_mycompany/mycompany_base/spec/acceptance/base_local_spec.rb
-      env_vars:
-        TARGET_HOST: 127.0.0.1
-        TARGET_PORT: 2222
-        LOGIN_USER: vagrant
-        SSH_KEY: 'c:/repository/puppet_repo/private_key.pem'
+
+```
+
+Set environment variables dynamically on your workstation
+```
+export KITCHEN_HOST=127.0.0.1
+export KITCHEN_PORT=2222
+export KITCHEN_USERNAME=vagrant
+export KITCHEN_SSH_KEY='c:/repository/puppet_repo/private_key.pem'
+Or for Windows Workstations:
+set KITCHEN_HOST=127.0.0.1
+set KITCHEN_PORT=2222
+set KITCHEN_USERNAME=vagrant
+set KITCHEN_SSH_KEY='c:/repository/puppet_repo/private_key.pem'
 ```
 
 The spec/spec_helper.rb should contain
@@ -199,12 +207,10 @@ require 'pathname'
 require 'net/ssh'
 
 RSpec.configure do |config|
-  set :host,  ENV['TARGET_HOST']
+  set :host, ENV['KITCHEN_HOSTNAME']
   # 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 :ssh_options, :user => ENV['KITCHEN_USERNAME'], :port => ENV['KITCHEN_PORT'], :paranoid => false, :verbose => :error, :host_key => 'ssh-rsa', :keys => [ ENV['KITCHEN_SSH_KEY'] ]
   set :backend, :ssh
   set :request_pty, true
 end

data/lib/kitchen/verifier/serverspec.rb

@@ -374,6 +374,8 @@ module Kitchen
         env_state[:environment]['KITCHEN_SUITE'] = instance.suite.name
         state.each_pair do |key, value|
           env_state[:environment]['KITCHEN_' + key.to_s.upcase] = value
+          ENV['KITCHEN_' + key.to_s.upcase] = value.to_s
+          info("Environment variable #{'KITCHEN_' + key.to_s.upcase} value #{value}")
         end
         config[:shellout_opts].merge!(env_state)
       end

data/lib/kitchen/verifier/serverspec_version.rb

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

metadata

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