parallel_cucumber 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21efcd236f18ea3ac32ac8fe307a3856701d45d227ad3edd05cb571bbf34ea83
-  data.tar.gz: 35ddffec456a2add5916990eb77844039d6132dd5b5c4459c506a834bdc321e8
+  metadata.gz: 50176784f3a666778c3c6e4ebf590e9121a7aef8b054d0180841f2bf30320132
+  data.tar.gz: 8fa12b1fa391046c64cb0b7e175a557a7d8d3e202107b94ad42ac0a60dc851f0
 SHA512:
-  metadata.gz: e37068e9ee2e6a8e754baf49cf29c92d909dd96f6625dc4eb17b4b9ac8fc932a58181a5210ee4fe14c6cd21f6e5197faf7d011ed3a681bdf21d8a4c93b5d001d
-  data.tar.gz: 0ac4181e268d5868f797ec25b51539b63f6d6f9bd76338817f8240ecc29e2a680e55efd0a93127f785ff9e538dc5191952aedc817ee98c8c09c7f47e23c9286b
+  metadata.gz: ef3d82e89d50c8ee68553a55a51c7cebb24fec61223dd66cbb392c39090b5f42fcb101b618b16ae0dd068b3f4affbf1d863bf50b4a21497ff62df51c3cb7fd63
+  data.tar.gz: e8fc52cbf754cd46e0fb5b69aa5d75703008f6f71cb75202be2e964460cace827025f6af0ebd0d69fd6c6af742a2ae49a96d3b55762644d0f506fb8f6f65bc71

data/README.md

@@ -11,9 +11,6 @@ Example: parallel_cucumber -n 4 -o "-f pretty -f html -o report.html" examples/i
         --directed-tests JSON        Direct tests to specific workers, e.g. {"0": "-t @head"}
         --test-command COMMAND       Command to run for test phase, default cucumber
         --pre-batch-check COMMAND    Command causing worker to quit on exit failure
-        --on-batch-error COMMAND     Command to call on any error happened while running batch of tests.
-                 It will receive as argument json file with list of tests and error happened.
-        --no-pretty                  Now a no-op for compatibility there is no default pretty
         --log-dir DIR                Directory for worker logfiles
         --log-decoration JSON        Block quoting for logs, e.g. {start: "#start %s", end: "#end %s"}
         --summary JSON               Summary files, e.g. {failed: "./failed.txt", unknown: "./unknown.txt"}

data/lib/parallel_cucumber/cli.rb

@@ -89,14 +89,6 @@ module ParallelCucumber
           options[:pre_check] = pre_check
         end
 
-        opts.on('--on-batch-error COMMAND',
-                'Command to call on any error happened while running batch of tests.
-                 It will receive as argument json file with list of tests and error happened.') do |on_batch_error|
-          options[:on_batch_error] = on_batch_error
-        end
-
-        opts.on('--no-pretty', 'Now a no-op for compatibility there is no default pretty') {}
-
         opts.on('--log-dir DIR', 'Directory for worker logfiles') do |log_dir|
           options[:log_dir] = log_dir
         end

data/lib/parallel_cucumber/dsl.rb

@@ -26,6 +26,10 @@ module ParallelCucumber
       def after_workers(&proc)
         Hooks.register_after_workers(proc)
       end
+
+      def on_batch_error(&proc)
+        Hooks.register_on_batch_error(proc)
+      end
     end
   end
 end

data/lib/parallel_cucumber/hooks.rb

@@ -3,6 +3,7 @@ module ParallelCucumber
     @before_batch_hooks ||= []
     @after_batch_hooks  ||= []
     @after_workers      ||= []
+    @on_batch_error     ||= []
 
     class << self
       def register_before_batch(proc)
@@ -20,6 +21,11 @@ module ParallelCucumber
         @after_workers << proc
       end
 
+      def register_on_batch_error(proc)
+        raise(ArgumentError, 'Please provide a valid callback') unless proc.respond_to?(:call)
+        @on_batch_error << proc
+      end
+
       def fire_before_batch_hooks(*args)
         @before_batch_hooks.each do |hook|
           hook.call(*args)
@@ -37,6 +43,12 @@ module ParallelCucumber
           hook.call(*args)
         end
       end
+
+      def fire_on_batch_error(*args)
+        @on_batch_error.each do |hook|
+          hook.call(*args)
+        end
+      end
     end
   end
 end

data/lib/parallel_cucumber/version.rb

@@ -1,3 +1,3 @@
 module ParallelCucumber
-  VERSION = '0.2.12'.freeze
+  VERSION = '0.2.13'.freeze
 end

data/lib/parallel_cucumber/worker.rb

@@ -33,7 +33,6 @@ module ParallelCucumber
       @cucumber_options = options[:cucumber_options]
       @test_command = options[:test_command]
       @pre_check = options[:pre_check]
-      @on_batch_error = options[:on_batch_error]
       @index = index
       @queue_connection_params = options[:queue_connection_params]
       @setup_worker = options[:setup_worker]
@@ -177,31 +176,6 @@ module ParallelCucumber
       end
     end
 
-    def on_batch_error(batch_env, batch_id, error_file, tests, error)
-      return unless @on_batch_error
-
-      begin
-        error_info = {
-          class: error.class,
-          message: error.message,
-          backtrace: error.backtrace
-        }
-        batch_error_info = {
-          batch_id: batch_id,
-          tests: tests,
-          error: error_info
-        }
-        File.write(error_file, batch_error_info.to_json)
-        command = "#{@on_batch_error} #{error_file}"
-        Helper::Command.exec_command(
-          batch_env, 'on_batch_error', command, @logger, @log_decoration, timeout: @batch_error_timeout
-        )
-      rescue => e
-        message = "on-batch-error failed: #{e.message}"
-        @logger.warn(message)
-      end
-    end
-
     def running_totals(batch_results, running_total)
       batch_info = Status.constants.map do |status|
         status = Status.const_get(status)
@@ -253,8 +227,14 @@ module ParallelCucumber
         )
       rescue => e
         @logger << "ERROR #{e} #{e.backtrace.first(5)}"
-        error_file = "#{test_batch_dir}/error.json"
-        on_batch_error(batch_env, batch_id, error_file, tests, e)
+
+        begin
+          Hooks.fire_on_batch_error(tests: tests, batch_id: batch_id, env: batch_env, exception: e)
+        rescue StandardError => exc
+          trace = exc.backtrace.join("\n\t")
+          @logger.warn("There was exception in on_batch_error hook #{exc.message} \n #{trace}")
+        end
+
         return tests.map { |t| [t, ::ParallelCucumber::Status::UNKNOWN] }.to_h
       end
       parse_results(test_state, tests)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_cucumber
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Alexander Bayandin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber