capistrano-nomad 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38466c64a01144c2504b25cffc4d0a504323d8426a6d266b8596afbde174cc3b
-  data.tar.gz: 4f1921130d34135d6399dc66014ae09fef023a32d468729c001da69b46677b6f
+  metadata.gz: aa62522fae2723d97c57456a2404393ab7a231b9a8b690662b819fc60f9670fd
+  data.tar.gz: 3cc2ec3994a56a70e3bf4de01d8676849661a80f42b259079461fa7b7f60e11a
 SHA512:
-  metadata.gz: b19ed0fa9f0bd9f69b2679b26d282f2263307313b6376f95f32e65eb7ba08b7645e93d3e83232718a05abd5e8fc4ad378ba301d59a0fa6605cf0b5a30d08ffbf
-  data.tar.gz: 9ea11f2baf2ba068b5150b0294dfbba1142e5a89bdec74fa692e338cc02f05a1bbb313633e80d496f7f0b4350f14a4659003c4e1c9be41339c45c3b2381c7799
+  metadata.gz: 13de2ccba1589cce0c24add2a284d1b1932d38fb0d2ec9f1a3ed3715167d99ca9e2b181746041b59f7a89d48113e00d0608f3dd5138fd07a288db6e6bfc019c4
+  data.tar.gz: f993181266c7eabe3580c8ebdb03bd39c0affe87415e77f099898d8753bb6eb6ef12463459c3a24b4de493cff09af51e6b0c13a85e7a767ec02b69b8d7e02e57

data/Gemfile.lock

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

data/README.md

@@ -101,9 +101,10 @@ nomad_docker_image_type :restic,
 nomad_job :backend, docker_image_types: [:backend], var_files: [:rails]
 nomad_job :frontend
 nomad_job :postgres, docker_image_types: [:postgres]
-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_job :redis, docker_image_types: [:redis], tags: [:redis]
+nomad_job :"traefik-default", template: :traefik, erb_vars: { role: :default }, tags: [:traefik]
+nomad_job :"traefik-secondary", template: :traefik, erb_vars: { role: :secondary }, tags: [:traefik]
+nomad_job :"traefik-tertiary", template: :traefik, erb_vars: { role: :secondary }, tags: [:traefik]
 
 nomad_namespace :analytics do
   nomad_job :grafana
@@ -130,7 +131,7 @@ cap production nomad:analytics:grafana:restart
 cap production nomad:postgres:status
 ```
 
-Most tasks are also available for namespace or all
+Most tasks are also available for namespace or `all`
 
 ```shell
 cap production nomad:analytics:deploy
@@ -139,6 +140,13 @@ cap production nomad:all:deploy
 cap production nomad:all:upload_run
 ```
 
+Filter by tags
+
+```shell
+cap production nomad:all:deploy tag=traefik
+cap production nomad:all:upload_run tags=traefik,redis
+```
+
 Open console
 
 ```shell

data/capistrano-nomad.gemspec

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

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

@@ -255,12 +255,26 @@ def capistrano_nomad_fetch_job_var_files(name, *args)
 end
 
 def capistrano_nomad_fetch_jobs_names_by_namespace(namespace: :all)
-  jobs_names_by_namespace = fetch(:nomad_jobs).transform_values(&:keys)
+  # Can pass tags via command line (e.g. tag=foo or tags=foo,bar)
+  tags =
+    [ENV["tag"], ENV["tags"]].map do |tag_args|
+      next unless tag_args.presence
 
-  # Filter by namespace unless it's all
-  jobs_names_by_namespace = jobs_names_by_namespace.slice(namespace) unless namespace == :all
+      tag_args.split(",").map(&:presence).compact.map(&:to_sym)
+    end
+      .flatten
+      .compact
+
+  fetch(:nomad_jobs).each_with_object({}) do |(jobs_namespace, jobs_options), hash|
+    next if namespace != :all && namespace != jobs_namespace
+
+    hash[jobs_namespace] = jobs_options.each_with_object([]) do |(job_name, job_options), collection|
+      # Filter jobs by tags if specified
+      next if tags.any? && ((job_options[:tags]&.map(&:to_sym) || []) & tags).empty?
 
-  jobs_names_by_namespace
+      collection << job_name
+    end
+  end
 end
 
 def capistrano_nomad_fetch_jobs_docker_image_types(names, namespace: nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nomad
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - James Hu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport