Merge pull request #81 from cul/hours-126_almalinux

Hours 126 almalinux

.github/workflows/ci.yml

@@ -9,8 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.0.3']
-        node: ['8', '12']
+        ruby-version: ['3.2.2']
+        node: ['14', '16']
     env:
       RAILS_ENV: test
       MYSQL_HOST: 127.0.0.1

Gemfile

@@ -18,7 +18,7 @@ gem 'sass', '~> 3.7.4'
 gem 'sass-rails', '~> 5'
 gem "sprockets-rails"
 gem "net-ldap", '~> 0.17.1'
-gem 'nokogiri', '~> 1.10.10'
+gem 'nokogiri', '~> 1.15.2' # update past 1.10 requires alma
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # See https://github.com/rails/execjs#readme for more supported runtimes
@@ -38,7 +38,7 @@ group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
   # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '~> 3.33'
+  gem 'capybara', '~> 3.39'
   # For testing with chromedriver
   gem 'selenium-webdriver', '~> 4.0'
   gem 'rexml', '~> 3.2', '>= 3.2.4'
@@ -58,11 +58,11 @@ group :development do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
-  gem 'capistrano', '3.8.2'
-  gem 'capistrano-rails', '~> 1.2'
+  gem 'capistrano', '~> 3.17.3', require: false
+  gem 'capistrano-rails', '~> 1.4', require: false
   gem 'capistrano-bundler', '~> 1.1', require: false
   gem 'capistrano-rvm', '~> 0.1', require: false
-  gem 'capistrano-passenger', '~> 0.1', require: false
+  gem 'capistrano-passenger', '~> 0.2', require: false
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -75,7 +75,7 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
-    airbrussh (1.3.1)
+    airbrussh (1.5.0)
       sshkit (>= 1.6.1, != 1.7.0)
     bcrypt (3.1.18)
     bigdecimal (3.1.4)
@@ -85,7 +85,7 @@ GEM
     builder (3.2.4)
     byebug (11.0.0)
     cancancan (3.5.0)
-    capistrano (3.8.2)
+    capistrano (3.17.3)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -100,15 +100,16 @@ GEM
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capybara (3.33.0)
+    capybara (3.39.2)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
     cul_omniauth (0.8.0)
@@ -142,7 +143,7 @@ GEM
     globalid (1.1.0)
       activesupport (>= 5.0)
     hashie (5.0.0)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jbuilder (2.8.0)
       activesupport (>= 4.2.0)
@@ -159,13 +160,14 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.2)
-    method_source (0.9.2)
+    matrix (0.4.2)
+    method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.8.5)
     minitest (5.18.0)
     msgpack (1.4.5)
     multi_json (1.13.1)
-    mysql2 (0.5.2)
+    mysql2 (0.5.5)
     net-imap (0.3.4)
       date
       net-protocol
@@ -174,14 +176,15 @@ GEM
       net-protocol
     net-protocol (0.2.1)
       timeout
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
     net-smtp (0.3.3)
       net-protocol
-    net-ssh (5.2.0)
+    net-ssh (7.2.0)
     nio4r (2.5.9)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.15.5)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     omniauth (1.9.2)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
