specwrk 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 656884cedc1e6851a42054d696fb0c8cbb3c7afffa48935340c973d824cc6cc0
-  data.tar.gz: e8b562b8070e5342d6343b299a80fe0bc98a17060632aa369f5ded91ffecb820
+  metadata.gz: 4570e3aaeb01c00647b8671803076848bf28dee5068ec0cde66c88effea85bbe
+  data.tar.gz: 1d6709fc4b518ca5dcbad15e59820ba855adebb5dc6830ec26cc7f92d59f597d
 SHA512:
-  metadata.gz: a536a0bf7de4959ca820afa5e9249024181f198d073ca648f040f8f4276f63572ac74a1cdff481b9e050b1983f7af7eac5b2d31c3271dff911ae88aa75092f27
-  data.tar.gz: eddaa254e6254727f950006b30b653402a33acd827b1060baf583840d99ae2d41dec0ab4a15c11754c03db3f2664ea348efefc1b32b95b494c56287a0d3b88d0
+  metadata.gz: 3868e891fc3c14a8ce281b747d8e5b0c271e55f946f1fe1d23aa4d88d940ee40ea966fbf32bce5711ca1597c7870a8a4b1aa1bac610f117a9695888015eee6db
+  data.tar.gz: 385faa8d85c751eca15e1203ab626ec8d9abe3584e79265550dc52b18c81327f6a837535827dd63d56bc5fb0671fe11c8bd91698a96dc0d9a82d36a23edc7430

data/docker/Dockerfile.server

@@ -1,11 +1,6 @@
 FROM ruby:3.4-alpine
 
-RUN apk add --no-cache \
-      build-base \
-      ruby-dev \
-      linux-headers \
-      zlib-dev \
-      libffi-dev
+RUN apk add --no-cache build-base 
 
 WORKDIR /app
 
@@ -13,14 +8,15 @@ RUN mkdir .specwrk/
 
 ARG SPECWRK_SRV_PORT=5138
 ARG SPECWRK_VERSION=latest
-ARG GEMFILE=specwrk-$SPECWRK_VERSION.gem
+ARG GEM_FILE=specwrk-$SPECWRK_VERSION.gem
 
-COPY $GEMFILE ./
-RUN gem install ./$GEMFILE --no-document
-RUN rm ./$GEMFILE
+COPY $GEM_FILE ./
+RUN gem install ./$GEM_FILE --no-document
+RUN rm ./$GEM_FILE
 
-RUN gem install puma thruster
+RUN gem install pitchfork thruster
 COPY config.ru ./
+COPY docker/pitchfork.conf ./
 
 COPY docker/entrypoint.server.sh /usr/local/bin/entrypoint
 RUN chmod +x /usr/local/bin/entrypoint

data/docker/entrypoint.server.sh

@@ -2,6 +2,6 @@
 
 export THRUSTER_HTTP_PORT=${PORT:-5138}
 export THRUSTER_TARGET_PORT=3000
-export THRUSTER_HTTP_IDLE_TIMEOUT=${IDLE_TIMEOUT:-305}
+export THRUSTER_HTTP_IDLE_TIMEOUT=${IDLE_TIMEOUT:-300}
 
-exec thrust puma --workers 0 --bind tcp://127.0.0.1:3000 --threads ${PUMA_THREADS:-1} --workers ${PUMA_WORKERS:-0}
+exec thrust pitchfork -c pitchfork.conf

data/docker/pitchfork.conf

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+worker_processes 1
+listen "localhost:3000", backlog: 2048
+timeout 301

data/lib/specwrk/store/file_adapter.rb

@@ -10,20 +10,24 @@ module Specwrk
     class FileAdapter
       EXT = ".wrk.json"
 
-      THREAD_POOL = Class.new do
-        @work_queue = Queue.new
+      @work_queue = Queue.new
+      @threads = []
 
-        @threads = Array.new(ENV.fetch("SPECWRK_SRV_FILE_ADAPTER_THREAD_COUNT", "4").to_i) do
-          Thread.new do
-            loop do
-              @work_queue.pop.call
-            end
-          end
+      class << self
+        def schedule_work(&blk)
+          start_threads!
+          @work_queue.push blk
         end
 
-        class << self
-          def schedule(&blk)
-            @work_queue.push blk
+        def start_threads!
+          return if @threads.length.positive?
+
+          Array.new(ENV.fetch("SPECWRK_THREAD_COUNT", "4").to_i) do
+            @threads << Thread.new do
+              loop do
+                @work_queue.pop.call
+              end
+            end
           end
         end
       end
@@ -80,7 +84,7 @@ module Specwrk
         result_queue = Queue.new
 
         read_keys.each do |key|
-          THREAD_POOL.schedule do
+          self.class.schedule_work do
             result_queue.push([key.to_s, read(key)])
           end
         end
@@ -107,7 +111,7 @@ module Specwrk
         hash_with_filenames.each do |key, (filename, value)|
           content = JSON.generate(value)
 
-          THREAD_POOL.schedule do
+          self.class.schedule_work do
             result_queue << write(filename, content)
           end
         end

data/lib/specwrk/store.rb

@@ -7,40 +7,24 @@ require "specwrk/store/file_adapter"
 
 module Specwrk
   class Store
-    MUTEXES = {}
-    MUTEXES_MUTEX = Mutex.new # 🐢🐢🐢🐢
-
-    class << self
-      def mutex_for(path)
-        MUTEXES_MUTEX.synchronize do
-          MUTEXES[path] ||= Mutex.new
-        end
-      end
-    end
-
-    def initialize(path, thread_safe_reads: true)
+    def initialize(path)
       @path = path
-      @thread_safe_reads = thread_safe_reads
     end
 
     def [](key)
-      sync(thread_safe: thread_safe_reads) { adapter[key.to_s] }
+      adapter[key.to_s]
     end
 
     def multi_read(*keys)
-      sync(thread_safe: thread_safe_reads) { adapter.multi_read(*keys) }
+      adapter.multi_read(*keys)
     end
 
     def []=(key, value)
-      sync do
-        adapter[key.to_s] = value
-      end
+      adapter[key.to_s] = value
     end
 
     def keys
-      all_keys = sync(thread_safe: thread_safe_reads) do
-        adapter.keys
-      end
+      all_keys = adapter.keys
 
       all_keys.reject { |k| k.start_with? "____" }
     end
@@ -54,28 +38,24 @@ module Specwrk
     end
 
     def empty?
-      sync(thread_safe: thread_safe_reads) do
-        adapter.empty?
-      end
+      adapter.empty?
     end
 
     def delete(*keys)
-      sync { adapter.delete(*keys) }
+      adapter.delete(*keys)
     end
 
     def merge!(h2)
       h2.transform_keys!(&:to_s)
-      sync { adapter.merge!(h2) }
+      adapter.merge!(h2)
     end
 
     def clear
-      sync { adapter.clear }
+      adapter.clear
     end
 
     def to_h
-      sync(thread_safe: thread_safe_reads) do
-        adapter.multi_read(*keys).transform_keys!(&:to_sym)
-      end
+      adapter.multi_read(*keys).transform_keys!(&:to_sym)
     end
 
     def inspect
@@ -92,16 +72,6 @@ module Specwrk
 
     private
 
-    attr_reader :thread_safe_reads
-
-    def sync(thread_safe: true)
-      if !thread_safe || mutex.owned?
-        yield
-      else
-        mutex.synchronize { yield }
-      end
-    end
-
     def adapter
       @adapter ||= FileAdapter.new(@path)
     end
@@ -123,15 +93,13 @@ module Specwrk
     end
 
     def shift_bucket
-      sync do
-        return bucket_by_file unless run_time_bucket_maximum&.positive?
-
-        case ENV["SPECWRK_SRV_GROUP_BY"]
-        when "file"
-          bucket_by_file
-        else
-          bucket_by_timings
-        end
+      return bucket_by_file unless run_time_bucket_maximum&.positive?
+
+      case ENV["SPECWRK_SRV_GROUP_BY"]
+      when "file"
+        bucket_by_file
+      else
+        bucket_by_timings
       end
     end
 

data/lib/specwrk/version.rb

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

