capistrano-asdf 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c739260d04538643bc1a872b1d04ff441d3f62a8bc8855e990950510b4ca369
-  data.tar.gz: 3af3ba1475e2eb98d13fd406d5a4c4871ad286842e55f143464b4e4d7ca5c490
+  metadata.gz: 36eaf3c3a8eb6d55f57f2b388d47ac459c995d2e55f3b761bf9e8768d181f607
+  data.tar.gz: f427f1ad1ef23abca7d7f5ee5ea3ce3fb4c06db5a7937f536531ab292b1ab521
 SHA512:
-  metadata.gz: b4ff3bb12d5a1e3752d2954b89c82eeda582e990540b07f4af647096714caafcc4c32ffcc142356015f79fe5bd080a1b2e9d27ffab7ca4ae60db7e9825ffdbe7
-  data.tar.gz: 44cb53b59394977830fa51144ddd69945ead0bc4dd0b95015ac3be3e7807b2f306a8df947f6ff1b3921683e400131e5b868315de34bde821a210008343d5d7c2
+  metadata.gz: ec2a4e72e16b30a34cdb255ce460d85b445a49d67da9fbf802a889cfeb9d4e16106040bfa91f96c1334703f86cde6331734d9ebda0872f77b8f9a95f8f7eef02
+  data.tar.gz: dbbde4809aad014580841cc666d43469cbe5846ab8bd37b618f6a6ba07f1a42bbd9e96044f7fe406d38cc3f46b48c9329d7ab608e18d233553d0da0c1878dded

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.1.1
+
+Fix ASDF wrapper.
+
+## 1.1.0
+
+Upload and use an ASDF wrapper to fully load ASDF environnement before executing commands.
+The wrapper is generated in `<shared_path>/asdf-wrapper` by default, but can be generated elsewhere by setting `:asdf_custom_wrapper_path` capistrano variable.
+
 ## 1.0.0
 
 Add asdf:install and asdf:add_plugins tasks

data/README.md

@@ -84,12 +84,21 @@ This gem adds new tasks `asdf:map_*` before `deploy` task.
 It loads the ASDF tools environment for capistrano when it wants to run
 some tools related programs like `rake`, `gem`, `bundle`, `node`, `npm` ...
 
+## Generate and upload the ASDF commands wrapper
+
+The ASDF wrapper is needed to correctly run the mapped commands.
+Since the wrapper is an executable script, it can be used in Systemd units.
+
+    $ cap production asdf:upload_wrapper
+
+This task is automaticaly called before `asdf:check`
+
 ## Install required tools
 
 If you want your tools (ruby, nodejs) to be installed, you can use the `asdf:install` task to
 preform plugins add and then install of required versions from your `.tool-versions`.
 `asdf:install` will automaticaly add necessary plugins running `asdf:add_plugins`.
-If you want to change the plugins to install you my set `:asdf_tools` accordingly.
+If you want to change the plugins to install you may set `:asdf_tools` accordingly.
 
     $ cap production asdf:install
 

data/capistrano-asdf.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "capistrano-asdf"
-  gem.version       = '1.0.0'
+  gem.version       = '1.1.1'
   gem.licenses      = ['MIT']
   gem.authors       = ["Jean-Baptiste Poix"]
   gem.email         = ["jbpoix@inosophia.com"]

data/lib/capistrano/tasks/asdf.rake

@@ -5,30 +5,66 @@ ASDF_DEFAULT_RUBY_BINS = %w{rake gem bundle ruby rails}
 # Nodejs related bin
 ASDF_DEFAULT_NODEJS_BINS = %w{node npm yarn}
 
+ASDF_DEFAULT_WRAPPER_TEMPLATES = <<~WRAPPER
+  #!/usr/bin/env bash
+
+  . @@ASDF_USER_PATH@@/asdf.sh
+  exec "$@"
+WRAPPER
+
 namespace :asdf do
+  desc "Upload ASDF wrapper to the target host"
+  task :upload_wrapper do
+    on roles(fetch(:asdf_roles, :all)) do
+      wrapper_content = ASDF_DEFAULT_WRAPPER_TEMPLATES.gsub('@@ASDF_USER_PATH@@', fetch(:asdf_path))
+      need_to_upload_wrapper = true
+      # Check if the wrapper already exists
+      if test("[ -f #{fetch(:asdf_wrapper_path)} ]")
+        # Check if md5sum is available on the target host
+        if test("which md5sum")
+        else
+          info "md5sum is not available on the target host, we can't check the wrapper integrity"
+          need_to_upload_wrapper = false
+        end
+        # Check if the wrapper is the same as the one we want to upload using a md5 checksum
+        if capture("md5sum #{fetch(:asdf_wrapper_path)}").split.first == Digest::MD5.hexdigest(wrapper_content)
+          need_to_upload_wrapper = false
+        else
+          info "ASDF wrapper already exists on the target host but is different from the one we want to upload"
+        end
+      end
+      if need_to_upload_wrapper
+        upload! StringIO.new(wrapper_content), "#{fetch(:asdf_wrapper_path)}"
+        execute("chmod +x #{fetch(:asdf_wrapper_path)}")
+      else
+        info "ASDF wrapper already exists on the target host"
+      end
+    end
+  end
+
   desc "Prints the ASDF tools versions on the target host"
   task :check do
     on roles(fetch(:asdf_roles, :all)) do
-      execute("source #{fetch(:asdf_path)}/asdf.sh; asdf current")
+      execute("#{fetch(:asdf_wrapper_path)} asdf current")
     end
   end
 
   desc "Install ASDF tools versions based on the .tool-versions of your project"
   task :install do
     on roles(fetch(:asdf_roles, :all)) do
-      execute("source #{fetch(:asdf_path)}/asdf.sh; asdf install")
+      execute("#{fetch(:asdf_wrapper_path)} asdf install")
     end
   end
 
   desc "Add ASDF plugins specified in :asdf_tools"
   task :add_plugins do
     on roles(fetch(:asdf_roles, :all)) do
-      already_installed_plugins = capture("source #{fetch(:asdf_path)}/asdf.sh; asdf plugin list")&.split
+      already_installed_plugins = capture("#{fetch(:asdf_wrapper_path)} asdf plugin list")&.split
       fetch(:asdf_tools)&.each do |asdf_tool|
         if already_installed_plugins.include?(asdf_tool)
           info "#{asdf_tool} Already installed"
         else
-          execute("source #{fetch(:asdf_path)}/asdf.sh; asdf plugin add #{asdf_tool}")
+          execute("#{fetch(:asdf_wrapper_path)} asdf plugin add #{asdf_tool}")
         end
       end
     end
@@ -37,7 +73,7 @@ namespace :asdf do
   task :map_ruby_bins do
     if fetch(:asdf_tools).include?('ruby')
       fetch(:asdf_map_ruby_bins).each do |mapped_command|
-        SSHKit.config.command_map.prefix[mapped_command.to_sym].unshift("source #{fetch(:asdf_path)}/asdf.sh;")
+        SSHKit.config.command_map.prefix[mapped_command.to_sym].unshift("#{fetch(:asdf_wrapper_path)}")
       end
     end
   end
@@ -45,15 +81,16 @@ namespace :asdf do
   task :map_nodejs_bins do
     if fetch(:asdf_tools).include?('nodejs')
       fetch(:asdf_map_nodejs_bins).each do |mapped_command|
-        SSHKit.config.command_map.prefix[mapped_command.to_sym].unshift("source #{fetch(:asdf_path)}/asdf.sh;")
+        SSHKit.config.command_map.prefix[mapped_command.to_sym].unshift("#{fetch(:asdf_wrapper_path)}")
       end
     end
   end
-  
+
 end
 
 before 'asdf:install', 'asdf:add_plugins'
 after 'deploy:check', 'asdf:check'
+before 'asdf:check', 'asdf:upload_wrapper'
 
 Capistrano::DSL.stages.each do |stage|
   after stage, 'asdf:map_ruby_bins'
@@ -66,6 +103,9 @@ namespace :load do
       asdf_path = fetch(:asdf_custom_path)
       asdf_path ||= ASDF_USER_PATH
     }
+    set :asdf_wrapper_path, -> {
+      fetch(:asdf_custom_wrapper_path) || "#{shared_path}/asdf-wrapper"
+    }
 
     set :asdf_tools, fetch(:asdf_tools, ASDF_DEFAULT_TOOLS)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-asdf
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jean-Baptiste Poix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ASDF integration for Capistrano