capistrano-nomad 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c292b51cccede02b32828727665d5db05ef156680bd30c36d828efb24b92487
-  data.tar.gz: 74bbb0362226b713380e368e6c4a1a9ebd15d11f35a93879cc047ccf167ae31b
+  metadata.gz: e1d44671f9ed79b03419c3de79d4b938652eb3f35f3553450f4e5118fadeb596
+  data.tar.gz: 3a6afdc265f7f434774f960e1aa2a9c5950cd8da00c02dbf21407c752ec2bb22
 SHA512:
-  metadata.gz: f26c0cce3bc2a23e46edf0499d2f3d959e9247292043bffac86f0b1a415e6fad654930a1133a8d73c0255b6b31476b5b114b97d42f070193804c59d096fccb51
-  data.tar.gz: 48173cbf24f482fea49d1766fe83d92165f4e268da1f2fb729877aff5ee148ca8ab03c41d26ace981e9ae77abd99581e4f69b9a892053d9cd5e37e7e574a964f
+  metadata.gz: 511bf835646bbfb0f5ec7bc0fe5dd575cd34b4a72573d73457ce07830284ad01260521bbdb2cc8a829e1ad535d78cbece3d041ed32f546efbd274090934523db
+  data.tar.gz: d576b13a85867cc3916dd32a7a26ece7aecdda4b1b14bc20a451f24a7bbeb48f3aef1144d3952e9e5ad831f06c33cb609fd41390bb40d2a29e0754254c48f098

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-nomad (0.2.2)
+    capistrano-nomad (0.3.0)
       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.2.2"
+  spec.version = "0.3.0"
   spec.authors = ["James Hu"]
 
   spec.summary = "Capistrano plugin for deploying and managing Nomad jobs"

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

@@ -1,3 +1,7 @@
+def capistrano_nomad_root
+  Pathname.new(fetch(:root) || "")
+end
+
 def capistrano_nomad_deep_symbolize_hash_keys(hash)
   JSON.parse(JSON[hash], symbolize_names: true)
 end

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

@@ -61,16 +61,18 @@ def capistrano_nomad_build_docker_image(image_type, path, *args)
       capistrano_nomad_build_docker_image_alias(image_type, git_commit_id),
       capistrano_nomad_build_docker_image_alias(image_type, "latest"),
       "trunk/#{fetch(:stage)}/#{image_type}:latest",
-    ].each do |tag|
-      args << "--tag #{tag}"
-    end
+    ]
+      .compact
+      .each do |tag|
+        args << "--tag #{tag}"
+      end
 
     # If any of these files exist then we're in the middle of rebase so we should interrupt
-    if ["rebase-merge", "rebase-apply"].any? { |f| File.exist?("#{fetch(:git).dir.path}/.git/#{f}") }
+    if ["rebase-merge", "rebase-apply"].any? { |f| File.exist?("#{capistrano_nomad_git.dir.path}/.git/#{f}") }
       raise StandardError, "still in the middle of git rebase, interrupting docker image build"
     end
 
-    system "docker build #{args.join(' ')} #{path}"
+    system "docker build #{args.join(' ')} .#{capistrano_nomad_root.join(path)}"
   end
 end
 

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

@@ -1,7 +1,7 @@
 require "git"
 
 def capistrano_nomad_git
-  Git.open(".")
+  @capistrano_nomad_git ||= Git.open(".")
 end
 
 def capistrano_nomad_fetch_git_commit_id

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

@@ -36,9 +36,6 @@ class NomadErbNamespace
 end
 
 def capistrano_nomad_build_file_path(parent_path, basename, namespace: nil)
-  # Remove initial slash if it exists
-  parent_path = parent_path[1..] if parent_path[0] == "/"
-
   segments = [parent_path]
   segments << namespace if namespace
   segments << "#{basename}.hcl"
@@ -54,19 +51,27 @@ 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_job_path(name, *args)
-  local_path = fetch(:root).join(capistrano_nomad_build_base_job_path(name, *args))
+def capistrano_nomad_build_local_path(path, *args)
+  local_path = ".#{capistrano_nomad_root.join(path)}"
 
   # Determine if it has .erb appended or not
   [local_path, "#{local_path}.erb"].find { |path| File.exist?(path) }
 end
 
+def capistrano_nomad_build_local_job_path(name, *args)
+  capistrano_nomad_build_local_path(capistrano_nomad_build_base_job_path(name, *args))
+end
+
+def capistrano_nomad_build_local_var_file_path(name, *args)
+  capistrano_nomad_build_local_path(capistrano_nomad_build_base_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_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_build_base_var_file_path(*args)}"
 end
 
 def capistrano_nomad_execute_nomad_command(*args)
@@ -158,7 +163,7 @@ def capistrano_nomad_build_jobs_docker_images(names, *args)
 
   return false if image_types.empty?
 
-  image_types.each { |i| capistrano_nomad_build_docker_image_for_type(i, *args) }
+  image_types.each { |i| capistrano_nomad_build_docker_image_for_type(i) }
 end
 
 def capistrano_nomad_push_jobs_docker_images(names, *args)
@@ -166,7 +171,7 @@ def capistrano_nomad_push_jobs_docker_images(names, *args)
 
   return false if image_types.empty?
 
-  image_types.each { |i| capistrano_nomad_push_docker_image_for_type(i, *args) }
+  image_types.each { |i| capistrano_nomad_push_docker_image_for_type(i) }
 end
 
 def capistrano_nomad_assemble_jobs_docker_images(names, *args)
@@ -180,7 +185,7 @@ def capistrano_nomad_upload_jobs(names, *args)
 
   uniq_var_files.each do |var_file|
     capistrano_nomad_upload_file(
-      local_path: capistrano_nomad_build_base_var_file_path(var_file, *args),
+      local_path: capistrano_nomad_build_local_var_file_path(var_file, *args),
       remote_path: capistrano_nomad_build_release_var_file_path(var_file, *args),
     )
   end
@@ -196,7 +201,7 @@ def capistrano_nomad_upload_jobs(names, *args)
       file_basename = nomad_job_options[:template] || name
 
       capistrano_nomad_upload_file(
-        local_path: capistrano_nomad_build_base_job_path(file_basename, *args),
+        local_path: capistrano_nomad_build_local_job_path(file_basename, *args),
         remote_path: capistrano_nomad_build_release_job_path(name, *args),
         erb_vars: erb_vars,
       )

metadata

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