spectre-core 1.9.0 → 1.12.1

data/lib/spectre/resources.rb

@@ -1,3 +1,5 @@
+require_relative '../spectre'
+
 require 'ostruct'
 
 module Spectre
@@ -12,7 +14,8 @@ module Spectre
       end
 
       def [] name
-        raise "Resource with name '#{name}' does not exist" if not @items.key? name
+        raise "Resource with name '#{name}' does not exist" unless @items.key? name
+
         @items[name]
       end
     end
@@ -26,7 +29,7 @@ module Spectre
     end
 
     Spectre.register do |config|
-      return if !config.key? 'resource_paths'
+      return unless config.key? 'resource_paths'
 
       config['resource_paths'].each do |resource_path|
         resource_files = Dir.glob File.join(resource_path, '**/*')
@@ -41,6 +44,6 @@ module Spectre
       @@resources.freeze
     end
 
-    Spectre.delegate :resources, to: Resources
+    Spectre.delegate :resources, to: self
   end
-end
+end

data/lib/spectre.rb

@@ -1,18 +1,44 @@
 module Spectre
   module Version
     MAJOR = 1
-    MINOR = 9
-    TINY  = 0
+    MINOR = 12
+    TINY  = 1
   end
 
   VERSION = [Version::MAJOR, Version::MINOR, Version::TINY].compact * '.'
 
 
+  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
+
+    def deep_clone
+      Marshal.load(Marshal.dump(self))
+    end
+  end
+
+  class ::Object
+    def to_h
+      self.instance_variables.each_with_object({}) do |var, hash|
+        hash[var.to_s.delete("@")] = self.instance_variable_get(var)
+      end
+    end
+  end
+
+
   ###########################################
   # Custom Exceptions
   ###########################################
 
 
+  class SpectreError < Exception
+    def initialize message
+      super message
+    end
+  end
+
   class ExpectationFailure < Exception
     attr_reader :expectation
 
@@ -31,25 +57,24 @@ module Spectre
   # https://www.dan-manges.com/blog/ruby-dsls-instance-eval-with-delegation
   class DslClass
     def _evaluate &block
-      @__bound_self__ = eval 'self', block.binding
+      @__bound_self__ = eval('self', block.binding)
       instance_eval(&block)
     end
 
-    def _execute args, &block
-      @__bound_self__ = eval 'self', block.binding
-      instance_exec(args, &block)
+    def _execute *args, &block
+      @__bound_self__ = eval('self', block.binding)
+      instance_exec(*args, &block)
     end
 
     def method_missing method, *args, **kwargs, &block
       if @__bound_self__.respond_to? method
-        @__bound_self__.send method, *args, **kwargs, &block
+        @__bound_self__.send(method, *args, **kwargs, &block)
       else
-        Delegator.redirect method, *args, **kwargs, &block
+        Delegator.redirect(method, *args, **kwargs, &block)
       end
     end
   end
 
-
   class Subject
     attr_reader :name, :desc, :specs
 
@@ -65,7 +90,6 @@ module Spectre
     end
   end
 
-
   class Spec
     attr_reader :name, :subject, :context, :desc, :tags, :data, :block, :file
 
@@ -85,9 +109,9 @@ module Spectre
     end
   end
 
-
   class RunInfo
-    attr_accessor :spec, :data, :started, :finished, :error, :failure, :skipped, :log, :properties
+    attr_accessor :spec, :data, :started, :finished, :error, :failure, :skipped
+    attr_reader :log, :properties
 
     def initialize spec, data=nil
       @spec = spec
@@ -114,7 +138,6 @@ module Spectre
     end
   end
 
-
   class Runner
     @@current
 
@@ -151,12 +174,16 @@ module Spectre
 
       begin
         specs.each do |spec|
-          if spec.data.length > 0
-            spec.data.each do |data|
-              Logger.log_spec(spec, data) do
-                runs << run_spec(spec, data)
+          raise SpectreError.new("Multi data definition (`with' parameter) of '#{spec.subject.desc} #{spec.desc}' has to be an `Array'") unless !spec.data.nil? and spec.data.is_a? Array
+
+          if spec.data.any?
+            spec.data
+              .map { |x| x.is_a?(Hash) ? OpenStruct.new(x) : x }
+              .each do |data|
+                Logger.log_spec(spec, data) do
+                  runs << run_spec(spec, data)
+                end
               end
-            end
           else
             Logger.log_spec(spec) do
               runs << run_spec(spec)
@@ -189,14 +216,11 @@ module Spectre
           end
 
           run_info.finished = Time.now
-
         rescue ExpectationFailure => e
           run_info.failure = e
-
         rescue Exception => e
           run_info.error = e
           Logger.log_error spec, e
-
         end
       end
 
@@ -208,7 +232,7 @@ module Spectre
     end
 
     def run_spec spec, data=nil
-      run_info = RunInfo.new spec, data
+      run_info = RunInfo.new(spec, data)
 
       @@current = run_info
 
@@ -216,31 +240,27 @@ module Spectre
 
       begin
         if spec.context.__before_blocks.count > 0
