specwrk 0.15.6 → 0.15.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20541408cebae1ced527a8f5d7f425b719151a9959fc95d421904dce37ad34b4
-  data.tar.gz: 9df0eff320f56aa55764993e16b100519b0112ebb17a19750e9ef9d39a01b51d
+  metadata.gz: 0a359bd88ba0482dad8bf78555ce9256e8dfa4f000d48f2e36579df34172a684
+  data.tar.gz: a41d177279abb2622d8778a14344ede5f8eac4cac83bbd99185e6302f956f6e7
 SHA512:
-  metadata.gz: 2769e8abf15400ea0984f73d5f1015bf8c2afa009b23a346cf7d74ff3bb0d38b4bcf8ccb85a298d8ae6e38ab7d88db16d40e14e1053228a4da11915af9476e83
-  data.tar.gz: 5e815ee3f6471bc09fff5202f6b867b7b7722310ad18fd9acd95eef1d39368ebc14968e01e1ac37bb7af816e914e7c102190fc9966335af0f66b401040eef6fa
+  metadata.gz: 7faa3a2e27b1338fde5aa02b8ae29482b8203857bfb07a54d5c8ff751e73b051b1bc7c69e05bf1b58a8aa609e9de15b767d78a4002936b83d60f3c2f90f928b7
+  data.tar.gz: d6c167e28a11bcc0798074d4214430430cbdb6e34c8b1f1c5c9bed2c086251736c73aefcc984d5ae10ce47e4204d1d13a4b3119a68ed6e26f262ec657839ab4f

data/README.md

@@ -263,7 +263,7 @@ end
 ```
 
 ## Prior/other works
-There are many prior works for running rspec tests across multiple processes. Most of them combine process output making failures hard to grok. Some are good at running tests locally, but not on CI, while others are invserly true. Others are comercial or impactical without making a purchase.
+There are many prior works for running rspec tests across multiple processes. Most of them combine process output making failures hard to grok. Some are good at running tests locally, but not on CI, while others are inversely true. Others are comercial or impactical without making a purchase.
 
 specwrk is different because it:
 1. Puts your developer experience first. Easy execution. No messy outputs. Retries built in. Easy(er) debugging of flaky tests. 
@@ -284,4 +284,4 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/dweste
 
 ## License
 
-The gem is available as open source under the terms of the [LGLPv3 License](http://www.gnu.org/licenses/lgpl-3.0.html).
+The gem is available as open source under the terms of the [LGPLv3 License](http://www.gnu.org/licenses/lgpl-3.0.html).

data/lib/specwrk/cli.rb

@@ -106,6 +106,16 @@ module Specwrk
         ENV["SPECWRK_SRV_KEY"] = key
         ENV["SPECWRK_SRV_GROUP_BY"] = group_by
       end
+
+      def find_open_port
+        require "socket"
+
+        server = TCPServer.new("127.0.0.1", 0)
+        port = server.addr[1]
+        server.close
+
+        port
+      end
     end
 
     class Version < Dry::CLI::Command
@@ -207,6 +217,10 @@ module Specwrk
         # nil this env var if it exists to prevent never-ending workers
         ENV["SPECWRK_SRV_URI"] = nil
 
+        # Start on a random open port to not conflict with another server
+        ENV["SPECWRK_SRV_PORT"] = find_open_port.to_s
+        ENV["SPECWRK_SRV_URI"] = "http://localhost:#{ENV.fetch("SPECWRK_SRV_PORT", "5138")}"
+
         web_pid = Process.fork do
           require "specwrk/web"
           require "specwrk/web/app"
@@ -273,6 +287,11 @@ module Specwrk
 
         # nil this env var if it exists to prevent never-ending workers
         ENV["SPECWRK_SRV_URI"] = nil
+
+        # Start on a random open port to not conflict with another server
+        ENV["SPECWRK_SRV_PORT"] = find_open_port.to_s
+        ENV["SPECWRK_SRV_URI"] = "http://localhost:#{ENV.fetch("SPECWRK_SRV_PORT", "5138")}"
+
         ENV["SPECWRK_SEED_WAITS"] = "0"
         ENV["SPECWRK_MAX_BUCKET_SIZE"] = "1"
         ENV["SPECWRK_COUNT"] = count.to_s
@@ -428,6 +447,16 @@ module Specwrk
       def worker_count
         @worker_count ||= [1, ENV["SPECWRK_COUNT"].to_i].max
       end
+
+      def find_open_port
+        require "socket"
+
+        server = TCPServer.new("127.0.0.1", 0)
+        port = server.addr[1]
+        server.close
+
+        port
+      end
     end
 
     register "version", Version, aliases: ["v", "-v", "--version"]

data/lib/specwrk/cli_reporter.rb

@@ -4,7 +4,7 @@ require "time"
 
 require "specwrk/client"
 
-require "rspec"
+require "rspec/core"
 require "rspec/core/formatters/helpers"
 require "rspec/core/formatters/console_codes"
 

data/lib/specwrk/store.rb

@@ -20,8 +20,12 @@ module Specwrk
 
           FileAdapter
         when /redis/
-          # Expects the specwrk-store-redis_adapter gem to be available
-          require "specwrk/store/redis_adapter" unless defined?(RedisAdapter)
+          begin
+            require "specwrk/store/redis_adapter" unless defined?(RedisAdapter)
+          rescue LoadError
+            warn "Unable use RedisAdapter with #{uri}, gem not found. Add `gem 'specwrk-store-redis_adapter'` to your Gemfile and bundle install."
+            exit(1)
+          end
 
           RedisAdapter
         end

data/lib/specwrk/version.rb

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

data/lib/specwrk/web/endpoints/base.rb

@@ -15,12 +15,12 @@ module Specwrk
         end
 
         def response
-          before_lock
-
           return with_response unless run_id # No run_id, no datastore usage in the endpoint
 
           payload # parse the payload before any locking
 
+          before_lock
+
           worker[:first_seen_at] ||= Time.now.iso8601
           worker[:last_seen_at] = Time.now.iso8601
 
@@ -119,7 +119,7 @@ module Specwrk
         end
 
         def with_lock
-          Store.with_lock(URI(ENV.fetch("SPECWRK_SRV_STORE_URI", "memory:///")), "server") { yield }
+          Store.with_lock(URI(ENV.fetch("SPECWRK_SRV_STORE_URI", "memory:///")), run_id) { yield }
         end
       end
 

data/lib/specwrk/worker/executor.rb

@@ -2,7 +2,7 @@
 
 require "tempfile"
 
-require "rspec"
+require "rspec/core"
 
 require "specwrk/worker/progress_formatter"
 require "specwrk/worker/completion_formatter"

metadata

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