kitchen-verifier-serverspec 0.6.8 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8c136751b96c5000dc1246fee312403371f4ba4f
-  data.tar.gz: 70876173b519b35bbb042589b9bc6b1c17c82df3
+SHA256:
+  metadata.gz: ecd072a5661b2d4782d77fbf382f898dae9fb989042ae4c06548be3da49d73a7
+  data.tar.gz: 7ff6f8cf40e1fa127b52d6dbe91fc82d994dc2784bb6f99e0de8f6c0c4c5c6c1
 SHA512:
-  metadata.gz: f79350328ed4800d35e1bc708179bc920bbb77537e9ee805447cd1cc13e8b666518052858899989efdea9e9147a8aa3ea589de41076c5bf23a1e2561a5be260c
-  data.tar.gz: 8eeb5d4720e61a42e5439738aad732b3ec6ec07418e77bc3c9b2be3ed21cf1edb161f02baca6e3fd1ff694f0556409b2d7303825301bec30ed0c55d18fa6f3a3
+  metadata.gz: 1ab7b8c1f6685e7f99c5c65a9c44464e8eab96d97e77c86c84662c3fa616993fc1872803f777504401b40cb25fe855a3e099d714b419ccf95b184bcbadeeb223
+  data.tar.gz: 4ad6e3fc032c08bf1041e516acbbfa363ea3e491ce64137cc0ede569bd646017fcf53dc1d64584cad84b6ac976af5aad98c6594da44d655f90cc1ea6ddc20c12

data/README.md

@@ -82,6 +82,12 @@ There are three ways to run verifier serverspec:
 
 Verifier Serverspec allows the serverspec files to be anywhere in the repository or in the test-kitchen default location i.e /test/integration. This means that you can use spec files that follow ansiblespec or puppet beaker locations.
 
+### Windows  
+
+A good example of using severspec wit windows can be found at:
+* https://github.com/josephkumarmichael/centos-serverspec-windows-testbed
+* Windows spec_helper.rb sample: https://github.com/josephkumarmichael/centos-serverspec-windows-testbed/blob/master/tests/spec/spec_helper.rb fput this in the spec folder. Then specify full path to the spec_helper in the default_spec test.
+
 ### Spec File Location and Updating
 
 When remote_exec is set to true (the default) the following rules apply for getting the spec files to the remote server instance.

data/kitchen-verifier-serverspec.gemspec

@@ -16,14 +16,8 @@ Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
   s.rubyforge_project = '[none]'
-  s.add_dependency 'test-kitchen', '~> 1.4'
-  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.add_dependency 'test-kitchen', '>= 1.4'
+  s.add_dependency 'net-ssh', '>= 3'
   s.description = <<-EOF
 Serverspec verifier for Test-Kitchen without having to transit the Busser layer.
 EOF

data/lib/kitchen/verifier/serverspec.rb

@@ -57,7 +57,7 @@ module Kitchen
           debug('Running Serverspec on remote server')
           if config[:default_pattern]
             create_sandbox
-            sandbox_dirs = Dir.glob(File.join(sandbox_path, '*'))
+            sandbox_dirs = [ sandbox_path ]
           end
           instance.transport.connection(state) do |conn|
             conn.execute(install_command)
@@ -139,6 +139,7 @@ module Kitchen
                 if [ -f /etc/system-release ] && grep -q 'Amazon Linux' /etc/system-release; then
                   #{sudo_env('yum')} -y install ruby
                 else
+                  #{sudo_env('apt-get')} -y update
                   #{sudo_env('apt-get')} -y install ruby
                 fi
               fi
@@ -169,14 +170,20 @@ module Kitchen
       def install_bundler
         if config[:remote_exec]
           <<-INSTALL
-            if [ \"$(#{sudo('gem')} list bundler -i)\" = \"true\" ]; then
-              echo "Bundler already installed"
+            if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ]; then
+              echo '-----> Installing os provided bundler package'
+              #{sudo_env('yum')} -y install rubygem-bundler
             else
-              if [ \"$(#{sudo('gem')} list bundler -i)\" = \"false\" ]; then
-                #{sudo_env('gem')} install #{gem_proxy_parm} --no-ri --no-rdoc bundler
+              echo '-----> Installing bundler via rubygems'
+              if [ \"$(#{sudo('gem')} list bundler -i)\" = \"true\" ]; then
+                echo "Bundler already installed"
               else
-                echo "ERROR: Ruby not installed correctly"
-                exit 1
+                if [ \"$(#{sudo('gem')} list bundler -i)\" = \"false\" ]; then
+                  #{sudo_env('gem')} install #{gem_proxy_parm} --no-ri --no-rdoc bundler
+                else
+                  echo "ERROR: Ruby not installed correctly"
+                  exit 1
+                fi
               fi
             fi
           INSTALL
@@ -246,7 +253,7 @@ module Kitchen
           <<-INSTALL
           #{sudo('rm')} -f #{config[:default_path]}/Gemfile
           #{sudo('echo')} "source 'https://rubygems.org'" >> #{config[:default_path]}/Gemfile
-          #{sudo('echo')} "gem 'net-ssh','~> 2.9'"  >> #{config[:default_path]}/Gemfile
+          #{sudo('echo')} "gem 'net-ssh','~> 3'"  >> #{config[:default_path]}/Gemfile
           #{sudo('echo')} "gem 'serverspec'" >> #{config[:default_path]}/Gemfile
           INSTALL
         end
@@ -291,7 +298,7 @@ module Kitchen
         elsif config[:remote_exec]
           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(';')
         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(';')
+          config[:patterns].empty? ? '' : "#{env_vars} #{sudo_env(rspec_cmd)} #{color} -f #{config[:format]} --default-path  #{config[:default_path]} #{config[:extra_flags]} #{config[:patterns].map { |s| "-P #{s}" }.join(' ')}"
         end
       end
 
@@ -404,7 +411,7 @@ module Kitchen
           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|
+        %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

data/lib/kitchen/verifier/serverspec_version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Verifier
-    SERVERSPEC_VERSION = '0.6.8'.freeze
+    SERVERSPEC_VERSION = '0.7.1'.freeze
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-verifier-serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.1
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
@@ -38,8 +38,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-description: |
-  Serverspec verifier for Test-Kitchen without having to transit the Busser layer.
+description: 'Serverspec verifier for Test-Kitchen without having to transit the Busser
+  layer.
+
+  '
 email:
 - neillwturner@gmail.com
 executables: []
@@ -69,8 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: "[none]"
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Serverspec verifier for Test-Kitchen without having to transit the Busser