capistrano-nomad 0.10.1 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76af53f1a2764deb4b91363674b6627d7b6017a30609e067d42b66cdbd5c9fc0
-  data.tar.gz: 64825bb8a9bdccf833f23cb36aeb10cba6f516bbac8e6690193eb1674339fb94
+  metadata.gz: 44bb762da0b1f230e620bf5dded1c46fb791af7b3fa10bd55b8625bb378acf46
+  data.tar.gz: 3a9d575d16aeacd9cc6ffbd1b7c228eac10e8b158b8606da91afa8d10fe796ce
 SHA512:
-  metadata.gz: d359a15febd84d1303360f8d9c51faf026fa6388cf6a8b97edc7fa99cee59007c4999d040935bad0351ad1fa3bc1aca5908819b1cd1fc302d711b09a7d3a42e6
-  data.tar.gz: 5bf77756a9d1dc2bc28ded978f0523fff65059932154c1930545dd4b06930012d45ed646108f593802e606559b2aa4c2cae867f2012bef83245308b30d1a52dd
+  metadata.gz: fb3ec9b2cb4977a3b0834f8ce7d856efaf74325d5079f086f29b06bb9a4658dfba067e137f32cf362d34884cce1d781ea688e40cb8a58d341c51dba477e23862
+  data.tar.gz: 1e4beb478de4f084f058b295aaeb08bf92cce4a03397ee1cdae2eb447a25c90804ac79baa758199c696a4479da928cfddc24680978854662d9d795315e32e3b3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-nomad (0.10.1)
+    capistrano-nomad (0.10.4)
       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.1"
+  spec.version = "0.10.4"
   spec.authors = ["James Hu"]
 
   spec.summary = "Capistrano plugin for deploying and managing Nomad jobs"

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

@@ -16,6 +16,8 @@ def nomad_docker_image_type(image_type, attributes = {})
 end
 
 def nomad_namespace(namespace, **options, &block)
+  raise ArgumentError, "cannot define default nomad namespace" if namespace == :default
+
   nomad_namespaces = fetch(:nomad_namespaces) || {}
   nomad_namespaces[namespace] = options
   set(:nomad_namespaces, nomad_namespaces)
@@ -53,7 +55,7 @@ def nomad_job(name, attributes = {})
 
   define_tasks = lambda do |namespace: nil|
     description_name = ""
-    description_name << "#{namespace}/" if namespace
+    description_name << "#{namespace}/" if namespace != :default
     description_name << name.to_s
 
     namespace(name) do
@@ -164,8 +166,10 @@ def nomad_job(name, attributes = {})
   end
 
   namespace(:nomad) do
-    # Define tasks for service
     if @nomad_namespace
+      # Also define tasks without namespace for default Nomad namespace
+      define_tasks.call(namespace: @nomad_namespace) if @nomad_namespace == :default
+
       namespace(@nomad_namespace) do
         define_tasks.call(namespace: @nomad_namespace)
       end

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

@@ -32,7 +32,7 @@ end
 def capistrano_nomad_build_file_path(parent_path, basename, kind: nil, namespace: :default)
   segments = [parent_path]
 
-  if namespace
+  unless namespace == :default
     case kind
 
     # Always upload to namespace folder on remote
@@ -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

metadata

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