Skip to content

Commit

Permalink
Merge pull request #610 from sul-dlss/update-rails-5
Browse files Browse the repository at this point in the history
Update libsys-webforms to rails 5 and ruby-2.6.3
  • Loading branch information
dlrueda authored Sep 13, 2019
2 parents 52a35ab + 7482f45 commit 2d6ca8b
Show file tree
Hide file tree
Showing 186 changed files with 1,898 additions and 1,187 deletions.
29 changes: 24 additions & 5 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Rails:
Enabled: true
require:
- rubocop-performance
- rubocop-rails
- rubocop-rspec

AllCops:
TargetRubyVersion: 2.3
TargetRailsVersion: 4.2
TargetRubyVersion: 2.6
Exclude:
- 'Gemfile'
- 'bin/**/*'
Expand All @@ -26,7 +27,7 @@ Lint/UnusedBlockArgument:
Enabled: false

Metrics/BlockLength:
Max: 100
Max: 101

Metrics/LineLength:
Max: 120
Expand All @@ -53,6 +54,24 @@ Metrics/AbcSize:
Metrics/ParameterLists:
Max: 6

Rails/SkipsModelValidations:
Exclude:
- 'app/models/edi_lin.rb'

RSpec/AnyInstance:
Exclude:
- 'spec/rails_helper.rb'

RSpec/DescribeClass:
Exclude:
- 'spec/views/shared/_top_navbar.html.erb_spec.rb'

RSpec/ExampleLength:
Max: 8

RSpec/InstanceVariable:
Enabled: false

Style/PercentLiteralDelimiters:
Enabled: false

Expand Down
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
language: ruby
sudo: false
rvm:
- 2.3.4
- 2.6.3
cache:
- bundler
- directories
- '/home/travis/.rvm/'
bundler_args: --without production
before_script:
- mkdir -p tmp/Dataload/EndowRpt
Expand Down
45 changes: 23 additions & 22 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
source 'https://rubygems.org'

ruby '2.6.3'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 4.2.9'
gem 'rails', '~> 5.0'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.3.13'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
gem 'jbuilder'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'sdoc', group: :doc
# A gem for adding Stanford University Libraries styles to Rails applications
gem 'sul_styles'
# Use sass-powered bootstrap
gem 'bootstrap-sass', ">= 3.4.1"
gem 'bootstrap-sass'
# Use bootstrap_form for easy form building
gem 'bootstrap_form'
# Use boostrap datepicker
gem 'bootstrap-datepicker-rails'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
gem 'sassc-rails'
# Use jquery as the JavaScript library
# (pinning to < 4.1 until issue w/ webshims is resolved https://github.com/aFarkas/webshim/issues/560)
gem 'jquery-rails', '< 4.1'
# Use cancan for authorization
gem 'cancan'
gem 'jquery-rails'
# Use cancancan for authorization
gem 'cancancan'
# composite_primary_keys for models that have two or more primary_keys
gem 'composite_primary_keys', '=8.1.4'
gem 'composite_primary_keys'
# Use Unicorn as the app server
# gem 'unicorn'
# Use Faraday for making http requests
Expand All @@ -38,34 +40,34 @@ gem 'systemu'
# For exception reporting
gem 'honeybadger'
# For uploading files from Ruby applications
gem 'carrierwave', '~> 1.0'
gem 'carrierwave'
# to compress javascript
gem 'uglifier'
# For fiscal year functions
gem 'fiscali'
#To filter Sal3BatchRequestsBatches to day of the week
# To filter Sal3BatchRequestsBatches to day of the week
gem 'has_scope'
# To parse tsv for DigitalBookplate data
gem 'tsv'
# Rails javascript runtime environment
gem 'therubyracer'

group :production do
# This is for the rails 4.2 version. See https://github.com/rsim/oracle-enhanced#rails-42
# When upgrading to rails 5 we can remove the deprecated self.emulate_* lines from config/initializers/oracle.rb
# See https://github.com/rsim/oracle-enhanced#rails-52 and https://github.com/rsim/oracle-enhanced/issues/1449
gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0'
gem 'activerecord-oracle_enhanced-adapter', '~> 1.7.0'
gem 'ruby-oci8'
gem 'ruby-plsql'
end

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debug console
gem 'byebug'
gem 'rspec-rails', '~> 3.0'
gem 'rails-controller-testing'
gem 'rspec-rails'

# Rubocop is a static code analyzer to enforce style.
gem 'rubocop'
gem 'rubocop-performance'
gem 'rubocop-rails'
gem 'rubocop-rspec'

# scss-lint will test the scss files to enforce styles
Expand All @@ -74,22 +76,21 @@ group :development, :test do
# Capybara for feature/integration tests
gem 'capybara'

#Coveralls for code coverage
# Coveralls for code coverage
gem 'coveralls', require: false

gem 'factory_bot_rails'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
gem 'ruby-plsql'
gem 'web-console'
end

group :deployment do
gem 'capistrano', '~> 3.0'
gem 'capistrano'
gem 'capistrano-bundler'
gem 'capistrano-rails'
gem 'capistrano-passenger'
gem 'capistrano-rails'
gem 'dlss-capistrano'
end
Loading

0 comments on commit 2d6ca8b

Please sign in to comment.