spectre-core 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b99588a188c8c1be3c0c319db5a96c4c79bcd97892ffb9e94f93fa14fcc73031
-  data.tar.gz: a4d123d92b977abbd62c926c6b57fcb4b74a197832b61a8b5d4715d4cc7187e0
+  metadata.gz: 2b37c624f29760c1122c88ec60a107bb60a96c7402aeedd5b2bc3919bbe68f7d
+  data.tar.gz: fe69db81edfcdc648bce5f5d32f584a766b6869c7b9bd398bd9f97fab9015aa7
 SHA512:
-  metadata.gz: 818e44f0ab3b8d849d4081dca1b830a0a18c8d0a0553f0a952540b5c3b165f7d7b0ce0b8695b9ef373168cbf84e67690a73bbcc7d8e5b200e2e164b61421aef6
-  data.tar.gz: 74b8fe125c8407dd6afdc32d7ffc47f7a1ab3f0755d2c0af12620e31757d6f921129d35fe4ba2fce119edd31e41636be5239316d016aa117baf5a9dfcd9c6a4d
+  metadata.gz: 53b943ea103803174ad87d51eaeb64a77724b09ce49ad1f9d97446db527e5f62b1b4ab02eec0c779f3ffedf0e2c192a6b47ce71dc6b2b1852d3ae6f68ce1b301
+  data.tar.gz: c29017035f83ac51f171b27647a3b714b4461a77322d2d2ae8d46749cf8a1ed6c24a03bd176f5accb6de33e568ca6aaac73144f21b3312a359ab632980b97104

data/exe/spectre

@@ -70,8 +70,8 @@ options = OptionParser.new do |opts|
     config_overrides['formatter'] = class_name
   end
 
-  opts.on('--reporter NAME', 'Use specified reporter') do |class_name|
-    config_overrides['reporter'] = class_name
+  opts.on('--reporters NAME', Array, 'Use specified reporters') do |reporters|
+    config_overrides['reporters'] = reporters
   end
 
   opts.on('--json', 'Use JSON formatter') do
@@ -108,7 +108,7 @@ options = OptionParser.new do |opts|
   end
 
   opts.on('-m MODULE,MODULE', '--modules MODULE,MODULE', Array, 'Load the given modules') do |modules|
-    config_overrides['modules'] += modules
+    config_overrides['modules'] = modules
   end
 
   opts.on('-d', '--debug', 'Run in debug mode. Do not use in production!') do

data/lib/spectre/version.rb

@@ -1,3 +1,3 @@
 module Spectre
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.3'.freeze
 end

data/lib/spectre.rb

@@ -194,10 +194,7 @@ module Spectre
     def initialize(config, **)
       log_file = config['log_file']
 
-      if log_file.is_a? String
-        log_file = log_file.gsub('<date>', DateTime.now.strftime('%Y-%m-%d_%H%M%S%3N'))
-        FileUtils.mkdir_p(File.dirname(log_file))
-      end
+      FileUtils.mkdir_p(File.dirname(log_file)) if log_file.is_a? String
 
       super(log_file, **)
 
@@ -1502,8 +1499,17 @@ module Spectre
       end
 
       # Merge property overrides
+      # Merging would override arrays. We don't want this in certain cases,
+      # so merge them manually
+      @config['reporters'].concat(config.delete('reporters')) if config.key? 'reporters'
+      @config['modules'].concat(config.delete('modules')) if config.key? 'modules'
       @config.deep_merge!(config)
 
+      # Replace log filename placeholders
+      if @config['log_file'].respond_to? :gsub!
+        @config['log_file'].gsub!('<date>', DateTime.now.strftime('%Y-%m-%d_%H%M%S%3N'))
+      end
+
       # Set env before loading specs in order to make it available in spec definitions
       @env = @config.to_recursive_struct
 
@@ -1615,8 +1621,14 @@ module Spectre
     #
     def cleanup
       Dir.chdir(@config['work_dir'])
+
+      # Remove all log files explicitly
       log_file_pattern = @config['log_file'].gsub('<date>', '*')
       FileUtils.rm_rf(Dir.glob(log_file_pattern), secure: true)
+
+      # Remove all files (reports) in the output directory
+      out_files_pattern = File.join(@config['out_path'], '*')
+      FileUtils.rm_rf(Dir.glob(out_files_pattern), secure: true)
     end
 
     ##

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Christian Neubauer
 bindir: exe
 cert_chain: []
-date: 2025-03-21 00:00:00.000000000 Z
+date: 2025-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug