spectre-core 1.12.4 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d2cb2622682713c0fc37e7c0e679aa0d93f01ac9af389c8430496a272608038
-  data.tar.gz: 8b313cd7952c0b9e4baf9e8f0cec0af397d1f8cf8fc25760204714f687718df8
+  metadata.gz: 3ec3e298c4efb325f628370a3855a110136cba4a9d7f870db90d95a5b39c9e8a
+  data.tar.gz: fde6391319206d2f8d603b02be31f0f5bb72d424fcb25541b9be0597670ce49a
 SHA512:
-  metadata.gz: c3e939b9e9851ece96d27e31d19fa7f4c5b26bd9141e28e2e5964b5f20ed1f9c9b0f4a77800b87c411d1c271d0b4acf1afa1f50359e832842e241a1ba536b811
-  data.tar.gz: d105a5a9924cba80b028790a538945087ef0e19a30763e619b712c1d7b31b54259a03504a5a52d1f1cc24be6a03f1e8185d499ed9e7343a17655c4336f22dd40
+  metadata.gz: 5fdb065d1ce08d8c4e78e164bc1caad26ed03d50f4cf6199398699859cb9a81a00260b6e3af785de4a7852aa45da1ae61a2977b0b92bbb5c0c832e6079178cce
+  data.tar.gz: ce6b95998d3e3145876bc1d7bb8fe06ce941f1327a6a283557e9944447ffba888c3012124c474d0321f5e9eb91914b53fbdd285255f947db34dd783e084446b5

data/exe/spectre

@@ -16,6 +16,7 @@ end
 
 
 DEFAULT_CONFIG = {
+  'project' => nil,
   'config_file' => './spectre.yml',
   'environment' => 'default',
   'specs' => [],
@@ -26,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' => {
@@ -54,7 +55,6 @@ DEFAULT_CONFIG = {
   'modules' => [
     'spectre/helpers',
     'spectre/reporter/console',
-    'spectre/reporter/junit',
     'spectre/logger/console',
     'spectre/logger/file',
     'spectre/assertion',
@@ -66,6 +66,7 @@ DEFAULT_CONFIG = {
     'spectre/http/basic_auth',
     'spectre/http/keystone',
     'spectre/resources',
+    'spectre/async',
   ],
   'include' => [
 
@@ -79,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(' ')
 
-Usage: spectre [command] [options]
+OptionParser.new do |opts|
+  opts.banner = <<~BANNER
+    Spectre #{Spectre::VERSION}
 
-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
+    Usage: spectre [command] [options]
 
-Specific 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
+
+      Specific options:
+  BANNER
 
   opts.on('-s SPEC,SPEC', '--specs SPEC,SPEC', Array, 'The specs to run') do |specs|
     cmd_options['specs'] = specs
@@ -130,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
 
@@ -159,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
@@ -199,13 +210,19 @@ if File.exists? config_file
   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|
@@ -250,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}"
+      end
 
-  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}"
+      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
 
 
@@ -418,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
 
@@ -504,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