capistrano-nomad 0.10.3 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e53ea71739d8bf0e6a35acc8fc6cf53b38793e2cb84406eabcbcae39eb3c95a
-  data.tar.gz: 9acd6a38e395394f5b6fd2c29b7f79ff57ab4b5f03580b507131f4f14fa0e73c
+  metadata.gz: 044045d89fd983a7ecbc98532843a5fbaf28e18b48661338a41bc91279454341
+  data.tar.gz: 4895faeb0b7e75aeb6d2e9cddd17e4509c6d60d76af97c604fd39327c06b00f8
 SHA512:
-  metadata.gz: b40e9dc02e6e447f20ba8f22c8c2916512b6d16204da16268f9156e5c48e77743adbacc51c06e0bb1df150bdf2d0fd2e9f6631ca1b2684830b76b72dfff06b9e
-  data.tar.gz: a3a36894b7296ada17af461c3f61874f17c72be48f9307fc25b7b5e7940b6292a636249442f189fc38a8b966501bc45482202a3e7d9a5ddcf45d5bdd0e3b8078
+  metadata.gz: 1813cdeab5785b355c78b316ec8f36ad69b8ab0485c3ff190f318bb4058a54bb4d224b1a030cb0af6322cf600bfe54cd13fa6d4138383fb8dd76084e5ead6ec8
+  data.tar.gz: e8d606d27e30fe7e095214d1a7eb22fef82a98aac64dc7aefb63c62a0fcfa14e0c9e7cef3809952d9cd1033960cb377b2e249ffd954220b58793ec468c017701

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-nomad (0.10.3)
+    capistrano-nomad (0.10.5)
       activesupport (<= 7.0.8)
       byebug
       capistrano (~> 3.0)

data/capistrano-nomad.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "capistrano-nomad"
-  spec.version = "0.10.3"
+  spec.version = "0.10.5"
   spec.authors = ["James Hu"]
 
   spec.summary = "Capistrano plugin for deploying and managing Nomad jobs"

data/lib/capistrano/nomad/helpers/nomad.rb

@@ -135,14 +135,18 @@ end
 def capistrano_nomad_find_job_task_details(name, namespace: :default, task: nil)
   task = task.presence || name
 
-  # Find alloc id that contains task
+  # Find alloc id that contains task that is also running
   allocs_output = capistrano_nomad_capture_nomad_command(
     :job,
     :allocs,
-    { namespace: namespace, t: "'{{range .}}{{ .ID }},{{ .TaskGroup }}|{{end}}'" },
+    { namespace: namespace, t: "'{{range .}}{{ .ID }},{{ .ClientStatus }},{{ .TaskGroup }}|{{end}}'" },
     name,
   )
-  alloc_id = allocs_output.split("|").map { |s| s.split(",") }.find { |_, t| t == task.to_s }&.first
+  alloc_id = allocs_output
+    .split("|")
+    .map { |s| s.split(",") }
+    .find { |_, s, t| s == "running" && t == task.to_s }
+    &.first
 
   # Can't continue if we can't choose an alloc id
   return unless alloc_id
@@ -491,7 +495,9 @@ end
 
 def capistrano_nomad_restart_jobs(names, **options)
   names.each do |name|
-    capistrano_nomad_execute_nomad_command(:job, :restart, options, name)
+    # Automatic yes to prompts. If set, the command automatically restarts multi-region jobs only in the region targeted
+    # by the command, ignores batch errors, and automatically proceeds with the remaining batches without waiting
+    capistrano_nomad_execute_nomad_command(:job, :restart, options.reverse_merge(yes: true), name)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nomad
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.5
 platform: ruby
 authors:
 - James Hu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-28 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport