specwrk 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3916d92756b30810112db210d2a7ab6627ed250dbddfdc64ba8b0f24248d22c
-  data.tar.gz: eaa7c44ddacb99dde93337de842a420ebe8b12157b9dd90b5a158d75be8bebbb
+  metadata.gz: 9d76f2f9716e7c7e613bc0b341f89e42caf9375dfe0d48083afb908146d1374b
+  data.tar.gz: 36136d67829a41b39f4e9de4fff45ea1a614111f9556a523eefde1b35cceba51
 SHA512:
-  metadata.gz: 138e0a9358bcdd82472f3ab03c607ca647393c6d79c818d2c470fbd13670e045853e1355d3ca53634e0e8447058d5cc50676ea8692fb3286afa015346765970a
-  data.tar.gz: 2480031a9d3a080c3ddda3f4a6b5e736c3331356415da510c77ec8525114c65469c34fd0530a60fed49ccb15cef2ca03b438672920118872cc45fa8393edd8a5
+  metadata.gz: b7fd2a78d6019864949e6847f09474ad357b04614dd1a2cc3f563ec95f915e7958bfdf211c9d60213d61bea517e59e200ad3e7898963fe0cdd49df114941a786
+  data.tar.gz: 6b1836bb1a50ba0d853689ec5b7f169c83883a39c134caf93b4a70637a81c3b4f6e4f8112285dca4b30065d0c6a816807e13e65ff748dc7b16d5c5d03064e52c

data/lib/specwrk/cli.rb

@@ -37,11 +37,13 @@ module Specwrk
         base.unique_option :id, type: :string, default: "specwrk-worker", desc: "The identifier for this worker. Default specwrk-worker(-COUNT_INDEX)."
         base.unique_option :count, type: :integer, default: 1, aliases: ["-c"], desc: "The number of worker processes you want to start. Default 1."
         base.unique_option :output, type: :string, default: ENV.fetch("SPECWRK_OUT", ".specwrk/"), aliases: ["-o"], desc: "Directory where worker output is stored. Overrides SPECWRK_OUT. Default '.specwrk/'."
+        base.unique_option :seed_waits, type: :integer, default: ENV.fetch("SPECWRK_SEED_WAITS", "10"), aliases: ["-w"], desc: "Number of times the worker will wait for examples to be seeded to the server. 1sec between attempts. Overrides SPECWRK_SEED_WAITS. Default '10'."
       end
 
-      on_setup do |id:, count:, output:, **|
+      on_setup do |id:, count:, output:, seed_waits:, **|
         ENV["SPECWRK_ID"] = id
         ENV["SPECWRK_COUNT"] = count.to_s
+        ENV["SPECWRK_SEED_WAITS"] = seed_waits.to_s
         ENV["SPECWRK_OUT"] = Pathname.new(output).expand_path(Dir.pwd).to_s
         FileUtils.mkdir_p(ENV["SPECWRK_OUT"])
       end
@@ -75,10 +77,11 @@ module Specwrk
         base.unique_option :output, type: :string, default: ENV.fetch("SPECWRK_OUT", ".specwrk/"), aliases: ["-o"], desc: "Directory where worker output is stored. Overrides SPECWRK_OUT. Default '.specwrk/'."
         base.unique_option :group_by, values: %w[file timings], default: ENV.fetch("SPECWERK_SRV_GROUP_BY", "timings"), desc: "How examples will be grouped for workers; fallback to file if no timings are found. Overrides SPECWERK_SRV_GROUP_BY. Default timings."
         base.unique_option :single_run, type: :boolean, default: false, desc: "Act on shutdown requests from clients. Default: false."
+        base.unique_option :single_seed_per_run, type: :boolean, default: false, desc: "Only allow one seed per run. Useful for CI where many nodes may seed at the same time. Default: false."
         base.unique_option :verbose, type: :boolean, default: false, desc: "Run in verbose mode. Default false."
       end
 
-      on_setup do |port:, bind:, output:, key:, single_run:, group_by:, verbose:, **|
+      on_setup do |port:, bind:, output:, key:, single_run:, single_seed_per_run:, group_by:, verbose:, **|
         ENV["SPECWRK_OUT"] = Pathname.new(output).expand_path(Dir.pwd).to_s
         FileUtils.mkdir_p(ENV["SPECWRK_OUT"])
 
@@ -88,6 +91,7 @@ module Specwrk
         ENV["SPECWRK_SRV_BIND"] = bind
         ENV["SPECWRK_SRV_KEY"] = key
         ENV["SPECWRK_SRV_SINGLE_RUN"] = "1" if single_run
+        ENV["SPECWRK_SRV_SINGLE_SEED_PER_RUN"] = "1" if single_seed_per_run
         ENV["SPECWRK_SRV_GROUP_BY"] = group_by
       end
     end

data/lib/specwrk/queue.rb

@@ -19,7 +19,11 @@ module Specwrk
     end
 
     def synchronize(&blk)
-      @mutex.synchronize { yield(@hash) }
+      if @mutex.owned?
+        yield(@hash)
+      else
+        @mutex.synchronize { yield(@hash) }
+      end
     end
 
     def method_missing(name, *args, &block)
@@ -70,7 +74,7 @@ module Specwrk
     end
 
     def merge_with_previous_run_times!(h2)
-      @mutex.synchronize do
+      synchronize do
         h2.each { |_id, example| merge_example(example) }
 
         # Sort by exepcted run time, slowest to fastest

data/lib/specwrk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Specwrk
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

data/lib/specwrk/web/endpoints.rb

@@ -58,8 +58,15 @@ module Specwrk
 
       class Seed < Base
         def response
-          examples = payload.map { |hash| [hash[:id], hash] }.to_h
-          pending_queue.merge_with_previous_run_times!(examples)
+          pending_queue.synchronize do |pending_queue_hash|
+            unless ENV["SPECWRK_SRV_SINGLE_SEED_PER_RUN"] && pending_queue_hash.length.positive?
+              examples = payload.map { |hash| [hash[:id], hash] }.to_h
+
+              pending_queue.merge_with_previous_run_times!(examples)
+
+              ok
+            end
+          end
 
           ok
         end

data/lib/specwrk/worker.rb

@@ -17,6 +17,7 @@ module Specwrk
       @running = true
       @client = Client.new
       @executor = Executor.new
+      @seed_waits = ENV.fetch("SPECWRK_SEED_WAITS", "10").to_i
       @heartbeat_thread ||= Thread.new do
         thump
       end
@@ -40,7 +41,7 @@ module Specwrk
         @seed_wait_count ||= 0
         @seed_wait_count += 1
 
-        if @seed_wait_count <= 10
+        if @seed_wait_count <= @seed_waits
           warn "No examples seeded yet, waiting..."
           sleep 1
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specwrk
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Daniel Westendorf