Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ gem 'mutex_m'
gem 'oj', '~> 3.13'
gem 'pmb-client', '0.1.0', github: 'sanger/pmb-client'
gem 'puma'
gem 'rails', '~> 7.0.8', '>= 7.0.8.7'
gem 'rails', '~> 7.1.0'
gem 'roo', '~> 2.8.0'
gem 'sanger_barcode_format', github: 'sanger/sanger_barcode_format', branch: 'development'
gem 'sassc-rails'
Expand Down
174 changes: 106 additions & 68 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,72 +15,78 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.10)
actionpack (= 7.0.10)
activesupport (= 7.0.10)
actioncable (7.1.6)
actionpack (= 7.1.6)
activesupport (= 7.1.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.10)
actionpack (= 7.0.10)
activejob (= 7.0.10)
activerecord (= 7.0.10)
activestorage (= 7.0.10)
activesupport (= 7.0.10)
zeitwerk (~> 2.6)
actionmailbox (7.1.6)
actionpack (= 7.1.6)
activejob (= 7.1.6)
activerecord (= 7.1.6)
activestorage (= 7.1.6)
activesupport (= 7.1.6)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.10)
actionpack (= 7.0.10)
actionview (= 7.0.10)
activejob (= 7.0.10)
activesupport (= 7.0.10)
actionmailer (7.1.6)
actionpack (= 7.1.6)
actionview (= 7.1.6)
activejob (= 7.1.6)
activesupport (= 7.1.6)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.10)
actionview (= 7.0.10)
activesupport (= 7.0.10)
rails-dom-testing (~> 2.2)
actionpack (7.1.6)
actionview (= 7.1.6)
activesupport (= 7.1.6)
cgi
nokogiri (>= 1.8.5)
racc
rack (~> 2.0, >= 2.2.4)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.10)
actionpack (= 7.0.10)
activerecord (= 7.0.10)
activestorage (= 7.0.10)
activesupport (= 7.0.10)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.6)
actionpack (= 7.1.6)
activerecord (= 7.1.6)
activestorage (= 7.1.6)
activesupport (= 7.1.6)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.10)
activesupport (= 7.0.10)
actionview (7.1.6)
activesupport (= 7.1.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.10)
activesupport (= 7.0.10)
cgi
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.6)
activesupport (= 7.1.6)
globalid (>= 0.3.6)
activemodel (7.0.10)
activesupport (= 7.0.10)
activerecord (7.0.10)
activemodel (= 7.0.10)
activesupport (= 7.0.10)
activestorage (7.0.10)
actionpack (= 7.0.10)
activejob (= 7.0.10)
activerecord (= 7.0.10)
activesupport (= 7.0.10)
activemodel (7.1.6)
activesupport (= 7.1.6)
activerecord (7.1.6)
activemodel (= 7.1.6)
activesupport (= 7.1.6)
timeout (>= 0.4.0)
activestorage (7.1.6)
actionpack (= 7.1.6)
activejob (= 7.1.6)
activerecord (= 7.1.6)
activesupport (= 7.1.6)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.10)
activesupport (7.1.6)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
Expand Down Expand Up @@ -116,15 +122,18 @@ GEM
capybara-selenium (0.0.6)
capybara
selenium-webdriver
cgi (0.5.1)
childprocess (5.1.0)
logger (~> 1.5)
coderay (1.1.3)
concurrent-ruby (1.3.4)
connection_pool (3.0.2)
crass (1.0.6)
csv (3.3.5)
date (3.5.0)
docile (1.4.0)
drb (2.2.3)
erb (6.0.1)
erubi (1.13.1)
exception_notification (4.6.0)
actionmailer (>= 5.2, < 9)
Expand Down Expand Up @@ -164,6 +173,12 @@ GEM
logger
i18n (1.14.8)
concurrent-ruby (~> 1.0)
io-console (0.8.2)
irb (1.17.0)
pp (>= 0.6.0)
prism (>= 1.3.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jquery-rails (4.6.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
Expand Down Expand Up @@ -201,9 +216,9 @@ GEM
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.27.0)
minitest-rails (7.0.1)
minitest (~> 5.10)
railties (~> 7.0.0)
minitest-rails (7.1.1)
minitest (~> 5.20)
railties (>= 7.1.0, < 8.0.0)
minitest-rails-capybara (0.0.2)
capybara
minitest-rails
Expand Down Expand Up @@ -237,33 +252,44 @@ GEM
parser (3.3.10.1)
ast (~> 2.4.1)
racc
pp (0.6.3)
prettyprint
prettyprint (0.2.0)
prism (1.9.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry-rails (0.3.11)
pry (>= 0.13.0)
psych (5.3.1)
date
stringio
public_suffix (6.0.1)
puma (7.2.0)
nio4r (~> 2.0)
racc (1.8.1)
rack (2.2.21)
rack-session (1.0.2)
rack (< 3)
rack-test (2.2.0)
rack (>= 1.3)
rails (7.0.10)
actioncable (= 7.0.10)
actionmailbox (= 7.0.10)
actionmailer (= 7.0.10)
actionpack (= 7.0.10)
actiontext (= 7.0.10)
actionview (= 7.0.10)
activejob (= 7.0.10)
activemodel (= 7.0.10)
activerecord (= 7.0.10)
activestorage (= 7.0.10)
activesupport (= 7.0.10)
rackup (1.0.1)
rack (< 3)
webrick
rails (7.1.6)
actioncable (= 7.1.6)
actionmailbox (= 7.1.6)
actionmailer (= 7.1.6)
actionpack (= 7.1.6)
actiontext (= 7.1.6)
actionview (= 7.1.6)
activejob (= 7.1.6)
activemodel (= 7.1.6)
activerecord (= 7.1.6)
activestorage (= 7.1.6)
activesupport (= 7.1.6)
bundler (>= 1.15.0)
railties (= 7.0.10)
railties (= 7.1.6)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -275,19 +301,28 @@ GEM
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
railties (7.0.10)
actionpack (= 7.0.10)
activesupport (= 7.0.10)
method_source
railties (7.1.6)
actionpack (= 7.1.6)
activesupport (= 7.1.6)
cgi
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
thor (~> 1.0, >= 1.2.2)
tsort (>= 0.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.3.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rdoc (7.2.0)
erb
psych (>= 4.0.0)
tsort
regexp_parser (2.11.3)
reline (0.6.3)
io-console (~> 0.5)
rexml (3.4.4)
roo (2.8.3)
nokogiri (~> 1)
Expand Down Expand Up @@ -350,19 +385,22 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
stringio (3.2.0)
syslog (0.4.0)
logger
thor (1.4.0)
tilt (2.1.0)
timecop (0.9.10)
timeout (0.4.4)
tsort (0.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.1)
execjs (>= 0.3.0, < 3)
unicode-display_width (3.2.0)
unicode-emoji (~> 4.1)
unicode-emoji (4.2.0)
webrick (1.9.2)
websocket (1.2.11)
websocket-driver (0.8.0)
base64
Expand Down Expand Up @@ -405,7 +443,7 @@ DEPENDENCIES
pmb-client (= 0.1.0)!
pry-rails
puma
rails (~> 7.0.8, >= 7.0.8.7)
rails (~> 7.1.0)
rails-controller-testing
roo (~> 2.8.0)
rubocop
Expand Down
25 changes: 11 additions & 14 deletions bin/setup
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
#!/usr/bin/env ruby
require 'fileutils'
include FileUtils
require "fileutils"

# path to your application root.
APP_ROOT = File.expand_path('..', __dir__)
APP_ROOT = File.expand_path("..", __dir__)

def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==")
system(*args, exception: true)
end

chdir APP_ROOT do
# This script is a starting point to setup your application.
FileUtils.chdir APP_ROOT do
# This script is a way to set up or update your development environment automatically.
# This script is idempotent, so that you can run it at any time and get an expectable outcome.
# Add necessary setup steps to this file.

puts '== Installing dependencies =='
system! 'gem install bundler --conservative'
system('bundle check') || system!('bundle install')

# Install JavaScript dependencies if using Yarn
# system('bin/yarn')
puts "== Installing dependencies =="
system! "gem install bundler --conservative"
system("bundle check") || system!("bundle install")

puts "\n== Removing old logs and tempfiles =="
system! 'bin/rails log:clear tmp:clear'
system! "bin/rails log:clear tmp:clear"

puts "\n== Restarting application server =="
system! 'bin/rails restart'
system! "bin/rails restart"
end
26 changes: 25 additions & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
require_relative 'boot'

# We don't want ActiveRecord
require 'rails'
# Pick the frameworks you want:
require 'active_model/railtie'
require 'active_job/railtie'
require 'action_controller/railtie'
require 'action_mailer/railtie'
require 'sprockets/railtie'
require 'action_view/railtie'
require 'rails/test_unit/railtie'
require './lib/gatekeeper/version'

Expand All @@ -27,6 +31,26 @@ class Application < Rails::Application
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
# config.time_zone = 'Central Time (US & Canada)'

# No longer add autoloaded paths into `$LOAD_PATH`. This means that you won't be able
# to manually require files that are managed by the autoloader, which you shouldn't do anyway.
#
# This will reduce the size of the load path, making `require` faster if you don't use bootsnap, or reduce the size
# of the bootsnap cache if you use it.
config.add_autoload_paths_to_load_path = false

# Please, add to the `ignore` list any other `lib` subdirectories that do
# not contain `.rb` files, or that should not be reloaded or eager loaded.
# Common ones are `templates`, `generators`, or `middleware`, for example.
config.autoload_lib(ignore: %w[assets tasks])

# Configuration for the application, engines, and railties goes here.
#
# These settings can be overridden in specific environments using the files
# in config/environments, which are processed later.
#
# config.time_zone = "Central Time (US & Canada)"
# config.eager_load_paths << Rails.root.join("extras")

# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
config.i18n.enforce_available_locales = false
Expand Down
Loading
Loading