spectre-core 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd2c5dd03f2ded27246d351696a749bf0f0fbb06ff87ecc27363873202ecb1ac
-  data.tar.gz: a17d75c2581c6f64f58664b78c68449936610f8fa9c6c313dc73011da59094c6
+  metadata.gz: a4bf64674e85ed8358b24a20cb06d453531cb4af450c1670dee4712bcc51fd18
+  data.tar.gz: 8647deb255849902fc577c846e14c3e03636dde92619915b1d216d78eef9c73c
 SHA512:
-  metadata.gz: 941692c923f0437410ad99376a1df249c81dd970c527445e9a4e3721554e35e2f6d10cca4f23293894df212f7bd5dc4b36ab1610b3351919a88dc9a6fdd8cd18
-  data.tar.gz: 7245b35708dc29ee1c0d2ec60ec10cbd39125f7302aa3e84962037e2e30824793290b59f70c51e8a7892d79780747697f8635c90b48e3ba4d2276015538bb8b3
+  metadata.gz: ab929ce12105b08fb0e0f3180040233c2f748ec6037e71c3b59281083a8a9156b152cb07c0713e56e8d723d2c836671f37a505c6497fae48d7717eeca6008f34
+  data.tar.gz: acc709c87e6f5d5132f5a5ad01c4478b893479e847a5f38c2edc8fc793d411390bde9173edde3e2712e95258de5056f24511b5a2a67c51378fe39f78f4721e29

data/exe/spectre

@@ -55,9 +55,6 @@ DEFAULT_CONFIG = {
   'modules' => [
     'spectre/helpers',
     'spectre/reporter/console',
-    'spectre/reporter/junit',
-    'spectre/reporter/vstest',
-    'spectre/reporter/html',
     'spectre/logger/console',
     'spectre/logger/file',
     'spectre/assertion',
@@ -86,19 +83,21 @@ property_overrides = {}
 $COMMAND = ['spectre'].concat(ARGV.clone).join(' ')
 
 OptionParser.new do |opts|
-  opts.banner = %{Spectre #{Spectre::VERSION}
+  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
@@ -136,11 +135,17 @@ OptionParser.new do |opts|
     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
 
@@ -165,9 +170,9 @@ OptionParser.new do |opts|
     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
@@ -205,15 +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|
@@ -258,127 +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)
 
-  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::Logging.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::Logging.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
 
 
@@ -425,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
 
@@ -511,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

data/lib/spectre/assertion.rb

@@ -1,4 +1,5 @@
 require_relative '../spectre'
+require_relative '../spectre/helpers'
 
 require 'ostruct'
 require_relative 'logger'
@@ -7,32 +8,39 @@ require_relative 'logger'
 module Spectre
   module Assertion
     class ::Object
-      def should_be(val)
-        raise AssertionFailure.new("'#{self.to_s.trim}' should be '#{val.to_s.trim}'", val, self) unless self.to_s == val.to_s
+      def should_be(value)
+        evaluate(value, "#{self} should be #{value}") do |x|
+          self.equal? x
+        end
       end
 
       def should_be_empty
-        raise AssertionFailure.new("'#{self.to_s.trim}' should be empty", nil, self) unless self.nil?
+        raise AssertionFailure.new("#{self.to_s.trim} should be empty", nil, self) unless self.nil?
       end
 
       def should_not_be(val)
-        raise AssertionFailure.new("'#{self.to_s.trim}' should not be '#{val.to_s.trim}'", val, self) unless self.to_s != val.to_s
+        raise AssertionFailure.new("#{self.to_s.trim} should not be #{val.to_s.trim}", val, self) unless self.to_s != val.to_s
       end
 
       def should_not_exist
-        raise AssertionFailure.new("'#{self.to_s.trim}' should not exist, but it does", val, self) unless self.to_s != nil
+        raise AssertionFailure.new("#{self.to_s.trim} should not exist, but it does", val, self) unless self.to_s != nil
       end
 
       def should_not_be_empty
         raise AssertionFailure.new('empty value', 'nothing', self) unless self != nil
       end
 
+      def evaluate val, message, &block
+        val = Evaluation.new(val) unless val.is_a? Evaluation
+        raise AssertionFailure.new(message, val, self) unless val.run &block
+      end
+
       def or other
-        OrEvaluation.new self, other
+        OrEvaluation.new(self, other)
       end
 
       def and other
-        AndEvaluation.new self, other
+        AndEvaluation.new(self, other)
       end
     end
 
@@ -93,7 +101,9 @@ module Spectre
           val = OpenStruct.new(val)
         end
 
-        raise AssertionFailure.new("[#{list.join(', ').trim}] should contain '#{val.to_s.trim}'", val, list) unless list.include? val
+        evaluate(val, "#{self} should contain #{val.to_s}") do |x|
+          self.include? x
+        end
       end
 
       def should_not_contain(val)
@@ -134,15 +144,9 @@ module Spectre
       end
 
       def should_contain(value)
-        raise AssertionFailure.new("Value is nil") if value.nil?
-
-        predicate = proc { |x| self.include? x.to_s }
-        evaluation = SingleEvaluation.new(value)
-        success = evaluation.call(predicate)
-
-        return if success
-
-        raise AssertionFailure.new("'#{self.to_s.trim}' should contain #{evaluation.to_s}", evaluation, self)
+        evaluate(value, "'#{self.trim}' should contain #{value.to_s}") do |x|
+          self.include? x.to_s
+        end
       end
 
       def should_not_contain(val)
@@ -162,54 +166,58 @@ module Spectre
     end
 
     class Evaluation
-      def initialize value, other
-        @value = value
-        @other = other
+      def initialize val
+        @val = val
       end
 
-      def eval_assertion predicate, val
+      def run &block
+        evaluate(@val, block)
+      end
+
+      def evaluate(val, predicate)
         if val.is_a? Evaluation
-          val.call(predicate)
+          val.run &predicate
         else
           predicate.call(val)
         end
       end
 
-      alias :| :or
-      alias :& :and
-    end
-
-    class SingleEvaluation < Evaluation
-      def initialize value
-        super(value, nil)
-      end
-
-      def call predicate
-        eval_assertion(predicate, @value)
-      end
-
       def to_s
-        @value.to_s
+        @val.to_s
       end
     end
 
     class OrEvaluation < Evaluation
-      def call predicate
-        eval_assertion(predicate, @value) or eval_assertion(predicate, @other)
+      def initialize val, other
+        @val = val
+        @other = other
+      end
+
+      def run &block
+        res1 = evaluate(@val, block)
+        res2 = evaluate(@other, block)
+        res1 or res2
       end
 
       def to_s
-        "(#{@value.to_s} or #{@other.to_s})"
+        "(#{@val} or #{@other})"
       end
     end
 
     class AndEvaluation < Evaluation
-      def call predicate
-        eval_assertion(predicate, @value) and eval_assertion(predicate, @other)
+      def initialize val, other
+        @val = val
+        @other = other
+      end
+
+      def run &block
+        res1 = evaluate(@val, block)
+        res2 = evaluate(@other, block)
+        res1 and res2
       end
 
       def to_s
-        "(#{@value.to_s} and #{@other.to_s})"
+        "(#{@val} and #{@other})"
       end
     end
 

data/lib/spectre/http.rb

@@ -19,7 +19,7 @@ module Spectre
       'cert' => nil,
       'headers' => nil,
       'query' => nil,
-      'content_type' => '',
+      'content_type' => nil,
       'timeout' => 180,
       'retries' => 0,
     }
@@ -77,8 +77,7 @@ module Spectre
         data = data.to_h if data.is_a? OpenStruct
         body JSON.pretty_generate(data)
 
-        # TODO: Only set content type, if not explicitly set
-        content_type('application/json')
+        content_type('application/json') unless @__req['content_type']
       end
 
       def body body_content
@@ -231,10 +230,6 @@ module Spectre
           # do nothing
         end
 
-        if str.length > 1000
-          str = str[0...1000] + "\n[...]"
-        end
-
         str
       end
 

data/lib/spectre.rb

@@ -1,7 +1,7 @@
 module Spectre
   module Version
     MAJOR = 1
-    MINOR = 13
+    MINOR = 14
     TINY  = 0
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Christian Neubauer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-09-05 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.1
+        version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: jsonpath
   requirement: !ruby/object:Gem::Requirement
@@ -63,15 +63,7 @@ files:
 - lib/spectre/logger/file.rb
 - lib/spectre/mixin.rb
 - lib/spectre/reporter/console.rb
-- lib/spectre/reporter/html.rb
-- lib/spectre/reporter/junit.rb
-- lib/spectre/reporter/vstest.rb
 - lib/spectre/resources.rb
-- resources/OpenSans-Regular.ttf
-- resources/fa-regular-400.ttf
-- resources/fa-solid-900.ttf
-- resources/spectre_icon.svg
-- resources/vue.global.prod.js
 homepage: https://github.com/ionos-spectre/spectre-core
 licenses:
 - GPL-3.0-or-later