hastci 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36417a2faab01e0a54f959f9ce42384c79a3ea1ab6d12d7058ec36adc5cedda2
-  data.tar.gz: 4680906b82856a6c8a6c9b52a15c90a310f48ade90326fade13d8e5875353284
+  metadata.gz: 91790bf0626d7e4df2d26cc1cefe89371d5bf3080bc56708775a11782f412a62
+  data.tar.gz: be0ce4993d12695e2b41f0b57b1860312bd52b86b2bd478973653edb994af2e8
 SHA512:
-  metadata.gz: ad9dfe7dcacd33f965efaca4dd5edadc0ba984f802b0fa7f621e7e74764213ebeffbd36c41edfd428e2cad9f2dc7a6057459672a466f41c313a447c25c0808ed
-  data.tar.gz: 3a14dd0bdbebd83ee3ddb7d11be9e7ef07c6e582efda353a846dd26932f6664320773e23337ffadf98245d363e6a56cb1767dee0177042869e0cdd3cb29372d6
+  metadata.gz: f4279fb63c5b4ba58d73f94dd342f81611af331a78b69c309d5a912c40361fc0ee4352bdb18b395ef2d7903ac38fd143236f044b34a1dea936d633f3ba214376
+  data.tar.gz: eec7921d963ba82888dad00cc7a3a4d93db8e8ec35044a0149aae410330a80d1503ad8d6d17543fe23a9c25826e77e2aeaf76b36a98ca00c35ffde35f84ad449

data/lib/hastci/api_client.rb

@@ -106,19 +106,7 @@ module HastCI
         context: "#{API_PATH_PREFIX}/runs/:run_id/claims"
       )
 
-      tasks = Array(response.fetch("tasks", [])).map do |task_data|
-        Task.new(
-          id: fetch_required(task_data, "id", context: "#{API_PATH_PREFIX}/runs/:run_id/claims"),
-          name: fetch_required(task_data, "name", context: "#{API_PATH_PREFIX}/runs/:run_id/claims")
-        )
-      end
-
-      ClaimResult.new(
-        tasks: tasks,
-        queue_state: response["queue_state"]&.to_sym,
-        remaining: response["remaining"],
-        should_stop: response["should_stop"]
-      )
+      build_claim_result(response)
     end
 
     def ack(task_id:, status:, duration_s:, logs:)
@@ -142,6 +130,21 @@ module HastCI
 
     private
 
+    def build_claim_result(response)
+      tasks = Array(response.fetch("tasks", [])).map do |task_data|
+        Task.new(
+          id: fetch_required(task_data, "id", context: "#{API_PATH_PREFIX}/runs/:run_id/claims"),
+          name: fetch_required(task_data, "name", context: "#{API_PATH_PREFIX}/runs/:run_id/claims")
+        )
+      end
+
+      ClaimResult.new(
+        tasks: tasks,
+        queue_state: response["queue_state"]&.to_sym,
+        remaining: response["remaining"]
+      )
+    end
+
     def get_json(path, pool: CONNECTION_DEFAULT)
       uri = build_uri(path)
       request = @http_class::Get.new(uri)
@@ -274,6 +277,8 @@ module HastCI
       body = response.body
 
       case status
+      when 409
+        raise RunCancelled.new("Run cancelled", status_code: status, response_body: body)
       when 410
         raise QueueDrained.new("Queue drained", status_code: status, response_body: body)
       when 400..499

data/lib/hastci/claim_result.rb

@@ -2,26 +2,17 @@
 
 module HastCI
   class ClaimResult
-    attr_reader :tasks, :queue_state, :remaining, :should_stop
+    attr_reader :tasks, :queue_state, :remaining
 
-    def initialize(tasks:, queue_state:, remaining: nil, should_stop: nil)
+    def initialize(tasks:, queue_state:, remaining: nil)
       @tasks = tasks
       @queue_state = queue_state
       @remaining = remaining
-      @should_stop = should_stop
       freeze
     end
 
-    def drained?
-      queue_state == :drained
-    end
-
     def empty?
       tasks.empty?
     end
-
-    def cancelled?
-      should_stop == true
-    end
   end
 end

data/lib/hastci/task_buffer.rb

@@ -133,6 +133,8 @@ module HastCI
       @fetcher.call(capacity)
     rescue QueueDrained
       handle_queue_drained
+    rescue RunCancelled
+      handle_stop_signal
     rescue RetryExhaustedError => e
       handle_fatal_fetch_error(e, "Prefetch failed after retries")
     rescue FatalApiError => e
@@ -144,7 +146,6 @@ module HastCI
     end
 
     def process_fetch_result(result, requested_capacity:)
-      return handle_stop_signal if result.cancelled?
       return handle_empty_response if result.empty?
       return handle_overflow(result, requested_capacity: requested_capacity) if result.tasks.size > requested_capacity
 

data/lib/hastci/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module HastCI
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end
 # :nocov:

data/spec/pacts/hastci_rspec-hastci_api.json

@@ -332,31 +332,12 @@
         }
       },
       "response": {
-        "status": 200,
+        "status": 409,
         "headers": {
           "Content-Type": "application/json"
         },
         "body": {
-          "tasks": [
-        ],
-          "queue_state": "cancelled",
-          "remaining": {
-            "queued": 0,
-            "assigned": 0,
-            "completed": 5
-          },
-          "should_stop": true
-        },
-        "matchingRules": {
-          "$.body.remaining.queued": {
-            "match": "type"
-          },
-          "$.body.remaining.assigned": {
-            "match": "type"
-          },
-          "$.body.remaining.completed": {
-            "match": "type"
-          }
+          "queue_state": "cancelled"
         }
       }
     },

metadata

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