specwrk 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f9b53c4d462665fee20cfd4f6599770bcbe11b226f9617977a43678d3b6f511
-  data.tar.gz: ecd33a1c676d898160493fe5fc49c21dc4ef20c038aa2d551b01f21fcb18ddce
+  metadata.gz: 620355ee669758b42abdd60b638044fbe7bbc4880d51356ea20e9785ab1bb4e3
+  data.tar.gz: 4444c229b60e2b83b5adfc620290965c1a866d5de0cdcfab8a63fab4a7948312
 SHA512:
-  metadata.gz: d8819747f5affeb51ea228a030856ea3659b50347ba30c177921cba4d7b966cf79bc7df69b391d2ad16607a7b4273360f82fff105e8d3f624ad3e45b6a07ff35
-  data.tar.gz: d225da51ec8eb8d165fb82a07cacfcc706a34cff6c7398a36b5202e8212bfd3e7656394fc56b28ca4e9a8e1ae4418eba4d083609da3c8c251981abebcb0e763f
+  metadata.gz: ec37f9d67476e6e0ce8ac12d970dc153ca4cdcec1f931b4e35973d71f05459599e8e38b750d8a5bfd81bc218866bc55f1e9dacc561340d9d67fa75b437cd4efa
+  data.tar.gz: 5267ffee5481ca36ce19559e84bc1c276de5351abe755950f22d2b8a2047ba931376d6c07adc69fd678375487d120964c04c090bdb5f121c32cde433d61bfe59

data/lib/specwrk/cli.rb

@@ -16,7 +16,7 @@ module Specwrk
       extend Hookable
 
       on_included do |base|
-        base.unique_option :uri, type: :string, default: ENV.fetch("SPECWRK_SRV_URI", "https://localhost:#{ENV.fetch("SPECWRK_SRV_PORT", "5138")}"), desc: "HTTP URI of the server to pull jobs from. Overrides SPECWRK_SRV_PORT. Default 5138."
+        base.unique_option :uri, type: :string, default: ENV.fetch("SPECWRK_SRV_URI", "http://localhost:#{ENV.fetch("SPECWRK_SRV_PORT", "5138")}"), desc: "HTTP URI of the server to pull jobs from. Overrides SPECWRK_SRV_PORT. Default 5138."
         base.unique_option :key, type: :string, default: ENV.fetch("SPECWRK_SRV_KEY", ""), aliases: ["-k"], desc: "Authentication key clients must use for access. Overrides SPECWRK_SRV_KEY. Default ''."
         base.unique_option :run, type: :string, default: ENV.fetch("SPECWRK_RUN", "main"), aliases: ["-r"], desc: "The run identifier for this job execution. Overrides SPECWRK_RUN. Default main."
         base.unique_option :timeout, type: :integer, default: ENV.fetch("SPECWRK_TIMEOUT", "5"), aliases: ["-t"], desc: "The amount of time to wait for the server to respond. Overrides SPECWRK_TIMEOUT. Default 5."
@@ -54,7 +54,8 @@ module Specwrk
 
             require "specwrk/worker"
 
-            Specwrk::Worker.run!
+            status = Specwrk::Worker.run!
+            exit(status)
           end
         end
       end
@@ -133,13 +134,21 @@ module Specwrk
         self.class.setup(**args)
 
         start_workers
-        Process.waitall
+        wait_for_workers_exit
 
         require "specwrk/cli_reporter"
-        status = Specwrk::CLIReporter.new.report
+        Specwrk::CLIReporter.new.report
 
         exit(status)
       end
+
+      def wait_for_workers_exit
+        @exited_pids = Specwrk.wait_for_pids_exit(@worker_pids)
+      end
+
+      def status
+        @exited_pids.value?(1) ? 1 : 0
+      end
     end
 
     class Serve < Dry::CLI::Command
@@ -194,44 +203,24 @@ module Specwrk
           status "Samples seeded ✓"
         end
 
-        wait_for_pids_exit([seed_pid])
+        Specwrk.wait_for_pids_exit([seed_pid])
 
         return if Specwrk.force_quit
         status "Starting #{worker_count} workers..."
         start_workers
 
         status "#{worker_count} workers started ✓\n"
-        wait_for_pids_exit(@worker_pids)
+        Specwrk.wait_for_pids_exit(@worker_pids)
 
         return if Specwrk.force_quit
 
         require "specwrk/cli_reporter"
         status = Specwrk::CLIReporter.new.report
 
-        wait_for_pids_exit([web_pid, seed_pid] + @worker_pids)
+        Specwrk.wait_for_pids_exit([web_pid, seed_pid] + @worker_pids)
         exit(status)
       end
 
-      def wait_for_pids_exit(pids)
-        exited_pids = {}
-
-        loop do
-          pids.each do |pid|
-            next if exited_pids.key? pid
-
-            _, status = Process.waitpid2(pid, Process::WNOHANG)
-            exited_pids[pid] = status.exitstatus if status&.exitstatus
-          rescue Errno::ECHILD
-            exited_pids[pid] = 0
-          end
-
-          break if exited_pids.keys.length == pids.length
-          sleep 0.1
-        end
-
-        exited_pids
-      end
-
       def status(msg)
         print "\e[2K\r#{msg}"
         $stdout.flush

