capistrano-nomad 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d227d6f15f433cd6410884afc5572cf9c7e115a7365e00e244d3b95ca320f148
-  data.tar.gz: a0cdd0e131319cd0f1a17a926afe70619d24550018de9731c96a610b075300c2
+  metadata.gz: eac8deb55e886ac97912499380a208f03ef15f7f952123afda2d6f8910e30df0
+  data.tar.gz: 730715ed63a01273775a7dccc403993866d73cb562de7cf70d0c22cf2754b493
 SHA512:
-  metadata.gz: fd4aec6aecd6698d4ed23d4e1a2c3d3e8ded18467c1a4d8daee191e29304e2f91f85ca7d604681dba4ec6cb885308f0fb6985fb4e9d952e459fc7859a3b3917a
-  data.tar.gz: 6009d60f5bd99e35fdb2961f6b9d860ea9db40ac844cebacf87b21ae58381eeefd35022fb58c7a6b88fa74da7e3acff3ee26a0f9a71a92e1b61495102bf53a21
+  metadata.gz: 933da9e873b7d6ed030983f0a441a157a4b2bac6c8803076a6dbeebb2bf3afeb922e57d5d3f5ba1b437f9da371386c9a09676d4e3f8dc32e68e3bfa86e5ae4b8
+  data.tar.gz: a87d69e22c6df4fcb9189a43279e399e27d9a625d1a86d728626fba63327daeed6a924113f019ed639d2782fae6db47367fbcd2568337faeafe9410ed3176b9f

data/Gemfile.lock

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

data/README.md

@@ -61,7 +61,7 @@ end
 
 # Use hosted Docker image
 nomad_docker_image_type :postgres,
-  alias_digest: "postgres:5.0.0"
+  alias: "postgres:5.0.0"
 
 # Use Docker image that will be built locally relative to project and push
 nomad_docker_image_type :backend,

data/capistrano-nomad.gemspec

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

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

@@ -133,8 +133,8 @@ def capistrano_nomad_push_docker_image_for_type(image_type, is_manifest_updated:
   return false unless [:local_push, :remote_push].include?(attributes[:strategy])
 
   run_locally do
-    # Don't push Docker image if alias digest is already passed in
-    unless alias_digest
+    # Only push Docker image if it was built from path
+    if attributes[:path]
       interaction_handler = CapistranoNomadDockerPushImageInteractionHandler.new
       image_alias = capistrano_nomad_build_docker_image_alias(image_type)
 

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

@@ -3,13 +3,15 @@ require "active_support/core_ext/hash"
 def nomad_docker_image_type(image_type, attributes = {})
   docker_image_types = fetch(:nomad_docker_image_types) || {}
   docker_image_types[image_type] = attributes.reverse_merge(
-    # In case image doesn't get pushed, this will still be populated
-    alias_digest: attributes[:alias],
-
     # By default build and push Docker image locally
     strategy: :local_push,
   )
 
+  raise ArgumentError, "passing in alias_digest is not allowed!" if attributes[:alias_digest]
+
+  # If Docker image doesn't get pushed, this will still be populated
+  docker_image_types[image_type][:alias_digest] = attributes[:alias]
+
   set(:nomad_docker_image_types, docker_image_types)
 end
 

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

@@ -180,48 +180,45 @@ def capistrano_nomad_upload(local_path:, remote_path:, erb_vars: {})
     Dir.glob("#{local_path}/*").each do |path|
       capistrano_nomad_upload(local_path: path, remote_path: "#{remote_path}/#{File.basename(path)}")
     end
+
+  # If file, attempt to always parse it as ERB
   else
-    io =
-      if File.extname(local_path) == ".erb"
-        docker_image_types = fetch(:nomad_docker_image_types)
-        docker_image_types_manifest = capistrano_nomad_read_docker_image_types_manifest
-
-        # Merge manifest into image types
-        docker_image_types_manifest.each do |manifest_image_type, manifest_attributes|
-          docker_image_types[manifest_image_type]&.merge!(manifest_attributes) || {}
-        end
-
-        # Parse manifest files using ERB
-        erb = ERB.new(File.open(local_path).read, trim_mode: "-")
-
-        final_erb_vars = {
-          git_commit_id: fetch(:current_revision) || capistrano_nomad_git_commit_id,
-          docker_image_types: docker_image_types,
-        }
-
-        # Add global ERB vars
-        final_erb_vars.merge!(fetch(:nomad_template_vars) || {})
-
-        # Add job-specific ERB vars
-        final_erb_vars.merge!(erb_vars)
-
-        # We use a custom namespace class so that we can include helper methods into the namespace to make them available
-        # for template to access
-        namespace = CapistranoNomadErbNamespace.new(
-          context: self,
-          vars: final_erb_vars,
-        )
-
-        StringIO.new(erb.result(namespace.instance_eval { binding }))
-      else
-        File.open(local_path)
-      end
+    docker_image_types = fetch(:nomad_docker_image_types)
+    docker_image_types_manifest = capistrano_nomad_read_docker_image_types_manifest
+
+    # Merge manifest into image types
+    docker_image_types_manifest.each do |manifest_image_type, manifest_attributes|
+      docker_image_types[manifest_image_type]&.merge!(manifest_attributes) || {}
+    end
+
+    # Parse manifest files using ERB
+    erb = ERB.new(File.open(local_path).read, trim_mode: "-")
+
+    final_erb_vars = {
+      git_commit_id: fetch(:current_revision) || capistrano_nomad_git_commit_id,
+      docker_image_types: docker_image_types,
+    }
+
+    # Add global ERB vars
+    final_erb_vars.merge!(fetch(:nomad_template_vars) || {})
+
+    # Add job-specific ERB vars
+    final_erb_vars.merge!(erb_vars)
+
+    # We use a custom namespace class so that we can include helper methods into the namespace to make them available
+    # for template to access
+    namespace = CapistranoNomadErbNamespace.new(
+      context: self,
+      vars: final_erb_vars,
+    )
+
+    string_io = StringIO.new(erb.result(namespace.instance_eval { binding }))
 
     capistrano_nomad_run_remotely do
       # Ensure parent directory exists
       execute(:mkdir, "-p", File.dirname(remote_path))
 
-      upload!(io, remote_path)
+      upload!(string_io, remote_path)
     end
   end
 end

metadata

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