kitchen-goss 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce5f8c25a4185a67fa5fe0c3199fc0379f7ca216
-  data.tar.gz: b9708046daabc4f8f998a25f8d725ce32758dc43
+  metadata.gz: 9e96537e1b24496345c539fca26df41d821d98ac
+  data.tar.gz: 38c5ea624b276e3736084d9127d53e51455950e4
 SHA512:
-  metadata.gz: 11e19b6cca2daf32e7c8dc9410443005626823f71eb7f887a55f416cae13cca993f9de454b81213331c29d06e2b27997e2df38f6ee65e54f40a800a928b900cd
-  data.tar.gz: e7455947e4ef10287cd8cb120e434e3071f31c20b03e8623ac0b0c1d0b5cc5082ab993db59dcc770546412a2d6e905510f9fac44d888ff18b642769d6a473558
+  metadata.gz: 61108525c60316fee3bbb7a3dd35cee962f659a434e0dfb675490bea122b20ff56f53423bee14eb7dd8aa8eb71e432580b6c4f45081b81fb4a3c31476a04bfe0
+  data.tar.gz: f1e84433bcb08fa6ee8d22cae4c48a0be7bbc45003f988db4244aecbd0e07402c302009ae4d382c3bbbfdbbb253abb7613ccebf5bc72946b9f7aff139f4e80a1

data/README.md

@@ -28,6 +28,12 @@ gem install kitchen-goss-<version>.gem
 ```yaml
 verifier                    :
   name                      : "goss"
+  sleep                     : 0
+  use_sudo                  : true
+  goss_version              : "v0.3.6"
+  goss_link                 : "https://github.com/aelsabbahy/goss/releases/download/$VERSION/goss-linux-${ARCH}"
+  goss_var_path             : "common.yml"
+  env_vars                  : {"test_uid": 123}
 ```
 
 ## kitchen.yml options
@@ -42,6 +48,7 @@ default_config :validate_output, "documentation"
 default_config :custom_install_command, nil
 default_config :goss_link, "https://github.com/aelsabbahy/goss/releases/download/$VERSION/goss-${DISTRO}-${ARCH}"
 default_config :goss_download_path, "/tmp/goss-${VERSION}-${DISTRO}-${ARCH}"
+default_config :goss_var_path, nil
 ```
 
 ## Test structure
@@ -57,6 +64,7 @@ test/
       \_goss/
         \_test1.yml
         |_test2.yml
+        |_common.yml  # --vars common.yml with .Vars render, not for goss test
 ```
 
 

data/lib/kitchen/verifier/goss.rb

@@ -4,7 +4,7 @@ module Kitchen
   module Verifier
     class Goss < Kitchen::Verifier::Base
       require 'mixlib/shellout'
-      require "kitchen/util"
+      require 'kitchen/util'
       require 'pathname'
 
       kitchen_verifier_api_version 1
@@ -14,11 +14,12 @@ module Kitchen
       default_config :sleep, 0
       default_config :use_sudo, false
       default_config :env_vars, {}
-      default_config :goss_version, "v0.1.5"
-      default_config :validate_output, "documentation"
+      default_config :goss_version, 'v0.3.6'
+      default_config :validate_output, 'documentation'
       default_config :custom_install_command, nil
-      default_config :goss_link, "https://github.com/aelsabbahy/goss/releases/download/$VERSION/goss-${DISTRO}-${ARCH}"
-      default_config :goss_download_path, "/tmp/goss-${VERSION}-${DISTRO}-${ARCH}"
+      default_config :goss_link, 'https://github.com/aelsabbahy/goss/releases/download/$VERSION/goss-${DISTRO}-${ARCH}'
+      default_config :goss_download_path, '/tmp/goss-${VERSION}-${DISTRO}-${ARCH}'
+      default_config :goss_var_path, nil
 
       def install_command
         # If cutom install
@@ -54,7 +55,7 @@ module Kitchen
       # (see Base#init_command)
       def init_command
         return if local_suite_files.empty?
-        debug("Remove root_path on remote server.")
+        debug('Remove root_path on remote server.')
         <<-CMD
           suite_dir="#{config[:root_path]}"
           if [ "${suite_dir}" = "x" ]; then
@@ -74,19 +75,19 @@ module Kitchen
       # @raise [ActionFailed] if the action could not be completed
       def call(state)
         create_sandbox
-        sandbox_dirs = Dir.glob(File.join(sandbox_path, "*"))
+        sandbox_dirs = Dir.glob(File.join(sandbox_path, '*'))
 
         instance.transport.connection(state) do |conn|
           conn.execute(install_command)
           conn.execute(init_command)
           info("Transferring files to #{instance.to_str}")
           conn.upload(sandbox_dirs, config[:root_path])
-          debug("Transfer complete")
+          debug('Transfer complete')
           conn.execute(prepare_command)
           conn.execute(run_command)
         end
       rescue Kitchen::Transport::TransportFailed => ex
-        if ex.message .include? "<TEST EXECUTION FAILED>"
+        if ex.message .include? '<TEST EXECUTION FAILED>'
           raise ActionFailed, "Action #verify failed for #{instance.to_str}."
         else
           raise ActionFailed, ex.message
@@ -99,7 +100,7 @@ module Kitchen
       def run_command
         return if local_suite_files.empty?
 
-        debug("Running tests")
+        debug('Running tests')
         prefix_command(wrap_shell_code(Util.outdent!(<<-CMD)))
           set +e
           #{goss_filename_flags}
@@ -115,9 +116,9 @@ module Kitchen
         base = File.join(config[:test_base_path], config[:suite_name])
 
         local_suite_files.each do |src|
-          dest = File.join(sandbox_suites_dir, src.sub("#{base}/", ""))
+          dest = File.join(sandbox_suites_dir, src.sub("#{base}/", ''))
           FileUtils.mkdir_p(File.dirname(dest))
-          FileUtils.cp(src, dest, :preserve => true)
+          FileUtils.cp(src, dest, preserve: true)
         end
       end
 
@@ -129,8 +130,8 @@ module Kitchen
       # @api private
       def local_suite_files
         base = File.join(config[:test_base_path], config[:suite_name])
-        glob = File.join(base, "goss/**/*")
-        #testfiles = Dir.glob(glob).reject { |f| File.directory?(f) }
+        glob = File.join(base, 'goss/**/*')
+        # testfiles = Dir.glob(glob).reject { |f| File.directory?(f) }
         Dir.glob(glob).reject { |f| File.directory?(f) }
       end
 
@@ -143,7 +144,7 @@ module Kitchen
       # @return [String] path to suites directory under sandbox path
       # @api private
       def sandbox_suites_dir
-        File.join(sandbox_path, "suites")
+        File.join(sandbox_path, 'suites')
       end
 
       def env_vars
@@ -151,12 +152,26 @@ module Kitchen
         config[:env_vars].map { |k, v| "#{k}=#{v}" }.join(' ')
       end
 
+      def remote_var_file
+        base_path = File.join(config[:test_base_path], config[:suite_name])
+        remote_base_path = File.join(config[:root_path], 'suites')
+        result = ''
+        local_suite_files.each do |src|
+          if File.basename(src) == config[:goss_var_path]
+            result = src.sub(base_path, remote_base_path)
+          end
+        end
+        result
+      end
+
       # @return [String] the run command to execute tests
       # @api private
       def run_test_command
         command = config[:goss_download_path]
         command = "sudo -E #{command}" if !config[:use_sudo] == true
-        command = "#{env_vars} #{command}" if !config[:env_vars].none?
+        command = "#{env_vars} #{command}" if config[:env_vars].any?
+        command = "#{command} --vars #{remote_var_file}" if config[:goss_var_path]
+        puts command
 
         <<-CMD
           if [ ! -x "#{config[:goss_download_path]}" ]; then
@@ -183,7 +198,7 @@ module Kitchen
       end
 
       def goss_filename_flags
-          <<-CMD
+        <<-CMD
            ## Set the flags for GOSS command path
            VERSION="#{config[:goss_version]}"
            DISTRO="$(uname)"
@@ -193,15 +208,39 @@ module Kitchen
            else
              ARCH="386"
            fi
+
+            if [ -f /etc/os-release ]; then
+
+              if [ "$(grep -i 'ubuntu' /etc/os-release)" != ""  ]; then
+                OS="ubuntu"
+              fi
+              if [ "$(grep -i 'centos' /etc/os-release)" != "" ]; then
+                OS="centos"
+              fi
+              if [ "$(grep -i '7' /etc/os-release)" != "" ]; then
+                VER='7'
+              fi
+              if [ "$(grep -i '16.04' /etc/os-release)" != "" ]; then
+                VER='16.04'
+              fi
+            else
+              OS="centos"
+              VER="6"
+            fi
+
+            OS_VERSION=${OS}${VER}
+            echo $OS_VERSION
           CMD
       end
 
       def get_test_name
         base_path = File.join(config[:test_base_path], config[:suite_name])
-        remote_base_path = File.join(config[:root_path], "suites")
-        all_tests = ""
+        remote_base_path = File.join(config[:root_path], 'suites')
+        all_tests = ''
         local_suite_files.each do |test_file|
-           all_tests += " " +  test_file.sub(base_path, remote_base_path)
+          if File.basename(test_file) != config[:goss_var_path] && File.basename(test_file).end_with?('.yml')
+            all_tests += ' ' + test_file.sub(base_path, remote_base_path)
+            end
         end
         all_tests
       end
@@ -215,7 +254,6 @@ module Kitchen
           sleep 1
         end
       end
-
     end
   end
-end
+end

data/lib/kitchen/verifier/goss_version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Verifier
-    GOSS_VERSION = '0.1.0'
+    GOSS_VERSION = '0.1.1'.freeze
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-goss
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Adham Helal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: A test-kitchen verifier plugin for GOSS