hastci 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5b2325eb3310d82c948100ad8944303a1cafc0f3824497fa68ff3a2d229184b
-  data.tar.gz: 93b8a6e612a613d8491624008fa0e334653aff2b769e437385141c56ad62372b
+  metadata.gz: c539e7bbcfc1e63ae87f60a4802989e13917dfd260c90f5b4ae034790351bfc5
+  data.tar.gz: 3246b32dbd057b5435404c37d1938049e96bbcb27643df0a69cb1f07c4b6d2d6
 SHA512:
-  metadata.gz: d8d05f307a3408f5238081361f11c5fafbf5e5f1c1eb822bbeaf8dd42fb172bc4048ca7ae6d3303aa5cf77de543f51cea829313e7efaee814c74df59680debe3
-  data.tar.gz: 9b557ef0c58252027907cb79197d00273e100a7735b2072203d68c897c6a966cb0b47d0d985993ebcedf2954ab1238cdab9333902352a28cdb8fd3344d0a5397
+  metadata.gz: 6fbd3844f3a7791f4ca01a315bce6e999b5431dbe7aeb89e70e897c1ba467664d985943bd50bcd7b71854e4c563624a8fe54001da2f22424371857a71af800c1
+  data.tar.gz: 86d5796be2b12d15b5a5b26b9ec57ad8c7862a88cf4d57af663db85164608a49483048eb747c99a4799326d788aa881eed99059c7f3236a24455a077f68f9f32

data/lib/hastci/ack_worker.rb

@@ -4,7 +4,7 @@ module HastCI
   class AckWorker
     DEFAULT_QUEUE_SIZE = 1000
     DEFAULT_FLUSH_TIMEOUT = 10
-    EMPTY_QUEUE_POLL_INTERVAL = 0.05
+    EMPTY_QUEUE_POLL_INTERVAL = 0.5
     SHUTDOWN_TIMEOUT = 10
 
     private_constant :DEFAULT_QUEUE_SIZE, :DEFAULT_FLUSH_TIMEOUT, :EMPTY_QUEUE_POLL_INTERVAL,

data/lib/hastci/adapters/rspec/runner.rb

@@ -147,27 +147,18 @@ module HastCI
         end
 
         def build_logs(failed_examples)
-          {
-            summary: summary_for(failed_examples),
-            failures: failed_examples.map { |example| failure_payload(example) }
-          }
-        end
-
-        def summary_for(failed_examples)
-          return "passed" if failed_examples.empty?
+          return [] if failed_examples.empty?
 
-          "failed: #{failed_examples.length}"
-        end
+          failed_examples.map do |example|
+            exception = example.exception
 
-        def failure_payload(example)
-          exception = example.exception
-
-          {
-            file: example.metadata[:file_path],
-            line: example.metadata[:line_number],
-            message: exception&.message,
-            backtrace: Array(exception&.backtrace)
-          }
+            {
+              file: example.metadata[:file_path],
+              line: example.metadata[:line_number],
+              message: exception&.message,
+              backtrace: Array(exception&.backtrace)
+            }
+          end
         end
 
         def ordered_task_names(example_groups)

data/lib/hastci/api_client.rb

@@ -7,6 +7,8 @@ require "uri"
 
 module HastCI
   class ApiClient
+    OriginalNetHTTP = Net::HTTP
+
     DEFAULT_MAX_RETRIES = 5
     DEFAULT_INITIAL_BACKOFF = 0.5
     DEFAULT_MAX_BACKOFF = 30
@@ -28,11 +30,13 @@ module HastCI
 
     private_constant :API_PATH_PREFIX, :CONNECTION_DEFAULT, :CONNECTION_HEARTBEAT, :CONNECTION_ACK
 
-    def initialize(config:, sleeper: Kernel.method(:sleep), max_retries: nil, random: Random.new)
+    def initialize(config:, sleeper: Kernel.method(:sleep), max_retries: nil, random: Random.new,
+      http_class: OriginalNetHTTP)
       @config = config
       @max_retries = max_retries || config.api_max_retries || DEFAULT_MAX_RETRIES
       @sleeper = sleeper
       @random = random
+      @http_class = http_class
 
       @base_url = URI.parse(config.api_base_url)
       @api_key = config.api_key
@@ -140,7 +144,7 @@ module HastCI
 
     def get_json(path, pool: CONNECTION_DEFAULT)
       uri = build_uri(path)
-      request = Net::HTTP::Get.new(uri)
+      request = @http_class::Get.new(uri)
       request["Authorization"] = "Bearer #{@api_key}"
 
       execute_request(request, pool: pool)
@@ -148,7 +152,7 @@ module HastCI
 
     def post_json(path, body, pool: CONNECTION_DEFAULT)
       uri = build_uri(path)
-      request = Net::HTTP::Post.new(uri)
+      request = @http_class::Post.new(uri)
       request["Content-Type"] = "application/json"
       request["Authorization"] = "Bearer #{@api_key}"
       request.body = JSON.generate(body)
@@ -226,7 +230,7 @@ module HastCI
     end
 
     def create_connection
-      http = Net::HTTP.new(@base_url.host, @base_url.port)
+      http = @http_class.new(@base_url.host, @base_url.port)
       http.use_ssl = @base_url.scheme == "https"
       http.open_timeout = DEFAULT_OPEN_TIMEOUT
       http.read_timeout = DEFAULT_READ_TIMEOUT

