capistrano-nomad 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76af53f1a2764deb4b91363674b6627d7b6017a30609e067d42b66cdbd5c9fc0
-  data.tar.gz: 64825bb8a9bdccf833f23cb36aeb10cba6f516bbac8e6690193eb1674339fb94
+  metadata.gz: 9e53ea71739d8bf0e6a35acc8fc6cf53b38793e2cb84406eabcbcae39eb3c95a
+  data.tar.gz: 9acd6a38e395394f5b6fd2c29b7f79ff57ab4b5f03580b507131f4f14fa0e73c
 SHA512:
-  metadata.gz: d359a15febd84d1303360f8d9c51faf026fa6388cf6a8b97edc7fa99cee59007c4999d040935bad0351ad1fa3bc1aca5908819b1cd1fc302d711b09a7d3a42e6
-  data.tar.gz: 5bf77756a9d1dc2bc28ded978f0523fff65059932154c1930545dd4b06930012d45ed646108f593802e606559b2aa4c2cae867f2012bef83245308b30d1a52dd
+  metadata.gz: b40e9dc02e6e447f20ba8f22c8c2916512b6d16204da16268f9156e5c48e77743adbacc51c06e0bb1df150bdf2d0fd2e9f6631ca1b2684830b76b72dfff06b9e
+  data.tar.gz: a3a36894b7296ada17af461c3f61874f17c72be48f9307fc25b7b5e7940b6292a636249442f189fc38a8b966501bc45482202a3e7d9a5ddcf45d5bdd0e3b8078

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-nomad (0.10.1)
+    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.1"
+  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

@@ -32,7 +32,7 @@ end
 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

metadata

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