capistrano-nomad 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa62522fae2723d97c57456a2404393ab7a231b9a8b690662b819fc60f9670fd
-  data.tar.gz: 3cc2ec3994a56a70e3bf4de01d8676849661a80f42b259079461fa7b7f60e11a
+  metadata.gz: '064875b4478852c18387c8084ff4b0e5c2cb4e9377a6854724f46119b416ecf5'
+  data.tar.gz: 15069bfd33db0a2b497a7e6a1adf816669df6ba0b508364fb8a26728e46ae329
 SHA512:
-  metadata.gz: 13de2ccba1589cce0c24add2a284d1b1932d38fb0d2ec9f1a3ed3715167d99ca9e2b181746041b59f7a89d48113e00d0608f3dd5138fd07a288db6e6bfc019c4
-  data.tar.gz: f993181266c7eabe3580c8ebdb03bd39c0affe87415e77f099898d8753bb6eb6ef12463459c3a24b4de493cff09af51e6b0c13a85e7a767ec02b69b8d7e02e57
+  metadata.gz: eff94039fa9b7c506fbe139670639d326423c409813c4a10c97c15e79256f4bc5f65a181a2d8608af9bdd0aa51aeaeb999ad27e02836b2af8815b961999f8470
+  data.tar.gz: 255c76c93ba40a4fd35206b31d511a7a42e2954c4e4f072154effe68643e66a938fd0aacd3f029e7e5cfa37f13f82cb924606ab4bc2fc61be92234c5e3d7428d

data/Gemfile.lock

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

data/README.md

@@ -102,11 +102,14 @@ 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], 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 :"traefik-default", template: :admin,
+  erb_vars: { role: :default },
+  tags: [:traefik]
+nomad_job :"traefik-secondary", template: :admin,
+  erb_vars: { role: :secondary },
+  tags: [:traefik]
+
+nomad_namespace :analytics, tags: [:admin] do
   nomad_job :grafana
 end
 
@@ -131,20 +134,15 @@ cap production nomad:analytics:grafana:restart
 cap production nomad:postgres:status
 ```
 
-Most tasks are also available for namespace or `all`
+Tasks can go by namespace or `all` namespaces, and can also be filtered by tags
 
 ```shell
 cap production nomad:analytics:deploy
 cap production nomad:analytics:upload_run
 cap production nomad:all:deploy
+cap production nomad:all:deploy TAG=admin
 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
+cap production nomad:all:upload_run TAGS=admin,redis
 ```
 
 Open console

data/capistrano-nomad.gemspec

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

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

@@ -36,6 +36,13 @@ def nomad_namespace(namespace, **options, &block)
 end
 
 def nomad_job(name, attributes = {})
+  attributes[:tags] ||= []
+
+  # Tags added to namespace should be added to all jobs within
+  if (nomad_namespace_options = capistrano_nomad_fetch_namespace_options(@nomad_namespace))
+    attributes[:tags] += nomad_namespace_options[:tags] || []
+  end
+
   nomad_jobs = fetch(:nomad_jobs) || Hash.new { |h, n| h[n] = {} }
   nomad_jobs[@nomad_namespace][name] = attributes
 

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

@@ -243,7 +243,7 @@ def capistrano_nomad_upload(local_path:, remote_path:, erb_vars: {})
 end
 
 def capistrano_nomad_fetch_namespace_options(namespace)
-  fetch(:nomad_namespaces).dig(namespace)
+  fetch(:nomad_namespaces)&.dig(namespace)
 end
 
 def capistrano_nomad_fetch_job_options(name, *args, namespace: nil)
@@ -255,9 +255,9 @@ def capistrano_nomad_fetch_job_var_files(name, *args)
 end
 
 def capistrano_nomad_fetch_jobs_names_by_namespace(namespace: :all)
-  # Can pass tags via command line (e.g. tag=foo or tags=foo,bar)
+  # Can pass tags via command line (e.g. TAG=foo or TAGS=foo,bar)
   tags =
-    [ENV["tag"], ENV["tags"]].map do |tag_args|
+    [ENV["TAG"], ENV["TAGS"]].map do |tag_args|
       next unless tag_args.presence
 
       tag_args.split(",").map(&:presence).compact.map(&:to_sym)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nomad
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - James Hu