specwrk 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d9511529ad6b58048312d287ed54240cffd3918b5621555f59c54b69b9451b4
-  data.tar.gz: a1a878eff39f2ae7592c37572195d1a7da5268554004df4966a6adba559f75e1
+  metadata.gz: 52798ca674b5b11b238ba315c34ada0357a0d4c52df995a04f3dbbdeaeb523eb
+  data.tar.gz: cf488e8d531ca483d3f8a7e6ce80600c55693028f05cba5321da190e3fdec114
 SHA512:
-  metadata.gz: dc0f1e302994fc815d00e409d86536acc3589baeb77d4e765741c061a0b0942ae93902ac64940cb5a9aeb5828d899982b67fd13b3e6ac1ffa6252d5efb8139ed
-  data.tar.gz: e789547dab6d911d1d69c244b87043fb48842380eeac948952b016e6d4f9e7b7e1d9daf8ce96428b1d1902bcb32c4054e52b048d454c51bc4622f3ac241e72c5
+  metadata.gz: 4d4fad41383ca3388bde45eebff774b9f052d2b830de7dca35774cc9f567236be56cdeb036207241617c8774684c07f9ec37d7e4d57eb75811117c29cbe78dae
+  data.tar.gz: 4f308d4b2c362981b2f88f4bdca0f6b271f96a354954dd911b3f1208fecd3c95f16e2fe84a44f0d2ba0e96dcfc38922228dd242f68ec7d49c0ea817d839fbf1c

data/lib/specwrk/cli.rb

@@ -16,7 +16,7 @@ module Specwrk
       extend Hookable
 
       on_included do |base|
-        base.unique_option :uri, type: :string, default: ENV.fetch("SPECWRK_SRV_URI", "http://localhost:#{ENV.fetch("SPECWRK_SRV_PORT", "5138")}"), desc: "HTTP URI of the server to pull jobs from. Overrides SPECWRK_SRV_PORT. Default 5138."
+        base.unique_option :uri, type: :string, default: ENV.fetch("SPECWRK_SRV_URI", "http://localhost:#{ENV.fetch("SPECWRK_SRV_PORT", "5138")}"), desc: "HTTP URI of the server to pull jobs from. Overrides SPECWRK_SRV_URI. Default http://localhost:5138."
         base.unique_option :key, type: :string, default: ENV.fetch("SPECWRK_SRV_KEY", ""), aliases: ["-k"], desc: "Authentication key clients must use for access. Overrides SPECWRK_SRV_KEY. Default ''."
         base.unique_option :run, type: :string, default: ENV.fetch("SPECWRK_RUN", "main"), aliases: ["-r"], desc: "The run identifier for this job execution. Overrides SPECWRK_RUN. Default main."
         base.unique_option :timeout, type: :integer, default: ENV.fetch("SPECWRK_TIMEOUT", "5"), aliases: ["-t"], desc: "The amount of time to wait for the server to respond. Overrides SPECWRK_TIMEOUT. Default 5."
@@ -77,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"])
 
@@ -90,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.1"
+  VERSION = "0.4.3"
 end

data/lib/specwrk/web/app.rb

@@ -50,22 +50,24 @@ module Specwrk
           Rack::Builder.new do
             use Rack::Runtime
             use Specwrk::Web::Logger, $stdout
-            use Specwrk::Web::Auth          # global auth check
-            run Specwrk::Web::App.new       # your router
+            use Specwrk::Web::Auth, %w[/health] # global auth check
+            run Specwrk::Web::App.new           # your router
           end
         end
       end
 
       def call(env)
-        request = Rack::Request.new(env)
+        env[:request] ||= Rack::Request.new(env)
 
-        route(method: request.request_method, path: request.path_info)
-          .new(request)
+        route(method: env[:request].request_method, path: env[:request].path_info)
+          .new(env[:request])
           .response
       end
 
       def route(method:, path:)
         case [method, path]
+        when ["GET", "/health"]
+          Endpoints::Health
         when ["GET", "/heartbeat"]
           Endpoints::Heartbeat
         when ["POST", "/pop"]

data/lib/specwrk/web/auth.rb

@@ -5,12 +5,16 @@ require "rack/auth/abstract/request"
 module Specwrk
   class Web
     class Auth
-      def initialize(app)
+      def initialize(app, excluded_paths = [])
         @app = app
+        @excluded_paths = excluded_paths
       end
 
       def call(env)
+        env[:request] ||= Rack::Request.new(env)
+
         return @app.call(env) if [nil, ""].include? ENV["SPECWRK_SRV_KEY"]
+        return @app.call(env) if @excluded_paths.include? env[:request].path_info
 
         auth = Rack::Auth::AbstractRequest.new(env)
 

data/lib/specwrk/web/endpoints.rb

@@ -50,6 +50,12 @@ module Specwrk
       # Base default response is 404
       NotFound = Class.new(Base)
 
+      class Health < Base
+        def response
+          ok
+        end
+      end
+
       class Heartbeat < Base
         def response
           ok
@@ -58,8 +64,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

metadata

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