immosquare-capistrano 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d21992d6862c4412d439d94e332daa87bd4388d897968d622cbcfec44b288f55
-  data.tar.gz: d4038ca94a06375b0c01c74f09c94678cf397ac538d866b940b0968cdb9dbecd
+  metadata.gz: 1301c09a4f7adc7c81ffa460898f976eec5ad6c19d4c577ccd6dc039c0341d53
+  data.tar.gz: 64ebe76148b314d08b4f388fe0759fcb55dd0e9a9c96a502653fdf16d1802277
 SHA512:
-  metadata.gz: 76a896e2b628412f9bb2a4b1b4ade6c8def6020dbe73430c64d9c86739b723d7050fc544f9d00a2271d7110ebed1a3d6c50aacc3f61e3061a7b38e8954343313
-  data.tar.gz: dc02e35d9e183637e9ce333605b071ef3473c1c25892b8cc0bb23f14d8c2afae91f81b50f9af2696e705ca57de3a46288ab706543eedbc9c3caa15b72bb505ec
+  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/rvm.rb

@@ -13,3 +13,8 @@ load File.expand_path("tasks/rvm.rake", __dir__)
 Capistrano::DSL.stages.each do |stage|
   after stage, "rvm:hook"
 end
+
+##============================================================##
+## Update .ruby-gemset &&  ruby-version files
+##============================================================##
+before "deploy:updated", "rvm:update_rvm_dot_files"

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
 
 
@@ -65,4 +66,38 @@ namespace :rvm do
       end
     end
   end
+
+  ##============================================================##
+  ## Update .ruby-gemset and .ruby-version files with
+  ## values from the rvm_ruby_version variable
+  ##============================================================##
+  task :update_rvm_dot_files do
+    on roles(:app) do
+      rvm_ruby_version = fetch(:rvm_ruby_version)
+      ruby_version     = rvm_ruby_version.split("@").first
+      gemset_name      = rvm_ruby_version.split("@").last
+
+      info "Updating .ruby-version file with #{ruby_version}"
+      info "Updating .ruby-gemset file with #{gemset_name}"
+
+      ##============================================================##
+      ## Mettre à jour les fichiers dans `release_path`
+      ## The gem capistrano-bundler launch
+      ## bundle config --local deployment true with the release_path
+      ##============================================================##
+      within release_path do
+        execute :echo, ruby_version.to_s, ">", ".ruby-version"
+        execute :echo, gemset_name.to_s, ">", ".ruby-gemset"
+      end
+
+      ##============================================================##
+      ## To have the same version in the current path to lauch
+      ## bundle exec commands from the current path
+      ##============================================================##
+      within current_path do
+        execute :echo, ruby_version.to_s, ">", ".ruby-version"
+        execute :echo, gemset_name.to_s, ">", ".ruby-gemset"
+      end
+    end
+  end
 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.6".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.6
+  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