dlss-capistrano 5.0.0 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 567a3f876085fa1cdc2de7ed0d79b874ca479674a82d158a32dece1d66316a92
-  data.tar.gz: 2cabff7242f8966857e68d05a27dfec7664192c094bbacf007b4bea605b7cab3
+  metadata.gz: 7d2be7ee14246b985ddc27517e14b9a50d3657f5ab2d2cefc71e12ab56463478
+  data.tar.gz: cdf05f64d3afe15292784235fb420da1e9ac2f9ae30cc954c6f88671af966aac
 SHA512:
-  metadata.gz: fca3a41b870e3b4050847bc283481a55066fc32ae36719ebed145f4771fe2ef9d70b76494bc5b44e43e372322a5f5df8dd9ee59b2c0bdefaead5a58ac2c0078d
-  data.tar.gz: 93dfc1d74b6de88f4a9d69bcac565faa5ad4262f694dbfef1f0ca5d77ab89a2ebcd016ca4898d826cb1076d882bba879797171d587ea5e277e6c32954e23d172
+  metadata.gz: 44071af75e21fd81b4bb17a14def12eda881694716d107860a1ccc44d94e52cfc8af895d29c82645009b6fc9c3e50fc6a16b8936495c5662a627044eba2b1a4a
+  data.tar.gz: 0c49339f0cca3ad096e4d5b0fb1c3a887c76a949c8d532a58899760cd95998b3f152386d07c3d17fda5ef540f3abbbbf88b81b85d710665ae19f12bcfe30b7a1

data/README.md

@@ -6,6 +6,8 @@ This gem provides Capistrano deployment tasks used by Stanford Libraries' Digita
 
 ## Necessary setup
 
+To use controlmaster, you need to opt-in by setting the environment variable `USE_CAPISTRANO_CONTROLMASTER=true` (in e.g. your `~/.zshenv` file or similar for your particular shell).
+
 If you use values other than the defaults for  `CONTROLMASTER_HOST` (`dlss-jump`) or `CONTROLMASTER_SOCKET` (`"~/.ssh/%r@%h:%p"`), you'll want to set these environment variables locally to the values you use (in e.g. your `~/.zshenv` file or similar for your particular shell).  Otherwise, the gem will fail to connect to the appropriate host and/or won't be able to properly check the status of the control master process.
 
 The control master host is the value of the `ProxyJump` directive in your SSH config, and the control master socket is the value of the `ControlPath` directive in your SSH config.

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.0.0'
+  s.version     = '5.0.2'
 
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Chris Beer", 'Mike Giarlo']
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency "capistrano", "~> 3.0"
   s.add_dependency "capistrano-bundle_audit", ">= 0.3.0"
   s.add_dependency "capistrano-shared_configs"
-  s.add_dependency "net-ssh-krb"
   # support for MacOS 14.4+ usage of ed25519 SSH keys
   s.add_dependency "ed25519"
   s.add_dependency "bcrypt_pbkdf"

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

@@ -2,8 +2,13 @@
 
 require 'open3'
 
-CONTROLMASTER_HOST = ENV.fetch('CONTROLMASTER_HOST', 'dlss-jump')
-CONTROLMASTER_SOCKET = ENV.fetch('CONTROLMASTER_SOCKET', "~/.ssh/%r@%h:%p")
+namespace :load do
+  task :defaults do
+    set :use_controlmaster, ENV.fetch('USE_CAPISTRANO_CONTROLMASTER', false) == 'true'
+    set :controlmaster_host, ENV.fetch('CONTROLMASTER_HOST', 'dlss-jump')
+    set :controlmaster_socket, ENV.fetch('CONTROLMASTER_SOCKET', "~/.ssh/%r@%h:%p")
+  end
+end
 
 # Integrate hook into Capistrano
 namespace :deploy do
@@ -15,12 +20,14 @@ end
 namespace :controlmaster do
   desc 'set up an SSH controlmaster process if missing'
   task :setup do
+    next unless fetch(:use_controlmaster)
+
     if fetch(:log_level) == :debug
-      puts "checking if controlmaster process exists (#{CONTROLMASTER_SOCKET}) for #{CONTROLMASTER_HOST}"
+      puts "checking if controlmaster process exists (#{fetch(:controlmaster_socket)}) for #{fetch(:controlmaster_host)}"
     end
 
     status, output = Open3.popen2e(
-      "ssh -O check -S #{CONTROLMASTER_SOCKET} #{CONTROLMASTER_HOST}"
+      "ssh -O check -S #{CONTROLMASTER_SOCKET} #{fetch(:controlmaster_host)}"
     ) { |_, outerr, wait_thr| next wait_thr.value, outerr.read }
 
     if status.success?
@@ -34,12 +41,14 @@ namespace :controlmaster do
 
   # NOTE: no `desc` here to avoid publishing this task in the `cap -T` list
   task :start do
+    next unless fetch(:use_controlmaster)
+
     if fetch(:log_level) == :debug
-      puts "creating new controlmaster process for #{CONTROLMASTER_HOST} at #{CONTROLMASTER_SOCKET}"
+      puts "creating new controlmaster process for #{fetch(:controlmaster_host)} at #{fetch(:controlmaster_socket)}"
     end
 
     status, output = Open3.popen2e(
-      "ssh -f -N -S #{CONTROLMASTER_SOCKET} #{CONTROLMASTER_HOST}"
+      "ssh -f -N -S #{fetch(:controlmaster_socket)} #{fetch(:controlmaster_host)}"
     ) { |_, outerr, wait_thr| next wait_thr.value, outerr.read }
 
     if status.success?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dlss-capistrano
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.2
 platform: ruby
 authors:
 - Chris Beer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-14 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -53,20 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-ssh-krb
-  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
@@ -144,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Capistrano recipes for use in SUL/DLSS projects