spectre-core 1.9.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b3c5faed7a6a34d2c9fe9e2c3b637ce8cc818e8ea597649e7b1c386dd444fde
-  data.tar.gz: 330492cacaad784dea242b35bd539a75660268022485afde75e47cdc99d374a7
+  metadata.gz: 77d4435f515a88fa60eef0a6c43b90975fb6ae1168a60294ee2847536ff51a67
+  data.tar.gz: 1366a0d67961a565bf2020d9fa9e6724f5df4b4add1ac58712ed2cdfe992e74d
 SHA512:
-  metadata.gz: 02b2682ae4911e462be2c9e48622c0dca079916719a9b2ce519bae1d7945290a989572e16c8c21768201f811177ef5580d3077f2a0f50ce0225639a93c1c1b9a
-  data.tar.gz: 140ebcba6bbbd1056510bd8c231fe16b0e63a6d0a4209abb69701fdfc9d99b2a2655742e334880e31e3fbda55cf0a434d2dee1290a95a7513a5a64699bb5a288
+  metadata.gz: 7699c3e1433edc8b7b0c7886f28ef90ad3f6438b2189ebbbe8bfc40c6386f7b142bd8848809af13e9c893d8efcffc6598c595fea8bdea9ff67899a84c5394e27
+  data.tar.gz: 1b5da1f3b490dbcf2510e8a58306efe3a0924891c5004fe9862854f0700e502d81b46e8353e85b77be43f4c4aea9e67b7c4db276501f971046d47e4488c5d07f

data/exe/spectre

@@ -10,14 +10,6 @@ require 'ectoplasm'
 require_relative '../lib/spectre'
 
 
-class ::Hash
-  def deep_merge!(second)
-    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge!(v2, &merger) : v2 }
-    self.merge!(second, &merger)
-  end
-end
-
-
 DEFAULT_CONFIG = {
   'config_file' => './spectre.yml',
   'environment' => 'default',
@@ -44,7 +36,7 @@ DEFAULT_CONFIG = {
       'separator' => '-- <desc>',
       'start_group' => "-- Start '<desc>'",
       'end_group' => "-- End '<desc>'",
-    }
+    },
   },
   'debug' => false,
   'out_path' => './reports',
@@ -75,7 +67,7 @@ DEFAULT_CONFIG = {
   ],
   'exclude' => [
 
-  ]
+  ],
 }
 
 
@@ -148,10 +140,9 @@ Specific options:}
 
     curr_opt = cmd_options
     (key.split '.').each do |k|
-      curr_opt[k] = {} if not curr_opt.key? k
+      curr_opt[k] = {} unless curr_opt.key? k
     end
     curr_opt = val
-
   end
 
   opts.separator "\nCommon options:"
@@ -226,7 +217,7 @@ cfg['env_partial_patterns'].each do |pattern|
   Dir.glob(pattern).each do|f|
     partial_env = YAML.load_file(f)
     name = partial_env.delete('name') || 'default'
-    next if not envs.key? name
+    next unless envs.key? name
 
     envs[name].deep_merge! partial_env
   end
@@ -238,6 +229,10 @@ cfg.merge! env if env
 
 String.colored! if cfg['colored']
 
+# Load environment exlicitly before loading specs to make it available in spec definition
+require_relative '../lib/spectre/environment' unless cfg['exclude'].include? 'spectre/environment'
+Spectre.configure(cfg)
+
 
 ###########################################
 # Load Specs
@@ -256,11 +251,11 @@ end
 ###########################################
 
 
-if action == 'list'
+if 'list' == action
   colors = [:blue, :magenta, :yellow, :green]
   specs = Spectre.specs(cfg['specs'], cfg['tags'])
 
-  exit 1 if specs.length == 0
+  exit 1 unless specs.any?
 
   counter = 0
 
@@ -285,42 +280,52 @@ end
 ###########################################
 
 
-if action == 'run'
+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 if !Dir.exists? log_dir
+  FileUtils.makedirs log_dir unless Dir.exists? log_dir
 
   # Load Modules
+
   cfg['modules']
     .concat(cfg['include'])
     .select { |mod| !cfg['exclude'].include? mod }
     .each do |mod|
-      begin
-        spectre_lib_mod = File.join('../lib', mod)
-
-        if File.exists? mod
-          require_relative mod
+    begin
+      mod_file = mod + '.rb'
+      spectre_lib_mod = File.join(File.dirname(__dir__), 'lib', mod_file)
 
-        elsif File.exists? spectre_lib_mod
-          require_relative spectre_lib_mod
+      if File.exists? mod_file
+        require_relative mod_file
 
-        else
-          require mod
-        end
+      elsif File.exists? spectre_lib_mod
+        require_relative spectre_lib_mod
 
-      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
+      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
+  end
+
+  # Load mixins
+
+  cfg['mixin_patterns'].each do |pattern|
+    Dir.glob(pattern).each do|f|
+      require_relative File.join(Dir.pwd, f)
+    end
   end
 
   Spectre.configure(cfg)
@@ -334,7 +339,7 @@ if action == 'run'
 
   specs = Spectre.specs(cfg['specs'], cfg['tags'])
 
-  if specs.length == 0
+  unless specs.any?
     puts "No specs found in #{Dir.pwd}"
     exit 1
   end
@@ -346,9 +351,9 @@ if action == 'run'
     reporter.report(run_infos)
   end
 
-  errors = run_infos.select { |x| x.error != nil or x.failure != nil }
+  errors = run_infos.select { |x| nil != x.error or nil != x.failure }
 
-  exit 0 if cfg['ignore_failure'] or errors.count == 0
+  exit 0 if cfg['ignore_failure'] or not errors.any?
 
   exit 1
 end
@@ -359,8 +364,8 @@ end
 ###########################################
 
 
-if action == 'envs'
-  exit 1 if envs.length == 0
+if 'envs' == action
+  exit 1 unless envs.any?
   puts envs.pretty
   exit 0
 end
@@ -371,7 +376,7 @@ end
 ###########################################
 
 
-if action == 'show'
+if 'show' == action
   puts cfg.pretty
   exit 0
 end
@@ -382,7 +387,7 @@ end
 ###########################################
 
 
-if action == 'dump'
+if 'dump' == action
   puts YAML.dump(cfg)
 end
 
@@ -487,7 +492,7 @@ gem 'spectre-core', '>= #{Spectre::VERSION}'
 # gem 'spectre-git', '>= 0.1.0'
 ]
 
