parallel_cucumber 0.2.20 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a31341018e5e795f214f486be417238a227ee925d0407bf35c9e51551bbdbe6d
-  data.tar.gz: 404a526634cf771d86afd7971070955f899dea1cccc542975fb27675bf9ff39d
+  metadata.gz: b2a5fcb6c187e21abd99851009a31c5015221e31118e5e16ccbb022467f64614
+  data.tar.gz: f45853fb7908faa80978b52c7e8208b2cec406a4dad87c80949623e615870dcc
 SHA512:
-  metadata.gz: 26acc0ea083fa5055c8ba31e9c8a5f16f555673da808511ce031b25787420075a1f29ba79c23654a4a15dbc0c7cb99617f2f0ce1e52a1b3deac314260068a4b2
-  data.tar.gz: de0cb8942fdebfb3e74ca1731948125ac7da0df9c4912d4ec9eb1e19e7e31a65dc71ab916d1ba3af99ac219934351b7357c1983a1e9174393f706e865516e6e7
+  metadata.gz: 21f7385b3c24476db0de9b9890d0e47166cd2ab3d4d5a5c52e8a73e39bc97e58502c50c0faaf4c82f0e250bda4ebe86a401a6b40c5f84b71959f058a9c6bfecb
+  data.tar.gz: eaeb5edcda79f778eb6b3bf1c0af1bfdabe69137422724a79523e9f0288c5e3e8177cfb30b920c227173ffcdf4644272772fb112ac46a214a3d3423a2709d0e9

data/lib/parallel_cucumber/cli.rb

@@ -8,7 +8,6 @@ module ParallelCucumber
       batch_size: 1,
       batch_timeout: 600,
       setup_timeout: 30,
-      precheck_timeout: 30,
       batch_error_timeout: 30,
       cucumber_options: '',
       debug: false,
@@ -90,10 +89,6 @@ module ParallelCucumber
           options[:test_command] = test_command
         end
 
-        opts.on('--pre-batch-check COMMAND', 'Command causing worker to quit on exit failure') do |pre_check|
-          options[:pre_check] = pre_check
-        end
-
         opts.on('--log-dir DIR', 'Directory for worker logfiles') do |log_dir|
           options[:log_dir] = log_dir
         end
@@ -173,13 +168,6 @@ module ParallelCucumber
           options[:batch_timeout] = batch_timeout
         end
 
-        help_message = <<-TEXT.gsub(/\s+/, ' ').strip
-          Timeout for each test precheck. Default is #{DEFAULTS[:batch_timeout]}
-        TEXT
-        opts.on('--precheck-timeout SECONDS', Float, help_message) do |timeout|
-          options[:precheck_timeout] = timeout
-        end
-
         help_message = <<-TEXT.gsub(/\s+/, ' ').strip
           Timeout for each batch_error script. Default is #{DEFAULTS[:batch_error_timeout]}
         TEXT

data/lib/parallel_cucumber/dsl.rb

@@ -23,6 +23,10 @@ module ParallelCucumber
         Hooks.register_after_batch(proc)
       end
 
+      def worker_health_check(&proc)
+        Hooks.register_worker_health_check(proc)
+      end
+
       def before_workers(&proc)
         Hooks.register_before_workers(proc)
       end

data/lib/parallel_cucumber/hooks.rb

@@ -1,12 +1,18 @@
 module ParallelCucumber
   class Hooks
-    @before_batch_hooks ||= []
-    @after_batch_hooks  ||= []
-    @before_workers     ||= []
-    @after_workers      ||= []
-    @on_batch_error     ||= []
+    @worker_health_check ||= []
+    @before_batch_hooks  ||= []
+    @after_batch_hooks   ||= []
+    @before_workers      ||= []
+    @after_workers       ||= []
+    @on_batch_error      ||= []
 
     class << self
+      def register_worker_health_check(proc)
+        raise(ArgumentError, 'Please provide a valid callback') unless proc.respond_to?(:call)
+        @worker_health_check << proc
+      end
+
       def register_before_batch(proc)
         raise(ArgumentError, 'Please provide a valid callback') unless proc.respond_to?(:call)
         @before_batch_hooks << proc
@@ -32,6 +38,12 @@ module ParallelCucumber
         @on_batch_error << proc
       end
 
+      def fire_worker_health_check(*args)
+        @worker_health_check.each do |hook|
+          hook.call(*args)
+        end
+      end
+
       def fire_before_batch_hooks(*args)
         @before_batch_hooks.each do |hook|
           hook.call(*args)

data/lib/parallel_cucumber/version.rb

@@ -1,3 +1,3 @@
 module ParallelCucumber
-  VERSION = '0.2.20'.freeze
+  VERSION = '0.2.21'.freeze
 end

data/lib/parallel_cucumber/worker.rb

@@ -10,11 +10,9 @@ module ParallelCucumber
       @group_by = options[:group_by]
       @batch_timeout = options[:batch_timeout]
       @batch_error_timeout = options[:batch_error_timeout]
-      @precheck_timeout = options[:precheck_timeout]
       @setup_timeout = options[:setup_timeout]
       @cucumber_options = options[:cucumber_options]
       @test_command = options[:test_command]
-      @pre_check = options[:pre_check]
       @index = index
       @name = "W#{@index}"
       @setup_worker = options[:setup_worker]
@@ -99,12 +97,7 @@ module ParallelCucumber
               job = @jobs_queue.pop(false)
               case job.type
               when Job::PRECHECK
-                precmd = precheck(env)
-                if (m = precmd.match(/precmd:retry-after-(\d+)-seconds/))
-                  @manager.inform_idle(@name)
-                  sleep(1 + m[1].to_i)
-                  next
-                end
+                Hooks.fire_worker_health_check(env)
                 @manager.inform_healthy(@name)
               when Job::RUN_TESTS
                 run_batch(env, results, running_total, job.details)
@@ -161,18 +154,6 @@ module ParallelCucumber
       @logger.update_into(@stdout_logger)
     end
 
-    def precheck(env)
-      return 'default no-op pre_check' unless @pre_check
-      begin
-        return Helper::Command.exec_command(
-          env, 'precheck', @pre_check, @logger, @log_decoration, timeout: @precheck_timeout, capture: true
-        )
-      rescue
-        @logger.error('Pre-check failed: quitting immediately')
-        raise 'Pre-check failed: quitting immediately'
-      end
-    end
-
     def running_totals(batch_results, running_total)
       batch_info = Status.constants.map do |status|
         status = Status.const_get(status)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_cucumber
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.21
 platform: ruby
 authors:
 - Alexander Bayandin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber