gurke 2.0.0.dev.1.b18 → 2.0.0.dev.1.b19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTliYzQwOGExYjAzODMxMTE3YWZhMmU1ZDhmZDM5YjZjZWM5Y2E5ZA==
+    MzAxYTk2ODk0YzgxZWM2OTBkM2QzY2ZkYTIzOWI2NWIyODJmYjE0Zg==
   data.tar.gz: !binary |-
-    ZjdiNTE1MDQ5NTk5ZmY4YTIwZGZhZWM2MmRhZGYwMWQ1YWRhZjVjYQ==
+    YTQ2NWJmMzY0MGE2Y2NjMjRiMWEwMTc5ODhlZGU3Nzg5ZmU5Y2ZjMw==
 SHA512:
   metadata.gz: !binary |-
-    Y2EzNTBhOTE4OTFmOWQ2ZjU0NzI1MWY2YjhhMGE1N2EyNGJiNjNlYTA5NTNl
-    MmVmM2Y0NWM4NTVhYzIxNDY0OTY5ZDBiZTZkYTIwODAwMDljMzIxNTNkMTYy
-    Y2JmZmZiZjc3ZTYwNTdkMzlhNzgyOTMwZjk3NzEzZWIzNDRjNGU=
+    MmI4ZGViNDEyYmZmZDAzMWI2MDI4ZmE3OTgzODU5MjJhZDMzZDk2Y2I1MjQ0
+    ZWUxNTUwOWUzNDI2ZjNkM2RkMjMyMmE3NWE5YjE0YjIzMjE0YmIxMjgwM2I2
+    MzFjZWFjZjllMDhjODEwOGYxMjJmMjcwNWI2Zjk3ZDE2ZmM3NmI=
   data.tar.gz: !binary |-
-    NGFiZmE4ODNkMDkxODY3ZWZjYTE1ODBkYzNkYjY4MWU1NTgwNzYxZDEzY2Y4
-    ZTBlOWY3M2U2ZWQ2MGFjODFiYThhNDEyOWYzZmU3MWQ0M2JlMzVjMTBhZjVh
-    YzYwNDNhZGNmOTFjZmQ2YmYxYzRkZjU1MmM5ZDdlMDkyMzg2NTg=
+    ZjU2ZDUzYzcxOGMxZTk5YTEzZGRlNmRmNmJmOTE4ODlkYWJmZjc3NmI1YTE2
+    MDU4MjI2NDYwNjAxNjI0NDgzODM4OWFmYjEzNGFlZmNjODljZDI2Yjc1OTAx
+    NmQ1M2RlZjliMjBmYjViNThjMDhlYmMwMmU3MGRhZjNkOTIzNjA=

data/lib/gurke/cli.rb

@@ -30,7 +30,7 @@ module Gurke
       end if options[:require].any?
 
       files  = Dir[options[:pattern].to_s] if files.empty? && options[:pattern]
-      status = Runner.new(files, options).run
+      status = Runner.new(Gurke.config, files, options).run
 
       Kernel.exit(status)
     end

data/lib/gurke/configuration.rb

@@ -15,11 +15,15 @@ module Gurke
     # @yield Before any matching action is executed.
     #
     def before(action = :scenario, opts = nil, &block)
-      BEFORE_HOOKS.append action, Hook.new(opts, &block)
+      raise ArgumentError.new "Unknown hook: #{action}" unless hooks[action]
+
+      hooks[action].append :before, Hook.new(opts, &block)
     end
 
     def around(action = :scenario, opts = nil, &block)
-      AROUND_HOOKS.append action, Hook.new(opts, &block)
+      raise ArgumentError.new "Unknown hook: #{action}" unless hooks[action]
+
+      hooks[action].append :around, Hook.new(opts, &block)
     end
 
     # Define a after filter running after given action.
@@ -35,7 +39,9 @@ module Gurke
     # @yield After any matching action is executed.
     #
     def after(action = :scenario, opts = nil, &block)
-      AFTER_HOOKS.append action, Hook.new(opts, &block)
+      raise ArgumentError.new "Unknown hook: #{action}" unless hooks[action]
+
+      hooks[action].append :after, Hook.new(opts, &block)
     end
 
     # Include given module into all or specific features or
@@ -58,7 +64,17 @@ module Gurke
 
     # @api private
     def hooks
-      @hooks ||= Hooks.new
+      @hooks ||= begin
+        hooks = {
+          features: HookSet.new,
+          feature: HookSet.new,
+          scenario: HookSet.new,
+          step: HookSet.new
+        }
+
+        hooks.merge each: hooks[:scenario]
+        hooks
+      end
     end
 
     # @api private
@@ -73,25 +89,35 @@ module Gurke
 
     # @api private
     class HookSet
-      attr_reader :hooks
-
       def initialize
-        @hooks = {}
+        @before = []
+        @after  = []
+        @around = []
       end
 
-      def for(action)
-        hooks[action] ||= []
+      def append(set, hook)
+        case set
+          when :before then @before << hook
+          when :after  then @after << hook
+          when :around then @around << hook
+          else raise ArgumentError.new "Unknown hook set: #{set}"
+        end
       end
 
-      def append(action, hook)
-        self.for(action) << hook
+      def run(world, &block)
+        @before.each{|hook| hook.run world }
+        @around.reduce(block){|blk, hook| proc{ hook.run world, blk }}.call
+      ensure
+        @after.each do |hook|
+          begin
+            hook.run world
+          rescue => e
+            warn "Rescued error in after hook: #{e}\n#{e.backtrace.join("\n")}"
+          end
+        end
       end
     end
 
-    BEFORE_HOOKS = HookSet.new
-    AROUND_HOOKS = HookSet.new
-    AFTER_HOOKS  = HookSet.new
-
     # @api private
     class Hook
       attr_reader :opts, :block

data/lib/gurke/runner.rb

@@ -4,8 +4,10 @@ module Gurke
     attr_reader :builder
     attr_reader :files
     attr_reader :options
+    attr_reader :config
 
-    def initialize(files, options = {})
+    def initialize(config, files, options = {})
+      @config  = config
       @options = options
       @files   = files
       @builder = Builder.new options
@@ -24,18 +26,7 @@ module Gurke
     end
 
     def hook(scope, world, &block)
-      Configuration::BEFORE_HOOKS.for(scope).each{|hook| hook.run world }
-      Configuration::AROUND_HOOKS.for(scope).reduce(block) do |blk, hook|
-        proc { hook.run(world, blk) }
-      end.call
-    ensure
-      Configuration::AFTER_HOOKS.for(scope).each do |hook|
-        begin
-          hook.run world
-        rescue => e
-          warn "Rescued error in after hook: #{e}\n#{e.backtrace.join("\n")}"
-        end
-      end
+      config.hooks[scope].run world, &block
     end
 
     def with_filtered_backtrace

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gurke
 version: !ruby/object:Gem::Version
-  version: 2.0.0.dev.1.b18
+  version: 2.0.0.dev.1.b19
 platform: ruby
 authors:
 - Jan Graichen