data/lib/hastci/cli.rb

@@ -86,12 +86,15 @@ module HastCI
     private_class_method :configure_logging
 
     # :nocov:
-    def self.setup_interrupt_handler(session, err, &on_interrupt)
+    def self.setup_interrupt_handler(session, err, signal_enqueuer: nil, &on_interrupt)
       signals = Queue.new
       signal_count = 0
+      enqueue_signal = signal_enqueuer || lambda do |queue, signal|
+        Thread.new { queue << signal }
+      end
 
-      trap("INT") { signals << "SIGINT" }
-      trap("TERM") { signals << "SIGTERM" }
+      trap("INT") { enqueue_signal.call(signals, "SIGINT") }
+      trap("TERM") { enqueue_signal.call(signals, "SIGTERM") }
 
       watcher = Thread.new do
         loop do

data/lib/hastci/config.rb

@@ -5,7 +5,7 @@ require "securerandom"
 module HastCI
   class Config
     DEFAULT_API_BASE_URL = "https://hastci.com"
-    DEFAULT_CLAIM_BATCH_SIZE = 10
+    DEFAULT_CLAIM_BATCH_SIZE = 3
     DEFAULT_HEARTBEAT_INTERVAL = 15
     DEFAULT_SEEDING_TIMEOUT = 300
     DEFAULT_LOG_LEVEL = "INFO"

data/lib/hastci/session.rb

@@ -3,8 +3,8 @@
 module HastCI
   class Session
     DEFAULT_POLL_INTERVAL = 0.5
-    DEFAULT_BUFFER_MIN_SIZE = 3
-    DEFAULT_BUFFER_MAX_SIZE = 10
+    DEFAULT_BUFFER_MIN_SIZE = 1
+    DEFAULT_BUFFER_MAX_SIZE = 3
     DEFAULT_SEEDING_POLL_INTERVAL = 1.0
 
     STOP_REASONS = %i[user_interrupt server_cancelled].freeze

data/lib/hastci/task_buffer.rb

@@ -54,20 +54,24 @@ module HastCI
     end
 
     def next_task
-      error = @error_collector.first_error
-      raise error if error
-
-      task = @queue.pop
-
-      if task.nil?
+      loop do
         error = @error_collector.first_error
         raise error if error
 
-        return nil
-      end
+        return nil if queue_closed_and_empty?
+
+        begin
+          task = @queue.pop(true)
+        rescue ThreadError
+          @sleeper.call(@poll_interval)
+          next
+        end
+
+        return nil if task.nil?
 
-      signal_prefetch_if_needed
-      task
+        signal_prefetch_if_needed
+        return task
+      end
     end
 
     def size
@@ -84,6 +88,10 @@ module HastCI
 
     private
 
+    def queue_closed_and_empty?
+      @queue.respond_to?(:closed?) && @queue.closed? && @queue.empty?
+    end
+
     def signal_prefetch_if_needed
       @mutex.synchronize do
         @prefetch_condition.signal if @queue.size < @min_size
@@ -117,9 +125,7 @@ module HastCI
 
     def wait_for_prefetch_signal
       @mutex.synchronize do
-        while @running && !@drained && @queue.size >= @min_size
-          @prefetch_condition.wait(@mutex, @poll_interval)
-        end
+        @prefetch_condition.wait(@mutex, @poll_interval) while @running && !@drained && @queue.size >= @min_size
       end
     end
 

data/lib/hastci/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module HastCI
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end
 # :nocov:

data/spec/pacts/hastci_rspec-hastci_api.json

@@ -373,16 +373,69 @@
         "body": {
           "status": "passed",
           "duration_s": 1.5,
-          "logs": {
-            "summary": "1 example, 0 failures",
-            "failures": [
+          "logs": [
         ]
+        },
+        "matchingRules": {
+          "$.path": {
+            "match": "regex",
+            "regex": "^\\/api\\/v1\\/tasks\\/\\d+\\/acknowledgment$"
           }
+        }
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "Content-Type": "application/json"
+        },
+        "body": {
+          "ok": true
+        }
+      }
+    },
+    {
+      "description": "a request to ack a task with failures",
+      "providerState": "a task exists",
+      "request": {
+        "method": "post",
+        "path": "/api/v1/tasks/101/acknowledgment",
+        "headers": {
+          "Authorization": "Bearer test-api-key",
+          "Content-Type": "application/json"
+        },
+        "body": {
+          "status": "failed",
+          "duration_s": 2.0,
+          "logs": [
+            {
+              "file": "spec/models/user_spec.rb",
+              "line": 123,
+              "message": "Expected 1, got 2",
+              "backtrace": [
+                "spec/models/user_spec.rb:123:in `block'"
+              ]
+            }
+          ]
         },
         "matchingRules": {
           "$.path": {
             "match": "regex",
             "regex": "^\\/api\\/v1\\/tasks\\/\\d+\\/acknowledgment$"
+          },
+          "$.body.logs[0].file": {
+            "match": "type"
+          },
+          "$.body.logs[0].line": {
+            "match": "type"
+          },
+          "$.body.logs[0].message": {
+            "match": "type"
+          },
+          "$.body.logs[0].backtrace": {
+            "min": 1
+          },
+          "$.body.logs[0].backtrace[*].*": {
+            "match": "type"
           }
         }
       },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hastci
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Wojciech Wrona