kitchen-verifier-serverspec 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aad3aa5089f6233a1d51c7ab81a77432a6c1ff41
-  data.tar.gz: f3ec2441cb006d1e24e5bf092abd5703a761e065
+  metadata.gz: b04ea622e5e64149fe8915e40acffec028e15c7b
+  data.tar.gz: 5a8d0743a3d7b45b3bfa2e467bbf079485aa64fc
 SHA512:
-  metadata.gz: f247568a8a02206e18282b7d3930a818f19e331a1129fa4d1cd80ec1e92bf033c4653d0f833f1aeab078d207d7e1ea42c8487cd64f3cdffb8ff5cfbdc0614488
-  data.tar.gz: 5eaa111b9cce8190617c1d957639ed8140888ef5bb8b553fdaf618485cec7c2732d04437f3e7199bf92f5bf86ba223ebcd9a27c043595d0a6026c7c12eedfadd
+  metadata.gz: 950ede95612d63939b3f08fd528fcd3d52efcb22af0ed2c3bf79313bc8956b5f0d1f553ef331ff71197f033a73998035fe0c517a20f734a5620c1c6726802d64
+  data.tar.gz: b2c96eedfd9bcbf2741747bb238986433249414a02c28edd59dc095cce0495bda2ffac3fea7351be70970662e8332a27552251967c180c500cbcc074049579f1

data/README.md

@@ -40,29 +40,38 @@ this allows extra dependencies to be specified and the version of serverspec spe
 
 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_install_commmand | nil | Additional shell command to be used at install stage. 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
+bundler_path | | override path for bundler command
 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
+custom_serverspec_command | nil | custom command to run serverspec. Can be multiline. See examples below.
+default_path | '/tmp/kitchen' | Set the default path where serverspec looks for patterns
+default_pattern | false | use default dir behaviour of busser i.e. test/integration/SUIT_NAME/serverspec/*_spec.rb
+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.
 extra_flags | nil | extra flags to add to ther serverspec command
-remove_default_path | false | remove the default_path after successful serverspec run
+format | 'documentation' | format of serverspec output
+gemfile | nil | custom gemfile to use to install serverspec
 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 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
+patterns | [] | array of patterns for spec test files
+remote_exec | true | specify false to run serverspec on workstation
+remove_default_path | false | remove the default_path after successful serverspec run
+require_runner | false | run the custom runner instead of rspec directly
 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
+sleep | 0 |
+sudo | nil | use sudo to run commands
+sudo_command | 'sudo -E -H' | sudo command to run when sudo set to true
+test_serverspec_installed | true | only run install_command if serverspec not installed
+
+## Tips
+
+If you get errors like 'Bundler installed as root, can't be found' then you will need to set the paths. Its hard to get the default paths correct when ruby maybe installed in a different user.
+```
+bundler_path: '/usr/local/bin'
+rspec_path: '/usr/local/bin'
+```
 
 ## Usage
 

data/kitchen-verifier-serverspec.gemspec

@@ -20,7 +20,9 @@ Gem::Specification.new do |s|
   if RUBY_VERSION >= '2.0'
     s.add_dependency 'net-ssh', '~> 3'
   else
+    s.add_dependency 'json', '~> 1.8'
     s.add_dependency 'net-ssh', '~> 2.9'
+    s.add_dependency 'rubocop', '~> 0.41.2'
   end
   s.description = <<-EOF
 Serverspec verifier for Test-Kitchen without having to transit the Busser layer.

data/lib/kitchen/verifier/serverspec.rb

@@ -35,6 +35,7 @@ module Kitchen
       default_config :color, true
       default_config :default_path, '/tmp/kitchen'
       default_config :patterns, []
+      default_config :default_pattern, false
       default_config :gemfile, nil
       default_config :custom_install_command, nil
       default_config :additional_install_command, nil
@@ -164,17 +165,13 @@ module Kitchen
       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
+        return unless config[:require_runner]
+        raise ActionFailed, 'Serverspec Runners only for remote execution' unless 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
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
@@ -253,6 +250,10 @@ module Kitchen
 
       def rspec_commands
         info('Running Serverspec')
+        if config[:default_pattern]
+          info("Using default pattern #{config[:test_base_path]}/#{config[:suite_name]}/serverspec/*_spec.rb")
+          config[:patterns] = ["#{config[:test_base_path]}/#{config[:suite_name]}/serverspec/*_spec.rb"]
+        end
         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]
@@ -348,6 +349,7 @@ module Kitchen
       end
 
       def shellout(command)
+        command = command.strip
         info("Running command: #{command}")
         cmd = Mixlib::ShellOut.new(command, config[:shellout_opts])
         cmd.live_stream = config[:live_stream]
@@ -369,6 +371,13 @@ module Kitchen
           ENV['KITCHEN_' + key.to_s.upcase] = value.to_s
           info("Environment variable #{'KITCHEN_' + key.to_s.upcase} value #{value}")
         end
+        # if using a driver that uses transport expose those too
+        %w(username password ssh_key port).each do |key|
+          next if instance.transport[key.to_sym].nil?
+          value = instance.transport[key.to_sym].to_s
+          ENV['KITCHEN_' + key.to_s.upcase] = value
+          info("Transport Environment variable #{'KITCHEN_' + key.to_s.upcase} value #{value}")
+        end
         config[:shellout_opts].merge!(env_state)
       end
     end

data/lib/kitchen/verifier/serverspec_version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Verifier
-    SERVERSPEC_VERSION = '0.5.2'.freeze
+    SERVERSPEC_VERSION = '0.6.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-verifier-serverspec
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-25 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen