capistrano-nomad 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f5358b24228c869a704b8ed79aa76d76b2aeb559ffcd7bd3bced8aa7d3281d1
-  data.tar.gz: 95f8c93adc89fdbcffe9f40bc5d18433ccfc4b743cfcb194a2b7b2e9468f6bb5
+  metadata.gz: 25b29aaa6c532b6656df34b6ebc7ebc23359c4acb3ae2b8c5d7320a2e79c7f66
+  data.tar.gz: 770838795fb494f1c4305168d6b60f51be7f1d33bec9c31e45b7d119ecd427f0
 SHA512:
-  metadata.gz: 834ccd5183128e4c3b4bed1067457b1a2a0036ed21c8ca954f82f25298aca61d6a108460b22c17cbe9f2fa561e02e4189942ddb99d784792ed7422b70e05ba0f
-  data.tar.gz: 1a4ade283a947f6243fb8c728ca3c3fcac55fac0471cad47b2fbabec66b66a7287fd342c29610bcad5a67d847a0251eb2ee66847ca27de449b963734d5a0d55d
+  metadata.gz: 24cd34d64db04c41e6b2e39ced4e84129e4fb3ff2d70a25e53d945e2bcdaf35e7a45f6783c1e5cd37d061053ba24b2717d939f6b3e0cd0939c14bc8f39def70d
+  data.tar.gz: e978fbbf7205ed2d160e2702ae9109ba73722c695f9de2e0c8f51cc010a248da5ffbed583d452e1bcc7a6e0ee22989202afd183430256ae73cc7f0f4515d83fa

data/Gemfile.lock

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

data/README.md

@@ -34,10 +34,21 @@ install_plugin Capistrano::Nomad
 Within `deploy.rb`
 
 ```ruby
+set :nomad_jobs_path, "nomad/jobs"
+set :nomad_var_files_path, "nomad/vars"
+
+# Accessible in all .erb files
+set :nomad_erb_vars, (lambda do
+  {
+    env_name: fetch(:stage).to_sym,
+    domain: fetch(:domain),
+    foo: "bar,"
+  }
+end)
 
 # Docker image types
-nomad_docker_image_type :app,
-  path: "backend",
+nomad_docker_image_type :backend,
+  path: "local/path/backend",
   alias: ->(image_type:) { "gcr.io/axsuul/#{image_type}" },
   target: "release",
   build_args: { foo: "bar" }
@@ -46,8 +57,11 @@ nomad_docker_image_type :redis,
   alias: "gcr.io/axsuul/redis"
 
 # Jobs
-nomad_job :app
+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

data/capistrano-nomad.gemspec

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

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

@@ -90,24 +90,7 @@ 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 "Open console to #{description_name} job. Specify task by passing TASK environment variable"

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

@@ -35,6 +35,10 @@ class CapistranoNomadErbNamespace
   # rubocop:enable Style/MissingRespondToMissing
 end
 
+def capistrano_nomad_ensure_absolute_path(path)
+  path[0] == "/" ? path : "/#{path}"
+end
+
 def capistrano_nomad_build_file_path(parent_path, basename, namespace: nil)
   segments = [parent_path]
   segments << namespace if namespace
@@ -71,11 +75,11 @@ def capistrano_nomad_build_local_var_file_path(name, *args)
 end
 
 def capistrano_nomad_build_release_job_path(*args)
-  "#{release_path}#{capistrano_nomad_build_base_job_path(*args)}"
+  "#{release_path}#{capistrano_nomad_ensure_absolute_path(capistrano_nomad_build_base_job_path(*args))}"
 end
 
 def capistrano_nomad_build_release_var_file_path(*args)
-  "#{release_path}#{capistrano_nomad_build_base_var_file_path(*args)}"
+  "#{release_path}#{capistrano_nomad_ensure_absolute_path(capistrano_nomad_build_base_var_file_path(*args))}"
 end
 
 def capistrano_nomad_run_nomad_command(kind, *args)
@@ -317,6 +321,12 @@ def capistrano_nomad_deploy_jobs(names, *args)
   capistrano_nomad_upload_run_jobs(names, *args)
 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.0
+  version: 0.6.2
 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