capistrano-nomad 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b71f2fc4375d471be5284038182715e6a4673dfb047b24f94409d9249509706
-  data.tar.gz: 04d0c5906845f755b6c265b8f3ff943a3dcff1b2d4d4df66591f3e9aacb80063
+  metadata.gz: fd8143ad35ea4f16a890256e65a5a73fab979acd0e63fa5471e8c75248c5fad8
+  data.tar.gz: cdf8f7552d3512ea4968208690ec537040915e42a59b51aef4bd8c85c81e95a1
 SHA512:
-  metadata.gz: 3417e1276e5e377db5e52051c39f5955a3ba50cd83243e51d6f1a2919d2e4eda7a602ee55bab9a0c91f4e4d85fc4505c18886e8164608515bc681b663d641b60
-  data.tar.gz: 66fbf60d498d0b312256a6788292c9c5ad9e84384c34152e0d000c2045267bae57b96483cdd894f0f5a5f138ba3b89c179c2d265b8eebb4c29c3a496918ed19c
+  metadata.gz: 52b3e33004964a0ea317bcd55478d02aa2088ded9c7df715be7119028588b9c3f848e63fd4fa8a85f3345c9e5203579428a71b79c3debfe16e5028b37183d477
+  data.tar.gz: f972389f3c4411a75162961f0545605ab87c92d6a81d4192db78e457bd320c8a87bccdcf3a61bb9f9e556c6f64d4b99cb3347752113951612edeb89b3fb9d2e4

data/Gemfile.lock

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

data/README.md

@@ -31,14 +31,39 @@ require "capistrano/nomad"
 install_plugin Capistrano::Nomad
 ```
 
-Define Nomad jobs within `deploy.rb`
+Within `deploy.rb`
 
 ```ruby
-nomad_job :app
-nomad_job :redis
+set :nomad_jobs_path, "nomad/jobs"
+set :nomad_var_files_path, "nomad/vars"
+
+# Accessible in all .erb files
+set :nomad_erb_vars, (lambda do
+  {
+    env_name: fetch(:stage).to_sym,
+    domain: fetch(:domain),
+    foo: "bar,"
+  }
+end)
+
+# Docker image types
+nomad_docker_image_type :backend,
+  path: "local/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 :frontend
+nomad_job :backend, docker_image_types: [:backend], var_files: [:rails]
+nomad_job :redis, docker_image_types: [:redis]
 
 nomad_namespace :analytics do
   nomad_job :grafana
+  nomad_job :"node-exporter"
 end
 ```
 

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.1"
   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

@@ -35,6 +35,10 @@ class CapistranoNomadErbNamespace
   # rubocop:enable Style/MissingRespondToMissing
 end
 
+def capistrano_nomad_ensure_absolute_path(path)
+  path[0] == "/" ? path : "/#{path}"
+end
+
 def capistrano_nomad_build_file_path(parent_path, basename, namespace: nil)
   segments = [parent_path]
   segments << namespace if namespace
@@ -51,11 +55,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
 
@@ -71,11 +75,11 @@ def capistrano_nomad_build_local_var_file_path(name, *args)
 end
 
 def capistrano_nomad_build_release_job_path(*args)
-  "#{release_path}#{capistrano_nomad_build_base_job_path(*args)}"
+  "#{release_path}#{capistrano_nomad_ensure_absolute_path(capistrano_nomad_build_base_job_path(*args))}"
 end
 
 def capistrano_nomad_build_release_var_file_path(*args)
-  "#{release_path}#{capistrano_nomad_build_base_var_file_path(*args)}"
+  "#{release_path}#{capistrano_nomad_ensure_absolute_path(capistrano_nomad_build_base_var_file_path(*args))}"
 end
 
 def capistrano_nomad_run_nomad_command(kind, *args)

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.1
 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