immosquare-capistrano 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d5ce30da4725609f237136b6fa05c3cae9668c128a9c10c7db824c26564df61
-  data.tar.gz: 7135f08dfb35aa6a54eda7c03ad8825df43c2f7aea822a813eb4a0fc161d67c1
+  metadata.gz: 1301c09a4f7adc7c81ffa460898f976eec5ad6c19d4c577ccd6dc039c0341d53
+  data.tar.gz: 64ebe76148b314d08b4f388fe0759fcb55dd0e9a9c96a502653fdf16d1802277
 SHA512:
-  metadata.gz: 91ffa7cba4f9af474bd1ae3a77f83199e740f49e44149f805fb8734759664b389ac13ec6ff9a686545810710c4d0673ac789e10bcae84aba9ae9bd7c2b2eab3c
-  data.tar.gz: ffe745d0bb6d5ad2c4570c3064e84a8ac0ce345feb938854a7ffcd5ed94f79df1c9b0de9236fa6528338bb6ac1c5e8cbb704f09dc6b719a51f6d420d1d6c6209
+  metadata.gz: 12429a4298672f04bd80c17994a3b684306d894e3bc26731c11779e0e97c954d8d89f717c3a7372bdd1f5666b350a8975e554d859021f65b14c6e2c41ea37e57
+  data.tar.gz: cb5ed273393ac7ce4336f9ef28b3b9d690de60ec522f189d2312a66a2b3d6abfcc66ff67a8181021f83efcddce5e0a73b0cca4cba17718e54651dc22b76fc9a8

data/lib/immosquare/capistrano/helpers.rb

@@ -1,13 +1,6 @@
 module Capistrano
   module Immosquare
     module Helpers
-      ##============================================================##
-      ## Get the path to bundle command
-      ##============================================================##
-      def self.expanded_bundle_command
-        SSHKit.config.command_map[:bundle].to_s
-      end
-
       def self.template_path(service)
         "#{File.dirname(__FILE__)}/templates/#{service}.service.erb"
       end

data/lib/immosquare/capistrano/tasks/rvm.rake

@@ -41,7 +41,8 @@ namespace :rvm do
       ## Set the RVM prefix for the commands
       ##============================================================##
       ["gem", "rake", "ruby", "bundle"].each do |command|
-        SSHKit.config.command_map.prefix[command.to_sym].unshift("#{rvm_bin_path} #{rvm_ruby_version} do")
+        cmd = "#{rvm_bin_path} #{rvm_ruby_version} do"
+        SSHKit.config.command_map.prefix[command.to_sym] << cmd if !SSHKit.config.command_map.prefix[command.to_sym].include?(cmd)
       end
 
 

data/lib/immosquare/capistrano/templates/puma.service.erb

@@ -8,7 +8,7 @@ Type=notify
 WatchdogSec=10
 User=<%= fetch(:puma_user) %>
 WorkingDirectory=<%= current_path %>
-ExecStart=<%= "#{Capistrano::Immosquare::Helpers.expanded_bundle_command.gsub("~", "/home/#{fetch(:puma_user)}")} exec puma -e #{fetch(:stage)}" %>
+ExecStart=<%= "#{SSHKit.config.command_map[:bundle]} exec puma -e #{fetch(:stage)}" %>
 ExecReload=/bin/kill -USR1 $MAINPID
 
 

data/lib/immosquare/capistrano/templates/sidekiq.service.erb

@@ -8,7 +8,7 @@ Type=notify
 WatchdogSec=10
 User=<%= fetch(:sidekiq_user) %>
 WorkingDirectory=<%= current_path %>
-ExecStart=<%= "#{Capistrano::Immosquare::Helpers.expanded_bundle_command.gsub("~", "/home/#{fetch(:sidekiq_user)}")} exec sidekiq -e #{fetch(:stage)}" %>
+ExecStart=<%= "#{SSHKit.config.command_map[:bundle]} exec sidekiq -e #{fetch(:stage)}" %>
 
 UMask=0002
 

data/lib/immosquare/capistrano/templates/solid_queue.service.erb

@@ -8,7 +8,7 @@ Environment=RAILS_ENV=<%= fetch(:stage) %>
 User=<%= fetch(:solid_queue_user) %>
 WorkingDirectory=<%= current_path %>
 
-ExecStart=<%= "#{Capistrano::Immosquare::Helpers.expanded_bundle_command.gsub("~", "/home/#{fetch(:solid_queue_user)}")} exec rake solid_queue:start" %>
+ExecStart=<%= "#{SSHKit.config.command_map[:bundle]} exec rake solid_queue:start" %>
 ExecReload=/bin/kill -HUP $MAINPID
 ExecStop=/bin/kill -TERM $MAINPID
 

data/lib/immosquare-capistrano/version.rb

@@ -1,3 +1,3 @@
 module ImmosquareCapistrano
-  VERSION = "0.1.7".freeze
+  VERSION = "0.1.8".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: immosquare-capistrano
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - immosquare
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano