spectre-core 1.12.3 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90860f8fafa6a00e51d72bfe917ea12b6ccf5d040d0696ab2701d0222375930
-  data.tar.gz: 40b26f956b3b9f363b2e87eb913542f1c57ef6cf9981035fcd54b42b765f5d42
+  metadata.gz: a4bf64674e85ed8358b24a20cb06d453531cb4af450c1670dee4712bcc51fd18
+  data.tar.gz: 8647deb255849902fc577c846e14c3e03636dde92619915b1d216d78eef9c73c
 SHA512:
-  metadata.gz: 93f9d8f9cd6266c53e6f91aab1d80faf3d1ae07550bf97a489e25e2597e57d8fea05b2c26637513bd80fd5824bad145f5121d25bd5a53c3c02302895a7cf9f33
-  data.tar.gz: 32f36474db3f486a6f36ea02ec0c2291e300be67f5f6eb13ce40e73ae0af19db56cd7a34b22ec3c18cae07f3de14f4f90ccbda03f61eed3a3a1a0ff51dfb789e
+  metadata.gz: ab929ce12105b08fb0e0f3180040233c2f748ec6037e71c3b59281083a8a9156b152cb07c0713e56e8d723d2c836671f37a505c6497fae48d7717eeca6008f34
+  data.tar.gz: acc709c87e6f5d5132f5a5ad01c4478b893479e847a5f38c2edc8fc793d411390bde9173edde3e2712e95258de5056f24511b5a2a67c51378fe39f78f4721e29

data/exe/spectre

