specwrk 0.4.8 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b54fec1f526b07cda2e86d7dd5c26c134e33023e50ad3122f637736234d2fbfd
-  data.tar.gz: d56dbf0ad829e9c554d6caca40ff28c74db66a45ce888593a8d1e6dbf0552c99
+  metadata.gz: e85bdff31c7f1312b12a9a823200a5da5b36653433496556cc1bce274a3dc90a
+  data.tar.gz: fa73aebb69753d7b528d333f2fca589e0e5525bd12b71e4c5b7815df0932b9a1
 SHA512:
-  metadata.gz: 767fe8a6e6316a3c942699925667dced8fb35c37df94d38a21d6211330492de47633d1ec4b283f9106ad81893f2b6fe19a27775177e93305e77da57fd1bc5ce3
-  data.tar.gz: 4fac68daee472d09bf1503afa44160162cf26a20ba715a09bf417597fbd44b71f88637694d8896f3e2b8621c4d8aa101da7e23c675e225404fa16bfeda1acda2
+  metadata.gz: 9467744c0cd676bdeb312b3f1deb4190113601cb01bb9ce939acdfa1c6170897904f3125b43c90dde536459ed56b2623be132bfeed84725c1f6b098ea65ae6a9
+  data.tar.gz: f8cd7800b9f117567c1aa53404f2ca7f9a99a907c4b46c1c05da34d7534a2743c68960c50ffd9555de82430f582cb6a042a70579e4a8a44f53dea136f72cd8ae

data/config.ru

@@ -2,4 +2,5 @@ require "specwrk"
 require "specwrk/web"
 require "specwrk/web/app"
 
+Specwrk::Web::App.setup!
 run Specwrk::Web::App.rackup

data/docker/Dockerfile.server

@@ -19,7 +19,7 @@ COPY $GEMFILE ./
 RUN gem install ./$GEMFILE --no-document
 RUN rm ./$GEMFILE
 
-RUN gem install puma
+RUN gem install puma thruster
 COPY config.ru ./
 
 COPY docker/entrypoint.server.sh /usr/local/bin/entrypoint

data/docker/entrypoint.server.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
-export SPECWRK_SRV_SINGLE_RUN=1
+export THRUSTER_HTTP_PORT=${PORT:-5138}
+export THRUSTER_TARGET_PORT=3000
+export THRUSTER_HTTP_IDLE_TIMEOUT=${IDLE_TIMEOUT:-305}
 
-exec puma --port ${PORT:-$SPECWRK_SRV_PORT} --bind tcp://0.0.0.0 --threads 1 --workers 0 --silent
+exec thrust puma --workers 0 --bind tcp://127.0.0.1:3000 --threads ${PUMA_THREADS:-1}

data/lib/specwrk/cli.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "pathname"
-require "fileutils"
 
 require "dry/cli"
 
@@ -45,7 +44,6 @@ module Specwrk
         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
 
       def start_workers
@@ -80,16 +78,13 @@ module Specwrk
         base.unique_option :verbose, type: :boolean, default: false, desc: "Run in verbose mode. Default false."
       end
 
-      on_setup do |port:, bind:, output:, key:, single_seed_per_run:, group_by:, verbose:, **|
+      on_setup do |port:, bind:, output:, key:, group_by:, verbose:, **|
         ENV["SPECWRK_OUT"] = Pathname.new(output).expand_path(Dir.pwd).to_s
-        FileUtils.mkdir_p(ENV["SPECWRK_OUT"])
+        ENV["SPECWRK_SRV_VERBOSE"] = "1" if verbose
 
-        ENV["SPECWRK_SRV_LOG"] ||= Pathname.new(File.join(ENV["SPECWRK_OUT"], "server.log")).to_s if output && !verbose
-        ENV["SPECWRK_SRV_OUTPUT"] ||= Pathname.new(File.join(ENV["SPECWRK_OUT"], "report.json")).expand_path(Dir.pwd).to_s if output
         ENV["SPECWRK_SRV_PORT"] = port
         ENV["SPECWRK_SRV_BIND"] = bind
         ENV["SPECWRK_SRV_KEY"] = key
-        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/version.rb

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

data/lib/specwrk/web/app.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "pathname"
+require "fileutils"
+
 require "webrick"
 require "rack"
 
@@ -21,9 +24,7 @@ module Specwrk
         def run!
           Process.setproctitle "specwrk-server"
 
-          if ENV["SPECWRK_SRV_LOG"]
-            $stdout.reopen(ENV["SPECWRK_SRV_LOG"], "w")
-          end
+          setup!
 
           server_opts = {
             Port: ENV.fetch("SPECWRK_SRV_PORT", "5138").to_i,
@@ -46,10 +47,26 @@ module Specwrk
           end
         end
 
+        def setup!
+          if ENV["SPECWRK_OUT"]
+
+            FileUtils.mkdir_p(ENV["SPECWRK_OUT"])
+            ENV["SPECWRK_SRV_LOG"] ||= Pathname.new(File.join(ENV["SPECWRK_OUT"], "server.log")).to_s unless ENV["SPECWRK_SRV_VERBOSE"]
+            ENV["SPECWRK_SRV_OUTPUT"] ||= Pathname.new(File.join(ENV["SPECWRK_OUT"], "report.json")).expand_path(Dir.pwd).to_s
+          end
+
+          if ENV["SPECWRK_SRV_LOG"]
+            $stdout.reopen(ENV["SPECWRK_SRV_LOG"], "w")
+          end
+        end
+
         def rackup
           Rack::Builder.new do
-            use Rack::Runtime
-            use Specwrk::Web::Logger, $stdout, %w[/health]
+            if ENV["SPECWRK_SRV_VERBOSE"]
+              use Rack::Runtime
+              use Specwrk::Web::Logger, $stdout, %w[/health]
+            end
+
             use Specwrk::Web::Auth, %w[/health] # global auth check
             run Specwrk::Web::App.new           # your router
           end

data/lib/specwrk/worker.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "stringio"
+require "fileutils"
 
 require "specwrk/client"
 require "specwrk/worker/executor"
@@ -13,6 +14,7 @@ module Specwrk
 
     def initialize
       Process.setproctitle ENV.fetch("SPECWRK_ID", "specwrk-worker")
+      FileUtils.mkdir_p(ENV["SPECWRK_OUT"]) if ENV["SPECWRK_OUT"]
 
       @running = true
       @client = Client.new
@@ -85,13 +87,13 @@ module Specwrk
 
     def thump
       while running && !Specwrk.force_quit
+        sleep 10
+
         begin
-          client.heartbeat if client.last_request_at.nil? || client.last_request_at < Time.now - 10
+          client.heartbeat if client.last_request_at.nil? || client.last_request_at < Time.now - 30
         rescue
           warn "Heartbeat failed!"
         end
-
-        sleep 1
       end
     end
 

metadata

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