kitchen-verifier-serverspec 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45596196f4147bbd86339157709190ad793aff46
-  data.tar.gz: 31b268ebeec5166107f965bbe2064331a902a4c0
+  metadata.gz: c96f0cae0d95e4b483b51082bcb656cc817c4ff1
+  data.tar.gz: 7de2f6876e0f16d5702d93ec82279e86fac96bdb
 SHA512:
-  metadata.gz: b9765cf70d0cea811609f74ee390c061ccdf7da528afcc271947be7c709ee00dc738961827b853ea6ac6ebd54f424fe3e211beb709676989b50eecb0f2d65909
-  data.tar.gz: 6aaddb1ef845aaf60d00c7660e8711d1f3fcd6987a3aaa0d4dd19544cf57f3210d491def18fab0948e03662ad601f464107b7ff579067eaaed44c8e86cfb76e8
+  metadata.gz: 88afd1c9537cfcb27938d4108c930fad7c23c09f9adb50c8325ca9d050ee1a95ac804881af8924468105a669605a2e5a7e952bec73b13ff849448fef9abecf4d
+  data.tar.gz: b8b641a7db018965b7c91991140a57a4e744e93c77f1827975b98e170f8bb4b7a1e79c0f8fab1f769a38ca180c05344edd0c1c10aa0a51502095705c785b3656

data/README.md

@@ -54,6 +54,26 @@ suites:
 
 See example [https://github.com/neillturner/puppet_beaker_repo](https://github.com/neillturner/puppet_beaker_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: '/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
@@ -72,6 +92,9 @@ 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
+env_vars | {} | environment variable to set for rspec
+bundle_path | nil | path for bundler command
+rspec_path | nil | path for rspec command
 
 
 ## Contributing

data/lib/kitchen/verifier/serverspec.rb

@@ -39,6 +39,9 @@ module Kitchen
       default_config :test_serverspec_installed, true
       default_config :extra_flags, nil
       default_config :remove_default_path, false
+      default_config :env_vars, {}
+      default_config :bundle_path, nil
+      default_config :rspec_path,  nil
 
       # (see Base#call)
       def call(state)
@@ -109,7 +112,7 @@ module Kitchen
               if [ -f /etc/system-release ] || [ grep -q 'Amazon Linux' /etc/system-release ]; then
                 #{sudo_env('yum')} -y install ruby
               else
-                #{sudo('apt-get')} -y install ruby
+                #{sudo_env('apt-get')} -y install ruby
               fi
             fi
           fi
@@ -126,16 +129,17 @@ module Kitchen
       def install_bundler
         <<-INSTALL
           if [ $(#{sudo('gem')} list bundler -i) == 'false' ]; then
-            #{sudo('gem')} install #{gem_proxy_parm} --no-ri --no-rdoc bundler
+            #{sudo_env('gem')} install #{gem_proxy_parm} --no-ri --no-rdoc bundler
           fi
         INSTALL
       end
 
       def install_serverspec
+        bundler_cmd = "#{bundler_path}bundler"
         <<-INSTALL
-          #{test_serverspec_installed}
+            #{test_serverspec_installed}
             #{install_gemfile}
-            #{sudo_env('bundler')} install --gemfile=#{config[:default_path]}/Gemfile
+            #{sudo_env(bundler_cmd)} install --gemfile=#{config[:default_path]}/Gemfile
           #{fi_test_serverspec_installed}
         INSTALL
       end
@@ -179,8 +183,16 @@ module Kitchen
       end
 
       def rspec_commands
+        rspec_cmd = "#{rspec_path}rspec"
         info('Running Serverspec')
-        config[:patterns].map { |s| "rspec #{color} -f #{config[:format]} --default-path  #{config[:default_path]} #{config[:extra_flags]} -P #{s}" }.join('\n')
+        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
+
+      def env_vars
+        return nil if config[:env_vars].none?
+        bash_vars = config[:env_vars].map { |k, v| "#{k}=#{v}" }.join(' ')
+        debug(bash_vars)
+        bash_vars
       end
 
       def sudo_env(pm)
@@ -189,6 +201,14 @@ module Kitchen
         p || s ? "#{sudo('env')} #{p} #{s} #{pm}" : sudo(pm).to_s
       end
 
+      def bundler_path
+        config[:bundler_path] ? "#{config[:bundler_path]}/" : nil
+      end
+
+      def rspec_path
+        config[:rspec_path] ? "#{config[:rspec_path]}/" : nil
+      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.1.0'.freeze
+    SERVERSPEC_VERSION = '0.1.1'.freeze
   end
 end

metadata

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