-if action == 'init'
+if 'init' == action
   DEFAULT_FILES = [
     ['./environments/default.env.yml', DEFAULT_ENV_CFG],
     ['./environments/default.env.secret.yml', DEFAULT_ENV_SECRET_CFG],
@@ -502,10 +507,10 @@ if action == 'init'
   end
 
   DEFAULT_FILES.each do |file, content|
-    if not File.exists? file
+    unless File.exists? file
       File.write(file, content)
     end
   end
 
   exit 0
-end
+end

data/lib/spectre/assertion.rb

@@ -1,3 +1,5 @@
+require_relative '../spectre'
+
 require 'ostruct'
 require_relative 'logger'
 
@@ -6,23 +8,23 @@ module Spectre
   module Assertion
     class ::Object
       def should_be(val)
-          raise AssertionFailure.new("The value '#{self.to_s.trim}' should be '#{val.to_s.trim}'", val, self) unless self.to_s == val.to_s
+        raise AssertionFailure.new("The value '#{self.to_s.trim}' should be '#{val.to_s.trim}'", val, self) unless self.to_s == val.to_s
       end
 
       def should_be_empty
-        raise AssertionFailure.new("The value '#{self.to_s.trim}' should be empty", nil, self) unless self == nil
+        raise AssertionFailure.new("The value '#{self.to_s.trim}' should be empty", nil, self) unless self.nil?
       end
 
       def should_not_be(val)
-          raise AssertionFailure.new("The value '#{self.to_s.trim}' should not be '#{val.to_s.trim}'", val, self) unless self.to_s != val.to_s
+        raise AssertionFailure.new("The value '#{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("The value '#{self.to_s.trim}' should not exist, but it does", val, self) unless self.to_s != nil
+        raise AssertionFailure.new("The value '#{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('The value should not be empty', 'nothing', self) unless self != nil
+        raise AssertionFailure.new('The value is empty', 'nothing', self) unless self != nil
       end
 
       def or other
@@ -34,7 +36,6 @@ module Spectre
       end
     end
 
-
     class ::NilClass
       def should_be(val)
         raise AssertionFailure.new("There is nothing, but the value should be '#{val.to_s.trim}'", val, nil) unless val == nil
@@ -51,11 +52,10 @@ module Spectre
       end
 
       def should_not_be_empty
-        raise AssertionFailure.new('not empty', 'nil')
+        raise AssertionFailure.new('The list is empty', 'nil')
       end
     end
 
-
     class ::Hash
       def should_contain(other)
         raise AssertionFailure.new(other, self) unless self.merge(other) == self
@@ -64,8 +64,25 @@ module Spectre
       def should_not_contain(other)
         raise AssertionFailure.new(other, self) unless self.merge(other) != self
       end
+
+      def should_be_empty
+        raise AssertionFailure.new('The object should be empty', nil, self) unless self.empty?
+      end
+
+      def should_not_be_empty
+        raise AssertionFailure.new('The object should not be empty', nil, self) if self.empty?
+      end
     end
 
+    class ::OpenStruct
+      def should_be_empty
+        raise AssertionFailure.new('The object should be empty', nil, self) unless self.to_h.empty?
+      end
+
+      def should_not_be_empty
+        raise AssertionFailure.new('The object should not be empty', nil, self) if self.to_h.empty?
+      end
+    end
 
     class ::Array
       def should_contain(val)
@@ -76,7 +93,7 @@ module Spectre
           val = OpenStruct.new(val)
         end
 
-        raise AssertionFailure.new("The list [#{list.join(', ').trim}] should contain '#{val.trim}'", val, list) unless list.include? val
+        raise AssertionFailure.new("The list [#{list.join(', ').trim}] should contain '#{val.to_s.trim}'", val, list) unless list.include? val
       end
 
       def should_not_contain(val)
@@ -87,19 +104,18 @@ module Spectre
           val = OpenStruct.new(val)
         end
 
-        raise AssertionFailure.new("The list [#{list.join(', ').trim}] should not contain '#{val.trim}'", val, list) if list.include? val
+        raise AssertionFailure.new("The list [#{list.join(', ').trim}] should not contain '#{val.to_s.trim}'", val, list) if list.include? val
       end
 
       def should_be_empty
-        raise AssertionFailure.new('empty list', self) unless self.length == 0
+        raise AssertionFailure.new('The list is not empty', self) unless self.empty?
       end
 
       def should_not_be_empty
-        raise AssertionFailure.new('no empty list', self) unless self.length > 0
+        raise AssertionFailure.new('The list is empty', self) if self.empty?
       end
     end
 
-
     class ::String
       def should_be(val)
         raise AssertionFailure.new("The text '#{self.trim}' should be '#{val.to_s.trim}'", val, self) unless self == val
@@ -110,7 +126,7 @@ module Spectre
       end
 
       def should_not_be(val)
-          raise AssertionFailure.new("The text '#{self.trim}' should not be '#{val.to_s.trim}'", val, self) unless self != val
+        raise AssertionFailure.new("The text '#{self.trim}' should not be '#{val.to_s.trim}'", val, self) unless self != val
       end
 
       def should_not_be_empty
@@ -118,8 +134,10 @@ module Spectre
       end
 
       def should_contain(value)
+        raise AssertionFailure.new("The value is nil") if value.nil?
+
         predicate = proc { |x| self.include? x.to_s }
-        evaluation = SingleEvaluation.new value
+        evaluation = SingleEvaluation.new(value)
         success = evaluation.call(predicate)
 
         return if success
@@ -143,7 +161,6 @@ module Spectre
       alias :& :and
     end
 
-
     class Evaluation
       def initialize value, other
         @value = value
@@ -162,10 +179,9 @@ module Spectre
       alias :& :and
     end
 
-
     class SingleEvaluation < Evaluation
       def initialize value
-        super value, nil
+        super(value, nil)
       end
 
       def call predicate
@@ -177,10 +193,9 @@ module Spectre
       end
     end
 
-
     class OrEvaluation < Evaluation
       def initialize value, other
-        super value, other
+        super(value, other)
       end
 
       def call predicate
@@ -192,10 +207,9 @@ module Spectre
       end
     end
 
-
     class AndEvaluation < Evaluation
       def initialize value, other
-        super value, other
+        super(value, other)
       end
 
       def call predicate
@@ -207,7 +221,6 @@ module Spectre
       end
     end
 
-
     class AssertionFailure < ExpectationFailure
       attr_reader :expected, :actual
 
@@ -222,27 +235,16 @@ module Spectre
     class << self
       @@success = nil
 
-      def eval_assertion predicate, val
-        if val.is_a? Proc
-          val.call(predicate)
-        else
-          predicate.call(val)
-        end
-      end
-
       def expect desc
         begin
           Logger.log_process("expect #{desc}")
           yield
           Logger.log_status(desc, Logger::Status::OK)
-
         rescue Interrupt => e
           raise e
-
         rescue AssertionFailure => e
           Logger.log_status(desc, Logger::Status::FAILED)
           raise AssertionFailure.new(e.message, e.expected, e.actual, desc), cause: nil
-
         rescue Exception => e
           Logger.log_status(desc, Logger::Status::ERROR)
           raise AssertionFailure.new("An unexpected error occured during expectation: #{e.message}", nil, nil, desc), cause: e
@@ -250,15 +252,21 @@ module Spectre
       end
 
       def observe desc = nil
+        prefix = 'observing'
+        prefix += " '#{desc}'" if desc
+
         begin
-          Logger.log_info("observing #{desc}") if desc
+          Logger.log_info(prefix) if desc
           yield
           @@success = true
-
+          @@logger.info("#{prefix} finished with success")
         rescue Interrupt => e
           raise e
-
         rescue Exception => e
+          error_message = "#{prefix} finished with failure: #{e.message}"
+          error_message += "\n" + e.backtrace.join("\n") if @@debug
+
+          @@logger.info(error_message)
           @@success = false
         end
       end
@@ -272,6 +280,11 @@ module Spectre
       end
     end
 
+    Spectre.register do |config|
+      @@logger = ::Logger.new(config['log_file'], progname: 'spectre/assertion')
+      @@debug = config['debug']
+    end
+
     Spectre.delegate :expect, :observe, :success?, :fail_with, to: self
   end
 end

data/lib/spectre/bag.rb

@@ -1,3 +1,5 @@
+require_relative '../spectre'
+
 require 'ostruct'
 
 module Spectre
@@ -14,6 +16,6 @@ module Spectre
       @@bag = OpenStruct.new
     end
 
-    Spectre.delegate :bag, to: Bag
+    Spectre.delegate :bag, to: self
   end
-end
+end