capistrano3_featureset 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231ac973fe34af91da551956ba5e43bd31fe2e689814fd40b87ddfdebd101f63
-  data.tar.gz: 708e8403c5c5dcf2805a2c9ad4f016df31bc7a38dbe536fb4d418c73b2891a29
+  metadata.gz: 7c9172c1524531a7246d2517f48daf9f6b409681914ddf539a44a6db35c81b0d
+  data.tar.gz: 5876c45aaf6bcbb5837866a60c52d982c61dc1fc0cbf97064fad34e16dd57b05
 SHA512:
-  metadata.gz: 81c2fc24ef4eab4e70d2b67f5b9e1efb45f8909b7be4f4837bffccc682896fffad2a420ea5ae803883afe957c6b41223574aeda2b47e29f234b1e74117c2f5ea
-  data.tar.gz: 33f91074feb41afbcec62dadea1f6adaa8e4926f33e30b732d558a8103723959202d0ad748ed71c51f09ced2f92af45d53ac0c0d3f54910b8c8402c3f4ccd1e9
+  metadata.gz: 9d12b43d848be73bcf6fef029fd6e928387ea50eeaf6339f43b278efa6c5aa3d05e7e7cb292736f24306389de271c4b32f579fd70433e24310d12c74ff319343
+  data.tar.gz: 0d5b5bdf4ae553d4d6f986dc92d0e0218172982ad827000e3986b8328c45f17a10d44c42e71ab4b477f69732cba5a94d3abd419997da2f4603d68509c2013e76

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/capistrano3_featureset-*.gem

data/README.md

@@ -1,5 +1,7 @@
 # Capistrano3 - Feature set
 
+A feature set for capistrano3 with rsync plugin.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -33,8 +35,9 @@ set :application, 'application-name'
 set :repo_url, 'git@github.com:your-repo.git'
 set :deploy_to, '/srv/application-name'
 
-set :rvm_ruby_version, '3.1.1'
+set :ruby_version, '4.0.1'
 
+# set :version_manager, 'rvm' # default is mise
 # set :enable_delayed_job, false # default is false
 # set :enable_solid_queue, false # default is false
 # set :enable_whenever, false # default is false
@@ -43,10 +46,38 @@ set :rvm_ruby_version, '3.1.1'
 # set :systemd_usage, true # default is true
 ```
 
-## License
+
+# Changelog
+
+## [1.1.0] - 2026-09-16
+
+### Added
+
+* Support for selecting the Ruby version manager.
+* Added support for both **mise** and **RVM**.
+* The version manager can be configured per deployment.
+
+### Changed
+
+* Existing RVM-based deployments remain supported.
+* Ruby command execution is now handled through the configured version manager.
+
+## [1.0.0]
+
+### Added
+
+* Initial stable release.
+* Working RVM-based Ruby deployment support.
+
+
+# License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
 ## Integration of Capistrano 3.7.1+ rsync plugin
 
 see https://github.com/infovore/capistrano-rsync-plugin
+
+## Integration of Capistrano::RVM plugin
+
+see https://github.com/capistrano/rvm

data/capistrano3_featureset.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano3_featureset'
-  spec.version       = '1.0.0'
+  spec.version       = '1.1.0'
   spec.authors       = ['Georg Limbach', 'Tom Armitage', 'Stefan Daschek']
   spec.email         = ['georg.limbach@lichtbit.com']
 
@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'capistrano', '~> 3.0'
   spec.add_dependency 'capistrano-rails'
-  spec.add_dependency 'capistrano-rvm'
   spec.add_dependency 'ed25519' #  to use modern ssh key ciphers
   spec.add_dependency 'bcrypt_pbkdf' #  to use modern ssh key ciphers
 end

data/lib/capistrano3_featureset/default.rb

@@ -8,7 +8,6 @@ require 'capistrano/deploy'
 require 'capistrano/rsync'
 install_plugin Capistrano::SCM::Rsync
 
-require 'capistrano/rvm'
 require 'capistrano/rails'
 begin
   require 'whenever/capistrano'
@@ -16,4 +15,30 @@ rescue StandardError, LoadError
   nil
 end
 
+
+namespace :load do
+  task :defaults do
+    set :ruby_map_bins, %w{gem rake ruby bundle}
+    set :rvm_type, :user
+
+    rsync_excludes = %w[.git* spec rspec test Capfile config/deploy config/deploy.rb]
+    set :rsync_options, "-azc --delete --delete-excluded --exclude #{rsync_excludes.join(' --exclude ')}"
+
+    set :version_manager, 'mise'
+    set :enable_delayed_job, false
+    set :enable_solid_queue, false
+    set :enable_whenever, false
+    set :enable_unicorn, false
+    set :enable_puma, false
+
+    set :systemd_usage, true
+
+    append :linked_dirs, 'public/uploads'
+    append :linked_dirs, 'private'
+    append :linked_dirs, 'log'
+    set :more_linked_dirs, 'tmp/pids' => 'pids'
+  end
+end
+
+load File.expand_path('tasks/version_manager.rake', __dir__)
 load File.expand_path('tasks/featureset.rake', __dir__)

data/lib/capistrano3_featureset/tasks/featureset.rake

@@ -121,28 +121,6 @@ namespace :featureset do
   end
 end
 
-namespace :load do
-  task :defaults do
-    rsync_excludes = %w[.git* spec rspec test Capfile config/deploy config/deploy.rb]
-    set :rsync_options, "-azc --delete --delete-excluded --exclude #{rsync_excludes.join(' --exclude ')}"
-
-    set :rvm_type, :user
-
-    set :enable_delayed_job, false
-    set :enable_solid_queue, false
-    set :enable_whenever, false
-    set :enable_unicorn, false
-    set :enable_puma, false
-
-    set :systemd_usage, true
-
-    append :linked_dirs, 'public/uploads'
-    append :linked_dirs, 'private'
-    append :linked_dirs, 'log'
-    set :more_linked_dirs, 'tmp/pids' => 'pids'
-  end
-end
-
 before 'deploy:migrate', 'featureset:db_load_schema' unless ENV['FIRST_DEPLOYMENT'].nil?
 after 'deploy:publishing', 'featureset:puma_reload'
 after 'deploy:publishing', 'featureset:unicorn_upgrade'

data/lib/capistrano3_featureset/tasks/version_manager.rake

@@ -0,0 +1,106 @@
+RVM_SYSTEM_PATH = "/usr/local/rvm"
+RVM_USER_PATH = "~/.rvm"
+
+namespace :version_manager do
+  desc "Prints the mise/RVM and Ruby version on the target host"
+  task :check do
+    on roles(fetch(:ruby_roles, :all)) do
+      if fetch(:version_manager) == 'mise'
+
+        # chcek ruby version
+        ruby_version = fetch(:ruby_version)
+        installed_rubies = capture(:mise, 'list', 'ruby', '--installed')
+        unless installed_rubies.include?(ruby_version)
+          error "Ruby #{ruby_version} is not installed via mise."
+          error "Installed Rubies:"
+          error installed_rubies
+          error "Install with: mise install ruby@#{ruby_version}"
+          raise Capistrano::Error, "Required Ruby #{ruby_version} is not installed"
+        end
+
+        # check env file
+        env_file = "/home/#{fetch(:application)}/#{fetch(:application)}_env_vars"
+        if test("[ -f #{env_file} ]")
+          exported_vars = capture(
+            :grep,
+            '-nE',
+            '^export[[:space:]]+',
+            env_file,
+            raise_on_non_zero_exit: false
+          )
+
+          unless exported_vars.empty?
+            error "Environment file contains variables using 'export':"
+            error exported_vars
+            error "Please use plain assignments like: FOO=bar"
+            raise Capistrano::Error, "Environment variables must not use 'export'"
+          end
+        else
+          error "Environment file not found: #{env_file}"
+          raise Capistrano::Error, "Required environment file is missing"
+        end
+      end
+
+      if fetch(:log_level) == :debug
+        if fetch(:version_manager) == 'mise'
+          puts capture(:mise, "version")
+        else
+          puts capture(:rvm, "version")
+          puts capture(:rvm, "current")
+        end
+        puts capture(:ruby, "--version")
+      end
+    end
+  end
+
+  task :hook do
+    if fetch(:version_manager) == 'mise'
+      env = fetch(:default_env, {})
+      path = env.fetch(:PATH, '$PATH')
+
+      SSHKit.config.default_env.merge!(path: "/home/#{fetch(:application)}/.local/bin:$PATH")
+      SSHKit.config.default_env.merge!(mise_config_file: "/home/#{fetch(:application)}/#{fetch(:application)}.mise.toml")
+
+      set :mise_path, "~/.local/bin/mise"
+
+      SSHKit.config.command_map[:mise] = fetch(:mise_path)
+
+      mise_prefix = "#{fetch(:mise_path)} exec ruby@#{fetch(:ruby_version)} --"
+      fetch(:ruby_map_bins).each do |command|
+        SSHKit.config.command_map.prefix[command.to_sym].unshift(mise_prefix)
+      end
+    else
+      on roles(fetch(:ruby_roles, :all)) do
+        rvm_path = fetch(:rvm_custom_path)
+        rvm_path ||= case fetch(:rvm_type)
+        when :auto
+          if test("[ -d #{RVM_USER_PATH} ]")
+            RVM_USER_PATH
+          elsif test("[ -d #{RVM_SYSTEM_PATH} ]")
+            RVM_SYSTEM_PATH
+          else
+            RVM_USER_PATH
+          end
+        when :system, :mixed
+          RVM_SYSTEM_PATH
+        else # :user
+          RVM_USER_PATH
+        end
+
+        set :rvm_path, rvm_path
+      end
+
+      SSHKit.config.command_map[:rvm] = "#{fetch(:rvm_path)}/bin/rvm"
+
+      rvm_prefix = "#{fetch(:rvm_path)}/bin/rvm #{fetch(:ruby_version)} do"
+      fetch(:ruby_map_bins).each do |command|
+        SSHKit.config.command_map.prefix[command.to_sym].unshift(rvm_prefix)
+      end
+    end
+  end
+end
+
+Capistrano::DSL.stages.each do |stage|
+  after stage, 'version_manager:hook'
+  after stage, 'version_manager:check'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3_featureset
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Georg Limbach
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-28 00:00:00.000000000 Z
+date: 2026-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -40,20 +40,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: capistrano-rvm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ed25519
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +85,7 @@ files:
 - lib/capistrano3_featureset.rb
 - lib/capistrano3_featureset/default.rb
 - lib/capistrano3_featureset/tasks/featureset.rake
+- lib/capistrano3_featureset/tasks/version_manager.rake
 homepage:
 licenses:
 - MIT
@@ -118,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Capistrano3 feature set