capistrano-nomad 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd8143ad35ea4f16a890256e65a5a73fab979acd0e63fa5471e8c75248c5fad8
-  data.tar.gz: cdf8f7552d3512ea4968208690ec537040915e42a59b51aef4bd8c85c81e95a1
+  metadata.gz: 1f13cb3a6f203bc88f1bad802dea89660937818fe4568824fb0f2aa9ed789fab
+  data.tar.gz: '09f27219c86a2fe67e2d47a660cabdef3844517954feba31141d4c38fb20d6a5'
 SHA512:
-  metadata.gz: 52b3e33004964a0ea317bcd55478d02aa2088ded9c7df715be7119028588b9c3f848e63fd4fa8a85f3345c9e5203579428a71b79c3debfe16e5028b37183d477
-  data.tar.gz: f972389f3c4411a75162961f0545605ab87c92d6a81d4192db78e457bd320c8a87bccdcf3a61bb9f9e556c6f64d4b99cb3347752113951612edeb89b3fb9d2e4
+  metadata.gz: 3cd44e5fb4c6cbd3db75cc22f67ef116d0ece07965c1e20387cebee287bf28de7b09ee9d8cd5d9b0cff29a1bb0ae0a5d16d0deb451cdeb731ddcdd32fbfa0a57
+  data.tar.gz: 9759e600f1bc654c9093b5e72606de756bf220271a11ee6a0b8fc770b78f78e638f4557ba6054e57326f4cd5ef4ee05de6183a66f1e0351fc9129bd5bbcf4177

data/Gemfile.lock

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

data/README.md

@@ -60,10 +60,11 @@ nomad_docker_image_type :redis,
 nomad_job :frontend
 nomad_job :backend, docker_image_types: [:backend], var_files: [:rails]
 nomad_job :redis, docker_image_types: [:redis]
+nomad_job :"traefik-default", template: :traefik, erb_vars: { role: :default }
+nomad_job :"traefik-secondary", template: :traefik, erb_vars: { role: :secondary }
 
 nomad_namespace :analytics do
   nomad_job :grafana
-  nomad_job :"node-exporter"
 end
 ```
 

data/capistrano-nomad.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "capistrano-nomad"
-  spec.version = "0.6.1"
+  spec.version = "0.6.3"
   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)
@@ -90,24 +80,22 @@ def nomad_job(name, attributes = {})
 
       desc "Restart #{description_name} job"
       task :restart do
-        on(roles(:manager)) do
-          # We can't restart the job directly so we'll need to fetch all its running allocs and restart each of one
-          # individually instead
-          running_alloc_ids_output = capistrano_nomad_capture_nomad_command(
-            :job,
-            :allocs,
-            {
-              namespace: namespace,
-              t: "'{{range .}}{{if eq .ClientStatus \"running\"}}{{ println .ID}}{{end}}{{end}}'",
-            },
-            name,
-          )
-          running_alloc_ids = running_alloc_ids_output.strip.split("\n")
-
-          running_alloc_ids.each do |alloc_id|
-            capistrano_nomad_execute_nomad_command(:alloc, :restart, alloc_id)
-          end
-        end
+        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"

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

@@ -321,6 +321,18 @@ 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)
+  end
+end
+
 def capistrano_nomad_purge_jobs(names, namespace: nil, is_detached: true)
   names.each do |name|
     capistrano_nomad_execute_nomad_command(:stop, { namespace: namespace, purge: true, detach: is_detached }, name)

metadata

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