specwrk 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 620355ee669758b42abdd60b638044fbe7bbc4880d51356ea20e9785ab1bb4e3
-  data.tar.gz: 4444c229b60e2b83b5adfc620290965c1a866d5de0cdcfab8a63fab4a7948312
+  metadata.gz: 3d9511529ad6b58048312d287ed54240cffd3918b5621555f59c54b69b9451b4
+  data.tar.gz: a1a878eff39f2ae7592c37572195d1a7da5268554004df4966a6adba559f75e1
 SHA512:
-  metadata.gz: ec37f9d67476e6e0ce8ac12d970dc153ca4cdcec1f931b4e35973d71f05459599e8e38b750d8a5bfd81bc218866bc55f1e9dacc561340d9d67fa75b437cd4efa
-  data.tar.gz: 5267ffee5481ca36ce19559e84bc1c276de5351abe755950f22d2b8a2047ba931376d6c07adc69fd678375487d120964c04c090bdb5f121c32cde433d61bfe59
+  metadata.gz: dc0f1e302994fc815d00e409d86536acc3589baeb77d4e765741c061a0b0942ae93902ac64940cb5a9aeb5828d899982b67fd13b3e6ac1ffa6252d5efb8139ed
+  data.tar.gz: e789547dab6d911d1d69c244b87043fb48842380eeac948952b016e6d4f9e7b7e1d9daf8ce96428b1d1902bcb32c4054e52b048d454c51bc4622f3ac241e72c5

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

data/lib/specwrk/client.rb

@@ -88,6 +88,8 @@ module Specwrk
       case response.code
       when "200"
         JSON.parse(response.body, symbolize_names: true)
+      when "204"
+        raise WaitingForSeedError
       when "404"
         raise NoMoreExamplesError
       when "410"

data/lib/specwrk/version.rb

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

data/lib/specwrk/web/endpoints.rb

@@ -94,7 +94,9 @@ module Specwrk
 
           if @examples.length.positive?
             [200, {"Content-Type" => "application/json"}, [JSON.generate(@examples)]]
-          elsif processing_queue.length.zero?
+          elsif pending_queue.length.zero? && processing_queue.length.zero? && completed_queue.length.zero?
+            [204, {"Content-Type" => "text/plain"}, ["Waiting for sample to be seeded."]]
+          elsif completed_queue.length.positive? && processing_queue.length.zero?
             [410, {"Content-Type" => "text/plain"}, ["That's a good lad. Run along now and go home."]]
           else
             not_found

data/lib/specwrk/worker/executor.rb

@@ -11,6 +11,8 @@ require "specwrk/worker/null_formatter"
 module Specwrk
   class Worker
     class Executor
+      attr_reader :example_processed
+
       def failure
         completion_formatter.failure
       end
@@ -27,6 +29,7 @@ module Specwrk
         reset!
 
         example_ids = examples.map { |example| example[:id] }
+        @example_processed ||= true unless example_ids.size.zero? # only ever toggle from nil => true
 
         options = RSpec::Core::ConfigurationOptions.new rspec_options + example_ids
         RSpec::Core::Runner.new(options).run($stderr, $stdout)

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
@@ -36,6 +37,17 @@ module Specwrk
         # This will cause workers to 'hang' until all work has been completed
         # TODO: break here if all the other worker processes on this host are done executing examples
         sleep 0.5
+      rescue WaitingForSeedError
+        @seed_wait_count ||= 0
+        @seed_wait_count += 1
+
+        if @seed_wait_count <= @seed_waits
+          warn "No examples seeded yet, waiting..."
+          sleep 1
+        else
+          warn "No examples seeded, giving up!"
+          break
+        end
       end
 
       executor.final_output.tap(&:rewind).each_line { |line| $stdout.write line }
@@ -88,6 +100,7 @@ module Specwrk
     attr_reader :running, :client, :executor
 
     def status
+      return 1 unless executor.example_processed
       return 1 if executor.failure
       return 1 if Specwrk.force_quit
 

data/lib/specwrk.rb

@@ -8,6 +8,7 @@ module Specwrk
   # HTTP Client Errors
   ClientError = Class.new(Error)
   UnhandledResponseError = Class.new(ClientError)
+  WaitingForSeedError = Class.new(ClientError)
   NoMoreExamplesError = Class.new(ClientError)
   CompletedAllExamplesError = Class.new(ClientError)
 

metadata

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