data/lib/specwrk/client.rb

@@ -4,6 +4,12 @@ require "uri"
 require "net/http"
 require "json"
 
+require "specwrk"
+
+# Some rspec setups might use webmock, which intercepts specwrk server calls
+# Let's capture the OG HTTP before that happens
+Specwrk.net_http = Net::HTTP
+
 module Specwrk
   class Client
     def self.connect?
@@ -18,7 +24,8 @@ module Specwrk
 
     def self.build_http
       uri = URI(ENV.fetch("SPECWRK_SRV_URI", "http://localhost:5138"))
-      Net::HTTP.new(uri.host, uri.port).tap do |http|
+      Specwrk.net_http.new(uri.host, uri.port).tap do |http|
+        http.use_ssl = uri.scheme == "https"
         http.open_timeout = ENV.fetch("SPECWRK_TIMEOUT", "5").to_i
         http.read_timeout = ENV.fetch("SPECWRK_TIMEOUT", "5").to_i
         http.keep_alive_timeout = 300
@@ -105,28 +112,28 @@ module Specwrk
     private
 
     def get(path, headers: default_headers, body: nil)
-      request = Net::HTTP::Get.new(path, headers)
+      request = Specwrk.net_http::Get.new(path, headers)
       request.body = body if body
 
       make_request(request)
     end
 
     def post(path, headers: default_headers, body: nil)
-      request = Net::HTTP::Post.new(path, headers)
+      request = Specwrk.net_http::Post.new(path, headers)
       request.body = body if body
 
       make_request(request)
     end
 
     def put(path, headers: default_headers, body: nil)
-      request = Net::HTTP::Put.new(path, headers)
+      request = Specwrk.net_http::Put.new(path, headers)
       request.body = body if body
 
       make_request(request)
     end
 
     def delete(path, headers: default_headers, body: nil)
-      request = Net::HTTP::Delete.new(path, headers)
+      request = Specwrk.net_http::Delete.new(path, headers)
       request.body = body if body
 
       make_request(request)

data/lib/specwrk/version.rb

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

data/lib/specwrk/worker/completion_formatter.rb

@@ -5,23 +5,28 @@ module Specwrk
     class CompletionFormatter
       RSpec::Core::Formatters.register self, :stop
 
-      attr_reader :examples
+      attr_reader :examples, :failure
 
       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,
-            status: notification.example.metadata[:execution_result].status,
+            status: notification.example.execution_result.status,
             file_path: notification.example.metadata[:file_path],
             line_number: notification.example.metadata[:line_number],
-            started_at: notification.example.metadata[:execution_result].started_at.iso8601(6),
-            finished_at: notification.example.metadata[:execution_result].finished_at.iso8601(6),
-            run_time: notification.example.metadata[:execution_result].run_time
+            started_at: notification.example.execution_result.started_at.iso8601(6),
+            finished_at: notification.example.execution_result.finished_at.iso8601(6),
+            run_time: notification.example.execution_result.run_time
           }
         end
       end

data/lib/specwrk/worker/executor.rb

@@ -11,6 +11,10 @@ require "specwrk/worker/null_formatter"
 module Specwrk
   class Worker
     class Executor
+      def failure
+        completion_formatter.failure
+      end
+
       def examples
         completion_formatter.examples
       end

data/lib/specwrk/worker.rb

@@ -42,10 +42,14 @@ module Specwrk
 
       @heartbeat_thread.kill
       client.close
+
+      status
     rescue Errno::ECONNREFUSED
       warn "\nServer at #{ENV.fetch("SPECWRK_SRV_URI", "http://localhost:5138")} is refusing connections, exiting..."
+      1
     rescue Errno::ECONNRESET
       warn "\nServer at #{ENV.fetch("SPECWRK_SRV_URI", "http://localhost:5138")} stopped responding to connections, exiting..."
+      1
     end
 
     def execute
@@ -83,6 +87,13 @@ module Specwrk
 
     attr_reader :running, :client, :executor
 
+    def status
+      return 1 if executor.failure
+      return 1 if Specwrk.force_quit
+
+      0
+    end
+
     def warn(msg)
       super("#{ENV.fetch("SPECWRK_ID", "specwrk-worker")}: #{msg}")
     end

data/lib/specwrk.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "specwrk/version"
+require "specwrk/version"
 
 module Specwrk
   Error = Class.new(StandardError)
@@ -15,7 +15,27 @@ module Specwrk
   @starting_pid = Process.pid
 
   class << self
-    attr_accessor :force_quit
+    attr_accessor :force_quit, :net_http
     attr_reader :starting_pid
+
+    def wait_for_pids_exit(pids)
+      exited_pids = {}
+
+      loop do
+        pids.each do |pid|
+          next if exited_pids.key? pid
+
+          _, status = Process.waitpid2(pid, Process::WNOHANG)
+          exited_pids[pid] = status.exitstatus if status&.exitstatus
+        rescue Errno::ECHILD
+          exited_pids[pid] = 1
+        end
+
+        break if exited_pids.keys.length == pids.length
+        sleep 0.1
+      end
+
+      exited_pids
+    end
   end
 end

metadata

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