capistrano-nomad 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: decb45a7958cc1a3b2bc96d8d48e72ff6132d160eac93e81e995b59661dfc5ff
-  data.tar.gz: adaf5bb0a848328cfd830f861b1f8ff744e46bba6eab66f9180fdd21f1bad57b
+  metadata.gz: 02c77eac2e5164a6644400d4eca6b03b57dffac252ad90d224f3b2c184bbda6c
+  data.tar.gz: da268efd0e1118b5fab7b1190469b3b3154221dfedf641a4f2fd41b416f9cb94
 SHA512:
-  metadata.gz: cac6624d0caceedcd3ac833d87a3a498d0a023b74d604b626413df62f15e107324a538035d93e9a39800eba57dddca4b6a70a8bd4825fed99a002411634254a5
-  data.tar.gz: 3a622b2f506d8a3d98f5c97646fa6da662b8b6ea86e86c9e315c10a62ef4f88acd7befc7f22167f52b8de3b0d9ea9fc8dfccf5924da7da74a061f3b1ba450ea8
+  metadata.gz: c5b1c53a098c84fa455ed9774376fe646a154436e96d2807050b0cb510484073d7993040571ba231f547478e4a43ee3f105690d7899f8f6a38dac3992567e88f
+  data.tar.gz: a3936fbea10215f136ef8630d5ca0d8253991af7bf16d02b5a7d1615eeaaa11fc6ed38376608a0cfe21b301d34d245196adb5941749fad885f2d574bbd2f523d

data/Gemfile.lock

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

data/README.md

@@ -42,7 +42,7 @@ nomad_namespace :analytics do
 end
 ```
 
-Utilize tasks
+Deploy with
 
 ```shell
 cap production nomad:app:deploy
@@ -50,6 +50,14 @@ cap production nomad:redis:purge
 cap production nomad:analytics:grafana:deploy
 ```
 
+Open console with
+
+```shell
+cap production nomad:app:console
+cap production nomad:app:console TASK=custom-task-name
+cap production nomad:analytics:grafana:console
+```
+
 ## 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.4.0"
+  spec.version = "0.4.2"
   spec.authors = ["James Hu"]
 
   spec.summary = "Capistrano plugin for deploying and managing Nomad jobs"

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

@@ -76,19 +76,13 @@ def capistrano_nomad_build_docker_image_for_type(image_type)
     "--platform linux/amd64",
   ]
 
-  build_args =
-    if attributes[:build_args].is_a?(Proc)
-      proc_args = attributes[:build_args].arity == 1 ? [capistrano_nomad_fetch_git_commit_id] : []
-
-      attributes[:build_args].call(*proc_args)
-    else
-      attributes[:build_args]
-    end
-
   if (target = attributes[:target])
     args << "--target #{target}"
   end
 
+  build_args = attributes[:build_args]
+  build_args = build_args.call if build_args&.is_a?(Proc)
+
   (build_args || []).each do |key, value|
     args << "--build-arg #{key}=#{value}"
   end

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

@@ -107,9 +107,9 @@ def nomad_job(name, attributes = {})
         end
       end
 
-      desc "Open console to #{description_name} job"
+      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)
+        capistrano_nomad_exec_within_job(name, "/bin/bash", namespace: namespace, task: ENV["TASK"].presence)
       end
     end
   end

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

@@ -4,6 +4,6 @@ def capistrano_nomad_git
   @capistrano_nomad_git ||= Git.open(".")
 end
 
-def capistrano_nomad_fetch_git_commit_id
-  capistrano_nomad_git.log.first.sha
+def capistrano_nomad_git_commit_id
+  @capistrano_nomad_git_commit_id ||= capistrano_nomad_git.log.first.sha
 end

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

@@ -105,8 +105,14 @@ def capistrano_nomad_execute_nomad_command(*args)
   end
 end
 
-def capistrano_nomad_exec_within_job(name, command, namespace: nil)
-  capistrano_nomad_execute_nomad_command(:alloc, :exec, { namespace: namespace, task: name, job: name }, command)
+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,
+  )
 end
 
 def capistrano_nomad_upload_file(local_path:, remote_path:, erb_vars: {})
@@ -122,7 +128,7 @@ def capistrano_nomad_upload_file(local_path:, remote_path:, erb_vars: {})
   erb = ERB.new(File.open(local_path).read, trim_mode: "-")
 
   final_erb_vars = {
-    git_commit_id: fetch(:current_revision) || capistrano_nomad_fetch_git_commit_id,
+    git_commit_id: fetch(:current_revision) || capistrano_nomad_git_commit_id,
     docker_image_types: docker_image_types,
   }
 

data/lib/capistrano/nomad/scm/git_local.rb

@@ -6,7 +6,7 @@ class Capistrano::SCM::GitLocal < Capistrano::SCM::Plugin
     namespace :git_local do
       task :set_current_revision do
         on release_roles :manager do
-          set :current_revision, capistrano_nomad_fetch_git_commit_id
+          set :current_revision, capistrano_nomad_git_commit_id
         end
       end
 

metadata

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