specwrk 0.12.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d642db71c542c4b2dbf17038db546a34f713ffccb010dc903e4e7a96c8071016
-  data.tar.gz: 00fd8258a2441acd31c4a484c2e039ad5e83028e8c10eef509cdca070daab1c8
+  metadata.gz: b3028afb58991e7fc5837333b22d842ba261c6fa5985809db231b21fb40fa904
+  data.tar.gz: b3471eafa04b678db1b14cf0684296677dbe995fb2f3a5f920659479110e291f
 SHA512:
-  metadata.gz: 6c88c00baa4d0455e8b928e276e6c66cf66fd881f7e9193a4e19f665a93d7b177b18e5f2cd00a8605ef4613e9607634791527898836f85f99bec0d3faf17e3d7
-  data.tar.gz: 7370d6c27e8b052a17bcc93d84fdbea18efab35792ec6f010cc21d05a45ed8aad4cc29e1c24e4b5e10aca65787f8fb08bc7bf94fa4e928293e41405a300259d6
+  metadata.gz: 5ed970474e4a193778c33c113f374ffe8146dca152fb14e991f4a2b1970d1b71fee7050b78029ecd7fd3594b16dbd594d94cacd00e29e98ba7eeefc77c8bed90
+  data.tar.gz: 6a22138e628cd93aa6db4ceaf06d04b702d540765c53c41a0cefe04192af218394a0c5df6aec0200c5e3fcaadae8d521d3b9839290422b562819b6c78701b005

data/lib/specwrk/client.rb

@@ -44,12 +44,13 @@ module Specwrk
       raise Errno::ECONNREFUSED unless connected
     end
 
-    attr_reader :last_request_at, :retry_count
+    attr_reader :last_request_at, :retry_count, :worker_status
 
     def initialize
       @mutex = Mutex.new
       @http = self.class.build_http
       @http.start
+      @worker_status = 1
     end
 
     def close
@@ -99,12 +100,6 @@ module Specwrk
       end
     end
 
-    def complete_examples(examples)
-      response = post "/complete", body: examples.to_json
-
-      (response.code == "200") ? true : raise(UnhandledResponseError.new("#{response.code}: #{response.body}"))
-    end
-
     def complete_and_fetch_examples(examples)
       response = post "/complete_and_pop", body: examples.to_json
 
@@ -171,7 +166,11 @@ module Specwrk
     def make_request(request)
       @mutex.synchronize do
         @last_request_at = Time.now
-        @http.request(request).tap { @retry_count = 0 }
+        @http.request(request).tap do |response|
+          @retry_count = 0
+
+          @worker_status = response["x-specwrk-status"].to_i if response["x-specwrk-status"]
+        end
       end
     end
 

data/lib/specwrk/store/file_adapter.rb

@@ -2,6 +2,7 @@
 
 require "json"
 require "base64"
+require "securerandom"
 
 require "specwrk/store/base_adapter"
 
@@ -126,7 +127,7 @@ module Specwrk
       private
 
       def write(filename, content)
-        tmp_filename = [filename, "tmp"].join(".")
+        tmp_filename = [filename, SecureRandom.uuid, "tmp"].join(".")
 
         File.binwrite(tmp_filename, content)
 

data/lib/specwrk/store.rb

@@ -72,7 +72,7 @@ module Specwrk
     end
 
     def to_h
-      adapter.multi_read(*keys).transform_keys!(&:to_sym)
+      multi_read(*keys).transform_keys!(&:to_sym)
     end
 
     def inspect

data/lib/specwrk/version.rb

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

data/lib/specwrk/web/app.rb

@@ -88,8 +88,6 @@ module Specwrk
           Endpoints::Heartbeat
         when ["POST", "/pop"]
           Endpoints::Pop
-        when ["POST", "/complete"]
-          Endpoints::Complete
         when ["POST", "/complete_and_pop"]
           Endpoints::CompleteAndPop
         when ["POST", "/seed"]

data/lib/specwrk/web/endpoints.rb

@@ -33,6 +33,8 @@ module Specwrk
 
           after_lock
 
+          final_response[1]["x-specwrk-status"] = worker_status.to_s
+
           final_response
         end
 
@@ -102,6 +104,12 @@ module Specwrk
           @worker ||= Store.new(ENV.fetch("SPECWRK_SRV_STORE_URI", "memory:///"), File.join(run_id, "workers", request.get_header("HTTP_X_SPECWRK_ID").to_s))
         end
 
+        def worker_status
+          return 0 if worker[:failed].nil? && completed.any? # worker starts after run has completed
+
+          worker[:failed] || 1
+        end
+
         def run_id
           request.get_header("HTTP_X_SPECWRK_RUN")
         end
@@ -190,29 +198,6 @@ module Specwrk
         end
       end
 
-      class Complete < Base
-        def with_response
-          warn "[DEPRECATED] This endpoint will be retired in favor of CompleteAndPop. Upgrade your clients."
-          completed.merge!(completed_examples)
-          processing.delete(*completed_examples.keys)
-
-          ok
-        end
-
-        private
-
-        def completed_examples
-          @completed_data ||= payload.map { |example| [example[:id], example] if processing[example[:id]] }.compact.to_h
-        end
-
-        # We don't care about exact values here, just approximate run times are fine
-        # So if we overwrite run times from another process it is nbd
-        def after_lock
-          run_time_data = payload.map { |example| [example[:id], example[:run_time]] }.to_h
-          run_times.merge! run_time_data
-        end
-      end
-
       class Popable < Base
         private
 
@@ -261,6 +246,8 @@ module Specwrk
       end
 
       class CompleteAndPop < Popable
+        EXAMPLE_STATUSES = %w[passed failed pending]
+
         def with_response
           completed.merge!(completed_examples)
           processing.delete(*completed_examples.keys)
@@ -274,10 +261,22 @@ module Specwrk
           @completed_data ||= payload.map { |example| [example[:id], example] if processing[example[:id]] }.compact.to_h
         end
 
-        # We don't care about exact values here, just approximate run times are fine
-        # So if we overwrite run times from another process it is nbd
+        def completed_examples_status_counts
+          @completed_examples_status_counts ||= completed_examples.values.map { |example| example[:status] }.tally
+        end
+
         def after_lock
+          # We don't care about exact values here, just approximate run times are fine
+          # So if we overwrite run times from another process it is nbd
           run_times.merge! run_time_data
+
+          # workers are single proces, single-threaded, so safe to do this work without the lock
+          existing_status_counts = worker.multi_read(*EXAMPLE_STATUSES)
+          new_status_counts = EXAMPLE_STATUSES.map do |status|
+            [status, existing_status_counts.fetch(status, 0) + completed_examples_status_counts.fetch(status, 0)]
+          end.to_h
+
+          worker.merge!(new_status_counts)
         end
 
         def run_time_data

data/lib/specwrk/worker/completion_formatter.rb

@@ -5,19 +5,14 @@ module Specwrk
     class CompletionFormatter
       RSpec::Core::Formatters.register self, :stop
 
-      attr_reader :examples, :failure
+      attr_reader :examples
 
       def initialize
         @examples = []
-        @failure = false
       end
 
       def stop(group_notification)
         group_notification.notifications.map do |notification|
-          unless failure
-            @failure = notification.example.execution_result.status == :failed
-          end
-
           examples << {
             id: notification.example.id,
             full_description: notification.example.full_description,

data/lib/specwrk/worker/executor.rb

@@ -11,12 +11,6 @@ require "specwrk/worker/null_formatter"
 module Specwrk
   class Worker
     class Executor
-      attr_reader :example_processed
-
-      def failure
-        completion_formatter.failure
-      end
-
       def examples
         completion_formatter.examples
       end
@@ -29,7 +23,6 @@ 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

@@ -110,11 +110,10 @@ module Specwrk
     attr_reader :running, :client, :executor
 
     def status
-      return 1 if !executor.example_processed && !@all_examples_completed
-      return 1 if executor.failure
+      return 0 if @all_examples_completed && client.worker_status.zero?
       return 1 if Specwrk.force_quit
 
-      0
+      client.worker_status
     end
 
     def warn(msg)

metadata

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