capistrano-nomad 0.7.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02685bbf3f2ad3d0bc5dbc45b33f31622ddbe9a465671381645bd665266cf4aa'
-  data.tar.gz: 6f386d0642e4cd00f66e5dc0ddefdb3815d537d254525e130717251d7407a56d
+  metadata.gz: 9ab89a48a26fb135563d9685083c2ec1ae913dba51baf289b2a232407a26b01e
+  data.tar.gz: 85ee06cb6f05413ff54c67f0306818394f5e071a1b07fc1e2eef50016226f129
 SHA512:
-  metadata.gz: 5c7a4c7173a08c5ef7bc7207a5e3500864a1f85171a4a324342bf0ed6bdfda3b7bce2ba3db147440476db96513f1ab0b9af7458c59fee7bd8c4f6996686acc69
-  data.tar.gz: f6d8b9affa00bea01d56a6ef3c067d80a6596c7881b8f4893c4b16e17fd5f2d0030128dfa0f0de4dce6cd908e29013ca088d61a26df5897fe97bebf6aa215d7d
+  metadata.gz: bf2f8c90f6f9768f055afaed469cb1d692fa15bce243b5219ead74e9f0bc076498e2c89ed4a451ca34b46318ee6405a8bf06da342ab384013ff5466aa027b977
+  data.tar.gz: 6551a3d5ca81af0be6f8876ca27278592c76ecc5ecbe78494d70fa3d025a57c064e930b61876f58abaf6014c20438b6362a853ae3723a51a366272010d925b38

data/Gemfile.lock

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

data/README.md

@@ -101,12 +101,6 @@ nomad_namespace :maintenance, path: "maintenance-stuff" do
 end
 ```
 
-Deploy all jobs
-
-```shell
-cap production nomad:all:deploy
-```
-
 Deploy individual jobs
 
 ```shell
@@ -123,6 +117,15 @@ cap production nomad:analytics:grafana:restart
 cap production nomad:postgres:status
 ```
 
+Most tasks are also available for namespace or all
+
+```shell
+cap production nomad:analytics:deploy
+cap production nomad:analytics:upload_run
+cap production nomad:all:deploy
+cap production nomad:all:upload_run
+```
+
 Open console
 
 ```shell

data/capistrano-nomad.gemspec

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

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

@@ -27,6 +27,11 @@ def nomad_namespace(namespace, **options, &block)
 
   @nomad_namespace = nil
 
+  # Define tasks for namespace jobs
+  namespace(:nomad) do
+    capistrano_nomad_define_group_tasks(namespace: namespace)
+  end
+
   true
 end
 

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

@@ -254,14 +254,86 @@ def capistrano_nomad_fetch_job_var_files(name, *args)
   capistrano_nomad_fetch_job_options(name, :var_files, *args) || []
 end
 
-def capistrano_nomad_fetch_jobs_names_by_namespace
-  fetch(:nomad_jobs).transform_values(&:keys)
+def capistrano_nomad_fetch_jobs_names_by_namespace(namespace: :all)
+  jobs_names_by_namespace = fetch(:nomad_jobs).transform_values(&:keys)
+
+  # Filter by namespace unless it's all
+  jobs_names_by_namespace = jobs_names_by_namespace.slice(namespace) unless namespace == :all
+
+  jobs_names_by_namespace
 end
 
 def capistrano_nomad_fetch_jobs_docker_image_types(names, namespace: nil)
   names.map { |n| fetch(:nomad_jobs).dig(namespace, n.to_sym, :docker_image_types) }.flatten.compact.uniq
 end
 
