dlss-capistrano 5.0.4 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39143f216a91dfe66390f1ae31a1f8b93d180cc03a5f548dd0d7a5e6a3bb7c24
-  data.tar.gz: 9ae2c9d0e0c5dc7dee168e5078d2a6fcbeef2b2346b28242fa486b4ccc3114cf
+  metadata.gz: f69b0b30f58f3313e59a5fc7cf0d510d5c95d99fe5e077a772588e6ffdccbbd9
+  data.tar.gz: e0020c24765ddd757ee839371f962325900b147aa69a399c7ad97eb60b7babb8
 SHA512:
-  metadata.gz: ca176055c581b300a67a0891f73a56d26f5617fdb01fd5f90b9bc605dbe4418b8b24e4e26b3e8122dbd97946567d89a967e81adc130823bce1ea6cb5beb06431
-  data.tar.gz: 858e89f34ed203ec856dd8edda786371f90a13c328e9aeb997516482c5cf6d48329ce3044dc8b817355d9cd0e0cf8001fe581f051b85d3b82f65b8212cc4221d
+  metadata.gz: 9e14e482febdd209f99802e0b4b0ac6323825da0312c6e50c21e97a51746fe651c8825691a9b0d86576b5239c7ba8328113c9df18565cc82a542d5cb158e0ba4
+  data.tar.gz: ddbc21daf2f1e259764d1257a741a9fb8208e8731e693c40daf9d15c49dfb6747615ce1161ce98f34e7757ae7eacd7cce5c09c3ccfde4c9c81b8cb654f5ad837

data/README.md

@@ -4,7 +4,9 @@
 
 This gem provides Capistrano deployment tasks used by Stanford Libraries' Digital Library Systems and Services group.
 
-## Necessary setup
+## Necessary Setup
+
+To start, we recommend an SSH configuration like the one described in the [DeveloperPlaybook](https://github.com/sul-dlss/DeveloperPlaybook/blob/main/best-practices/ssh_configuration.md), since it has sensible defaults for Kerberos authentication and multi-factor authentication (using `ProxyJump` and `ControlMaster`, etc.).
 
 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).
 

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.4'
+  s.version     = '5.1.1'
 
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Chris Beer", 'Mike Giarlo']
@@ -21,6 +21,7 @@ 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 "capistrano-one_time_key", ">= 0.2.0"
   # 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

@@ -12,7 +12,7 @@ end
 
 # Integrate hook into Capistrano
 namespace :deploy do
-  before :starting, :setup_controlmaster do
+  before :generate_otk, :setup_controlmaster do
     invoke 'controlmaster:setup'
   end
 end

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

@@ -1,5 +1,5 @@
 desc 'display the deployed branch and commit'
-task deployed_branch: 'controlmaster:setup' do
+task deployed_branch: ['controlmaster:setup', 'otk:generate'] do
   # see https://github.com/mattbrictson/airbrussh/tree/v1.5.2?tab=readme-ov-file#capistrano-34x
   Airbrussh.configure do |config|
     config.truncate = false

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

@@ -10,7 +10,7 @@ namespace :load do
 end
 
 desc "execute command on all servers"
-task :remote_execute, [:command] => 'controlmaster:setup' do |_task, args|
+task :remote_execute, [:command] => ['controlmaster:setup', 'otk:generate'] do |_task, args|
   raise ArgumentError, 'remote_execute task requires an argument' unless args[:command]
 
   # see https://github.com/mattbrictson/airbrussh/tree/v1.5.2?tab=readme-ov-file#capistrano-34x

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

@@ -1,5 +1,5 @@
 desc "check ssh connections to all app servers"
-task ssh_check: 'controlmaster:setup' do
+task ssh_check: ['controlmaster:setup', 'otk:generate'] do
   on roles(:app), in: :sequence do
     execute
   end

data/lib/dlss/capistrano.rb

@@ -1,14 +1,5 @@
+require 'capistrano/one_time_key'
 require 'capistrano/bundle_audit'
 require 'capistrano/shared_configs'
 
-# NOTE: This is only here so we can test this task against any host without needing to touch config/deploy/*.rb
-#
-# Instead of generating a one-time key, add legit gssapi authN via `net-ssh-krb` gem (thanks again, cbeer!)
-module Capistrano
-  module OneTimeKey
-    def self.generate_one_time_key!
-    end
-  end
-end
-
 Dir.glob("#{__dir__}/capistrano/tasks/*.rake").each { |r| import r }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dlss-capistrano
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.1.1
 platform: ruby
 authors:
 - Chris Beer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capistrano-one_time_key
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: ed25519
   requirement: !ruby/object:Gem::Requirement