capistrano-nomad 0.10.0 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9993fb04b78b68b03c055faa66454360543c92108f2e410f7156bedf7158f763
-  data.tar.gz: 20b4708abc11215f259bc46b8b4c7f4f0606fb0d2ff7e3c862c799b850ead5ee
+  metadata.gz: 9e53ea71739d8bf0e6a35acc8fc6cf53b38793e2cb84406eabcbcae39eb3c95a
+  data.tar.gz: 9acd6a38e395394f5b6fd2c29b7f79ff57ab4b5f03580b507131f4f14fa0e73c
 SHA512:
-  metadata.gz: 86d6750e7e181d120db5b56da6c5b7b083310901939e452aee8e7a6de12db22544f2c1accfe8fb9790c75c188644ed0108446a8281875566b0d6243ae8db6191
-  data.tar.gz: f80d0003e093e3ed5e0fefc69b6b89db158064145c7c21573944b8fc88f8beb40a1cb0b40fbbbb956856bbc637f217a72001c5a1de10ed992ea46e6fd45b8809
+  metadata.gz: b40e9dc02e6e447f20ba8f22c8c2916512b6d16204da16268f9156e5c48e77743adbacc51c06e0bb1df150bdf2d0fd2e9f6631ca1b2684830b76b72dfff06b9e
+  data.tar.gz: a3a36894b7296ada17af461c3f61874f17c72be48f9307fc25b7b5e7940b6292a636249442f189fc38a8b966501bc45482202a3e7d9a5ddcf45d5bdd0e3b8078

data/Gemfile.lock

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

data/capistrano-nomad.gemspec

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

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

@@ -16,6 +16,8 @@ def nomad_docker_image_type(image_type, attributes = {})
 end
 
 def nomad_namespace(namespace, **options, &block)
+  raise ArgumentError, "cannot define default nomad namespace" if namespace == :default
+
   nomad_namespaces = fetch(:nomad_namespaces) || {}
   nomad_namespaces[namespace] = options
   set(:nomad_namespaces, nomad_namespaces)
@@ -53,7 +55,7 @@ def nomad_job(name, attributes = {})
 
   define_tasks = lambda do |namespace: nil|
     description_name = ""
-    description_name << "#{namespace}/" if namespace
+    description_name << "#{namespace}/" if namespace != :default
     description_name << name.to_s
 
     namespace(name) do
@@ -164,8 +166,10 @@ def nomad_job(name, attributes = {})
   end
 
   namespace(:nomad) do
-    # Define tasks for service
     if @nomad_namespace
+      # Also define tasks without namespace for default Nomad namespace
+      define_tasks.call(namespace: @nomad_namespace) if @nomad_namespace == :default
+
       namespace(@nomad_namespace) do
         define_tasks.call(namespace: @nomad_namespace)
       end

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

@@ -29,10 +29,10 @@ def capistrano_nomad_ensure_absolute_path(path)
   path[0] == "/" ? path : "/#{path}"
 end
 
-def capistrano_nomad_build_file_path(parent_path, basename, kind: nil, namespace: nil)
+def capistrano_nomad_build_file_path(parent_path, basename, kind: nil, namespace: :default)
   segments = [parent_path]
 
-  if namespace
+  unless namespace == :default
     case kind
 
     # Always upload to namespace folder on remote
@@ -132,7 +132,7 @@ def capistrano_nomad_capture_nomad_command(*args)
   output
 end
 
-def capistrano_nomad_find_job_task_details(name, namespace: nil, task: nil)
+def capistrano_nomad_find_job_task_details(name, namespace: :default, task: nil)
   task = task.presence || name
 
   # Find alloc id that contains task
@@ -170,7 +170,7 @@ def capistrano_nomad_find_job_task_details(name, namespace: nil, task: nil)
   }
 end
 
-def capistrano_nomad_exec_within_job(name, command, namespace: nil, task: nil)
+def capistrano_nomad_exec_within_job(name, command, namespace: :default, task: nil)
   capistrano_nomad_run_remotely do
     if (task_details = capistrano_nomad_find_job_task_details(name, namespace: namespace, task: task))
       capistrano_nomad_execute_nomad_command(
@@ -246,7 +246,7 @@ def capistrano_nomad_fetch_namespace_options(namespace)
   fetch(:nomad_namespaces)&.dig(namespace)
 end
 
-def capistrano_nomad_fetch_job_options(name, *args, namespace: nil)
+def capistrano_nomad_fetch_job_options(name, *args, namespace: :default)
   fetch(:nomad_jobs).dig(namespace, name.to_sym, *args)
 end
 
@@ -254,7 +254,7 @@ 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(namespace: nil)
+def capistrano_nomad_fetch_jobs_names_by_namespace(namespace: :default)
   # Can pass tags via command line (e.g. TAG=foo or TAGS=foo,bar)
   tags =
     [ENV["TAG"], ENV["TAGS"]].map do |tag_args|
@@ -277,11 +277,11 @@ def capistrano_nomad_fetch_jobs_names_by_namespace(namespace: nil)
   end
 end
 
-def capistrano_nomad_fetch_jobs_docker_image_types(names, namespace: nil)
+def capistrano_nomad_fetch_jobs_docker_image_types(names, namespace: :default)
   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: nil)
+def capistrano_nomad_define_group_tasks(namespace:)
   define_tasks = lambda do |nomad_namespace: nil|
     desc "Build #{nomad_namespace} job Docker images"
     task :build do
@@ -429,7 +429,7 @@ def capistrano_nomad_plan_jobs(names, *args)
   end
 end
 
-def capistrano_nomad_run_jobs(names, namespace: nil, is_detached: true)
+def capistrano_nomad_run_jobs(names, namespace: :default, is_detached: true)
   names.each do |name|
     run_options = {
       namespace: namespace,
@@ -501,7 +501,7 @@ def capistrano_nomad_stop_jobs(names, **options)
   end
 end
 
-def capistrano_nomad_purge_jobs(names, namespace: nil, is_detached: true)
+def capistrano_nomad_purge_jobs(names, namespace: :default, is_detached: true)
   names.each do |name|
     capistrano_nomad_execute_nomad_command(:stop, { namespace: namespace, purge: true, detach: is_detached }, name)
   end
@@ -511,7 +511,7 @@ def capistrano_nomad_display_job_status(name, **options)
   capistrano_nomad_execute_nomad_command(:status, options, name)
 end
 
-def capistrano_nomad_display_job_logs(name, namespace: nil, **options)
+def capistrano_nomad_display_job_logs(name, namespace: :default, **options)
   if (task_details = capistrano_nomad_find_job_task_details(name, namespace: namespace, task: ENV["TASK"]))
     capistrano_nomad_execute_nomad_command(
       :alloc,
@@ -534,7 +534,7 @@ def capistrano_nomad_tail_job_logs(*args, **options)
   capistrano_nomad_display_job_logs(*args, **options.merge(tail: true, n: 50))
 end
 
-def capistrano_nomad_open_job_ui(name, namespace: nil)
+def capistrano_nomad_open_job_ui(name, namespace: :default)
   run_locally do
     url = "#{fetch(:nomad_ui_url)}/ui/jobs/#{name}"
     url += "@#{namespace}" if namespace

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

@@ -1,6 +1,6 @@
 namespace :nomad do
   # Define tasks for all jobs
-  capistrano_nomad_define_group_tasks
+  capistrano_nomad_define_group_tasks(namespace: nil)
 
   desc "Create missing and remove unused namespaces"
   task :modify_namespaces do

metadata

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