-          before_ctx = SpecContext.new spec.subject, 'before'
+          before_ctx = SpecContext.new(spec.subject, 'before')
 
           Logger.log_context before_ctx do
             spec.context.__before_blocks.each do |block|
-              block.call data
+              block.call(data)
             end
           end
         end
 
-        spec.block.call data
-
+        spec.block.call(data)
       rescue ExpectationFailure => e
         run_info.failure = e
-
       rescue Interrupt
         run_info.skipped = true
         Logger.log_skipped spec
-
       rescue Exception => e
         run_info.error = e
         Logger.log_error spec, e
-
       ensure
         if spec.context.__after_blocks.count > 0
-          after_ctx = SpecContext.new spec.subject, 'after'
+          after_ctx = SpecContext.new(spec.subject, 'after')
 
           Logger.log_context after_ctx do
             begin
@@ -249,14 +269,11 @@ module Spectre
               end
 
               run_info.finished = Time.now
-
             rescue ExpectationFailure => e
               run_info.failure = e
-
             rescue Exception => e
               run_info.error = e
               Logger.log_error spec, e
-
             end
           end
         end
@@ -290,7 +307,6 @@ module Spectre
     end
 
     def it desc, tags: [], with: [], &block
-
       # Get the file, where the spec is defined.
       # Nasty, but it works
       # Maybe there is another way, but this works for now
@@ -344,6 +360,7 @@ module Spectre
       methods.each do |method_name|
         define_method(method_name) do |*args, &block|
           return super(*args, &block) if respond_to? method_name
+
           target.send(method_name, *args, &block)
         end
 
@@ -354,8 +371,9 @@ module Spectre
     end
 
     def self.redirect method_name, *args, **kwargs, &block
-      target = @@mappings[method_name]
-      raise "No method or variable '#{method_name}' defined" if !target
+      target = @@mappings[method_name] || Kernel
+      raise SpectreError.new("no variable or method '#{method_name}' found") unless target.respond_to? method_name
+
       target.send(method_name, *args, **kwargs, &block)
     end
   end
@@ -373,12 +391,11 @@ module Spectre
         .map { |x| x.specs }
         .flatten
         .select do |spec|
-          (spec_filter.empty? or spec_filter.any? { |x| spec.name.match('^' + x.gsub('*', '.*') + '$') }) and (tags.empty? or tags.any? { |x| has_tag(spec.tags, x) })
+          (spec_filter.empty? or spec_filter.any? { |x| spec.name.match('^' + x.gsub('*', '.*') + '$') }) and (tags.empty? or tags.any? { |x| tag?(spec.tags, x) })
         end
     end
 
-
-    def has_tag tags, tag_exp
+    def tag? tags, tag_exp
       tags = tags.map { |x| x.to_s }
       all_tags = tag_exp.split '+'
       included_tags = all_tags.select { |x| !x.start_with? '!' }
@@ -386,17 +403,14 @@ module Spectre
       included_tags & tags == included_tags and excluded_tags & tags == []
     end
 
-
     def delegate *method_names, to: nil
       Spectre::Delegator.delegate *method_names, to
     end
 
-
     def register &block
       @@modules << block
     end
 
-
     def configure config
       @@modules.each do |block|
         block.call(config)
@@ -412,7 +426,7 @@ module Spectre
     def describe desc, &block
       subject = @@subjects.find { |x| x.desc == desc }
 
-      if !subject
+      unless subject
         subject = Subject.new(desc)
         @@subjects << subject
       end
@@ -424,11 +438,10 @@ module Spectre
     def property key, val
       Spectre::Runner.current.properties[key] = val
     end
-
   end
 
   delegate :describe, :property, to: Spectre
 end
 
 
-extend Spectre::Delegator
+extend Spectre::Delegator

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Christian Neubauer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ectoplasm
@@ -24,9 +24,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: jsonpath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: A DSL and command line tool to describe and run automated tests
 email:
-- me@christianneubauer.de
+- christian.neubauer@ionos.com
 executables:
 - spectre
 extensions: []
@@ -50,15 +64,15 @@ files:
 - lib/spectre/reporter/console.rb
 - lib/spectre/reporter/junit.rb
 - lib/spectre/resources.rb
-homepage: https://github.com/cneubauer/spectre-core
+homepage: https://github.com/ionos-spectre/spectre-core
 licenses:
-- MIT
+- GPL-3.0-or-later
 metadata:
   allowed_push_host: https://rubygems.org/
-  homepage_uri: https://github.com/cneubauer/spectre-core
-  source_code_uri: https://github.com/cneubauer/spectre-core
-  changelog_uri: https://github.com/cneubauer/spectre-core/blob/master/CHANGELOG.md
-post_install_message: 
+  homepage_uri: https://github.com/ionos-spectre/spectre-core
+  source_code_uri: https://github.com/ionos-spectre/spectre-core
+  changelog_uri: https://github.com/ionos-spectre/spectre-core/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -73,8 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Describe and run automated tests
 test_files: []