data/lib/specwrk/web/auth.rb

@@ -28,7 +28,7 @@ module Specwrk
       private
 
       def unauthorized
-        [401, {"Content-Type" => "application/json"}, ["Unauthorized"]]
+        [401, {"content-type" => "application/json"}, ["Unauthorized"]]
       end
     end
   end

data/lib/specwrk/web/endpoints.rb

@@ -51,11 +51,11 @@ module Specwrk
         end
 
         def not_found
-          [404, {"Content-Type" => "text/plain"}, ["This is not the path you're looking for, 'ol chap..."]]
+          [404, {"content-type" => "text/plain"}, ["This is not the path you're looking for, 'ol chap..."]]
         end
 
         def ok
-          [200, {"Content-Type" => "text/plain"}, ["OK, 'ol chap"]]
+          [200, {"content-type" => "text/plain"}, ["OK, 'ol chap"]]
         end
 
         def payload
@@ -83,11 +83,11 @@ module Specwrk
         end
 
         def metadata
-          @metadata ||= Store.new(File.join(datastore_path, "metadata"), thread_safe_reads: false)
+          @metadata ||= Store.new(File.join(datastore_path, "metadata"))
         end
 
         def run_times
-          @run_times ||= Store.new(File.join(ENV["SPECWRK_OUT"], "run_times"), thread_safe_reads: false)
+          @run_times ||= Store.new(File.join(ENV["SPECWRK_OUT"], "run_times"))
         end
 
         def worker
@@ -230,11 +230,11 @@ module Specwrk
           processing.merge!(processing_data)
 
           if @examples.any?
-            [200, {"Content-Type" => "application/json"}, [JSON.generate(@examples)]]
+            [200, {"content-type" => "application/json"}, [JSON.generate(@examples)]]
           elsif pending.empty? && processing.empty? && completed.empty?
-            [204, {"Content-Type" => "text/plain"}, ["Waiting for sample to be seeded."]]
+            [204, {"content-type" => "text/plain"}, ["Waiting for sample to be seeded."]]
           elsif completed.any? && processing.empty?
-            [410, {"Content-Type" => "text/plain"}, ["That's a good lad. Run along now and go home."]]
+            [410, {"content-type" => "text/plain"}, ["That's a good lad. Run along now and go home."]]
           else
             not_found
           end
@@ -253,11 +253,11 @@ module Specwrk
           processing.merge!(processing_data)
 
           if @examples.any?
-            [200, {"Content-Type" => "application/json"}, [JSON.generate(@examples)]]
+            [200, {"content-type" => "application/json"}, [JSON.generate(@examples)]]
           elsif pending.empty? && processing.empty? && completed.empty?
-            [204, {"Content-Type" => "text/plain"}, ["Waiting for sample to be seeded."]]
+            [204, {"content-type" => "text/plain"}, ["Waiting for sample to be seeded."]]
           elsif completed.any? && processing.empty?
-            [410, {"Content-Type" => "text/plain"}, ["That's a good lad. Run along now and go home."]]
+            [410, {"content-type" => "text/plain"}, ["That's a good lad. Run along now and go home."]]
           else
             not_found
           end
@@ -288,7 +288,7 @@ module Specwrk
 
       class Report < Base
         def with_response
-          [200, {"Content-Type" => "application/json"}, [JSON.generate(completed.dump)]]
+          [200, {"content-type" => "application/json"}, [JSON.generate(completed.dump)]]
         end
       end
 
@@ -299,7 +299,7 @@ module Specwrk
 
           interupt! if ENV["SPECWRK_SRV_SINGLE_RUN"]
 
-          [200, {"Content-Type" => "text/plain"}, ["✌️"]]
+          [200, {"content-type" => "text/plain"}, ["✌️"]]
         end
 
         def interupt!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specwrk
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Daniel Westendorf
@@ -180,6 +180,7 @@ files:
 - config.ru
 - docker/Dockerfile.server
 - docker/entrypoint.server.sh
+- docker/pitchfork.conf
 - examples/circleci/config.yml
 - examples/github/specwrk-multi-node.yml
 - examples/github/specwrk-single-node.yml