+def capistrano_nomad_define_group_tasks(namespace:)
+  namespace(namespace) do
+    desc "Build #{namespace} job Docker images"
+    task :build do
+      capistrano_nomad_fetch_jobs_names_by_namespace(namespace: namespace).each do |namespace_by, names|
+        capistrano_nomad_push_jobs_docker_images(names, namespace: namespace_by)
+      end
+    end
+
+    desc "Push #{namespace} job Docker images"
+    task :push do
+      capistrano_nomad_fetch_jobs_names_by_namespace(namespace: namespace).each do |namespace_by, names|
+        capistrano_nomad_push_jobs_docker_images(names, namespace: namespace_by)
+      end
+    end
+
+    desc "Build and push #{namespace} job Docker images"
+    task :assemble do
+      capistrano_nomad_fetch_jobs_names_by_namespace(namespace: namespace).each do |namespace_by, names|
+        capistrano_nomad_assemble_jobs_docker_images(names, namespace: namespace_by)
+      end
+    end
+
+    desc "Upload #{namespace} jobs"
+    task :upload do
+      capistrano_nomad_fetch_jobs_names_by_namespace(namespace: namespace).each do |namespace_by, names|
+        capistrano_nomad_upload_jobs(names, namespace: namespace_by)
+      end
+    end
+
+    desc "Run #{namespace} jobs"
+    task :run do
+      capistrano_nomad_fetch_jobs_names_by_namespace(namespace: namespace).each do |namespace_by, names|
+        capistrano_nomad_run_jobs(names, namespace: namespace_by)
+      end
+    end
+
+    desc "Upload and run #{namespace} jobs"
+    task :upload_run do
+      capistrano_nomad_fetch_jobs_names_by_namespace(namespace: namespace).each do |namespace_by, names|
+        capistrano_nomad_upload_run_jobs(names, namespace: namespace_by)
+      end
+    end
+
+    desc "Deploy #{namespace} jobs"
+    task :deploy do
+      capistrano_nomad_fetch_jobs_names_by_namespace(namespace: namespace).each do |namespace_by, names|
+        capistrano_nomad_deploy_jobs(names, namespace: namespace_by)
+      end
+    end
+
+    desc "Rerun #{namespace} jobs"
+    task :rerun do
+      capistrano_nomad_fetch_jobs_names_by_namespace(namespace: namespace).each do |namespace_by, names|
+        capistrano_nomad_rerun_jobs(names, namespace: namespace_by)
+      end
+    end
+
+    desc "Purge #{namespace} jobs"
+    task :purge do
+      capistrano_nomad_fetch_jobs_names_by_namespace(namespace: namespace).each do |namespace_by, names|
+        capistrano_nomad_purge_jobs(names, namespace: namespace_by)
+      end
+    end
+  end
+end
+
 def capistrano_nomad_build_jobs_docker_images(names, *args)
   image_types = capistrano_nomad_fetch_jobs_docker_image_types(names, *args)
 

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

@@ -4,61 +4,18 @@ namespace :nomad do
     capistrano_nomad_execute_nomad_command(:version)
   end
 
-  namespace :all do
-    desc "Build all job Docker images"
-    task :build do
-      capistrano_nomad_fetch_jobs_names_by_namespace.each do |namespace, names|
-        capistrano_nomad_push_jobs_docker_images(names, namespace: namespace)
-      end
-    end
-
-    desc "Push all job Docker images"
-    task :push do
-      capistrano_nomad_fetch_jobs_names_by_namespace.each do |namespace, names|
-        capistrano_nomad_push_jobs_docker_images(names, namespace: namespace)
-      end
-    end
-
-    desc "Build and push all job Docker images"
-    task :assemble do
-      capistrano_nomad_fetch_jobs_names_by_namespace.each do |namespace, names|
-        capistrano_nomad_assemble_jobs_docker_images(names, namespace: namespace)
-      end
-    end
-
-    desc "Upload and run all jobs"
-    task :upload_run do
-      capistrano_nomad_fetch_jobs_names_by_namespace.each do |namespace, names|
-        capistrano_nomad_upload_run_jobs(names, namespace: namespace)
-      end
-    end
-
-    desc "Deploy all jobs"
-    task :deploy do
-      capistrano_nomad_fetch_jobs_names_by_namespace.each do |namespace, names|
-        capistrano_nomad_deploy_jobs(names, namespace: namespace)
-      end
-    end
-
-    desc "Rerun all jobs"
-    task :rerun do
-      capistrano_nomad_fetch_jobs_names_by_namespace.each do |namespace, names|
-        capistrano_nomad_rerun_jobs(names, namespace: namespace)
-      end
-    end
-
-    desc "Purge all jobs"
-    task :purge do
-      capistrano_nomad_fetch_jobs_names_by_namespace.each do |namespace, names|
-        capistrano_nomad_purge_jobs(names, namespace: namespace)
-      end
-    end
+  # Define tasks for all jobs
+  capistrano_nomad_define_group_tasks(namespace: :all)
 
+  namespace :all do
     desc "Create missing and remove unused namespaces"
     task :modify_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
+
+      # If key is nil then it actually belongs to the default namespace
+      desired_namespaces = fetch(:nomad_jobs).keys.map { |n| n.nil? ? :default : n.to_sym }
+
       missing_namespaces = desired_namespaces - current_namespaces
       unused_namespaces = current_namespaces - desired_namespaces
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nomad
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.1
 platform: ruby
 authors:
 - James Hu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2024-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport