spectre-core 1.12.3 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90860f8fafa6a00e51d72bfe917ea12b6ccf5d040d0696ab2701d0222375930
-  data.tar.gz: 40b26f956b3b9f363b2e87eb913542f1c57ef6cf9981035fcd54b42b765f5d42
+  metadata.gz: 9d2cb2622682713c0fc37e7c0e679aa0d93f01ac9af389c8430496a272608038
+  data.tar.gz: 8b313cd7952c0b9e4baf9e8f0cec0af397d1f8cf8fc25760204714f687718df8
 SHA512:
-  metadata.gz: 93f9d8f9cd6266c53e6f91aab1d80faf3d1ae07550bf97a489e25e2597e57d8fea05b2c26637513bd80fd5824bad145f5121d25bd5a53c3c02302895a7cf9f33
-  data.tar.gz: 32f36474db3f486a6f36ea02ec0c2291e300be67f5f6eb13ce40e73ae0af19db56cd7a34b22ec3c18cae07f3de14f4f90ccbda03f61eed3a3a1a0ff51dfb789e
+  metadata.gz: c3e939b9e9851ece96d27e31d19fa7f4c5b26bd9141e28e2e5964b5f20ed1f9c9b0f4a77800b87c411d1c271d0b4acf1afa1f50359e832842e241a1ba536b811
+  data.tar.gz: d105a5a9924cba80b028790a538945087ef0e19a30763e619b712c1d7b31b54259a03504a5a52d1f1cc24be6a03f1e8185d499ed9e7343a17655c4336f22dd40

data/exe/spectre

@@ -9,6 +9,11 @@ require 'ectoplasm'
 
 require_relative '../lib/spectre'
 
+def load_yaml file_path
+  yaml = File.read(file_path)
+  YAML.safe_load(yaml, aliases: true)
+end
+
 
 DEFAULT_CONFIG = {
   'config_file' => './spectre.yml',
@@ -182,14 +187,14 @@ cfg.deep_merge! DEFAULT_CONFIG
 global_config_file = File.join File.expand_path('~'), '.spectre'
 
 if File.exists? global_config_file
-  global_options = YAML.load_file(global_config_file)
+  global_options = load_yaml(global_config_file)
   cfg.deep_merge! global_options if global_options
 end
 
 config_file = cmd_options['config_file'] || cfg['config_file']
 
 if File.exists? config_file
-  file_options = YAML.load_file(config_file)
+  file_options = load_yaml(config_file)
   cfg.deep_merge! file_options
   Dir.chdir File.dirname(config_file)
 end
@@ -205,7 +210,7 @@ envs = {}
 read_env_files = {}
 cfg['env_patterns'].each do |pattern|
   Dir.glob(pattern).each do|f|
-    spec_env = YAML.load_file(f) || {}
+    spec_env = load_yaml(f) || {}
 
     name = spec_env['name'] || 'default'
 
@@ -223,7 +228,7 @@ end
 # Merge partial environment configs with existing environments
 cfg['env_partial_patterns'].each do |pattern|
   Dir.glob(pattern).each do|f|
-    partial_env = YAML.load_file(f)
+    partial_env = load_yaml(f)
     name = partial_env.delete('name') || 'default'
     next unless envs.key? name
 

data/lib/spectre/logger/console.rb

@@ -113,8 +113,14 @@ module Spectre
         print_line('', txt)
       end
 
-      def log_skipped _spec
-        print_line('', Status::SKIPPED.grey)
+      def log_skipped _spec, message=nil
+        txt = Status::SKIPPED
+
+        unless message.nil?
+          txt += ' - ' + message
+        end
+
+        print_line('', txt.grey)
       end
 
       private

data/lib/spectre/logger/file.rb

@@ -82,8 +82,14 @@ module Spectre
         @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
-        @file_log.warn "spec '#{spec.desc}' canceled by user"
+      def log_skipped spec, message=nil
+        txt = "spec '#{spec.desc}' skipped"
+
+        unless message.nil?
+          txt += ': ' + message
+        end
+
+        @file_log.warn txt
       end
 
       def log_status desc, status, annotation=nil

data/lib/spectre/logger.rb

@@ -109,8 +109,8 @@ module Spectre
         delegate(:log_error, spec, exception)
       end
 
-      def log_skipped spec
-        delegate(:log_skipped, spec)
+      def log_skipped spec, message=nil
+        delegate(:log_skipped, spec, message)
       end
 
       def log_status desc, status, annotation=nil

data/lib/spectre/reporter/junit.rb

@@ -1,4 +1,4 @@
-require 'CGI'
+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

data/lib/spectre.rb

@@ -2,7 +2,7 @@ module Spectre
   module Version
     MAJOR = 1
     MINOR = 12
-    TINY  = 3
+    TINY  = 4
   end
 
   VERSION = [Version::MAJOR, Version::MINOR, Version::TINY].compact * '.'
@@ -48,6 +48,12 @@ module Spectre
     end
   end
 
+  class SpectreSkip < Interrupt
+    def initialize message
+      super message
+    end
+  end
+
 
   ###########################################
   # Internal Classes
@@ -252,9 +258,12 @@ module Spectre
         spec.block.call(data)
       rescue ExpectationFailure => e
         run_info.failure = e
+      rescue SpectreSkip => e
+        run_info.skipped = true
+        Logger.log_skipped spec, e.message
       rescue Interrupt
         run_info.skipped = true
-        Logger.log_skipped spec
+        Logger.log_skipped spec, 'canceled by user'
       rescue Exception => e
         run_info.error = e
         Logger.log_error spec, e
@@ -438,9 +447,13 @@ module Spectre
     def property key, val
       Spectre::Runner.current.properties[key] = val
     end
+
+    def skip message=nil
+      raise SpectreSkip.new(message)
+    end
   end
 
-  delegate :describe, :property, to: Spectre
+  delegate :describe, :property, :skip, to: Spectre
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.4
 platform: ruby
 authors:
 - Christian Neubauer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ectoplasm
@@ -80,14 +80,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Describe and run automated tests