dlss-capistrano 5.3.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c20ce3abcea6996c7366473874dbd9b7106749c5e7b365d21e301195ead06830
-  data.tar.gz: 75a94eb0b169763cd62e7dd92bcb8b183d7621e5ea271613c06b7b4814835c7d
+  metadata.gz: 3e1b8d438e47aeccd15dd40990abe17e81629f4d84ce51b1f51f80e977fe0cb1
+  data.tar.gz: 4e8cb2dc57d7504eec22095ac9208068f3679b7b38f827eeb607e32cb22f67db
 SHA512:
-  metadata.gz: c18fc1a359d2bffa0f474b4e3eaa4d00010e01bddf6eb37dde993512c1f3076ed861b5ff79d955afa8a406d125c95feb5a9b91561a02d81561484c0e802a03b9
-  data.tar.gz: c03fd209a7440b754cad93ed9b671cd3554d86804c358bc7aa0b65fb2c46a99d6b518b3baab57719da1784fe42c85d03b55d5602f56a8810fbf13cb2e56a0f9b
+  metadata.gz: f5c5375c551681add97ce74d86647b15db8eaa4d5c57ff5795b427a035a48ae1605a004ef43e97011b713c1d1b2a6ae09211c3e9363b568a094474e16e371e75
+  data.tar.gz: 3b00d0ef2a7343a58c8d6f24e06dc0d741418c6cb7f382906c4f4a3a13285cc62298c692defe5cb2b6f3ecca44e7b2de1f14bba290c437d8bfb383bb7c5e6597

data/README.md

@@ -89,6 +89,12 @@ These tasks are intended to replace those provided by `capistrano-sidekiq` gem,
 
 `cap ENV racecar_systemd:{stop,start,restart}`: stops, starts, restarts Racecar via systemd.
 
+### Ruby install
+This is useful for upgrading to a new version of Ruby and ensuring the bundle is installed, before switching
+the application server to default to the new Ruby version.
+
+`cap ENV "dlss:ruby:install:[ruby-4.0.0]`: installs or updates Ruby via rvm.
+
 #### Capistrano role
 
 The sidekiq_systemd tasks assume a Capistrano role of `:app`. If your application uses a different Capistrano role for hosts that run Sidekiq workers, you can configure this in `config/deploy.rb`, _e.g._:

data/dlss-capistrano.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "dlss-capistrano"
-  s.version     = '5.3.0'
+  s.version     = '6.1.0'
 
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Chris Beer", 'Mike Giarlo']
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   # All dependencies are runtime dependencies, since this gem's "runtime" is
   # the dependent gem's development-time.
   s.add_dependency "capistrano", "~> 3.0"
-  s.add_dependency "capistrano-bundle_audit", ">= 0.3.0"
   s.add_dependency "capistrano-shared_configs"
   s.add_dependency "capistrano-one_time_key", ">= 0.2.0"
   # support for MacOS 14.4+ usage of ed25519 SSH keys

data/lib/dlss/capistrano/tasks/install_ruby.rake

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+namespace :dlss do
+  namespace :ruby do
+    desc 'Install a specific Ruby version using RVM and run bundle install'
+    task :install, :version do |_task, args|
+      on roles(:app) do
+        ruby_version = args[:version]
+
+        if ruby_version.nil? || ruby_version.empty?
+          error <<~ERROR
+            Ruby version is required.
+
+            Usage examples:
+              cap stage dlss:ruby:install[ruby-3.1.0]           # Basic usage
+              cap stage "dlss:ruby:install[ruby-3.1.0]"         # Quoted (recommended for zsh)
+              RUBY_VERSION=ruby-3.1.0 cap stage dlss:ruby:install_with_env
+          ERROR
+          exit 1
+        end
+
+        info "Installing Ruby #{ruby_version} using RVM..."
+
+        # Check if RVM is installed
+        rvm_installed = test('which rvm') || test('[ -s "$HOME/.rvm/scripts/rvm" ]') || test('command -v rvm')
+
+        unless rvm_installed
+          error <<~ERROR
+            RVM is not installed on the remote server.
+
+            To install RVM first, run:
+              \\curl -sSL https://get.rvm.io | bash -s stable
+
+            Then logout and login again, or source the RVM script manually.
+          ERROR
+          exit 1
+        end
+
+        # Try to source RVM if it exists
+        if test('[ -s "$HOME/.rvm/scripts/rvm" ]')
+          execute 'source ~/.rvm/scripts/rvm'
+        elsif test('[ -s "/etc/profile.d/rvm.sh" ]')
+          execute 'source /etc/profile.d/rvm.sh'
+        end
+
+        # Install the Ruby version
+        info "Installing Ruby #{ruby_version}..."
+        execute "rvm install #{ruby_version}"
+
+        info "Setting Ruby #{ruby_version} as current..."
+        execute "rvm use #{ruby_version}"
+
+        # Use Capistrano's bundler task for bundle install with fallback
+        info 'Running bundle install using Capistrano bundler task...'
+        begin
+          invoke! 'bundler:install'
+          info "Ruby #{ruby_version} installed successfully and bundle install completed!"
+        rescue NameError => e
+          warn "Bundler task not available (#{e.message}), trying manual bundle install..."
+          # Fallback to manual bundle install in current directory
+          if test("[ -f #{current_path}/Gemfile ]")
+            within current_path do
+              execute 'bundle install'
+              info "Ruby #{ruby_version} installed successfully and bundle install completed!"
+            end
+          else
+            error "Could not find Gemfile in #{current_path}. Please check your deployment configuration."
+            exit 1
+          end
+        end
+      end
+    end
+
+    desc 'Install Ruby version from environment variable RUBY_VERSION'
+    task :install_with_env do
+      ruby_version = ENV.fetch('RUBY_VERSION', nil)
+      if ruby_version.nil? || ruby_version.empty?
+        error 'RUBY_VERSION environment variable is required. Usage: RUBY_VERSION=ruby-3.1.0 cap stage ruby:install_with_env'
+        exit 1
+      end
+      invoke 'ruby:install', ruby_version
+    end
+  end
+end

data/lib/dlss/capistrano.rb

@@ -1,5 +1,4 @@
 require 'capistrano/one_time_key'
-require 'capistrano/bundle_audit'
 require 'capistrano/shared_configs'
 
 Dir.glob("#{__dir__}/capistrano/tasks/*.rake").each { |r| import r }

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dlss-capistrano
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Chris Beer
 - Mike Giarlo
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -25,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: capistrano-bundle_audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: capistrano-shared_configs
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +102,7 @@ files:
 - lib/dlss/capistrano/tasks/check_status.rake
 - lib/dlss/capistrano/tasks/control_master.rake
 - lib/dlss/capistrano/tasks/deployed_branch.rake
+- lib/dlss/capistrano/tasks/install_ruby.rake
 - lib/dlss/capistrano/tasks/racecar_systemd.rake
 - lib/dlss/capistrano/tasks/remote_execute.rake
 - lib/dlss/capistrano/tasks/setup/setup.rake
@@ -127,11 +113,9 @@ files:
 - lib/dlss/capistrano/tasks/ssh_check.rake
 - lib/dlss/capistrano/tasks/strscan.rake
 - lib/lyberteam-capistrano-devel.rb
-homepage:
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Capistrano recipes for use in SUL/DLSS projects
 test_files: []