Skip to content

Commit 899a83b

Browse files
committed
Rails 5.2
1 parent 4642eb6 commit 899a83b

14 files changed

+171
-79
lines changed

Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ RUN export DATABASE_URL=mysql2://localhost/temp?encoding=utf8 && \
3636
apt-get update && \
3737
apt-get install -y mariadb-server && \
3838
/etc/init.d/mysql start && \
39+
mariadb -e "CREATE DATABASE temp" && \
3940
cp config/app_config.yml.SAMPLE config/app_config.yml && \
4041
cp config/database.yml.MySQL_SAMPLE config/database.yml && \
4142
bundle exec rake db:setup assets:precompile && \

Gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# A sample Gemfile
22
source "https://rubygems.org"
33

4-
gem "rails", '< 5.2'
4+
gem "rails", '~> 5.2'
55

66
gem 'sass-rails'
77
gem 'less-rails'
@@ -18,6 +18,7 @@ gem 'date_time_attribute'
1818
gem 'rails-assets-listjs', '0.2.0.beta.4' # remember to maintain list.*.js plugins and template engines on update
1919
gem 'i18n-js', '~> 3.0.0.rc8'
2020
gem 'rails-i18n'
21+
gem 'bootsnap', require: false
2122

2223
gem 'mysql2'
2324
gem 'prawn'

Gemfile.lock

+82-60
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,25 @@ PATH
6565
GEM
6666
remote: https://rubygems.org/
6767
specs:
68-
actioncable (5.1.7)
69-
actionpack (= 5.1.7)
68+
actioncable (5.2.4.3)
69+
actionpack (= 5.2.4.3)
7070
nio4r (~> 2.0)
71-
websocket-driver (~> 0.6.1)
72-
actionmailer (5.1.7)
73-
actionpack (= 5.1.7)
74-
actionview (= 5.1.7)
75-
activejob (= 5.1.7)
71+
websocket-driver (>= 0.6.1)
72+
actionmailer (5.2.4.3)
73+
actionpack (= 5.2.4.3)
74+
actionview (= 5.2.4.3)
75+
activejob (= 5.2.4.3)
7676
mail (~> 2.5, >= 2.5.4)
7777
rails-dom-testing (~> 2.0)
78-
actionpack (5.1.7)
79-
actionview (= 5.1.7)
80-
activesupport (= 5.1.7)
81-
rack (~> 2.0)
78+
actionpack (5.2.4.3)
79+
actionview (= 5.2.4.3)
80+
activesupport (= 5.2.4.3)
81+
rack (~> 2.0, >= 2.0.8)
8282
rack-test (>= 0.6.3)
8383
rails-dom-testing (~> 2.0)
8484
rails-html-sanitizer (~> 1.0, >= 1.0.2)
85-
actionview (5.1.7)
86-
activesupport (= 5.1.7)
85+
actionview (5.2.4.3)
86+
activesupport (= 5.2.4.3)
8787
builder (~> 3.1)
8888
erubi (~> 1.4)
8989
rails-dom-testing (~> 2.0)
@@ -93,16 +93,20 @@ GEM
9393
activemodel (>= 4.1, < 6.1)
9494
case_transform (>= 0.2)
9595
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
96-
activejob (5.1.7)
97-
activesupport (= 5.1.7)
96+
activejob (5.2.4.3)
97+
activesupport (= 5.2.4.3)
9898
globalid (>= 0.3.6)
99-
activemodel (5.1.7)
100-
activesupport (= 5.1.7)
101-
activerecord (5.1.7)
102-
activemodel (= 5.1.7)
103-
activesupport (= 5.1.7)
104-
arel (~> 8.0)
105-
activesupport (5.1.7)
99+
activemodel (5.2.4.3)
100+
activesupport (= 5.2.4.3)
101+
activerecord (5.2.4.3)
102+
activemodel (= 5.2.4.3)
103+
activesupport (= 5.2.4.3)
104+
arel (>= 9.0)
105+
activestorage (5.2.4.3)
106+
actionpack (= 5.2.4.3)
107+
activerecord (= 5.2.4.3)
108+
marcel (~> 0.3.1)
109+
activesupport (5.2.4.3)
106110
concurrent-ruby (~> 1.0, >= 1.0.2)
107111
i18n (>= 0.7, < 2)
108112
minitest (~> 5.1)
@@ -121,7 +125,7 @@ GEM
121125
apparition (0.6.0)
122126
capybara (~> 3.13, < 4)
123127
websocket-driver (>= 0.6.5)
124-
arel (8.0.0)
128+
arel (9.0.0)
125129
attribute_normalizer (1.2.0)
126130
base32 (0.3.4)
127131
better_errors (2.7.1)
@@ -131,6 +135,8 @@ GEM
131135
bindex (0.8.1)
132136
binding_of_caller (0.8.0)
133137
debug_inspector (>= 0.0.1)
138+
bootsnap (1.4.8)
139+
msgpack (~> 1.0)
134140
bootstrap-datepicker-rails (1.9.0.1)
135141
railties (>= 3.0)
136142
builder (3.2.4)
@@ -149,9 +155,9 @@ GEM
149155
activesupport
150156
chronic (0.10.2)
151157
coderay (1.1.3)
152-
coffee-rails (4.2.2)
158+
coffee-rails (5.0.0)
153159
coffee-script (>= 2.2.0)
154-
railties (>= 4.0.0)
160+
railties (>= 5.2.0)
155161
coffee-script (2.4.1)
156162
coffee-script-source
157163
execjs
@@ -160,12 +166,12 @@ GEM
160166
concurrent-ruby (1.1.7)
161167
connection_pool (2.2.3)
162168
content_for_in_controllers (0.0.2)
163-
coveralls (0.7.2)
169+
coveralls (0.7.1)
164170
multi_json (~> 1.3)
165-
rest-client (= 1.6.7)
171+
rest-client
166172
simplecov (>= 0.7)
167-
term-ansicolor (= 1.2.2)
168-
thor (= 0.18.1)
173+
term-ansicolor
174+
thor
169175
crass (1.0.6)
170176
daemons (1.3.1)
171177
database_cleaner (1.8.5)
@@ -180,6 +186,8 @@ GEM
180186
diff-lcs (1.4.4)
181187
diffy (3.4.0)
182188
docile (1.3.2)
189+
domain_name (0.5.20190701)
190+
unf (>= 0.0.5, < 1.0.0)
183191
doorkeeper (5.4.0)
184192
railties (>= 5)
185193
doorkeeper-i18n (5.2.2)
@@ -224,6 +232,9 @@ GEM
224232
nokogiri (>= 1.6.0)
225233
ruby_parser (~> 3.5)
226234
htmlentities (4.3.4)
235+
http-accept (1.7.0)
236+
http-cookie (1.0.3)
237+
domain_name (~> 0.5)
227238
i18n (1.8.5)
228239
concurrent-ruby (~> 1.0)
229240
i18n-js (3.0.11)
@@ -284,6 +295,8 @@ GEM
284295
skinny (>= 0.1.2)
285296
sqlite3-ruby
286297
thin
298+
marcel (0.3.3)
299+
mimemagic (~> 0.3.2)
287300
meta_request (0.7.2)
288301
rack-contrib (>= 1.1, < 3)
289302
railties (>= 3.0.0, < 7)
@@ -292,20 +305,23 @@ GEM
292305
mime-types (3.3.1)
293306
mime-types-data (~> 3.2015)
294307
mime-types-data (3.2020.0512)
308+
mimemagic (0.3.5)
295309
mini_mime (1.0.2)
296310
mini_portile2 (2.4.0)
297311
minitest (5.14.2)
298312
mono_logger (1.1.0)
313+
msgpack (1.3.3)
299314
multi_json (1.15.0)
300315
mustermann (1.1.1)
301316
ruby2_keywords (~> 0.0.1)
302317
mysql2 (0.5.3)
318+
netrc (0.11.0)
303319
nio4r (2.5.2)
304320
nokogiri (1.10.10)
305321
mini_portile2 (~> 2.4.0)
306322
pdf-core (0.8.1)
307-
polyamorous (2.3.0)
308-
activerecord (>= 5.0)
323+
polyamorous (2.3.2)
324+
activerecord (>= 5.2.1)
309325
polyglot (0.3.5)
310326
prawn (2.3.0)
311327
pdf-core (~> 0.8.1)
@@ -333,17 +349,18 @@ GEM
333349
rack
334350
rack-test (1.1.0)
335351
rack (>= 1.0, < 3)
336-
rails (5.1.7)
337-
actioncable (= 5.1.7)
338-
actionmailer (= 5.1.7)
339-
actionpack (= 5.1.7)
340-
actionview (= 5.1.7)
341-
activejob (= 5.1.7)
342-
activemodel (= 5.1.7)
343-
activerecord (= 5.1.7)
344-
activesupport (= 5.1.7)
352+
rails (5.2.4.3)
353+
actioncable (= 5.2.4.3)
354+
actionmailer (= 5.2.4.3)
355+
actionpack (= 5.2.4.3)
356+
actionview (= 5.2.4.3)
357+
activejob (= 5.2.4.3)
358+
activemodel (= 5.2.4.3)
359+
activerecord (= 5.2.4.3)
360+
activestorage (= 5.2.4.3)
361+
activesupport (= 5.2.4.3)
345362
bundler (>= 1.3.0)
346-
railties (= 5.1.7)
363+
railties (= 5.2.4.3)
347364
sprockets-rails (>= 2.0.0)
348365
rails-assets-listjs (0.2.0.beta.4)
349366
railties (>= 3.1)
@@ -359,28 +376,27 @@ GEM
359376
rails (>= 4.2.0)
360377
rails_tokeninput (1.7.0)
361378
railties (>= 3.1.0)
362-
railties (5.1.7)
363-
actionpack (= 5.1.7)
364-
activesupport (= 5.1.7)
379+
railties (5.2.4.3)
380+
actionpack (= 5.2.4.3)
381+
activesupport (= 5.2.4.3)
365382
method_source
366383
rake (>= 0.8.7)
367-
thor (>= 0.18.1, < 2.0)
384+
thor (>= 0.19.0, < 2.0)
368385
rainbow (3.0.0)
369386
rake (13.0.1)
370-
ransack (2.3.0)
371-
actionpack (>= 5.0)
372-
activerecord (>= 5.0)
373-
activesupport (>= 5.0)
387+
ransack (2.3.2)
388+
activerecord (>= 5.2.1)
389+
activesupport (>= 5.2.1)
374390
i18n
375-
polyamorous (= 2.3.0)
391+
polyamorous (= 2.3.2)
376392
rb-fsevent (0.10.4)
377393
rb-inotify (0.10.1)
378394
ffi (~> 1.0)
379-
recurring_select (2.1.0)
395+
recurring_select (3.0.0)
380396
coffee-rails (>= 3.1)
381397
ice_cube (>= 0.11)
382398
jquery-rails (>= 3.0)
383-
rails (>= 3.2)
399+
rails (>= 5.2)
384400
sass-rails (>= 4.0)
385401
redis (4.2.1)
386402
redis-namespace (1.8.0)
@@ -396,8 +412,11 @@ GEM
396412
redis-namespace (~> 1.6)
397413
sinatra (>= 0.9.2)
398414
vegas (~> 0.1.2)
399-
rest-client (1.6.7)
400-
mime-types (>= 1.16)
415+
rest-client (2.1.0)
416+
http-accept (>= 1.7.0, < 2.0)
417+
http-cookie (>= 1.0.2, < 2.0)
418+
mime-types (>= 1.16, < 4.0)
419+
netrc (~> 0.8)
401420
roo (2.8.3)
402421
nokogiri (~> 1)
403422
rubyzip (>= 1.3.0, < 3.0.0)
@@ -480,20 +499,22 @@ GEM
480499
sqlite3 (1.3.13)
481500
sqlite3-ruby (1.3.3)
482501
sqlite3 (>= 1.3.3)
502+
sync (0.5.0)
483503
temple (0.8.2)
484-
term-ansicolor (1.2.2)
485-
tins (~> 0.8)
504+
term-ansicolor (1.7.1)
505+
tins (~> 1.0)
486506
therubyracer (0.12.3)
487507
libv8 (~> 3.16.14.15)
488508
ref
489509
thin (1.7.2)
490510
daemons (~> 1.0, >= 1.0.9)
491511
eventmachine (~> 1.0, >= 1.0.4)
492512
rack (>= 1, < 3)
493-
thor (0.18.1)
513+
thor (1.0.1)
494514
thread_safe (0.3.6)
495515
tilt (2.0.10)
496-
tins (0.13.2)
516+
tins (1.25.0)
517+
sync
497518
ttfunk (1.6.2.1)
498519
twitter-bootstrap-rails (2.2.8)
499520
actionpack (>= 3.1)
@@ -517,7 +538,7 @@ GEM
517538
activemodel (>= 5.0)
518539
bindex (>= 0.4.0)
519540
railties (>= 5.0)
520-
websocket-driver (0.6.5)
541+
websocket-driver (0.7.3)
521542
websocket-extensions (>= 0.1.0)
522543
websocket-extensions (0.1.5)
523544
whenever (1.0.0)
@@ -543,6 +564,7 @@ DEPENDENCIES
543564
attribute_normalizer
544565
better_errors
545566
binding_of_caller
567+
bootsnap
546568
bootstrap-datepicker-rails
547569
bullet
548570
capybara
@@ -586,7 +608,7 @@ DEPENDENCIES
586608
pry-stack_explorer
587609
puma
588610
rack-cors
589-
rails (< 5.2)
611+
rails (~> 5.2)
590612
rails-assets-listjs (= 0.2.0.beta.4)
591613
rails-i18n
592614
rails-settings-cached (= 0.4.3)

bin/bundle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env ruby
2-
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
2+
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
33
load Gem.bin_path('bundler', 'bundle')

bin/setup

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/usr/bin/env ruby
2-
require 'pathname'
32
require 'fileutils'
43
include FileUtils
54

65
# path to your application root.
7-
APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
6+
APP_ROOT = File.expand_path('..', __dir__)
87

98
def system!(*args)
109
system(*args) || abort("\n== Command #{args} failed ==")
@@ -21,7 +20,6 @@ chdir APP_ROOT do
2120
# Install JavaScript dependencies if using Yarn
2221
# system('bin/yarn')
2322

24-
2523
# puts "\n== Copying sample files =="
2624
# unless File.exist?('config/database.yml')
2725
# cp 'config/database.yml.sample', 'config/database.yml'

bin/update

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/usr/bin/env ruby
2-
require 'pathname'
32
require 'fileutils'
43
include FileUtils
54

65
# path to your application root.
7-
APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
6+
APP_ROOT = File.expand_path('..', __dir__)
87

98
def system!(*args)
109
system(*args) || abort("\n== Command #{args} failed ==")
@@ -18,6 +17,9 @@ chdir APP_ROOT do
1817
system! 'gem install bundler --conservative'
1918
system('bundle check') || system!('bundle install')
2019

20+
# Install JavaScript dependencies if using Yarn
21+
# system('bin/yarn')
22+
2123
puts "\n== Updating database =="
2224
system! 'bin/rails db:migrate'
2325

bin/yarn

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env ruby
2-
VENDOR_PATH = File.expand_path('..', __dir__)
3-
Dir.chdir(VENDOR_PATH) do
2+
APP_ROOT = File.expand_path('..', __dir__)
3+
Dir.chdir(APP_ROOT) do
44
begin
5-
exec "yarnpkg #{ARGV.join(" ")}"
5+
exec "yarnpkg", *ARGV
66
rescue Errno::ENOENT
77
$stderr.puts "Yarn executable was not detected in the system."
88
$stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"

0 commit comments

Comments
 (0)