capistrano-nomad 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b71f2fc4375d471be5284038182715e6a4673dfb047b24f94409d9249509706
-  data.tar.gz: 04d0c5906845f755b6c265b8f3ff943a3dcff1b2d4d4df66591f3e9aacb80063
+  metadata.gz: 0f5358b24228c869a704b8ed79aa76d76b2aeb559ffcd7bd3bced8aa7d3281d1
+  data.tar.gz: 95f8c93adc89fdbcffe9f40bc5d18433ccfc4b743cfcb194a2b7b2e9468f6bb5
 SHA512:
-  metadata.gz: 3417e1276e5e377db5e52051c39f5955a3ba50cd83243e51d6f1a2919d2e4eda7a602ee55bab9a0c91f4e4d85fc4505c18886e8164608515bc681b663d641b60
-  data.tar.gz: 66fbf60d498d0b312256a6788292c9c5ad9e84384c34152e0d000c2045267bae57b96483cdd894f0f5a5f138ba3b89c179c2d265b8eebb4c29c3a496918ed19c
+  metadata.gz: 834ccd5183128e4c3b4bed1067457b1a2a0036ed21c8ca954f82f25298aca61d6a108460b22c17cbe9f2fa561e02e4189942ddb99d784792ed7422b70e05ba0f
+  data.tar.gz: 1a4ade283a947f6243fb8c728ca3c3fcac55fac0471cad47b2fbabec66b66a7287fd342c29610bcad5a67d847a0251eb2ee66847ca27de449b963734d5a0d55d

data/Gemfile.lock

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

data/README.md

@@ -31,11 +31,23 @@ require "capistrano/nomad"
 install_plugin Capistrano::Nomad
 ```
 
-Define Nomad jobs within `deploy.rb`
+Within `deploy.rb`
 
 ```ruby
+
+# Docker image types
+nomad_docker_image_type :app,
+  path: "backend",
+  alias: ->(image_type:) { "gcr.io/axsuul/#{image_type}" },
+  target: "release",
+  build_args: { foo: "bar" }
+nomad_docker_image_type :redis,
+  path: "/absolute/path/redis",
+  alias: "gcr.io/axsuul/redis"
+
+# Jobs
 nomad_job :app
-nomad_job :redis
+nomad_job :redis, docker_image_types: [:redis]
 
 nomad_namespace :analytics do
   nomad_job :grafana

data/capistrano-nomad.gemspec

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

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

@@ -101,7 +101,7 @@ def capistrano_nomad_build_docker_image_for_type(image_type)
         image_alias_args << "--tag #{tag}"
       end
 
-    execute("docker build #{image_alias_args.join(' ')} .#{capistrano_nomad_root.join(attributes[:path])}")
+    execute("docker build #{image_alias_args.join(' ')} #{capistrano_nomad_root.join(attributes[:path])}")
   end
 end
 

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

@@ -51,11 +51,11 @@ def capistrano_nomad_build_base_var_file_path(*args)
   capistrano_nomad_build_file_path(fetch(:nomad_var_files_path), *args)
 end
 
-def capistrano_nomad_build_local_path(path, *args)
-  local_path = ".#{capistrano_nomad_root.join(path)}"
+def capistrano_nomad_build_local_path(path)
+  local_path = capistrano_nomad_root.join(path)
 
   # Determine if it has .erb appended or not
-  found_local_path = [local_path, "#{local_path}.erb"].find { |path| File.exist?(path) }
+  found_local_path = [local_path, "#{local_path}.erb"].find { |each_local_path| File.exist?(each_local_path) }
 
   raise StandardError, "Could not find local path: #{path}" unless found_local_path
 

data/lib/capistrano/nomad.rb

@@ -9,8 +9,8 @@ require_relative "nomad/helpers/nomad"
 module Capistrano
   class Nomad < Capistrano::Plugin
     def set_defaults
-      set_if_empty(:nomad_jobs_path, "/nomad/jobs")
-      set_if_empty(:nomad_var_files_path, "/nomad/var_files")
+      set_if_empty(:nomad_jobs_path, "nomad/jobs")
+      set_if_empty(:nomad_var_files_path, "nomad/var_files")
       set_if_empty(:nomad_docker_image_alias, ->(**) {})
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nomad
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - James Hu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport