capistrano-nomad 0.15.1 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11b2eb94db466697a68736ef69c6c6013ba7a945d4160f62f0fce472c29c95f8
-  data.tar.gz: 2875316e762a87205dcf60e2adbe37d0585382912de0f364dae4d2d08fd309dc
+  metadata.gz: 137c81e55b24eb37ce7b3e39722c378d2addea5c5b331ceadeb6d5614f24402e
+  data.tar.gz: 24f1a3cd917263e2c9a34e2baad7968696f0fff7845b9a943a55c4b4742e09a7
 SHA512:
-  metadata.gz: cd58ba32ba7b3a862243d87b76c63bc2966190046193c45eef7bcff7f7ccb3bc0335f1bbf959d3b2c1bdcf552a03ec37314461cc3204bfd88628d3a56f2aff31
-  data.tar.gz: 48f9157c487e83d88c98910075894291da92f66244aa20467c71a53ed32c030f0019e91dce5f92aa72434054833cdef31edadafecb115c795ceb31a717467062
+  metadata.gz: 342ae22edc3a3a423ae62a92710ed7dec2445023cd7164f299406fc423bc8e5acbee77a4bd475c2fd82f3cfe26b18eb0c864e58023fb8af1928f00d47a32d89e
+  data.tar.gz: eff30623ea4be4debcdee3c2c31645ab928e4ef9eeef83dbd4c6a295131bffdd6c1d7c38a68c9dc97f29bfb2667791a5be3e55eb0090b4c901000e898cb55dbf

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [0.16.1]
+
+- Pass every configured variable file to `nomad plan` and `nomad run`
+
+## [0.16.0]
+
+- Add `:redeploy` task that stops job before performing a full deploy to ensure fresh allocations
+- Add `:agent_info` task for efficient command execution in containers via SSH + Nomad exec
+
 ## [0.15.1]
 
 - Fix console task to preserve TTY interactivity by using eval instead of piping into /bin/sh

data/Gemfile.lock

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

data/README.md

@@ -128,6 +128,13 @@ cap production nomad:app:deploy
 cap production nomad:analytics:grafana:deploy
 ```
 
+Redeploy individual jobs (stop + deploy with fresh allocations)
+
+```shell
+cap production nomad:app:redeploy
+cap production nomad:analytics:grafana:redeploy
+```
+
 Manage jobs
 
 ```shell
@@ -142,6 +149,7 @@ Tasks can apply across all namespaces or be filtered by namespaces or tags
 
 ```shell
 cap production nomad:analytics:deploy
+cap production nomad:analytics:redeploy
 cap production nomad:analytics:upload_run
 cap production nomad:deploy
 cap production nomad:deploy TAG=admin
@@ -178,6 +186,7 @@ Run jobs in detached mode (fire and forget)
 
 ```shell
 IS_DETACHED=true cap production nomad:app:deploy
+IS_DETACHED=true cap production nomad:app:redeploy
 IS_DETACHED=true cap production nomad:app:run
 IS_DETACHED=true cap production nomad:analytics:grafana:upload_run
 ```

data/capistrano-nomad.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "capistrano-nomad"
-  spec.version = "0.15.1"
+  spec.version = "0.16.1"
   spec.authors = ["James Hu"]
 
   spec.summary = "Capistrano plugin for deploying and managing Nomad jobs"
@@ -15,8 +15,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/axsuul/capistrano-nomad"
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  # Specify which files should be added to the gem when it is released. The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     %x(git ls-files -z).split("\x0").reject do |f|
       (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
@@ -35,6 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency("sshkit")
   spec.add_dependency("sshkit-interactive")
 
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
+  # For more information and examples about making a new gem, check out our guide at: https://bundler.io/guides/creating_gem.html
 end

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

@@ -116,6 +116,11 @@ def nomad_job(name, attributes = {})
         capistrano_nomad_deploy_jobs([name], namespace: namespace, is_detached: capistrano_nomad_job_detached_overridden?)
       end
 
+      desc("Redeploy #{description_name} job")
+      task(:redeploy) do
+        capistrano_nomad_redeploy_jobs([name], namespace: namespace, is_detached: capistrano_nomad_job_detached_overridden?)
+      end
+
       desc("Start #{description_name} job")
       task(:start) do
         capistrano_nomad_start_jobs([name], namespace: namespace)
@@ -150,6 +155,46 @@ def nomad_job(name, attributes = {})
         capistrano_nomad_display_job_status(name, namespace: namespace)
       end
 
+      desc("Display connection info for #{description_name} job as JSON for agent use. Specify task with TASK")
+      task(:agent_info) do
+        info = {}
+
+        capistrano_nomad_run_remotely do |host|
+          task_details = capistrano_nomad_find_job_task_details(name, task: ENV["TASK"], namespace: namespace)
+
+          unless task_details
+            $stderr.puts("No running allocation found")
+            next
+          end
+
+          # Build SSH command prefix using same source of truth as sshkit-interactive
+          netssh = host.netssh_options || {}
+          ssh_args = ["ssh"]
+          ssh_args << "-A" if netssh[:forward_agent]
+          ssh_args << "-p #{netssh[:port]}" if netssh[:port]
+          ssh_args << "-l #{host.user}" if host.user
+          ssh_args << %(-o "ProxyCommand #{netssh[:proxy].command_line_template}") if netssh[:proxy]
+          ssh_args << %(-o "HostName #{netssh[:host_name]}") if netssh[:host_name]
+          Array(netssh[:keys]).each { |key| ssh_args << "-i #{key}" }
+          Array(netssh[:auth_methods]).tap { |m| ssh_args << %(-o "PreferredAuthentications #{m.join(",")}") if m.any? }
+          ssh_args << host.hostname
+          info[:ssh_command] = ssh_args.join(" ")
+
+          # Build nomad alloc exec command prefix (non-interactive: no PTY, stdin open)
+          exec_parts = []
+          if (nomad_token = fetch(:nomad_token))
+            exec_parts << "NOMAD_TOKEN=#{nomad_token}"
+          end
+          exec_parts << "nomad alloc exec -i=true -t=false"
+          exec_parts << "-task=#{task_details[:name]}"
+          exec_parts << "-namespace=#{namespace}" if namespace && namespace != :default
+          exec_parts << task_details[:alloc_id]
+          info[:exec_command] = exec_parts.join(" ")
+        end
+
+        $stdout.puts(info.to_json) if info[:ssh_command]
+      end
+
       desc("Open console to #{description_name} job. Specify task with TASK, command with CMD")
       task(:console) do
         job_options = capistrano_nomad_fetch_job_options(name, namespace: namespace)

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

@@ -328,6 +328,15 @@ def capistrano_nomad_fetch_job_var_files(name, **options)
   capistrano_nomad_fetch_job_options(name, :var_files, **options) || []
 end
 
+# Build one command option per configured variable file so Nomad receives every file in order
+def capistrano_nomad_build_job_var_file_options(name, **options)
+  capistrano_nomad_fetch_job_var_files(name, **options).map do |var_file|
+    {
+      var_file: capistrano_nomad_build_release_var_file_path(var_file, **options),
+    }
+  end
+end
+
 def capistrano_nomad_fetch_jobs_names_by_namespace(**options)
   capistrano_nomad_ensure_options!(options)
   namespace = options[:namespace]
@@ -411,6 +420,13 @@ def capistrano_nomad_define_group_tasks(namespace:)
       end
     end
 
+    desc("Redeploy #{nomad_namespace} jobs")
+    task(:redeploy) do
+      capistrano_nomad_fetch_jobs_names_by_namespace(namespace: nomad_namespace).each do |jobs_namespace, names|
+        capistrano_nomad_redeploy_jobs(names, namespace: jobs_namespace)
+      end
+    end
+
     desc("Rerun #{nomad_namespace} jobs")
     task(:rerun) do
       capistrano_nomad_fetch_jobs_names_by_namespace(namespace: nomad_namespace).each do |jobs_namespace, names|
@@ -514,14 +530,19 @@ def capistrano_nomad_upload_jobs(names, **options)
   end
 end
 
+# Plan each job with every configured variable file before the uploaded job path
 def capistrano_nomad_plan_jobs(names, **options)
   names.each do |name|
-    args = [capistrano_nomad_build_release_job_path(name, **options)]
+    args = [
+      *capistrano_nomad_build_job_var_file_options(name, **options),
+      capistrano_nomad_build_release_job_path(name, **options),
+    ]
 
     capistrano_nomad_execute_nomad_command(:plan, *args)
   end
 end
 
+# Run each job with all configured variable files while preserving the existing command options
 def capistrano_nomad_run_jobs(names, is_detached: true, **options)
   capistrano_nomad_ensure_options!(options)
 
@@ -534,13 +555,10 @@ def capistrano_nomad_run_jobs(names, is_detached: true, **options)
       preserve_counts: true,
     }
 
-    capistrano_nomad_fetch_job_var_files(name, **options).each do |var_file|
-      run_options[:var_file] = capistrano_nomad_build_release_var_file_path(var_file, **options)
-    end
-
     capistrano_nomad_execute_nomad_command(
       :run,
       run_options,
+      *capistrano_nomad_build_job_var_file_options(name, **options),
       capistrano_nomad_build_release_job_path(name, **options),
     )
   end
@@ -584,6 +602,14 @@ def capistrano_nomad_deploy_jobs(names, **options)
   capistrano_nomad_upload_run_jobs(names, **general_options.merge(options))
 end
 
+# Stop job and deploy again with fresh allocations
+def capistrano_nomad_redeploy_jobs(names, **options)
+  general_options = options.slice!(:is_detached)
+
+  capistrano_nomad_stop_jobs(names, **general_options)
+  capistrano_nomad_deploy_jobs(names, **general_options.merge(options))
+end
+
 def capistrano_nomad_restart_jobs(names, **options)
   capistrano_nomad_ensure_options!(options)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nomad
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.1
 platform: ruby
 authors:
 - James Hu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-05 00:00:00.000000000 Z
+date: 2026-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Capistrano plugin for deploying and managing Nomad jobs