@@ -9,8 +9,14 @@ 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 = {
+  'project' => nil,
   'config_file' => './spectre.yml',
   'environment' => 'default',
   'specs' => [],
@@ -21,8 +27,8 @@ DEFAULT_CONFIG = {
     'Spectre::Reporter::Console',
   ],
   'loggers' => [
-    'Spectre::Logger::Console',
-    'Spectre::Logger::File',
+    'Spectre::Logging::Console',
+    'Spectre::Logging::File',
   ],
   'log_file' => './logs/spectre_<date>.log',
   'log_format' => {
@@ -49,7 +55,6 @@ DEFAULT_CONFIG = {
   'modules' => [
     'spectre/helpers',
     'spectre/reporter/console',
-    'spectre/reporter/junit',
     'spectre/logger/console',
     'spectre/logger/file',
     'spectre/assertion',
@@ -61,6 +66,7 @@ DEFAULT_CONFIG = {
     'spectre/http/basic_auth',
     'spectre/http/keystone',
     'spectre/resources',
+    'spectre/async',
   ],
   'include' => [
 
@@ -74,20 +80,24 @@ DEFAULT_CONFIG = {
 cmd_options = {}
 property_overrides = {}
 
-opt_parser = OptionParser.new do |opts|
-opts.banner = %{Spectre #{Spectre::VERSION}
+$COMMAND = ['spectre'].concat(ARGV.clone).join(' ')
+
+OptionParser.new do |opts|
+  opts.banner = <<~BANNER
+    Spectre #{Spectre::VERSION}
 
-Usage: spectre [command] [options]
+    Usage: spectre [command] [options]
 
-Commands:
-  list        List specs
-  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
+      Commands:
+        list        List specs
+        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:}
+      Specific options:
+  BANNER
 
   opts.on('-s SPEC,SPEC', '--specs SPEC,SPEC', Array, 'The specs to run') do |specs|
     cmd_options['specs'] = specs
@@ -125,11 +135,17 @@ Specific options:}
     cmd_options['out_path'] = File.absolute_path(path)
   end
 
-  opts.on('-r NAME', '--reporters NAME', Array, "A list of reporters to use") do |reporters|
+  opts.on('-r NAME,NAME', '--reporters NAME,NAME', Array, "A list of reporters to use") do |reporters|
     cmd_options['reporters'] = reporters
   end
 
-  opts.on('-d', '--debug', "Run in debug mode") do
+  opts.on('-m MODULE,MODULE', '--modules MODULE,MODULE', Array, "Load the given modules") do |modules|
+    modules.each do |mod|
+      require mod
+    end
+  end
+
+  opts.on('-d', '--debug', "Run in debug mode. Do not use in production!") do
     cmd_options['debug'] = true
   end
 
@@ -154,9 +170,9 @@ Specific options:}
     end
   end
 
-  opts.separator "\nCommon options:"
+  opts.separator "\n  Common options:"
 
-  opts.on_tail('--version', 'Print current installed version') do
+  opts.on_tail('-v', '--version', 'Print current installed version') do
     puts Spectre::VERSION
     exit
   end
@@ -182,30 +198,36 @@ 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
 
+# Set config options, which are only allowed to be overriden by command options
+cfg['debug'] = DEFAULT_CONFIG['debug']
+
+# Set project name
+cfg['project'] = File.basename(Dir.pwd) unless cfg['project']
+
 cfg.deep_merge! cmd_options
 
+
 ###########################################
 # Load Environment
 ###########################################
 
-
 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 +245,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
 
@@ -245,128 +267,131 @@ require_relative '../lib/spectre/environment' unless cfg['exclude'].include? 'sp
 Spectre.configure(cfg)
 
 
-###########################################
-# Load Specs
-###########################################
+# Load specs only, when listing or running specs
+if ['list', 'run'].include? action
 
+  ###########################################
+  # Load Specs
+  ###########################################
 
-cfg['spec_patterns'].each do |pattern|
-  Dir.glob(pattern).each do|f|
-    require_relative File.join(Dir.pwd, f)
+
+  cfg['spec_patterns'].each do |pattern|
+    Dir.glob(pattern).each do|f|
+      require_relative File.join(Dir.pwd, f)
+    end
   end
-end
 
 
-###########################################
-# List specs
-###########################################
+  ###########################################
+  # List specs
+  ###########################################
 
 
-if 'list' == action
-  colors = [:blue, :magenta, :yellow, :green]
-  specs = Spectre.specs(cfg['specs'], cfg['tags'])
+  if 'list' == action
+    colors = [:blue, :magenta, :yellow, :green]
+    specs = Spectre.specs(cfg['specs'], cfg['tags'])
 
-  exit 1 unless specs.any?
+    exit 1 unless specs.any?
 
-  counter = 0
+    counter = 0
 
-  specs.group_by { |x| x.subject }.each do |subject, spec_group|
-    spec_group.each do |spec|
-      tags = spec.tags.map { |x| '#' + x.to_s }.join ' '
-      desc = subject.desc
-      desc += ' - ' + spec.context.__desc + ' -' if spec.context.__desc
-      desc += ' ' + spec.desc
-      puts "[#{spec.name}]".send(colors[counter % colors.length]) + " #{desc} #{tags.cyan}"
+    specs.group_by { |x| x.subject }.each do |subject, spec_group|
+      spec_group.each do |spec|
+        tags = spec.tags.map { |x| '#' + x.to_s }.join ' '
+        desc = subject.desc
+        desc += ' - ' + spec.context.__desc + ' -' if spec.context.__desc
+        desc += ' ' + spec.desc
+        puts "[#{spec.name}]".send(colors[counter % colors.length]) + " #{desc} #{tags.cyan}"
+      end
+
+      counter += 1
     end
 
-    counter += 1
+    exit 0
   end
 
-  exit 0
-end
 
-
-###########################################
-# Run
-###########################################
+  ###########################################
+  # Run
+  ###########################################
 
 
-if 'run' == action
-  # Initialize logger
-  now = Time.now
+  if 'run' == action
+    # Initialize logger
+    now = Time.now
 
-  cfg['log_file'] = cfg['log_file'].frmt(
-{
-  shortdate: now.strftime('%Y-%m-%d'),
-  date: now.strftime('%Y-%m-%d_%H%M%S'),
-  timestamp: now.strftime('%s'),
-  subject: 'spectre',
-})
+    cfg['log_file'] = cfg['log_file'].frmt({
+      shortdate: now.strftime('%Y-%m-%d'),
+      date: now.strftime('%Y-%m-%d_%H%M%S'),
+      timestamp: now.strftime('%s'),
+      subject: 'spectre',
+    })
 
-  log_dir = File.dirname cfg['log_file']
-  FileUtils.makedirs log_dir unless Dir.exists? log_dir
+    log_dir = File.dirname(cfg['log_file'])
+    FileUtils.makedirs(log_dir)
 
-  # Load Modules
+    # Load Modules
 
-  cfg['modules']
-    .concat(cfg['include'])
-    .select { |mod| !cfg['exclude'].include? mod }
-    .each do |mod|
-    begin
-      mod_file = mod + '.rb'
-      spectre_lib_mod = File.join(File.dirname(__dir__), 'lib', mod_file)
+    cfg['modules']
+      .concat(cfg['include'])
+      .select { |mod| !cfg['exclude'].include? mod }
+      .each do |mod|
+      begin
+        mod_file = mod + '.rb'
+        spectre_lib_mod = File.join(File.dirname(__dir__), 'lib', mod_file)
 
-      if File.exists? mod_file
-        require_relative mod_file
+        if File.exists? mod_file
+          require_relative mod_file
 
-      elsif File.exists? spectre_lib_mod
-        require_relative spectre_lib_mod
+        elsif File.exists? spectre_lib_mod
+          require_relative spectre_lib_mod
 
-      else
-        require mod
+        else
+          require mod
+        end
+      rescue LoadError => e
+        puts "Unable to load module #{mod}. Check if the module exists or remove it from your spectre config:\n#{e.message}"
+        exit 1
       end
-    rescue LoadError => e
-      puts "Unable to load module #{mod}. Check if the module exists or remove it from your spectre config:\n#{e.message}"
-      exit 1
     end
-  end
 
-  # Load mixins
+    # Load mixins
 
-  cfg['mixin_patterns'].each do |pattern|
-    Dir.glob(pattern).each do|f|
-      require_relative File.join(Dir.pwd, f)
+    cfg['mixin_patterns'].each do |pattern|
+      Dir.glob(pattern).each do|f|
+        require_relative File.join(Dir.pwd, f)
+      end
     end
-  end
 
-  Spectre.configure(cfg)
+    Spectre.configure(cfg)
 
-  Spectre::Logger.debug! if cfg['debug']
+    Spectre::Logging.debug! if cfg['debug']
 
-  cfg['loggers'].each do |logger_name|
-    logger = Kernel.const_get(logger_name).new(cfg)
-    Spectre::Logger.add(logger)
-  end if cfg['loggers']
+    cfg['loggers'].each do |logger_name|
+      logger = Kernel.const_get(logger_name).new(cfg)
+      Spectre::Logging.add(logger)
+    end if cfg['loggers']
 
-  specs = Spectre.specs(cfg['specs'], cfg['tags'])
+    specs = Spectre.specs(cfg['specs'], cfg['tags'])
 
-  unless specs.any?
-    puts "No specs found in #{Dir.pwd}"
-    exit 1
-  end
+    unless specs.any?
+      puts "No specs found in #{Dir.pwd}"
+      exit 1
+    end
 
-  run_infos = Spectre::Runner.new.run(specs)
+    run_infos = Spectre::Runner.new.run(specs)
 
-  cfg['reporters'].each do |reporter|
-    reporter = Kernel.const_get(reporter).new(cfg)
-    reporter.report(run_infos)
-  end
+    cfg['reporters'].each do |reporter|
+      reporter = Kernel.const_get(reporter).new(cfg)
+      reporter.report(run_infos)
+    end
 
-  errors = run_infos.select { |x| nil != x.error or nil != x.failure }
+    errors = run_infos.select { |x| nil != x.error or nil != x.failure }
 
-  exit 0 if cfg['ignore_failure'] or not errors.any?
+    exit 0 if cfg['ignore_failure'] or not errors.any?
 
-  exit 1
+    exit 1
+  end
 end
 
 
@@ -413,10 +438,12 @@ if 'cleanup' == action
 
   Dir.glob(log_file_pattern).each do |log_file|
     File.delete(log_file)
+    puts "#{log_file} deleted"
   end
 
   Dir.glob(File.join cfg['out_path'], '/*').each do |out_file|
     File.delete(out_file)
+    puts "#{out_file} deleted"
   end
 end
 
@@ -499,7 +526,7 @@ SAMPLE_SPEC = %[describe '<subject>' do
     end
 
     expect 'a message to exist' do
-      response.json.message.should_not_be nil
+      response.json.message.should_not_be_empty
     end
   end
 end