dlss-capistrano 3.4.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 401c91b9bcf9711f8503d30133b8ae23d6270c13
-  data.tar.gz: de0a7413ead1776f1969a5770f5eed682f1b1ace
+SHA256:
+  metadata.gz: 7eea74ee6a9ac9242202225bf1f5483e90bdeb69cdac2610023991f665d6c205
+  data.tar.gz: c0e1dad48ea7b768620c6f4e067daae07068441e667534c22c8360cf2adfb649
 SHA512:
-  metadata.gz: 44895bd8295e04b3b5cb769af89dbc6912aa613612416dadd0580c22a83b002a9837290d20db4b906da943c373fc66ea52b1af70d4755da53019599129f33e74
-  data.tar.gz: 85b681f6633951e3f1540d9486c38a59095bb535356db39675fa947268808f6aa4f61b5f153e03fecf45960fcb4fb443967faa6c01eb1664c3ca95ebcebcc05a
+  metadata.gz: 249eefe27bc33417be80b1418c82fcb1766658e3fa4f35807725d98492e2eeeec3db8d92eccc3eff5a1d3cac5cc937007a41a25d547f168770e93c77449a2a72
+  data.tar.gz: 8ebf45a2df37fd94887f14c37e9aec109ab4aa939cd45ad5f413273c9fe2e3a3d7cd749c26892b1cc859aa8de67ad1d573476a113832a7b3644b081d119f9a91

data/.github/pull_request_template.md

@@ -0,0 +1,12 @@
+## Why was this change made?
+
+
+
+## How was this change tested?
+
+
+
+## Which documentation and/or configurations were updated?
+
+
+

data/LICENSE

@@ -1,20 +1,13 @@
-Copyright (c) 2009 Stanford University Library
+Copyright 2017 The Board of Trustees of the Leland Stanford Junior University
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+  http://www.apache.org/licenses/LICENSE-2.0
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -1,21 +1,87 @@
 # dlss-capistrano
 
-This gem contains classes that deal with the Capistrano deployment of SUL DLSS Ruby projects.
+[![Gem Version](https://badge.fury.io/rb/dlss-capistrano.svg)](https://badge.fury.io/rb/dlss-capistrano)
 
-## Capfile assumptions
+This gem provides Capistrano deployment tasks used by Stanford Libraries' Digital Library Systems and Services group.
 
-This gem makes the following assumptions about your Ruby project
+## Included Tasks
+
+### Bundle 2-style Configuration
+
+To override the capistrano-bundler gem and use Bundler 2-style configuration without using deprecated arguments, you can set the following settings in `config/deploy.rb`:
+
+```ruby
+set :bundler2_config_use_hook, true # this is how to opt-in to bundler 2-style config. it's false by default
+set :bundler2_config_roles, [:app] # feel free to add roles to this array if you need them
+set :bundler2_config_deployment, true # this is true by default
+set :bundler2_config_without, 'production' # exclude development, and test bundle groups by default
+set :bundler2_config_path, '/tmp' # set to '#{shared_path}/bundle' by default
+```
+
+Note that only `bundler2_config_use_hook` **must** be set in order to use this functionality.
+
+### Sidekiq symlink
+
+Every time the version of Sidekiq or Ruby changes, a corresponding Puppet PR must be made in order to update the XSendFilePath that allows Apache to access the bundled Sidekiq gem's assets. dlss-capistrano provides a hook to create a symlink to the bundled Sidekiq to avoid having to do this:
+
+```ruby
+set :bundled_sidekiq_symlink, true # false is the default value
+set :bundled_sidekiq_roles, [:app] # this is the default value
+```
+
+Set this in `config/deploy.rb` to automate the symlink creation, and then use `XSendFilePath /path/to/my/app/shared/bundled_sidekiq/web/assets` in Apache configuration (in Puppet).
+
+### SSH
+
+`cap ENV ssh` establishes an SSH connection to the host running in `ENV` environment, and changes into the current deployment directory
+
+### Display Revision (and branches)
+
+`cap ENV deployed_branch` displays the currently deployed revision (commit ID) and any branches containing the revision for each server in `ENV`.
+
+### Sidekiq via systemd
+
+`cap ENV sidekiq_systemd:{quiet,stop,start,restart}`: quiets, stops, starts, restarts Sidekiq via systemd.
+
+These tasks are intended to replace those provided by `capistrano-sidekiq` gem, which has assumptions about systemd that do not apply to our deployed environments.
+
+#### 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.*:
+
+```ruby
+set :sidekiq_systemd_role, :worker
+```
+
+#### Deployment hooks
+
+The sidekiq_systemd tasks assume you want to hook them into Capistrano deployment on your own. If you want to use the hooks provided by `dlss-capistrano`, you can opt in via `config/deploy.rb`:
+
+```ruby
+set :sidekiq_systemd_use_hooks, true
+```
+
+These are the hooks provided if you opt in:
+
+```ruby
+after 'deploy:failed', 'sidekiq_systemd:restart'
+after 'deploy:published', 'sidekiq_systemd:start'
+after 'deploy:starting', 'sidekiq_systemd:quiet'
+after 'deploy:updated', 'sidekiq_systemd:stop'
+```
+
+## Assumptions
+
+dlss-capistrano makes the following assumptions about your Ruby project
 
 - You are using Capistrano 3+
 - You use git for source control
-- The server you deploy to uses rvm, it is installed systemwide, and is the default system ruby
+- The server you deploy to uses rvm, it is installed system-wide, and is the default system ruby
 - You do not have an .rvmrc checked into git (should be in your .gitignore)
 - You will not use rvm gemsets on the server you deploy to
 - Bundler will install specified gems into {your_project_home}/shared/bundle directory
-- You have a VERSION file that contains an x.y.z version number. This will get passed to the DLSS release board
 - Will deploy from the master branch, unless you set :branch to another branch or tag
 
+## Copyright
 
-== Copyright
-
-Copyright (c) 2015 Stanford University Library. See LICENSE for details.
+Copyright (c) 2020 Stanford University. See LICENSE for details.

data/dlss-capistrano.gemspec

@@ -4,13 +4,14 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "dlss-capistrano"
-  s.version     = "3.4.0"
+  s.version     = "3.8.0"
 
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Chris Beer","Willy Mene"]
-  s.email       = ["cabeer@stanford.edu"]
-  s.summary     = "Capistrano recipies for use in SUL/DLSS projects"
-  s.description = "Capistrano recipies  to assist with the development, testing, and release of SUL/DLSS Ruby project"
+  s.authors     = ["Chris Beer", 'Mike Giarlo']
+  s.email       = ["cabeer@stanford.edu", 'mjgiarlo@stanford.edu']
+  s.summary     = "Capistrano recipes for use in SUL/DLSS projects"
+  s.description = "Capistrano recipes to assist with development, testing, & deployment of SUL/DLSS Ruby projects"
+  s.license     = "Apache-2.0"
 
   s.required_rubygems_version = ">= 1.3.6"
   s.required_ruby_version = '>= 1.9.3'
@@ -18,8 +19,7 @@ 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-releaseboard"
-  s.add_dependency "capistrano-bundle_audit", ">= 0.1.0"
+  s.add_dependency "capistrano-bundle_audit", ">= 0.3.0"
   s.add_dependency "capistrano-one_time_key"
   s.add_dependency "capistrano-shared_configs"
 

data/lib/dlss/capistrano.rb

@@ -1,6 +1,5 @@
-ENV['RELEASE_BOARD_URL'] ||= "https://dlss-releases.stanford.edu"
-
 require 'capistrano/one_time_key'
-require 'capistrano/releaseboard'
 require 'capistrano/bundle_audit'
 require 'capistrano/shared_configs'
+
+Dir.glob("#{__dir__}/capistrano/tasks/*.rake").each { |r| import r }

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# These tasks exist because capistrano-bundler does not yet have a built-in
+# mechanism for configuring bundler 2 without deprecation warnings. We can dump
+# this if/when https://github.com/capistrano/bundler/issues/115 is resolved.
+
+def default_bundle_path
+  Pathname.new("#{shared_path}/bundle")
+end
+
+namespace :load do
+  task :defaults do
+    # This provides opt-in behavior. Do nothing if not requested.
+    set :bundler2_config_use_hook, fetch(:bundler2_config_use_hook, false)
+    set :bundler2_config_roles, fetch(:bundler2_config_roles, [:app])
+    set :bundler2_config_deployment, fetch(:bundler2_config_deployment, true)
+    set :bundler2_config_without, fetch(:bundler2_config_without, 'development:test')
+    # NOTE: `shared_path` is not defined at this point, so we can't set the default value to `default_bundle_path`
+    set :bundler2_config_path, fetch(:bundler2_config_path, nil)
+  end
+end
+
+# Integrate bundle config hook into Capistrano
+namespace :deploy do
+  before :starting, :add_bundler2_config_hook do
+    invoke 'bundler2:add_hook' if fetch(:bundler2_config_use_hook)
+  end
+end
+
+namespace :bundler2 do
+  # NOTE: no `desc` here to avoid publishing this task in the `cap -T` list
+  task :add_hook do
+    # Override capistrano-bundler settings
+    # HT: https://github.com/capistrano/bundler/issues/115#issuecomment-616570236
+    set :bundle_flags, '--quiet' # this unsets --deployment, see details in config_bundler task details
+    set :bundle_path, nil
+    set :bundle_without, nil
+
+    before 'bundler:install', 'bundler2:config'
+  end
+
+  # NOTE: This task lacks a `desc` to avoid publishing it, since we do not
+  #       foresee needing to run this task manually. It should run via hook.
+  #
+  # Configure bundler 2 without using deprecated arguments (overrides capistrano-bundler
+  task :config do
+    on roles fetch(:bundler2_config_roles) do
+      execute "bundle config --local deployment #{fetch(:bundler2_config_deployment)}"
+      execute "bundle config --local without '#{fetch(:bundler2_config_without)}'"
+      execute "bundle config --local path #{fetch(:bundler2_config_path) || default_bundle_path}"
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# Capistrano plugin hook to set default values
+namespace :load do
+  task :defaults do
+    set :bundled_sidekiq_symlink, fetch(:bundled_sidekiq_symlink, false)
+    set :bundled_sidekiq_roles, fetch(:bundled_sidekiq_roles, [:app])
+  end
+end
+
+# Integrate sidekiq-bundle hook into Capistrano
+namespace :deploy do
+  before :starting, :add_bundled_sidekiq_hook do
+    invoke 'bundled_sidekiq:add_hook' if fetch(:bundled_sidekiq_symlink)
+  end
+end
+
+namespace :bundled_sidekiq do
+  # NOTE: no `desc` here to avoid publishing this task in the `cap -T` list
+  task :add_hook do
+    after 'bundler:install', 'bundled_sidekiq:symlink'
+  end
+
+  # NOTE: no `desc` here to avoid publishing this task in the `cap -T` list
+  task :symlink do
+    on roles fetch(:bundled_sidekiq_roles) do
+      within release_path do
+        bundled_sidekiq_path = capture(:bundle, :info, '--path', :sidekiq)
+        execute(:ln, '-sf', bundled_sidekiq_path, "#{shared_path}/bundled_sidekiq")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+desc 'display the deployed branch and commit'
+task :deployed_branch do
+  on roles(:app) do |host|
+    within current_path do
+      revision = capture :cat, 'REVISION'
+      branches = `git branch -r --contains #{revision}`.strip
+      info "#{host}: #{revision} (#{branches})"
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+# Capistrano plugin hook to set default values
+namespace :load do
+  task :defaults do
+    set :sidekiq_systemd_role, fetch(:sidekiq_systemd_role, :app)
+    set :sidekiq_systemd_use_hooks, fetch(:sidekiq_systemd_use_hooks, false)
+  end
+end
+
+# Integrate sidekiq hooks into Capistrano
+namespace :deploy do
+  before :starting, :add_sidekiq_systemd_hooks do
+    invoke 'sidekiq_systemd:add_hooks' if fetch(:sidekiq_systemd_use_hooks)
+  end
+end
+
+namespace :sidekiq_systemd do
+  # NOTE: no `desc` here to avoid publishing this task in the `cap -T` list
+  task :add_hooks do
+    after 'deploy:failed', 'sidekiq_systemd:restart'
+    after 'deploy:published', 'sidekiq_systemd:start'
+    after 'deploy:starting', 'sidekiq_systemd:quiet'
+    after 'deploy:updated', 'sidekiq_systemd:stop'
+  end
+
+  desc 'Stop workers from picking up new jobs'
+  task :quiet do
+    on roles fetch(:sidekiq_systemd_role) do
+      sudo :systemctl, 'reload', 'sidekiq-*', raise_on_non_zero_exit: false
+    end
+  end
+
+  desc 'Stop running workers gracefully'
+  task :stop do
+    on roles fetch(:sidekiq_systemd_role) do
+      sudo :systemctl, 'stop', 'sidekiq-*'
+    end
+  end
+
+  desc 'Start workers'
+  task :start do
+    on roles fetch(:sidekiq_systemd_role) do
+      sudo :systemctl, 'start', 'sidekiq-*', '--all'
+    end
+  end
+
+  desc 'Restart workers'
+  task :restart do
+    on roles fetch(:sidekiq_systemd_role) do
+      sudo :systemctl, 'restart', 'sidekiq-*', raise_on_non_zero_exit: false
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+desc "ssh to the current directory on the server"
+task :ssh do
+  on roles(:app), :primary => true do |host|
+    command = "cd #{fetch(:deploy_to)}/current && exec $SHELL -l"
+    puts command if fetch(:log_level) == :debug
+    exec "ssh -l #{host.user} #{host.hostname} -p #{host.port || 22} -t '#{command}'"
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dlss-capistrano
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Chris Beer
-- Willy Mene
+- Mike Giarlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -25,34 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: capistrano-releaseboard
-  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: capistrano-bundle_audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: capistrano-one_time_key
   requirement: !ruby/object:Gem::Requirement
@@ -81,14 +67,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Capistrano recipies  to assist with the development, testing, and release
-  of SUL/DLSS Ruby project
+description: Capistrano recipes to assist with development, testing, & deployment
+  of SUL/DLSS Ruby projects
 email:
 - cabeer@stanford.edu
+- mjgiarlo@stanford.edu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/pull_request_template.md"
 - ".gitignore"
 - Gemfile
 - LICENSE
@@ -97,9 +85,15 @@ files:
 - dlss-capistrano.gemspec
 - lib/dlss.rb
 - lib/dlss/capistrano.rb
+- lib/dlss/capistrano/tasks/bundle_config.rake
+- lib/dlss/capistrano/tasks/bundled_sidekiq.rake
+- lib/dlss/capistrano/tasks/deployed_branch.rake
+- lib/dlss/capistrano/tasks/sidekiq_systemd.rake
+- lib/dlss/capistrano/tasks/ssh.rake
 - lib/lyberteam-capistrano-devel.rb
 homepage: 
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -116,9 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Capistrano recipies for use in SUL/DLSS projects
+summary: Capistrano recipes for use in SUL/DLSS projects
 test_files: []