spectre-core 1.12.0 → 1.12.1

data/lib/spectre/logger.rb

@@ -1,146 +1,146 @@
-require_relative '../spectre'
-require 'date'
-
-module Spectre
-  module Logger
-    module Status
-      OK = '[ok]'
-      FAILED = '[failed]'
-      ERROR = '[error]'
-      INFO = '[info]'
-      SKIPPED = '[skipped]'
-      DEBUG = '[debug]'
-    end
-
-    class << self
-      @@debug = false
-      @@logger = []
-
-      def debug!
-        @@debug = true
-      end
-
-      def debug?
-        @@debug
-      end
-
-      def add logger
-        @@logger.append logger
-      end
-
-      def start_subject subject
-        delegate(:start_subject, subject)
-      end
-
-      def end_subject subject
-        delegate(:end_subject, subject)
-      end
-
-      def start_context context
-        delegate(:start_context, context)
-      end
-
-      def end_context context
-        delegate(:end_context, context)
-      end
-
-      def start_spec spec, data=nil
-        delegate(:start_spec, spec, data)
-      end
-
-      def end_spec spec, data=nil
-        delegate(:end_spec, spec, data)
-      end
-
-      def log_subject subject
-        begin
-          start_subject(subject)
-          yield
-        ensure
-          end_subject(subject)
-        end
-      end
-
-      def log_context context
-        begin
-          start_context(context)
-          yield
-        ensure
-          end_context(context)
-        end
-      end
-
-      def log_spec spec, data=nil
-        start_spec(spec, data)
-        yield
-        end_spec(spec, data)
-      end
-
-      def log_separator desc
-        delegate(:log_separator, desc)
-      end
-
-      def start_group desc
-        delegate(:start_group, desc)
-      end
-
-      def end_group desc
-        delegate(:end_group, desc)
-      end
-
-      def log_process desc
-        delegate(:log_process, desc)
-      end
-
-      def log_info message
-        add_log(message)
-        delegate(:log_info, message)
-      end
-
-      def log_debug message
-        return unless @@debug
-
-        add_log(message)
-        delegate(:log_debug, message)
-      end
-
-      def log_error spec, exception
-        add_log(exception)
-        delegate(:log_error, spec, exception)
-      end
-
-      def log_skipped spec
-        delegate(:log_skipped, spec)
-      end
-
-      def log_status desc, status, annotation=nil
-        delegate(:log_status, desc, status, annotation)
-      end
-
-      def group desc
-        Logger.start_group desc
-        yield
-        Logger.end_group desc
-      end
-
-      alias_method :info, :log_info
-      alias_method :log, :log_info
-      alias_method :debug, :log_debug
-      alias_method :separate, :log_separator
-
-      private
-
-      def delegate method, *args
-        @@logger.each do |logger|
-          logger.send(method, *args) if logger.respond_to? method
-        end
-      end
-
-      def add_log message
-        Spectre::Runner.current.log.append([DateTime.now, message])
-      end
-    end
-
-    Spectre.delegate :log, :info, :debug, :group, :separate, to: self
-  end
-end
+require_relative '../spectre'
+require 'date'
+
+module Spectre
+  module Logger
+    module Status
+      OK = '[ok]'
+      FAILED = '[failed]'
+      ERROR = '[error]'
+      INFO = '[info]'
+      SKIPPED = '[skipped]'
+      DEBUG = '[debug]'
+    end
+
+    class << self
+      @@debug = false
+      @@logger = []
+
+      def debug!
+        @@debug = true
+      end
+
+      def debug?
+        @@debug
+      end
+
+      def add logger
+        @@logger.append logger
+      end
+
+      def start_subject subject
+        delegate(:start_subject, subject)
+      end
+
+      def end_subject subject
+        delegate(:end_subject, subject)
+      end
+
+      def start_context context
+        delegate(:start_context, context)
+      end
+
+      def end_context context
+        delegate(:end_context, context)
+      end
+
+      def start_spec spec, data=nil
+        delegate(:start_spec, spec, data)
+      end
+
+      def end_spec spec, data=nil
+        delegate(:end_spec, spec, data)
+      end
+
+      def log_subject subject
+        begin
+          start_subject(subject)
+          yield
+        ensure
+          end_subject(subject)
+        end
+      end
+
+      def log_context context
+        begin
+          start_context(context)
+          yield
+        ensure
+          end_context(context)
+        end
+      end
+
+      def log_spec spec, data=nil
+        start_spec(spec, data)
+        yield
+        end_spec(spec, data)
+      end
+
+      def log_separator desc
+        delegate(:log_separator, desc)
+      end
+
+      def start_group desc
+        delegate(:start_group, desc)
+      end
+
+      def end_group desc
+        delegate(:end_group, desc)
+      end
+
+      def log_process desc
+        delegate(:log_process, desc)
+      end
+
+      def log_info message
+        add_log(message)
+        delegate(:log_info, message)
+      end
+
+      def log_debug message
+        return unless @@debug
+
+        add_log(message)
+        delegate(:log_debug, message)
+      end
+
+      def log_error spec, exception
+        add_log(exception)
+        delegate(:log_error, spec, exception)
+      end
+
+      def log_skipped spec
+        delegate(:log_skipped, spec)
+      end
+
+      def log_status desc, status, annotation=nil
+        delegate(:log_status, desc, status, annotation)
+      end
+
+      def group desc
+        Logger.start_group desc
+        yield
+        Logger.end_group desc
+      end
+
+      alias_method :info, :log_info
+      alias_method :log, :log_info
+      alias_method :debug, :log_debug
+      alias_method :separate, :log_separator
+
+      private
+
+      def delegate method, *args
+        @@logger.each do |logger|
+          logger.send(method, *args) if logger.respond_to? method
+        end
+      end
+
+      def add_log message
+        Spectre::Runner.current.log.append([DateTime.now, message])
+      end
+    end
+
+    Spectre.delegate :log, :info, :debug, :group, :separate, to: self
+  end
+end

data/lib/spectre/mixin.rb

@@ -1,58 +1,58 @@
-require_relative '../spectre'
-require_relative 'logger'
-
-require 'ostruct'
-
-module Spectre
-  module Mixin
-    class MixinContext < Spectre::DslClass
-      def initialize desc
-        @__desc = desc
-      end
-
-      def required params, *keys
-        missing_keys = keys.select { |x| !params.to_h.key? x }
-        Spectre::Logger.log_debug("required parameters for '#{@__desc}': #{keys.join ', '}")
-        raise ArgumentError, "mixin '#{@__desc}' requires #{keys.join ', '}, but only has #{missing_keys.join ', '} given" unless missing_keys.empty?
-      end
-
-      def optional params, *keys
-        Spectre::Logger.log_debug("optional parameters for '#{@__desc}': #{keys.join ', '}")
-        params
-      end
-    end
-
-    class << self
-      @@mixins = {}
-
-      def mixin desc, &block
-        @@mixins[desc] = block
-      end
-
-      def run desc, with: []
-        raise "no mixin with desc '#{desc}' defined" unless @@mixins.key? desc
-
-        Spectre::Logger.log_debug "running mixin '#{desc}'"
-
-        params = with || {}
-
-        ctx = MixinContext.new(desc)
-
-        if params.is_a? Array
-          return_val = ctx._execute(*params, &@@mixins[desc])
-        elsif params.is_a? Hash
-          return_val = ctx._execute(OpenStruct.new(params), &@@mixins[desc])
-        else
-          return_val = ctx._execute(params, &@@mixins[desc])
-        end
-
-        return_val.is_a?(Hash) ? OpenStruct.new(return_val) : return_val
-      end
-
-      alias_method :also, :run
-      alias_method :step, :run
-    end
-
-    Spectre.delegate :mixin, :run, :also, :step, to: self
-  end
-end
+require_relative '../spectre'
+require_relative 'logger'
+
+require 'ostruct'
+
+module Spectre
+  module Mixin
+    class MixinContext < Spectre::DslClass
+      def initialize desc
+        @__desc = desc
+      end
+
+      def required params, *keys
+        missing_keys = keys.select { |x| !params.to_h.key? x }
+        Spectre::Logger.log_debug("required parameters for '#{@__desc}': #{keys.join ', '}")
+        raise ArgumentError, "mixin '#{@__desc}' requires #{keys.join ', '}, but only has #{missing_keys.join ', '} given" unless missing_keys.empty?
+      end
+
+      def optional params, *keys
+        Spectre::Logger.log_debug("optional parameters for '#{@__desc}': #{keys.join ', '}")
+        params
+      end
+    end
+
+    class << self
+      @@mixins = {}
+
+      def mixin desc, &block
+        @@mixins[desc] = block
+      end
+
+      def run desc, with: []
+        raise "no mixin with desc '#{desc}' defined" unless @@mixins.key? desc
+
+        Spectre::Logger.log_debug "running mixin '#{desc}'"
+
+        params = with || {}
+
+        ctx = MixinContext.new(desc)
+
+        if params.is_a? Array
+          return_val = ctx._execute(*params, &@@mixins[desc])
+        elsif params.is_a? Hash
+          return_val = ctx._execute(OpenStruct.new(params), &@@mixins[desc])
+        else
+          return_val = ctx._execute(params, &@@mixins[desc])
+        end
+
+        return_val.is_a?(Hash) ? OpenStruct.new(return_val) : return_val
+      end
+
+      alias_method :also, :run
+      alias_method :step, :run
+    end
+
+    Spectre.delegate :mixin, :run, :also, :step, to: self
+  end
+end

data/lib/spectre/reporter/console.rb

@@ -1,102 +1,101 @@
-module Spectre::Reporter
-  class Console
-    def initialize config
-      @config = config
-    end
-
-    def report run_infos
-      report_str = ''
-
-      errors = 0
-      failures = 0
-      skipped = run_infos.select { |x| x.skipped? }.count
-
-      run_infos
-        .select { |x| x.error != nil or x.failure != nil }
-        .each_with_index do |run_info, index|
-        spec = run_info.spec
-
-        report_str += "\n#{index+1}) #{format_title(run_info)}\n"
-
-        if run_info.failure
-          report_str += "     Expected #{run_info.failure.expectation}"
-          report_str += " with #{run_info.data}" if run_info.data
-          report_str += " during #{spec.context.__desc}" if spec.context.__desc
-
-          report_str += " but it failed"
-
-          if run_info.failure.cause
-            report_str += "\n     with an unexpected error:\n"
-            report_str += format_exception(run_info.failure.cause)
-
-          elsif run_info.failure.message and not run_info.failure.message.empty?
-            report_str += " with:\n     #{run_info.failure.message}"
-
-          else
-            report_str += '.'
-          end
-
-          report_str += "\n"
-          failures += 1
-
-        else
-          report_str += "     but an unexpected error occured during run\n"
-          report_str += format_exception(run_info.error)
-          errors += 1
-        end
-      end
-
-      if failures + errors > 0
-        summary = ''
-        summary += "#{run_infos.length - failures - errors - skipped} succeeded "
-        summary += "#{failures} failures " if failures > 0
-        summary += "#{errors} errors " if errors > 0
-        summary += "#{skipped} skipped " if skipped > 0
-        summary += "#{run_infos.length} total"
-        print "\n#{summary}\n".red
-      else
-        summary = ''
-        summary = "\nRun finished successfully"
-        summary += " (#{skipped} skipped)" if skipped > 0
-        print "#{summary}\n".green
-      end
-
-      puts report_str.red
-    end
-
-    private
-
-    def format_title run_info
-      title = run_info.spec.subject.desc
-      title += ' ' + run_info.spec.desc
-      title += " (#{'%.3f' % run_info.duration}s)"
-      title += " [#{run_info.spec.name}]"
-      title
-    end
-
-    def format_exception error
-      non_spectre_files = error.backtrace.select { |x| !x.include? 'lib/spectre' }
-
-      if non_spectre_files.count > 0
-        causing_file = non_spectre_files.first
-      else
-        causing_file = error.backtrace[0]
-      end
-
-      matches = causing_file.match(/(.*\.rb):(\d+)/)
-
-      return '' unless matches
-
-      file, line = matches.captures
-      file.slice!(Dir.pwd + '/')
-
-      str = ''
-      str += "       file.....: #{file}\n"
-      str += "       line.....: #{line}\n"
-      str += "       type.....: #{error.class}\n"
-      str += "       message..: #{error.message}\n"
-      str += "       backtrace: \n         #{error.backtrace.join("\n         ")}\n" if @config['debug']
-      str
-    end
-  end
-end
+module Spectre::Reporter
+  class Console
+    def initialize config
+      @config = config
+    end
+
+    def report run_infos
+      report_str = ''
+
+      errors = 0
+      failures = 0
+      skipped = run_infos.select { |x| x.skipped? }.count
+
+      run_infos
+        .select { |x| x.error != nil or x.failure != nil }
+        .each_with_index do |run_info, index|
+        spec = run_info.spec
+
+        report_str += "\n#{index+1}) #{format_title(run_info)}\n"
+
+        if run_info.failure
+          report_str += "     Expected #{run_info.failure.expectation}"
+          report_str += " with #{run_info.data}" if run_info.data
+          report_str += " during #{spec.context.__desc}" if spec.context.__desc
+
+          report_str += " but it failed"
+
+          if run_info.failure.cause
+            report_str += "\n     with an unexpected error:\n"
+            report_str += format_exception(run_info.failure.cause)
+
+          elsif run_info.failure.message and not run_info.failure.message.empty?
+            report_str += " with:\n     #{run_info.failure.message}"
+
+          else
+            report_str += '.'
+          end
+
+          report_str += "\n"
+          failures += 1
+
+        else
+          report_str += "     but an unexpected error occured during run\n"
+          report_str += format_exception(run_info.error)
+          errors += 1
+        end
+      end
+
+      if failures + errors > 0
+        summary = ''
+        summary += "#{run_infos.length - failures - errors - skipped} succeeded "
+        summary += "#{failures} failures " if failures > 0
+        summary += "#{errors} errors " if errors > 0
+        summary += "#{skipped} skipped " if skipped > 0
+        summary += "#{run_infos.length} total"
+        print "\n#{summary}\n".red
+      else
+        summary = ''
+        summary = "\nRun finished successfully"
+        summary += " (#{skipped} skipped)" if skipped > 0
+        print "#{summary}\n".green
+      end
+
+      puts report_str.red
+    end
+
+    private
+
+    def format_title run_info
+      title = run_info.spec.subject.desc
+      title += ' ' + run_info.spec.desc
+      title += " (#{'%.3f' % run_info.duration}s)"
+      title += " [#{run_info.spec.name}]"
+      title
+    end
+
+    def format_exception error
+      non_spectre_files = error.backtrace.select { |x| !x.include? 'lib/spectre' }
+
+      if non_spectre_files.count > 0
+        causing_file = non_spectre_files.first
+      else
+        causing_file = error.backtrace[0]
+      end
+
+      matches = causing_file.match(/(.*\.rb):(\d+)/)
+
+      return '' unless matches
+
+      file, line = matches.captures
+      file.slice!(Dir.pwd + '/')
+
+      str = ''
+      str += "       file.....: #{file}:#{line}\n"
+      str += "       type.....: #{error.class}\n"
+      str += "       message..: #{error.message}\n"
+      str += "       backtrace: \n         #{error.backtrace.join("\n         ")}\n" if @config['debug']
+      str
+    end
+  end
+end