@@ -190,12 +193,13 @@ GEM
       nokogiri (~> 1.5)
       omniauth (~> 1.2)
     orm_adapter (0.5.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     public_suffix (5.0.1)
     puma (5.2.0)
       nio4r (~> 2.0)
+    racc (1.7.3)
     rack (2.2.7)
     rack-test (2.1.0)
       rack (>= 1.3)
@@ -225,11 +229,11 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
-    rake (13.0.6)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (1.8.2)
+    regexp_parser (2.8.3)
     responders (3.1.0)
       actionpack (>= 5.2)
       railties (>= 5.2)
@@ -286,7 +290,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    sshkit (1.18.2)
+    sshkit (1.21.6)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     thor (1.2.1)
@@ -323,12 +327,12 @@ DEPENDENCIES
   bootsnap
   byebug
   cancancan (~> 3.0)
-  capistrano (= 3.8.2)
+  capistrano (~> 3.17.3)
   capistrano-bundler (~> 1.1)
-  capistrano-passenger (~> 0.1)
-  capistrano-rails (~> 1.2)
+  capistrano-passenger (~> 0.2)
+  capistrano-rails (~> 1.4)
   capistrano-rvm (~> 0.1)
-  capybara (~> 3.33)
+  capybara (~> 3.39)
   cul-ldap!
   cul_omniauth (~> 0.8.0)
   database_cleaner
@@ -339,7 +343,7 @@ DEPENDENCIES
   listen (~> 3.2)
   mysql2
   net-ldap (~> 0.17.1)
-  nokogiri (~> 1.10.10)
+  nokogiri (~> 1.15.2)
   pry
   puma (~> 5.2)
   rails (~> 7.0.0)

config/deploy.rb

@@ -1,23 +1,24 @@
 # config valid only for current version of Capistrano
-lock "3.8.2"
+lock "~> 3.17.3"
 
 set :department, 'ldpd'
 set :instance, fetch(:department)
 set :application, 'hours'
-set :repo_name, "#{fetch(:department)}-#{fetch(:application)}"
+set :repo_name, "ldpd-hours"
 set :deploy_name, "#{fetch(:application)}_#{fetch(:stage)}"
 # used to run rake db:migrate, etc
 # Default value for :rails_env is fetch(:stage)
 set :rails_env, fetch(:deploy_name)
 # use the rvm wrapper
+set :rvm_custom_path, '~/.rvm-alma8'
 set :rvm_ruby_version, fetch(:deploy_name)
 
 set :repo_url,  "[email protected]:cul/#{fetch(:repo_name)}.git"
 
-set :remote_user, "#{fetch(:instance)}serv"
+set :remote_user, "renserv"
 
 # Default deploy_to directory is /var/www/:application
-set :deploy_to,   "/opt/passenger/#{fetch(:instance)}/#{fetch(:deploy_name)}"
+set :deploy_to,   "/opt/passenger/#{fetch(:deploy_name)}"
 
 # Default value for :log_level is :debug
 set :log_level, :info

config/deploy/dev.rb

@@ -1,3 +1,3 @@
-server 'all-nginx-dev1.cul.columbia.edu', user: fetch(:remote_user), roles: %w(app db web)
+server 'diglib-rails-dev1.cul.columbia.edu', user: fetch(:remote_user), roles: %w(app db web)
 # Current branch is suggested by default in development
 ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp

config/deploy/prod.rb

@@ -1,3 +1,3 @@
-server "ldpd-nginx-#{fetch(:stage)}1.cul.columbia.edu", user: fetch(:remote_user), roles: %w(app db web)
+server "diglib-rails-prod1.cul.columbia.edu", user: fetch(:remote_user), roles: %w(app db web)
 # In test/prod, deploy from release tags; most recent version is default
 ask :branch, proc { `git tag --sort=version:refname`.split("\n").last }

config/deploy/test.rb

@@ -1,3 +1,3 @@
-server 'ldpd-nginx-test1.cul.columbia.edu', user: fetch(:remote_user), roles: %w(app db web)
+server 'diglib-rails-test1.cul.columbia.edu', user: fetch(:remote_user), roles: %w(app db web)
 # Current branch is suggested by default in development
 ask :branch, proc { `git tag --sort=version:refname`.split("\n").last }

db/migrate/20170814194528_add_primary_location.rb

@@ -1,7 +1,7 @@
 class AddPrimaryLocation < ActiveRecord::Migration[5.1]
   def up
     add_reference :locations, :primary_location, foreign_key: {to_table: :locations}
-    add_column :locations, :primary, :boolean, {default: false}
+    add_column :locations, :primary, :boolean, default: false
     add_index :locations, :primary
   end