Skip to content

Commit

Permalink
This upgrades to rails 6 (#128)
Browse files Browse the repository at this point in the history 
upgrade to rails 6 and remove this ruby binstub that used 2.7.
  • Loading branch information
@johrstrom
johrstrom authored Feb 9, 2023
1 parent 80b87f9 commit 3567775
Show file tree
Hide file tree
Showing 19 changed files with 360 additions and 186 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
- name: Setup Ruby using Bundler
uses: ruby/setup-ruby@v1
with:
ruby-version: "2.7.1"
ruby-version: "3.0.2"
bundler-cache: true
bundler: "2.1.4"
bundler: "2.2.22"

- name: Install gems
run: bundle install
Expand Down
10 changes: 4 additions & 6 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ source 'https://rubygems.org'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '5.2.6'
gem 'rails', '6.0.6.1'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.3.6'
gem 'sqlite3', '~> 1.4.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand All @@ -20,8 +20,7 @@ gem 'jquery-rails'
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc


# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
Expand All @@ -43,8 +42,7 @@ gem 'bootstrap_form', '~> 2.7.0'
gem 'dotenv-rails', '~> 2.1'
gem 'js-routes', '~> 1.2.4'
gem 'local_time', '~> 1.0.3'
gem 'ood_appkit', '~> 1.0'
gem 'ood_appkit', '~> 2.1'
gem 'ood_core', '~> 0.21.0'
gem 'shellwords', '~> 0.1'

gem 'nokogiri', '>= 1.10.4'
211 changes: 117 additions & 94 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,52 +1,65 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.6)
actionpack (= 5.2.6)
actioncable (6.0.6.1)
actionpack (= 6.0.6.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
actionmailbox (6.0.6.1)
actionpack (= 6.0.6.1)
activejob (= 6.0.6.1)
activerecord (= 6.0.6.1)
activestorage (= 6.0.6.1)
activesupport (= 6.0.6.1)
mail (>= 2.7.1)
actionmailer (6.0.6.1)
actionpack (= 6.0.6.1)
actionview (= 6.0.6.1)
activejob (= 6.0.6.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.6)
actionview (= 5.2.6)
activesupport (= 5.2.6)
actionpack (6.0.6.1)
actionview (= 6.0.6.1)
activesupport (= 6.0.6.1)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.6)
activesupport (= 5.2.6)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.6.1)
actionpack (= 6.0.6.1)
activerecord (= 6.0.6.1)
activestorage (= 6.0.6.1)
activesupport (= 6.0.6.1)
nokogiri (>= 1.8.5)
actionview (6.0.6.1)
activesupport (= 6.0.6.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.6)
activesupport (= 5.2.6)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.6.1)
activesupport (= 6.0.6.1)
globalid (>= 0.3.6)
activemodel (5.2.6)
activesupport (= 5.2.6)
activerecord (5.2.6)
activemodel (= 5.2.6)
activesupport (= 5.2.6)
arel (>= 9.0)
activestorage (5.2.6)
actionpack (= 5.2.6)
activerecord (= 5.2.6)
marcel (~> 1.0.0)
activesupport (5.2.6)
activemodel (6.0.6.1)
activesupport (= 6.0.6.1)
activerecord (6.0.6.1)
activemodel (= 6.0.6.1)
activesupport (= 6.0.6.1)
activestorage (6.0.6.1)
actionpack (= 6.0.6.1)
activejob (= 6.0.6.1)
activerecord (= 6.0.6.1)
marcel (~> 1.0)
activesupport (6.0.6.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
arel (9.0.0)
autoprefixer-rails (10.2.5.0)
execjs (< 2.8.0)
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
autoprefixer-rails (10.4.7.0)
execjs (~> 2)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
Expand All @@ -60,97 +73,111 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.0)
crass (1.0.6)
dotenv (2.7.6)
dotenv-rails (2.7.6)
dotenv (= 2.7.6)
date (3.3.3)
dotenv (2.8.1)
dotenv-rails (2.8.1)
dotenv (= 2.8.1)
railties (>= 3.2)
erubi (1.10.0)
execjs (2.7.0)
ffi (1.15.0)
globalid (1.0.1)
erubi (1.12.0)
execjs (2.8.1)
ffi (1.15.5)
globalid (1.1.0)
activesupport (>= 5.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
jbuilder (2.11.2)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jquery-rails (4.4.0)
jquery-rails (4.5.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
js-routes (1.2.9)
railties (>= 3.2)
sprockets-rails
json (1.8.6)
local_time (1.0.3)
coffee-rails
lograge (0.11.2)
lograge (0.12.0)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mail (2.8.1)
mini_mime (>= 0.1.1)
marcel (1.0.1)
net-imap
net-pop
net-smtp
marcel (1.0.2)
method_source (1.0.0)
mini_mime (1.1.0)
mini_portile2 (2.8.0)
mini_mime (1.1.2)
mini_portile2 (2.8.1)
minitest (5.17.0)
nio4r (2.5.7)
nokogiri (1.13.10)
net-imap (0.3.4)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
timeout
net-smtp (0.3.3)
net-protocol
nio4r (2.5.8)
nokogiri (1.14.1)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
ood_appkit (1.1.5)
ood_appkit (2.1.1)
addressable (~> 2.4)
lograge (~> 0.3)
ood_core (~> 0.1)
rails (> 4.0.7, < 6.0)
rails (>= 6.0.0, < 7)
redcarpet (~> 3.2)
ood_core (0.21.0)
ffi (~> 1.9, >= 1.9.6)
ood_support (~> 0.0.2)
rexml (~> 3.2)
ood_support (0.0.3)
public_suffix (4.0.6)
racc (1.6.1)
public_suffix (5.0.1)
racc (1.6.2)
rack (2.2.6.2)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.6)
actioncable (= 5.2.6)
actionmailer (= 5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
activemodel (= 5.2.6)
activerecord (= 5.2.6)
activestorage (= 5.2.6)
activesupport (= 5.2.6)
rack-test (2.0.2)
rack (>= 1.3)
rails (6.0.6.1)
actioncable (= 6.0.6.1)
actionmailbox (= 6.0.6.1)
actionmailer (= 6.0.6.1)
actionpack (= 6.0.6.1)
actiontext (= 6.0.6.1)
actionview (= 6.0.6.1)
activejob (= 6.0.6.1)
activemodel (= 6.0.6.1)
activerecord (= 6.0.6.1)
activestorage (= 6.0.6.1)
activesupport (= 6.0.6.1)
bundler (>= 1.3.0)
railties (= 5.2.6)
railties (= 6.0.6.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.4)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (5.2.6)
actionpack (= 5.2.6)
activesupport (= 5.2.6)
railties (6.0.6.1)
actionpack (= 6.0.6.1)
activesupport (= 6.0.6.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (13.0.3)
rb-fsevent (0.11.0)
thor (>= 0.20.3, < 2.0)
rake (13.0.6)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (4.3.0)
redcarpet (3.5.1)
request_store (1.5.0)
redcarpet (3.6.0)
request_store (1.5.1)
rack (>= 1.4)
rexml (3.2.5)
sass (3.7.4)
Expand All @@ -166,31 +193,29 @@ GEM
tilt (>= 1.1, < 3)
sassc (2.4.0)
ffi (~> 1.9)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
shellwords (0.1.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
thor (1.1.0)
sqlite3 (1.4.4)
thor (1.2.1)
thread_safe (0.3.6)
tilt (2.0.10)
tilt (2.0.11)
timeout (0.3.1)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.10)
tzinfo (1.2.11)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
websocket-driver (0.7.3)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.6)

PLATFORMS
ruby
Expand All @@ -206,15 +231,13 @@ DEPENDENCIES
js-routes (~> 1.2.4)
local_time (~> 1.0.3)
nokogiri (>= 1.10.4)
ood_appkit (~> 1.0)
ood_appkit (~> 2.1)
ood_core (~> 0.21.0)
rails (= 5.2.6)
rails (= 6.0.6.1)
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
shellwords (~> 0.1)
sqlite3 (~> 1.3.6)
sqlite3 (~> 1.4.0)
turbolinks
uglifier (>= 1.3.0)

BUNDLED WITH
2.1.4
2.2.22
2 changes: 1 addition & 1 deletion app/models/job.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def default_scope

def submit(content = nil, opts = {})
options = opts.merge(content: content)
script = OodCore::Job::Script.new(options)
script = OodCore::Job::Script.new(**options)

job_id = adapter.submit script # throw exception up the stack

Expand Down
2 changes: 1 addition & 1 deletion bin/rails
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
APP_PATH = File.expand_path('../../config/application', __FILE__)
APP_PATH = File.expand_path('../config/application', __dir__)
require_relative '../config/boot'
require 'rails/commands'
4 changes: 0 additions & 4 deletions bin/ruby
View file

This file was deleted.

Loading

0 comments on commit 3567775

Please sign in to comment.