hastci 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27d28132add51197aa671ad6dd4144aa7867e6872fd04759b8a58c8374902916
-  data.tar.gz: 4837752bbdddb42aade93d3ccc557bdb6cf7a199a733be643c0b8c429184eb43
+  metadata.gz: b5b2325eb3310d82c948100ad8944303a1cafc0f3824497fa68ff3a2d229184b
+  data.tar.gz: 93b8a6e612a613d8491624008fa0e334653aff2b769e437385141c56ad62372b
 SHA512:
-  metadata.gz: 0be5ec737d6fe6196af175de67c21edcd39fe30463602ff757b98dadc0141583799ea89459eeec834fffd08e93d319212767067f3f728be446af7c84c8b96cec
-  data.tar.gz: 2f4118eb2e35de8edff25e53be4d6930d345366bb13f796656609f88ed29cc9063047caf6d46d0361b07172960a3abf08dd29a07d1585a928ede084c2b14da84
+  metadata.gz: d8d05f307a3408f5238081361f11c5fafbf5e5f1c1eb822bbeaf8dd42fb172bc4048ca7ae6d3303aa5cf77de543f51cea829313e7efaee814c74df59680debe3
+  data.tar.gz: 9b557ef0c58252027907cb79197d00273e100a7735b2072203d68c897c6a966cb0b47d0d985993ebcedf2954ab1238cdab9333902352a28cdb8fd3344d0a5397

data/devenv.lock

@@ -3,10 +3,10 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1764877862,
+        "lastModified": 1766921574,
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "5b6cb65d7dec827badc6bbceeac934931beb7f4e",
+        "rev": "02c9dcf3e050400d8101057f9f00ec458af7c959",
         "type": "github"
       },
       "original": {
@@ -19,10 +19,10 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1764712249,
+        "lastModified": 1766929376,
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "3b279e4317ccfa4865356387935310531357d919",
+        "rev": "236f248441a986331cda53b039e7f9fd96e03635",
         "type": "github"
       },
       "original": {
@@ -34,10 +34,10 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1764712249,
+        "lastModified": 1766929376,
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "3b279e4317ccfa4865356387935310531357d919",
+        "rev": "236f248441a986331cda53b039e7f9fd96e03635",
         "type": "github"
       },
       "original": {
@@ -72,10 +72,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1763988335,
+        "lastModified": 1765911976,
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
+        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
         "type": "github"
       },
       "original": {
@@ -128,10 +128,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1764740760,
+        "lastModified": 1766728475,
         "owner": "bobvanderlinden",
         "repo": "nixpkgs-ruby",
-        "rev": "6747e142e5689bb156d47c9c90fe1596ecd246cb",
+        "rev": "f167828eab19c3a7e3faa066a140d92e307f7b16",
         "type": "github"
       },
       "original": {

data/lib/hastci/api_client.rb

@@ -18,13 +18,15 @@ module HastCI
     private_constant :DEFAULT_MAX_RETRIES, :DEFAULT_INITIAL_BACKOFF, :DEFAULT_MAX_BACKOFF,
       :DEFAULT_KEEP_ALIVE_TIMEOUT, :DEFAULT_OPEN_TIMEOUT, :DEFAULT_READ_TIMEOUT, :DEFAULT_WRITE_TIMEOUT
 
+    API_PATH_PREFIX = "/api/v1"
+
     # Separate connections allow concurrent operations without blocking.
     # E.g., heartbeat can continue while the main thread waits on a claim.
     CONNECTION_DEFAULT = :default
     CONNECTION_HEARTBEAT = :heartbeat
     CONNECTION_ACK = :ack
 
-    private_constant :CONNECTION_DEFAULT, :CONNECTION_HEARTBEAT, :CONNECTION_ACK
+    private_constant :API_PATH_PREFIX, :CONNECTION_DEFAULT, :CONNECTION_HEARTBEAT, :CONNECTION_ACK
 
     def initialize(config:, sleeper: Kernel.method(:sleep), max_retries: nil, random: Random.new)
       @config = config
@@ -56,52 +58,54 @@ module HastCI
       commit_sha: @config.commit_sha
     )
       response = ensure_hash_response(
-        post_json("/runs/init", {
+        post_json("#{API_PATH_PREFIX}/runs", {
           run_key: run_key,
           worker_id: worker_id,
           commit_sha: commit_sha
         }),
-        context: "/runs/init"
+        context: "#{API_PATH_PREFIX}/runs"
       )
 
       {
-        run_id: fetch_required(response, "run_id", context: "/runs/init"),
-        status: fetch_required(response, "status", context: "/runs/init").to_sym,
-        role: fetch_required(response, "role", context: "/runs/init").to_sym
+        run_id: fetch_required(response, "run_id", context: "#{API_PATH_PREFIX}/runs"),
+        status: fetch_required(response, "status", context: "#{API_PATH_PREFIX}/runs").to_sym,
+        role: fetch_required(response, "role", context: "#{API_PATH_PREFIX}/runs").to_sym
       }
     end
 
     def seed(run_id:, tasks:)
-      post_json("/runs/#{run_id}/seed", {
+      post_json("#{API_PATH_PREFIX}/runs/#{run_id}/seed", {
         tasks: tasks.map { |name| {name: name} }
       })
     end
 
     def run_status(run_id:)
-      response = ensure_hash_response(get_json("/runs/#{run_id}/status"), context: "/runs/status")
+      response = ensure_hash_response(
+        get_json("#{API_PATH_PREFIX}/runs/#{run_id}"),
+        context: "#{API_PATH_PREFIX}/runs/:run_id"
+      )
 
       {
-        status: fetch_required(response, "status", context: "/runs/status").to_sym
+        status: fetch_required(response, "status", context: "#{API_PATH_PREFIX}/runs/:run_id").to_sym
       }
     end
 
     def claim(
-      run_key: @config.run_key,
+      run_id:,
       worker_id: @config.worker_id,
       batch: @config.claim_batch_size
     )
       response = ensure_hash_response(
-        post_json("/tasks/claim?batch=#{batch}", {
-          run_key: run_key,
+        post_json("#{API_PATH_PREFIX}/runs/#{run_id}/claims?batch=#{batch}", {
           worker_id: worker_id
         }),
-        context: "/tasks/claim"
+        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: "/tasks/claim"),
-          name: fetch_required(task_data, "name", context: "/tasks/claim")
+          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
 
@@ -114,7 +118,7 @@ module HastCI
     end
 
     def ack(task_id:, status:, duration_s:, logs:)
-      post_json("/tasks/#{task_id}/ack", {
+      post_json("#{API_PATH_PREFIX}/tasks/#{task_id}/acknowledgment", {
         status: status.to_s,
         duration_s: duration_s,
         logs: logs
@@ -122,11 +126,10 @@ module HastCI
     end
 
     def heartbeat(
-      run_key: @config.run_key,
+      run_id:,
       worker_id: @config.worker_id
     )
-      post_json("/workers/heartbeat", {
-        run_key: run_key,
+      post_json("#{API_PATH_PREFIX}/runs/#{run_id}/heartbeats", {
         worker_id: worker_id
       }, pool: CONNECTION_HEARTBEAT)
 
@@ -176,12 +179,13 @@ module HastCI
 
         elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time if @config.debug
         log_response(response, request_id, elapsed) if @config.debug
+        log_error_body(response, request_id) if @config.debug && response.code.to_i >= 400
         parse_response(response)
       end
     end
 
     def log_request(request, request_id)
-      HastCI.logger.debug("[#{request_id}] #{request.method} #{request.path}")
+      HastCI.logger.debug("[#{request_id}] #{request.method} #{@base_url}#{request.path}")
       return unless request.body
 
       body_preview = if request.body.length > 200
@@ -196,6 +200,15 @@ module HastCI
       HastCI.logger.debug("[#{request_id}] Response: #{response.code} (#{(elapsed_s * 1000).round}ms)")
     end
 
+    def log_error_body(response, request_id)
+      body = response.body.to_s
+      return if body.strip.empty?
+
+      summary = body.match(/No route matches[^<]*/)&.to_s
+      body_preview = summary || ((body.length > 200) ? "#{body[0, 200]}... (#{body.length} bytes)" : body)
+      HastCI.logger.debug("[#{request_id}] Error body: #{body_preview}")
+    end
+
     def log_retry(request_id, attempt)
       HastCI.logger.debug("[#{request_id}] Retry attempt #{attempt}")
     end

data/lib/hastci/cli.rb

@@ -9,16 +9,22 @@ module HastCI
       runner_exit_code = ExitCodes::SUCCESS
       interrupted = false
 
-      cleanup_result = HastCI::Session.run(config: config) do |session|
-        setup_interrupt_handler(session, err) { interrupted = true }
+      interrupt_cleanup = nil
 
-        session.start!
+      begin
+        cleanup_result = HastCI::Session.run(config: config) do |session|
+          interrupt_cleanup = setup_interrupt_handler(session, err) { interrupted = true }
 
-        runner_exit_code = if session.stopping?
-          ExitCodes::SUCCESS
-        else
-          runner_block.call(session, argv, err, out)
+          session.start!
+
+          runner_exit_code = if session.stopping?
+            ExitCodes::SUCCESS
+          else
+            runner_block.call(session, argv, err, out)
+          end
         end
+      ensure
+        interrupt_cleanup&.call
       end
 
       print_errors(cleanup_result, err: err)
@@ -81,20 +87,37 @@ module HastCI
 
     # :nocov:
     def self.setup_interrupt_handler(session, err, &on_interrupt)
-      handler = lambda do |signal|
-        if session.stopping?
-          err.puts("\nForce quit!")
-          exit!(1)
-        else
-          on_interrupt&.call
-          session.request_stop!(:user_interrupt)
-          err.puts("\nReceived #{signal} - shutting down after current task...")
+      signals = Queue.new
+      signal_count = 0
+
+      trap("INT") { signals << "SIGINT" }
+      trap("TERM") { signals << "SIGTERM" }
+
+      watcher = Thread.new do
+        loop do
+          signal = signals.pop
+          break if signal == :shutdown
+
+          already_stopping = session.stopping?
+          signal_count += 1
+
+          if already_stopping || signal_count > 1
+            err.puts("\nForce quit!")
+            exit!(1)
+          else
+            on_interrupt&.call
+            session.request_stop!(:user_interrupt)
+            err.puts("\nReceived #{signal} - shutting down after current task...")
+          end
         end
       end
 
-      trap("INT") { handler.call("SIGINT") }
-      trap("TERM") { handler.call("SIGTERM") }
+      lambda do
+        signals << :shutdown
+        watcher.join
+      end
     end
+
     private_class_method :setup_interrupt_handler
     # :nocov:
   end

data/lib/hastci/config.rb

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

data/lib/hastci/heartbeat.rb

@@ -7,8 +7,9 @@ module HastCI
 
     private_constant :SHUTDOWN_TIMEOUT, :MAX_CONSECUTIVE_FAILURES
 
-    def initialize(api_client:, error_collector: nil, interval: 15)
+    def initialize(api_client:, run_id:, error_collector: nil, interval: 15)
       @api_client = api_client
+      @run_id = run_id
       @error_collector = error_collector
       @interval = interval
       @running = false
@@ -64,7 +65,7 @@ module HastCI
     end
 
     def send_heartbeat
-      @api_client.heartbeat
+      @api_client.heartbeat(run_id: @run_id)
       @consecutive_failures = 0
     rescue RetryExhaustedError, FatalApiError => e
       @error_collector&.report(e)

data/lib/hastci/session.rb

@@ -203,6 +203,7 @@ module HastCI
 
       @heartbeat = Heartbeat.new(
         api_client: @api_client,
+        run_id: @run_id,
         interval: @config.heartbeat_interval,
         error_collector: @error_collector
       )
@@ -233,7 +234,7 @@ module HastCI
         max_size: @buffer_max_size,
         fetcher: lambda { |limit|
           batch_size = [limit, @config.claim_batch_size].min
-          @api_client.claim(batch: batch_size)
+          @api_client.claim(run_id: @run_id, batch: batch_size)
         },
         error_collector: @error_collector,
         poll_interval: @poll_interval,

data/lib/hastci/version.rb

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

data/spec/pacts/hastci_rspec-hastci_api.json

@@ -11,7 +11,7 @@
       "providerState": "a valid API key",
       "request": {
         "method": "post",
-        "path": "/runs/init",
+        "path": "/api/v1/runs",
         "headers": {
           "Authorization": "Bearer test-api-key",
           "Content-Type": "application/json"
@@ -39,13 +39,14 @@
           "Content-Type": "application/json"
         },
         "body": {
-          "run_id": "run-uuid-123",
+          "run_id": "abc123def456",
           "status": "seeding",
           "role": "seeder"
         },
         "matchingRules": {
           "$.body.run_id": {
-            "match": "type"
+            "match": "regex",
+            "regex": "^[0-9A-Za-z_-]{12}$"
           },
           "$.body.status": {
             "match": "regex",
@@ -63,7 +64,7 @@
       "providerState": "an invalid API key",
       "request": {
         "method": "post",
-        "path": "/runs/init",
+        "path": "/api/v1/runs",
         "headers": {
           "Authorization": "Bearer invalid-api-key",
           "Content-Type": "application/json"
@@ -91,7 +92,10 @@
           "Content-Type": "application/json"
         },
         "body": {
-          "error": "Unauthorized"
+          "error": {
+            "code": "unauthorized",
+            "message": "Unauthorized"
+          }
         },
         "matchingRules": {
           "$.body.error": {
@@ -105,9 +109,15 @@
       "providerState": "a run exists",
       "request": {
         "method": "get",
-        "path": "/runs/run-123/status",
+        "path": "/api/v1/runs/abc123def456",
         "headers": {
           "Authorization": "Bearer test-api-key"
+        },
+        "matchingRules": {
+          "$.path": {
+            "match": "regex",
+            "regex": "^\\/api\\/v1\\/runs\\/[0-9A-Za-z_-]{12}$"
+          }
         }
       },
       "response": {
@@ -131,7 +141,7 @@
       "providerState": "a run exists",
       "request": {
         "method": "post",
-        "path": "/runs/run-123/seed",
+        "path": "/api/v1/runs/abc123def456/seed",
         "headers": {
           "Authorization": "Bearer test-api-key",
           "Content-Type": "application/json"
@@ -145,6 +155,12 @@
               "name": "spec/models/post_spec.rb"
             }
           ]
+        },
+        "matchingRules": {
+          "$.path": {
+            "match": "regex",
+            "regex": "^\\/api\\/v1\\/runs\\/[0-9A-Za-z_-]{12}\\/seed$"
+          }
         }
       },
       "response": {
@@ -163,15 +179,20 @@
       "providerState": "tasks are available",
       "request": {
         "method": "post",
-        "path": "/tasks/claim",
+        "path": "/api/v1/runs/abc123def456/claims",
         "query": "batch=10",
         "headers": {
           "Authorization": "Bearer test-api-key",
           "Content-Type": "application/json"
         },
         "body": {
-          "run_key": "test-run-key",
           "worker_id": "worker-0"
+        },
+        "matchingRules": {
+          "$.path": {
+            "match": "regex",
+            "regex": "^\\/api\\/v1\\/runs\\/[0-9A-Za-z_-]{12}\\/claims$"
+          }
         }
       },
       "response": {
@@ -182,19 +203,27 @@
         "body": {
           "tasks": [
             {
-              "id": "task-1",
+              "id": 101,
               "name": "spec/models/user_spec.rb"
             },
             {
-              "id": "task-2",
+              "id": 102,
               "name": "spec/models/post_spec.rb"
+            },
+            {
+              "id": 103,
+              "name": "spec/models/comment_spec.rb"
+            },
+            {
+              "id": 104,
+              "name": "spec/models/profile_spec.rb"
             }
           ],
-          "queue_state": "ready",
+          "queue_state": "draining",
           "remaining": {
-            "queued": 10,
-            "assigned": 2,
-            "completed": 5
+            "queued": 0,
+            "assigned": 4,
+            "completed": 0
           }
         },
         "matchingRules": {
@@ -204,6 +233,12 @@
           "$.body.tasks[1].id": {
             "match": "type"
           },
+          "$.body.tasks[2].id": {
+            "match": "type"
+          },
+          "$.body.tasks[3].id": {
+            "match": "type"
+          },
           "$.body.remaining.queued": {
             "match": "type"
           },
@@ -221,15 +256,20 @@
       "providerState": "queue is empty but not drained",
       "request": {
         "method": "post",
-        "path": "/tasks/claim",
+        "path": "/api/v1/runs/abc123def456/claims",
         "query": "batch=10",
         "headers": {
           "Authorization": "Bearer test-api-key",
           "Content-Type": "application/json"
         },
         "body": {
-          "run_key": "test-run-key",
           "worker_id": "worker-0"
+        },
+        "matchingRules": {
+          "$.path": {
+            "match": "regex",
+            "regex": "^\\/api\\/v1\\/runs\\/[0-9A-Za-z_-]{12}\\/claims$"
+          }
         }
       },
       "response": {
@@ -244,14 +284,20 @@
       "providerState": "queue is drained",
       "request": {
         "method": "post",
-        "path": "/tasks/claim",
+        "path": "/api/v1/runs/abc123def456/claims",
         "query": "batch=10",
         "headers": {
-          "Authorization": "Bearer test-api-key"
+          "Authorization": "Bearer test-api-key",
+          "Content-Type": "application/json"
         },
         "body": {
-          "run_key": "test-run-key",
           "worker_id": "worker-0"
+        },
+        "matchingRules": {
+          "$.path": {
+            "match": "regex",
+            "regex": "^\\/api\\/v1\\/runs\\/[0-9A-Za-z_-]{12}\\/claims$"
+          }
         }
       },
       "response": {
@@ -264,12 +310,62 @@
         }
       }
     },
+    {
+      "description": "a request to claim from cancelled run",
+      "providerState": "run is cancelled",
+      "request": {
+        "method": "post",
+        "path": "/api/v1/runs/abc123def456/claims",
+        "query": "batch=10",
+        "headers": {
+          "Authorization": "Bearer test-api-key",
+          "Content-Type": "application/json"
+        },
+        "body": {
+          "worker_id": "worker-0"
+        },
+        "matchingRules": {
+          "$.path": {
+            "match": "regex",
+            "regex": "^\\/api\\/v1\\/runs\\/[0-9A-Za-z_-]{12}\\/claims$"
+          }
+        }
+      },
+      "response": {
+        "status": 200,
+        "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"
+          }
+        }
+      }
+    },
     {
       "description": "a request to ack a task",
       "providerState": "a task exists",
       "request": {
         "method": "post",
-        "path": "/tasks/task-123/ack",
+        "path": "/api/v1/tasks/101/acknowledgment",
         "headers": {
           "Authorization": "Bearer test-api-key",
           "Content-Type": "application/json"
@@ -282,6 +378,12 @@
             "failures": [
         ]
           }
+        },
+        "matchingRules": {
+          "$.path": {
+            "match": "regex",
+            "regex": "^\\/api\\/v1\\/tasks\\/\\d+\\/acknowledgment$"
+          }
         }
       },
       "response": {
@@ -299,14 +401,19 @@
       "providerState": "a worker exists",
       "request": {
         "method": "post",
-        "path": "/workers/heartbeat",
+        "path": "/api/v1/runs/abc123def456/heartbeats",
         "headers": {
           "Authorization": "Bearer test-api-key",
           "Content-Type": "application/json"
         },
         "body": {
-          "run_key": "test-run-key",
           "worker_id": "worker-0"
+        },
+        "matchingRules": {
+          "$.path": {
+            "match": "regex",
+            "regex": "^\\/api\\/v1\\/runs\\/[0-9A-Za-z_-]{12}\\/heartbeats$"
+          }
         }
       },
       "response": {
@@ -321,7 +428,7 @@
       "providerState": "resource not found",
       "request": {
         "method": "get",
-        "path": "/runs/invalid-run/status",
+        "path": "/api/v1/runs/invalid-run",
         "headers": {
           "Authorization": "Bearer test-api-key"
         }
@@ -337,7 +444,7 @@
       "providerState": "server error",
       "request": {
         "method": "post",
-        "path": "/runs/init",
+        "path": "/api/v1/runs",
         "headers": {
           "Authorization": "Bearer test-api-key",
           "Content-Type": "application/json"
@@ -359,7 +466,7 @@
       "providerState": "unexpected redirect",
       "request": {
         "method": "post",
-        "path": "/runs/init",
+        "path": "/api/v1/runs",
         "headers": {
           "Authorization": "Bearer test-api-key",
           "Content-Type": "application/json"

metadata

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