spectre-core 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b85338c15a8c29d520ed02d2e6816a64c579b6edd654f3d047fbeddb4a5c0ea3
-  data.tar.gz: 7be4646412f7dd3a971b21269215cddff5398cc12a50cd42dcd78a6bb70bf012
+  metadata.gz: c90860f8fafa6a00e51d72bfe917ea12b6ccf5d040d0696ab2701d0222375930
+  data.tar.gz: 40b26f956b3b9f363b2e87eb913542f1c57ef6cf9981035fcd54b42b765f5d42
 SHA512:
-  metadata.gz: 043d7b2bda42acf5687f09ce9468c8b3ce01566c5a61d3d1c753b9d61a126898b883f00b67be67d6d61600a85143475e8b041b31fdf42f02dee5aca48260037c
-  data.tar.gz: 890154e9fabf2664d50289f5eeb212cd9ea508a967341d9b27a2ad5dd329600542a168352274d4a0ca09dbe9aa91f3bc22e6c855d36a80e1219ccac9132dd047
+  metadata.gz: 93f9d8f9cd6266c53e6f91aab1d80faf3d1ae07550bf97a489e25e2597e57d8fea05b2c26637513bd80fd5824bad145f5121d25bd5a53c3c02302895a7cf9f33
+  data.tar.gz: 32f36474db3f486a6f36ea02ec0c2291e300be67f5f6eb13ce40e73ae0af19db56cd7a34b22ec3c18cae07f3de14f4f90ccbda03f61eed3a3a1a0ff51dfb789e

data/exe/spectre

@@ -72,9 +72,10 @@ DEFAULT_CONFIG = {
 
 
 cmd_options = {}
+property_overrides = {}
 
 opt_parser = OptionParser.new do |opts|
-  opts.banner = %{Spectre #{Spectre::VERSION}
+opts.banner = %{Spectre #{Spectre::VERSION}
 
 Usage: spectre [command] [options]
 
@@ -83,6 +84,7 @@ Commands:
   run         Run specs (default)
   show        Print current environment settings
   dump        Dumps the given environment in YAML format to console
+  cleanup     Will remove all generated files (e.g. logs and reports)
   init        Initializes a new spectre project
 
 Specific options:}
@@ -132,17 +134,24 @@ Specific options:}
   end
 
   opts.on('-p KEY=VAL', '--property KEY=VAL', "Override config option. Use `spectre show` to get list of available options") do |option|
-    key, val = option.split '='
-    val = val.split ',' if DEFAULT_CONFIG[key].is_a? Array
-    val = ['true', '1'].include? val if [true, false].include? DEFAULT_CONFIG[key]
+    key, val = option.split('=')
+    val = val.split(',') if DEFAULT_CONFIG[key].is_a? Array
+    val = ['true', '1'].include? val if [true, false].include?(DEFAULT_CONFIG[key])
     val = val.to_i if DEFAULT_CONFIG[key].is_a? Integer
-    cmd_options[key] = val
 
-    curr_opt = cmd_options
-    (key.split '.').each do |k|
-      curr_opt[k] = {} unless curr_opt.key? k
+    opt_path = key.split('.')
+
+    curr_opt = property_overrides
+
+    opt_path.each_with_index do |part, i|
+      if i == opt_path.count-1
+        curr_opt[part] = val
+        break
+      end
+
+      curr_opt[part] = {} unless curr_opt.key?(part)
+      curr_opt = curr_opt[part]
     end
-    curr_opt = val
   end
 
   opts.separator "\nCommon options:"
@@ -187,7 +196,6 @@ end
 
 cfg.deep_merge! cmd_options
 
-
 ###########################################
 # Load Environment
 ###########################################
@@ -224,7 +232,10 @@ cfg['env_partial_patterns'].each do |pattern|
 end
 
 env = envs[cfg['environment']]
-cfg.merge! env if env
+cfg.deep_merge! env if env
+
+# Merge property overrides after environment load to give it higher priority
+cfg.deep_merge! property_overrides
 
 
 String.colored! if cfg['colored']
@@ -392,6 +403,24 @@ if 'dump' == action
 end
 
 
+###########################################
+# Cleanup
+###########################################
+
+
+if 'cleanup' == action
+  log_file_pattern = cfg['log_file'].gsub('<date>', '*')
+
+  Dir.glob(log_file_pattern).each do |log_file|
+    File.delete(log_file)
+  end
+
+  Dir.glob(File.join cfg['out_path'], '/*').each do |out_file|
+    File.delete(out_file)
+  end
+end
+
+
 ###########################################
 # Init
 ###########################################

data/lib/spectre/assertion.rb

@@ -52,7 +52,7 @@ module Spectre
       end
 
       def should_not_be_empty
-        raise AssertionFailure.new('The list is empty', 'nil')
+        raise AssertionFailure.new('The value does not exist', 'nil')
       end
     end
 
@@ -247,7 +247,7 @@ module Spectre
           raise AssertionFailure.new(e.message, e.expected, e.actual, desc), cause: nil
         rescue Exception => e
           Logger.log_status(desc, Logger::Status::ERROR)
-          raise AssertionFailure.new("An unexpected error occured during expectation: #{e.message}", nil, nil, desc), cause: e
+          raise AssertionFailure.new("An unexpected error occurred during expectation: #{e.message}", nil, nil, desc), cause: e
         end
       end
 

data/lib/spectre/curl.rb

@@ -301,7 +301,10 @@ module Spectre::Curl
 
       req_log = "[>] #{req_id} #{req['method']} #{uri}\n"
       req_log += header_to_s(req['headers'])
-      req_log += try_format_json(req['body'], pretty: true)
+
+      if req[:body] != nil and not req[:body].empty?
+        req_log += try_format_json(req['body'], pretty: true)
+      end
 
       @@logger.info(req_log)
 
@@ -329,7 +332,7 @@ module Spectre::Curl
 
       exit_code = wait_thr.value.exitstatus
 
-      raise Exception.new "An error occured while executing curl:\n#{debug_log.lines.map { |x| not x.empty? }}" unless exit_code == 0
+      raise Exception.new "An error occurred while executing curl:\n#{debug_log.lines.map { |x| not x.empty? }}" unless exit_code == 0
 
       # Parse protocol, version, status code and status message from response
       match = /^(?<protocol>[A-Za-z0-9]+)\/(?<version>\d+\.?\d*) (?<code>\d+) (?<message>.*)/.match result

data/lib/spectre/logger/file.rb

@@ -79,7 +79,7 @@ module Spectre
 
       def log_error spec, exception
         file, line = exception.backtrace[0].match(/(.*\.rb):(\d+)/).captures
-        @file_log.error "An unexpected error occured at '#{file}:#{line}' while running spec '#{spec.name}': [#{exception.class}] #{exception.message}\n#{exception.backtrace.join "\n"}"
+        @file_log.error "An unexpected error occurred at '#{file}:#{line}' while running spec '#{spec.name}': [#{exception.class}] #{exception.message}\n#{exception.backtrace.join "\n"}"
       end
 
       def log_skipped spec

data/lib/spectre/reporter/console.rb

@@ -21,7 +21,6 @@ module Spectre::Reporter
         if run_info.failure
           report_str += "     Expected #{run_info.failure.expectation}"
           report_str += " with #{run_info.data}" if run_info.data
-          report_str += " during #{spec.context.__desc}" if spec.context.__desc
 
           report_str += " but it failed"
 
@@ -40,7 +39,7 @@ module Spectre::Reporter
           failures += 1
 
         else
-          report_str += "     but an unexpected error occured during run\n"
+          report_str += "     but an unexpected error occurred during run\n"
           report_str += format_exception(run_info.error)
           errors += 1
         end
@@ -68,6 +67,7 @@ module Spectre::Reporter
 
     def format_title run_info
       title = run_info.spec.subject.desc
+      title += " #{run_info.spec.context.__desc}" if run_info.spec.context.__desc
       title += ' ' + run_info.spec.desc
       title += " (#{'%.3f' % run_info.duration}s)"
       title += " [#{run_info.spec.name}]"

data/lib/spectre/reporter/junit.rb

@@ -1,3 +1,5 @@
+require 'CGI'
+
 # https://llg.cubic.org/docs/junit/
 # Azure mappings: https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/test/publish-test-results?view=azure-devops&tabs=junit%2Cyaml
 
@@ -22,11 +24,11 @@ module Spectre::Reporter
         errors = run_infos.select { |x| x.error != nil }
         skipped = run_infos.select { |x| x.skipped? }
 
-        xml_str += '<testsuite package="' + subject.desc + '" id="' + suite_id.to_s + '" name="' + subject.desc + '" timestamp="' + datetime + '" tests="' + run_infos.count.to_s + '" failures="' + failures.count.to_s + '" errors="' + errors.count.to_s + '" skipped="' + skipped.count.to_s + '">'
+        xml_str += '<testsuite package="' + CGI::escapeHTML(subject.desc) + '" id="' + CGI::escapeHTML(suite_id.to_s) + '" name="' + CGI::escapeHTML(subject.desc) + '" timestamp="' + datetime + '" tests="' + run_infos.count.to_s + '" failures="' + failures.count.to_s + '" errors="' + errors.count.to_s + '" skipped="' + skipped.count.to_s + '">'
         suite_id += 1
 
         run_infos.each do |run_info|
-          xml_str += '<testcase classname="' + run_info.spec.file.to_s + '" name="' + run_info.spec.desc + '" timestamp="' + run_info.started.to_s + '"  time="' + ('%.3f' % run_info.duration) + '">'
+          xml_str += '<testcase classname="' + CGI::escapeHTML(run_info.spec.file.to_s) + '" name="' + CGI::escapeHTML(run_info.spec.desc) + '" timestamp="' + run_info.started.to_s + '"  time="' + ('%.3f' % run_info.duration) + '">'
 
           if run_info.failure and !run_info.failure.cause
             failure_message = "Expected #{run_info.failure.expectation}"
@@ -38,7 +40,7 @@ module Spectre::Reporter
               failure_message += " but it failed"
             end
 
-            xml_str += '<failure message="' + failure_message.gsub('"', '`') + '"></failure>'
+            xml_str += '<failure message="' + CGI::escapeHTML(failure_message.gsub('"', '`')) + '"></failure>'
           end
 
 
@@ -49,7 +51,7 @@ module Spectre::Reporter
             failure_message = error.message
             text = error.backtrace.join "\n"
 
-            xml_str += '<error message="' + failure_message.gsub('"', '`') + '" type="' + type + '">'
+            xml_str += '<error message="' + CGI::escapeHTML(failure_message.gsub('"', '`')) + '" type="' + type + '">'
             xml_str += '<![CDATA[' + text + ']]>'
             xml_str += '</error>'
           end

data/lib/spectre.rb

@@ -2,7 +2,7 @@ module Spectre
   module Version
     MAJOR = 1
     MINOR = 12
-    TINY  = 2
+    TINY  = 3
   end
 
   VERSION = [Version::MAJOR, Version::MINOR, Version::TINY].compact * '.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors:
 - Christian Neubauer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ectoplasm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: jsonpath
   requirement: !ruby/object:Gem::Requirement