Dependencies upgrade

tomatoes-app · Oct 25, 2018 · de8634d · de8634d
1 parent 61f3103
commit de8634d
Show file tree

Hide file tree

Showing 18 changed files with 245 additions and 147 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ config/twitter.yml
 .DS_Store
 public/assets
 coverage/
+node_modules/
diff --git a/Gemfile b/Gemfile
@@ -1,13 +1,13 @@
 source 'http://rubygems.org'
 ruby '2.4.5'
 
-gem 'rails', '~> 5.1'
+gem 'rails', '~> 5.1.6'
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
+  gem 'mini_racer'
   gem 'sass-rails', '>= 3.2'
-  gem 'therubyracer'
   gem 'uglifier', '>= 1.0.3'
 
   # Upload assets to AWS S3
@@ -23,7 +23,7 @@ gem 'jquery-rails'
 gem 'http_accept_language'
 
 # Mongo
-gem 'mongoid'
+gem 'mongoid', '~> 6.4.2'
 
 # Omniauth
 gem 'omniauth'
@@ -57,6 +57,11 @@ gem 'sucker_punch', '~> 2.0'
 gem 'octokit'
 gem 'twitter'
 
+gem 'bootsnap', require: false
+
+# Asset pipeline
+gem 'sprockets', '>= 3.7.2'
+
 group :production do
   gem 'rails_12factor'
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,41 +1,41 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actioncable (5.1.4)
-      actionpack (= 5.1.4)
+    actioncable (5.1.6)
+      actionpack (= 5.1.6)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.4)
-      actionpack (= 5.1.4)
-      actionview (= 5.1.4)
-      activejob (= 5.1.4)
+    actionmailer (5.1.6)
+      actionpack (= 5.1.6)
+      actionview (= 5.1.6)
+      activejob (= 5.1.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.4)
-      actionview (= 5.1.4)
-      activesupport (= 5.1.4)
+    actionpack (5.1.6)
+      actionview (= 5.1.6)
+      activesupport (= 5.1.6)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.4)
-      activesupport (= 5.1.4)
+    actionview (5.1.6)
+      activesupport (= 5.1.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.4)
-      activesupport (= 5.1.4)
+    activejob (5.1.6)
+      activesupport (= 5.1.6)
       globalid (>= 0.3.6)
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activerecord (5.1.4)
-      activemodel (= 5.1.4)
-      activesupport (= 5.1.4)
+    activemodel (5.1.6)
+      activesupport (= 5.1.6)
+    activerecord (5.1.6)
+      activemodel (= 5.1.6)
+      activesupport (= 5.1.6)
       arel (~> 8.0)
-    activesupport (5.1.4)
+    activesupport (5.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
@@ -56,13 +56,15 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.3)
       debug_inspector (>= 0.0.1)
+    bootsnap (1.3.2)
+      msgpack (~> 1.0)
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
     bootstrap-social-rails (4.12.0)
       railties (>= 3.1)
     bootstrap_form (2.7.0)
-    bson (4.2.2)
+    bson (4.3.0)
     buftok (0.2.0)
     builder (3.2.3)
     byebug (9.1.0)
@@ -74,14 +76,14 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
-    crass (1.0.3)
+    crass (1.0.4)
     dalli (2.7.6)
     debug_inspector (0.0.3)
     docile (1.1.5)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     equalizer (0.0.11)
-    erubi (1.7.0)
+    erubi (1.7.1)
     exception_notification (4.2.2)
       actionmailer (>= 4.0, < 6)
       activesupport (>= 4.0, < 6)
@@ -120,7 +122,7 @@ GEM
     http-form_data (2.0.0)
     http_accept_language (2.1.1)
     http_parser.rb (0.6.0)
-    i18n (0.9.1)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     ipaddress (0.8.3)
     jquery-rails (4.3.1)
@@ -144,11 +146,11 @@ GEM
     kaminari-mongoid (1.0.1)
       kaminari-core (~> 1.0)
       mongoid
-    libv8 (3.16.14.19)
-    loofah (2.1.1)
+    libv8 (6.7.288.46.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     memcachier (0.0.2)
     memoizable (0.4.2)
@@ -158,28 +160,31 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
+    mini_racer (0.2.3)
+      libv8 (>= 6.3)
+    minitest (5.11.3)
     minitest-reporters (1.1.19)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     mocha (1.3.0)
       metaclass (~> 0.0.1)
-    mongo (2.4.3)
-      bson (>= 4.2.1, < 5.0.0)
-    mongoid (6.2.1)
-      activemodel (~> 5.1)
-      mongo (>= 2.4.1, < 3.0.0)
+    mongo (2.6.2)
+      bson (>= 4.3.0, < 5.0.0)
+    mongoid (6.4.2)
+      activemodel (>= 5.1, < 6.0.0)
+      mongo (>= 2.5.1, < 3.0.0)
+    msgpack (1.2.4)
     multi_json (1.12.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     naught (1.1.0)
     newrelic_rpm (4.6.0.338)
-    nio4r (2.1.0)
-    nokogiri (1.8.1)
+    nio4r (2.3.1)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     oauth (0.5.3)
     oauth2 (1.4.0)
@@ -215,45 +220,44 @@ GEM
       method_source (~> 0.9.0)
     public_suffix (3.0.1)
     puma (3.11.0)
-    rack (2.0.3)
-    rack-test (0.8.2)
+    rack (2.0.5)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.1.4)
-      actioncable (= 5.1.4)
-      actionmailer (= 5.1.4)
-      actionpack (= 5.1.4)
-      actionview (= 5.1.4)
-      activejob (= 5.1.4)
-      activemodel (= 5.1.4)
-      activerecord (= 5.1.4)
-      activesupport (= 5.1.4)
+    rails (5.1.6)
+      actioncable (= 5.1.6)
+      actionmailer (= 5.1.6)
+      actionpack (= 5.1.6)
+      actionview (= 5.1.6)
+      activejob (= 5.1.6)
+      activemodel (= 5.1.6)
+      activerecord (= 5.1.6)
+      activesupport (= 5.1.6)
       bundler (>= 1.3.0)
-      railties (= 5.1.4)
+      railties (= 5.1.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (5.1.4)
-      actionpack (= 5.1.4)
-      activesupport (= 5.1.4)
+    railties (5.1.6)
+      actionpack (= 5.1.6)
+      activesupport (= 5.1.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
-    rake (12.3.0)
+    rake (12.3.1)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rdiscount (2.2.0.1)
-    ref (2.0.0)
     rubocop (0.51.0)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -282,7 +286,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -295,9 +299,6 @@ GEM
       tins (~> 1.0)
     test-unit (3.2.6)
       power_assert
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
@@ -313,7 +314,7 @@ GEM
       multipart-post (~> 2.0)
       naught (~> 1.0)
       simple_oauth (~> 0.3.0)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.0.1)
       execjs (>= 0.3.0, < 3)
@@ -332,6 +333,7 @@ DEPENDENCIES
   asset_sync
   better_errors
   binding_of_caller
+  bootsnap
   bootstrap-sass (~> 3.3.6)
   bootstrap-social-rails
   bootstrap_form
@@ -346,25 +348,26 @@ DEPENDENCIES
   kaminari (~> 1.0)
   kaminari-mongoid (~> 1.0)
   memcachier
+  mini_racer
   minitest-reporters
   mocha
-  mongoid
+  mongoid (~> 6.4.2)
   newrelic_rpm
   octokit
   omniauth
   omniauth-github
   omniauth-twitter
   pry
   puma
-  rails (~> 5.1)
+  rails (~> 5.1.6)
   rails_12factor
   rdiscount
   rubocop (~> 0.51.0)
   sass-rails (>= 3.2)
   simplecov
+  sprockets (>= 3.7.2)
   sucker_punch (~> 2.0)
   test-unit (~> 3.0)
-  therubyracer
   twitter
   uglifier (>= 1.0.3)
 

diff --git a/bin/bundle b/bin/bundle
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
@@ -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'
diff --git a/bin/setup b/bin/setup
@@ -1,29 +1,28 @@
 #!/usr/bin/env ruby
-require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
   # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+  # Add necessary setup steps to this file.
 
   puts '== Installing dependencies =='
-  system 'gem install bundler --conservative'
-  system 'bundle check || bundle install'
-
-  # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
-  # end
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
 
-  puts "\n== Preparing database =="
-  system 'bin/rake db:setup'
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
 
   puts "\n== Removing old logs and tempfiles =="
-  system 'rm -f log/*'
-  system 'rm -rf tmp/cache'
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system 'touch tmp/restart.txt'
+  system! 'bin/rails restart'
 end