diff --git a/Gemfile b/Gemfile index 9c7cea5..6a6b15a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '2.3.1' +ruby '2.5.3' gem 'rails', '~> 5.2.0' gem 'sass-rails', '~> 5.0' @@ -36,11 +36,11 @@ gem 'rest-client' gem 'puma' gem 'bootsnap', '>= 1.3.0', require: false -gem 'mina', '~> 1.0.6', require: false -gem 'mina-puma', '~> 1.0.1', require: false +gem 'mina', '~> 1.2.2', require: false +gem 'mina-ng-puma', '~> 1.2.0', require: false gem 'mina-multistage', '~> 1.0.3', require: false -gem 'mina-sidekiq', '~> 1.0.1', require: false -gem 'mina-logs', '~> 1.0.1', require: false +gem 'mina-sidekiq', '~> 1.0.3', require: false +gem 'mina-logs', '~> 1.1.0', require: false gem 'browser_warrior' diff --git a/Gemfile.lock b/Gemfile.lock index 8a99ff6..cc9dd76 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,48 +1,48 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.2) - actionpack (= 5.2.2) + actioncable (5.2.3) + actionpack (= 5.2.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.2) - actionpack (= 5.2.2) - actionview (= 5.2.2) - activejob (= 5.2.2) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.2) - actionview (= 5.2.2) - activesupport (= 5.2.2) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.2) - activesupport (= 5.2.2) + actionview (5.2.3) + activesupport (= 5.2.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.2) - activesupport (= 5.2.2) + activejob (5.2.3) + activesupport (= 5.2.3) globalid (>= 0.3.6) - activemodel (5.2.2) - activesupport (= 5.2.2) - activerecord (5.2.2) - activemodel (= 5.2.2) - activesupport (= 5.2.2) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) arel (>= 9.0) - activestorage (5.2.2) - actionpack (= 5.2.2) - activerecord (= 5.2.2) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) marcel (~> 0.3.1) - activesupport (5.2.2) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) ansi (1.5.0) arel (9.0.0) @@ -50,7 +50,7 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - bootsnap (1.3.2) + bootsnap (1.4.3) msgpack (~> 1.0) browser (2.5.3) browser_warrior (0.10.0) @@ -58,8 +58,8 @@ GEM rails (~> 5.0) sass-rails (~> 5.0) builder (3.2.3) - byebug (10.0.2) - capybara (3.12.0) + byebug (11.0.1) + capybara (3.17.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -67,7 +67,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.2) xpath (~> 3.2) - carrierwave (1.2.3) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -81,7 +81,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) connection_pool (2.2.2) crass (1.0.4) database_cleaner (1.7.0) @@ -89,14 +89,14 @@ GEM docile (1.3.1) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - erubi (1.7.1) + erubi (1.8.0) execjs (2.7.0) - factory_bot (4.11.1) - activesupport (>= 3.0.0) - factory_bot_rails (4.11.1) - factory_bot (~> 4.11.1) - railties (>= 3.0.0) - ffi (1.9.25) + factory_bot (5.0.2) + activesupport (>= 4.2.0) + factory_bot_rails (5.0.2) + factory_bot (~> 5.0.2) + railties (>= 4.2.0) + ffi (1.10.0) figaro (1.1.1) thor (~> 0.14) font-awesome-sass (4.7.0) @@ -109,7 +109,7 @@ GEM railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) sprockets-es6 (>= 0.9.0) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) guard (2.15.0) formatador (>= 0.2.4) @@ -120,8 +120,8 @@ GEM pry (>= 0.9.12) shellany (~> 0.0) thor (>= 0.18.1) - guard-bundler (2.1.0) - bundler (~> 1.0) + guard-bundler (2.2.1) + bundler (>= 1.3.0, < 3) guard (~> 2.2) guard-compat (~> 1.1) guard-compat (1.2.1) @@ -137,7 +137,7 @@ GEM nokogiri (~> 1.5) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.2.0) + i18n (1.6.0) concurrent-ruby (~> 1.0) jbuilder (2.8.0) activesupport (>= 4.2.0) @@ -148,7 +148,7 @@ GEM thor (>= 0.14, < 2.0) js_cookie_rails (2.2.0) railties (>= 3.1) - json (2.1.0) + json (2.2.0) kaminari (1.1.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.1.1) @@ -176,30 +176,30 @@ GEM method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) - mimemagic (0.3.2) - mina (1.0.7) + mime-types-data (3.2019.0331) + mimemagic (0.3.3) + mina (1.2.3) open4 (~> 1.3.4) rake - mina-logs (1.0.1) + mina-logs (1.1.0) mina (>= 1.0.2) mina-multistage (1.0.3) mina (~> 1.0) - mina-puma (1.0.1) - mina (~> 1.0.0) + mina-ng-puma (1.2.0) + mina (~> 1.2.0) puma (>= 2.13) mina-sidekiq (1.0.3) mina (>= 1.0.2) - mini_magick (4.9.2) + mini_magick (4.9.3) mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.4) + msgpack (1.2.10) multi_json (1.13.1) nenv (0.3.0) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.9.0) + nokogiri (1.10.2) mini_portile2 (~> 2.4.0) notiffany (0.1.1) nenv (~> 0.1) @@ -210,25 +210,25 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.3) - puma (3.12.0) - rack (2.0.6) - rack-cors (1.0.2) - rack-protection (2.0.4) + puma (3.12.1) + rack (2.0.7) + rack-cors (1.0.3) + rack-protection (2.0.5) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.2) - actioncable (= 5.2.2) - actionmailer (= 5.2.2) - actionpack (= 5.2.2) - actionview (= 5.2.2) - activejob (= 5.2.2) - activemodel (= 5.2.2) - activerecord (= 5.2.2) - activestorage (= 5.2.2) - activesupport (= 5.2.2) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) bundler (>= 1.3.0) - railties (= 5.2.2) + railties (= 5.2.3) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -239,12 +239,12 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - rails-i18n (5.1.2) + rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.2.2) - actionpack (= 5.2.2) - activesupport (= 5.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -256,7 +256,7 @@ GEM redis (4.1.0) redis-namespace (1.6.0) redis (>= 3.0.4) - regexp_parser (1.3.0) + regexp_parser (1.4.0) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) @@ -268,13 +268,13 @@ GEM rspec-mocks (~> 3.8.0) rspec-core (3.8.0) rspec-support (~> 3.8.0) - rspec-expectations (3.8.2) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-rails (3.8.1) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -295,8 +295,9 @@ GEM sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) shellany (0.0.1) - sidekiq (5.2.3) + sidekiq (5.2.6) connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) simple_form (4.0.1) @@ -334,7 +335,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - temple (0.8.0) + temple (0.8.1) thor (0.20.3) thread_safe (0.3.6) tilt (2.0.9) @@ -347,7 +348,7 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.5) + unf_ext (0.0.7.6) websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) @@ -381,11 +382,11 @@ DEPENDENCIES js_cookie_rails kaminari listen (~> 3.x) - mina (~> 1.0.6) - mina-logs (~> 1.0.1) + mina (~> 1.2.2) + mina-logs (~> 1.1.0) mina-multistage (~> 1.0.3) - mina-puma (~> 1.0.1) - mina-sidekiq (~> 1.0.1) + mina-ng-puma (~> 1.2.0) + mina-sidekiq (~> 1.0.3) mini_magick nokogiri pg (~> 0.18) @@ -412,7 +413,7 @@ DEPENDENCIES uglifier (>= 2.7.2) RUBY VERSION - ruby 2.3.1p112 + ruby 2.5.3p105 BUNDLED WITH - 1.16.3 + 1.17.1 diff --git a/config/deploy.rb b/config/deploy.rb index 3ab7245..7ef14ad 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -10,9 +10,10 @@ require "mina_sidekiq/tasks" require 'mina/logs' require 'mina/multistage' -set :shared_dirs, fetch(:shared_dirs, []).push('log', 'public/uploads', 'node_modules', 'public/personal') +set :shared_dirs, fetch(:shared_dirs, []).push('log', 'public/uploads', 'node_modules', 'storage', 'public/personal') set :shared_files, fetch(:shared_files, []).push('config/database.yml', 'config/application.yml') +set :puma_config, ->{ "#{fetch(:current_path)}/config/puma.rb" } set :sidekiq_pid, ->{ "#{fetch(:shared_path)}/tmp/pids/sidekiq.pid" } task :remote_environment do @@ -35,6 +36,9 @@ task :setup do command %[mkdir -p "#{fetch(:shared_path)}/node_modules"] command %[chmod g+rx,u+rwx "#{fetch(:shared_path)}/node_modules"] + command %[mkdir -p "#{fetch(:shared_path)}/storage"] + command %[chmod g+rx,u+rwx "#{fetch(:shared_path)}/storage"] + command %[mkdir -p "#{fetch(:shared_path)}/config"] command %[chmod g+rx,u+rwx "#{fetch(:shared_path)}/config"] @@ -62,7 +66,7 @@ task :deploy do on :launch do invoke :'rbenv:load' - invoke :'puma:hard_restart' + invoke :'puma:phased_restart' invoke :'sidekiq:restart' end end