capistrano-nomad 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 050bf4a39838b2c0a98c02c1d1c38fcee02818cdb3936d2b00073adea0223aec
-  data.tar.gz: 96b95dd209e984447ed33bc3229562202887222641954d494bc922fd215ec050
+  metadata.gz: 0f5358b24228c869a704b8ed79aa76d76b2aeb559ffcd7bd3bced8aa7d3281d1
+  data.tar.gz: 95f8c93adc89fdbcffe9f40bc5d18433ccfc4b743cfcb194a2b7b2e9468f6bb5
 SHA512:
-  metadata.gz: 53535889c6707debe917ceefa837c6f4310c037523ded6e101ff752ff6962db3eb02805d2d60dd3fec1b693a3d0bcbae1dd5fe2f4c3a3451aea1170bcca0b2af
-  data.tar.gz: a43459682a67ba79448969660fbd659aca92ac90a0524e0ccf613212f537a148da93e06c3efb862dcec5c7b2441a3b46ad05f2a9ae0bdf8b5d761501ffba7839
+  metadata.gz: 834ccd5183128e4c3b4bed1067457b1a2a0036ed21c8ca954f82f25298aca61d6a108460b22c17cbe9f2fa561e02e4189942ddb99d784792ed7422b70e05ba0f
+  data.tar.gz: 1a4ade283a947f6243fb8c728ca3c3fcac55fac0471cad47b2fbabec66b66a7287fd342c29610bcad5a67d847a0251eb2ee66847ca27de449b963734d5a0d55d

data/Gemfile.lock

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

data/README.md

@@ -31,11 +31,23 @@ require "capistrano/nomad"
 install_plugin Capistrano::Nomad
 ```
 
-Define Nomad jobs within `deploy.rb`
+Within `deploy.rb`
 
 ```ruby
+
+# Docker image types
+nomad_docker_image_type :app,
+  path: "backend",
+  alias: ->(image_type:) { "gcr.io/axsuul/#{image_type}" },
+  target: "release",
+  build_args: { foo: "bar" }
+nomad_docker_image_type :redis,
+  path: "/absolute/path/redis",
+  alias: "gcr.io/axsuul/redis"
+
+# Jobs
 nomad_job :app
-nomad_job :redis
+nomad_job :redis, docker_image_types: [:redis]
 
 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.5.0"
+  spec.version = "0.6.0"
   spec.authors = ["James Hu"]
 
   spec.summary = "Capistrano plugin for deploying and managing Nomad jobs"

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

@@ -101,7 +101,7 @@ def capistrano_nomad_build_docker_image_for_type(image_type)
         image_alias_args << "--tag #{tag}"
       end
 
-    execute("docker build #{image_alias_args.join(' ')} .#{capistrano_nomad_root.join(attributes[:path])}")
+    execute("docker build #{image_alias_args.join(' ')} #{capistrano_nomad_root.join(attributes[:path])}")
   end
 end
 

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

@@ -90,15 +90,18 @@ def nomad_job(name, attributes = {})
 
       desc "Restart #{description_name} job"
       task :restart do
-        on roles :manager 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 = capture(
-            "nomad job allocs " \
-            "-t '{{range .}}{{if eq .ClientStatus \"running\"}}{{ println .ID}}{{end}}{{end}}' " \
-            "#{name}",
+          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|

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

@@ -51,11 +51,11 @@ def capistrano_nomad_build_base_var_file_path(*args)
   capistrano_nomad_build_file_path(fetch(:nomad_var_files_path), *args)
 end
 
-def capistrano_nomad_build_local_path(path, *args)
-  local_path = ".#{capistrano_nomad_root.join(path)}"
+def capistrano_nomad_build_local_path(path)
+  local_path = capistrano_nomad_root.join(path)
 
   # Determine if it has .erb appended or not
-  found_local_path = [local_path, "#{local_path}.erb"].find { |path| File.exist?(path) }
+  found_local_path = [local_path, "#{local_path}.erb"].find { |each_local_path| File.exist?(each_local_path) }
 
   raise StandardError, "Could not find local path: #{path}" unless found_local_path
 
@@ -78,7 +78,7 @@ def capistrano_nomad_build_release_var_file_path(*args)
   "#{release_path}#{capistrano_nomad_build_base_var_file_path(*args)}"
 end
 
-def capistrano_nomad_execute_nomad_command(*args)
+def capistrano_nomad_run_nomad_command(kind, *args)
   converted_args = args.each_with_object([]) do |arg, collection|
     # If hash then convert it as options
     if arg.is_a?(Hash)
@@ -97,22 +97,60 @@ def capistrano_nomad_execute_nomad_command(*args)
     end
   end
 
+  # Ignore errors
+  public_send(kind, :nomad, *converted_args, raise_on_non_zero_exit: false)
+end
+
+def capistrano_nomad_execute_nomad_command(*args)
   on(roles(:manager)) do |host|
     run_interactively(host) do
-      # Ignore errors
-      execute(:nomad, *converted_args, raise_on_non_zero_exit: false)
+      capistrano_nomad_run_nomad_command(:execute, *args)
     end
   end
 end
 
+def capistrano_nomad_capture_nomad_command(*args)
+  output = nil
+
+  on(roles(:manager)) do |host|
+    output = capistrano_nomad_run_nomad_command(:capture, *args)
+  end
+
+  output
+end
+
 def capistrano_nomad_exec_within_job(name, command, namespace: nil, task: nil)
-  capistrano_nomad_execute_nomad_command(
-    :alloc,
-    :exec,
-    { namespace: namespace, task: task || name, job: true },
-    name,
-    command,
-  )
+  on(roles(:manager)) do
+    task = name unless task
+
+    # Find alloc id that contains task
+    output = capistrano_nomad_capture_nomad_command(
+      :job,
+      :allocs,
+      { namespace: namespace, t: "'{{range .}}{{ .ID }},{{ .TaskGroup }}|{{end}}'" },
+      name,
+    )
+    alloc_id = output.split("|").map { |s| s.split(",") }.find { |_, t| t == task.to_s }&.first
+
+    if alloc_id
+      capistrano_nomad_execute_nomad_command(
+        :alloc,
+        :exec,
+        { namespace: namespace, task: task },
+        alloc_id,
+        command,
+      )
+    else
+      # If alloc can't be determined then choose at random
+      capistrano_nomad_execute_nomad_command(
+        :alloc,
+        :exec,
+        { namespace: namespace, job: true },
+        task,
+        command,
+      )
+    end
+  end
 end
 
 def capistrano_nomad_upload_file(local_path:, remote_path:, erb_vars: {})

data/lib/capistrano/nomad.rb

@@ -9,8 +9,8 @@ require_relative "nomad/helpers/nomad"
 module Capistrano
   class Nomad < Capistrano::Plugin
     def set_defaults
-      set_if_empty(:nomad_jobs_path, "/nomad/jobs")
-      set_if_empty(:nomad_var_files_path, "/nomad/var_files")
+      set_if_empty(:nomad_jobs_path, "nomad/jobs")
+      set_if_empty(:nomad_var_files_path, "nomad/var_files")
       set_if_empty(:nomad_docker_image_alias, ->(**) {})
     end
 

metadata

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