capistrano-nomad 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25b29aaa6c532b6656df34b6ebc7ebc23359c4acb3ae2b8c5d7320a2e79c7f66
-  data.tar.gz: 770838795fb494f1c4305168d6b60f51be7f1d33bec9c31e45b7d119ecd427f0
+  metadata.gz: 707ded6b01d5903708a362ef6e98f3c56d5e52fd1557bfad47f1844cb7d6c96e
+  data.tar.gz: 68ea61e7025400e99c97683b8f3390357a0f04cf5b173846bba378d8bdd5fa3d
 SHA512:
-  metadata.gz: 24cd34d64db04c41e6b2e39ced4e84129e4fb3ff2d70a25e53d945e2bcdaf35e7a45f6783c1e5cd37d061053ba24b2717d939f6b3e0cd0939c14bc8f39def70d
-  data.tar.gz: e978fbbf7205ed2d160e2702ae9109ba73722c695f9de2e0c8f51cc010a248da5ffbed583d452e1bcc7a6e0ee22989202afd183430256ae73cc7f0f4515d83fa
+  metadata.gz: 19a5ee3bcddf663ed3820245f10d0c35dee3cf2d1659b44f61947696c7ea24c263696c3c25d6dba032d14293706f0b9b68ee3e9cdbd41b66309e43eb92a0e297
+  data.tar.gz: b20019a85564cc4eee312bfaa17934becab4b73c2505c7a0b9511b1759b320c56fda3656b7f2b80b3cd090e347f05f5c0a2ef3e283a078850636c37ea58f20fb

data/Gemfile.lock

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

data/README.md

@@ -90,6 +90,12 @@ cap production nomad:app:console TASK=custom-task-name
 cap production nomad:analytics:grafana:console
 ```
 
+Create missing and delete unused namespaces
+
+```shell
+cap production nomad:all:replace_namespaces
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/capistrano-nomad.gemspec

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

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

@@ -58,16 +58,6 @@ def nomad_job(name, attributes = {})
         capistrano_nomad_rerun_jobs([name], namespace: namespace)
       end
 
-      desc "Purge #{description_name} job"
-      task :purge do
-        capistrano_nomad_purge_jobs([name], namespace: namespace, is_detached: false)
-      end
-
-      desc "Display status of #{description_name} job"
-      task :status do
-        capistrano_nomad_display_job_status(name, namespace: namespace)
-      end
-
       desc "Upload and plan #{description_name} job"
       task :upload_plan do
         capistrano_nomad_upload_plan_jobs([name], namespace: namespace)
@@ -93,6 +83,21 @@ def nomad_job(name, attributes = {})
         capistrano_nomad_restart_jobs([name], namespace: namespace)
       end
 
+      desc "Stop #{description_name} job"
+      task :stop do
+        capistrano_nomad_stop_jobs([name], namespace: namespace)
+      end
+
+      desc "Purge #{description_name} job"
+      task :purge do
+        capistrano_nomad_purge_jobs([name], namespace: namespace, is_detached: false)
+      end
+
+      desc "Display status of #{description_name} job"
+      task :status do
+        capistrano_nomad_display_job_status(name, namespace: namespace)
+      end
+
       desc "Open console to #{description_name} job. Specify task by passing TASK environment variable"
       task :console do
         capistrano_nomad_exec_within_job(name, "/bin/bash", namespace: namespace, task: ENV["TASK"].presence)

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

@@ -116,7 +116,7 @@ end
 def capistrano_nomad_capture_nomad_command(*args)
   output = nil
 
-  on(roles(:manager)) do |host|
+  on(roles(:manager)) do |_host|
     output = capistrano_nomad_run_nomad_command(:capture, *args)
   end
 
@@ -125,7 +125,7 @@ end
 
 def capistrano_nomad_exec_within_job(name, command, namespace: nil, task: nil)
   on(roles(:manager)) do
-    task = name unless task
+    task ||= name
 
     # Find alloc id that contains task
     output = capistrano_nomad_capture_nomad_command(
@@ -321,6 +321,12 @@ def capistrano_nomad_deploy_jobs(names, *args)
   capistrano_nomad_upload_run_jobs(names, *args)
 end
 
+def capistrano_nomad_stop_jobs(names, namespace: nil)
+  names.each do |name|
+    capistrano_nomad_execute_nomad_command(:job, :stop, { namespace: namespace }, name)
+  end
+end
+
 def capistrano_nomad_restart_jobs(names, namespace: nil)
   names.each do |name|
     capistrano_nomad_execute_nomad_command(:job, :restart, { namespace: namespace }, name)

data/lib/capistrano/nomad/tasks/nomad.rake

@@ -53,6 +53,25 @@ namespace :nomad do
         capistrano_nomad_purge_jobs(names, namespace: namespace)
       end
     end
+
+    desc "Create missing and remove unused namespaces"
+    task :replace_namespaces do
+      output = capistrano_nomad_capture_nomad_command(:namespace, :list, t: "'{{range .}}{{ .Name }}|{{end}}'")
+      current_namespaces = output.split("|").compact.map(&:to_sym)
+      desired_namespaces = fetch(:nomad_jobs).keys
+      missing_namespaces = desired_namespaces - current_namespaces
+      unused_namespaces = current_namespaces - desired_namespaces
+
+      # Remove unused namespaces
+      unused_namespaces.each do |namespace|
+        capistrano_nomad_execute_nomad_command(:namespace, :delete, namespace)
+      end
+
+      # Create missing namespaces
+      missing_namespaces.each do |namespace|
+        capistrano_nomad_execute_nomad_command(:namespace, :apply, namespace)
+      end
+    end
   end
 
   namespace :docker_images do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nomad
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - James Hu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport