kitchen-verifier-serverspec 0.6.10 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f41ff42d36d2dcc47d7a2a9ca8a8bed4e72928f1
-  data.tar.gz: 1a6f4cb919fd9b574f22d5aa0805974482154812
+SHA256:
+  metadata.gz: 05cdf1b71d04498724cdefd13405f9cc44b300de089c23196f51c410a184e0d7
+  data.tar.gz: 5a9b0c735ed76ffbcd67842c51092f1788f338496be4a31010693c3b0d2841e8
 SHA512:
-  metadata.gz: e9a501769d5a13f31ea6b261fe48031f99bda3340ff4051253a325054a152ef1ebcd3d9d67ddbfe9fbbc1a327f29f5020dec7da7ff753806d72091a9f8a209b6
-  data.tar.gz: 3bd1e6f437f16e7d19f474b99f294ce460f8d279a825962c1a8bd064566a9d37981d050de98ecb35df8934d182a4b813b362c01d33df86b0f0f4aa0e033b5d52
+  metadata.gz: ed36e751776fbf506236c9a880bd666c1771d1b4d3d766a85bbdfa0967c6d03905ac61a7250c9ecf75b6a8b6e994e2de8b8f213cc3eee925870103a6ff1fb46a
+  data.tar.gz: ece5f133e4b9115097673b3509bbd1852155a34fe5c7c85e653179f58675b56abcf68dd1afbbe943bd7148dda0b2a9b0ba465f4f1991dcb635364c3710a026ac

data/kitchen-verifier-serverspec.gemspec

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

data/lib/kitchen/verifier/serverspec.rb

@@ -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 ] || ( [ -f /etc/os-release ] && grep -q 'Amazon Linux 2' /etc/os-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
 

data/lib/kitchen/verifier/serverspec_version.rb

@@ -1,5 +1,6 @@
 module Kitchen
   module Verifier
-    SERVERSPEC_VERSION = '0.6.10'.freeze
+    SERVERSPEC_VERSION = '0.7.2'.freeze
   end
 end
+

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-verifier-serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.7.2
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2021-12-19 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
@@ -41,7 +41,7 @@ dependencies:
 description: 'Serverspec verifier for Test-Kitchen without having to transit the Busser
   layer.
 
-'
+  '
 email:
 - neillwturner@gmail.com
 executables: []
@@ -64,15 +64,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: "[none]"
-rubygems_version: 2.6.13
+rubygems_version: 3.2.21
 signing_key: 
 specification_version: 4
 summary: Serverspec verifier for Test-Kitchen without having to transit the Busser