kitchen-verifier-serverspec 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b527b35a5f9ac533376c0944ae890fc485f4273
-  data.tar.gz: bdee2f6e29bec19c5b34b883e2de16b2218a2101
+  metadata.gz: 5dfea35acb9f08d0ff7b162fb7b6640d96ca1da0
+  data.tar.gz: 66aed88576ddb5452b3661692cb41d89f787e38c
 SHA512:
-  metadata.gz: 25be95cebe0c1412ceb1cd32fd7a8c4ff0564d5621de252f79a57778221038f2a6d606c2dd0eec03c7339c3895c3f42f207c3edee36ac59efa30daf2560e757b
-  data.tar.gz: fad9cbf49743c65b07325c675df00cdc8d21f68eec13427434471c9bf0e394853c3eb033cbaec844b885768ca9eb6fb97b7f428b3d4fcde6429e49daf50c1a17
+  metadata.gz: 20ac9dc68138019c59bebb98cc82eaba8f1a8d9a4fa992911c396da0931993bb33ef44a313ee9565f4f5758be30dadc3d6117eef6f69e9610d63c1f75828d1b1
+  data.tar.gz: b853a8d7df3f57e3dbc629a661944b3cbe29e4bfc61b8cccc9895ed33ea7de65995bcb2a4455e7ea62c633155256e7e8ed92dbbbe7ee944943ed08762473b20a

data/README.md

@@ -80,12 +80,16 @@ There are three ways to run verifier serverspec:
   * Remotely directly on the server running serverspec in ssh mode
   * Locally on your workstation running serverspec in ssh mode
 
-Verifier Serverspec allows the serverspec files to be anywhere in the repository.This means that you can use spec files that follow ansiblespec or puppet beaker locations.
+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.
 
 ### Spec File Location and Updating
 
-Verfier Serverspec does not copy the the serverspec files. They are assumed to be there in the repository and to have been copied to the server via the provisioner. This means if you change a spec file you need to run converge again to get the spec files copied to the server. Verifier Serverspec doesn't copy spec files in the test/integration directory like the busser serverspec that is supplied by chef.
+When remote_exec is set to true (the default) the following rules apply for getting the spec files to the remote server instance.
 
+if default_pattern is set to true then Verifier Serverspec copies the spec files in the test/integration directory like the busser serverspec that is supplied by chef.
+
+if default_pattern is set to false (the default) then Verfier Serverspec does not copy the the serverspec files. They are assumed to be there in the repository and to have been copied to the server via the provisioner. This means in this case if you change a spec file you need to run converge again to get the spec files copied to the server.
+A future enhancement maybe to copy these files so the provisioner doesn't have to be called when they are changed.
 
 
 ## Remotely directly on server running serverspec in exec mode

data/lib/kitchen/verifier/serverspec.rb

@@ -54,10 +54,20 @@ module Kitchen
         sleep_if_set
         merge_state_to_env(state)
         if config[:remote_exec]
+          if config[:default_pattern]
+            create_sandbox
+            sandbox_dirs = Dir.glob(File.join(sandbox_path, '*'))
+          end
           instance.transport.connection(state) do |conn|
             conn.execute(install_command)
+            if config[:default_pattern]
+              info("Transferring files to #{instance.to_str}")
+              conn.upload(sandbox_dirs, config[:root_path])
+              debug('Transfer complete')
+            end
             conn.execute(serverspec_commands)
           end
+          cleanup_sandbox if config[:default_pattern]
         else
           config[:default_path] = Dir.pwd if config[:default_path] == '/tmp/kitchen'
           install_command
@@ -77,6 +87,12 @@ module Kitchen
         install_command
       end
 
+      # (see Base#create_sandbox)
+      def create_sandbox
+        super
+        prepare_suites
+      end
+
       def serverspec_commands
         if config[:remote_exec]
           if custom_serverspec_command
@@ -253,8 +269,13 @@ 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"]
+          if config[:remote_exec]
+            info("Using default pattern #{config[:root_path]}/serverspec/*_spec.rb")
+            config[:patterns] = ["#{config[:root_path]}/serverspec/*_spec.rb"]
+          else
+            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
         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]}"
@@ -382,6 +403,41 @@ module Kitchen
         end
         config[:shellout_opts].merge!(env_state)
       end
+
+      def chef_data_dir?(base, file)
+        file =~ %r{^#{base}/(data|data_bags|environments|nodes|roles)/}
+      end
+
+      # Returns an Array of test suite filenames for the related suite currently
+      # residing on the local workstation. Any special provisioner-specific
+      # directories (such as a Chef roles/ directory) are excluded.
+      #
+      # @return [Array<String>] array of suite files
+      # @api private
+      def local_suite_files
+        base = File.join(config[:test_base_path], config[:suite_name])
+        glob = File.join(base, '*/**/*')
+        Dir.glob(glob).reject do |f|
+          chef_data_dir?(base, f) || File.directory?(f)
+        end
+      end
+
+      # Copies all test suite files into the suites directory in the sandbox.
+      def prepare_suites
+        base = File.join(config[:test_base_path], config[:suite_name])
+        debug("Creating local sandbox of all test suite files in #{base}")
+        local_suite_files.each do |src|
+          dest = File.join(sandbox_suites_dir, src.sub("#{base}/", ''))
+          FileUtils.mkdir_p(File.dirname(dest))
+          FileUtils.cp(src, dest, :preserve => true)
+        end
+      end
+
+      # @return [String] path to suites directory under sandbox path
+      # @api private
+      def sandbox_suites_dir
+        File.join(sandbox_path, 'suites')
+      end
     end
   end
 end

data/lib/kitchen/verifier/serverspec_version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Verifier
-    SERVERSPEC_VERSION = '0.6.1'.freeze
+    SERVERSPEC_VERSION = '0.6.2'.freeze
   end
 end

metadata

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