From 229c9c50ec72fbcb5a46cda429e9a1b0f3c44b89 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 12 Sep 2018 09:13:42 -0700 Subject: [PATCH 1/2] install rails 5 --- Gemfile | 6 +- Gemfile.lock | 348 +++++++++++++++++++++++++-------------------------- 2 files changed, 177 insertions(+), 177 deletions(-) diff --git a/Gemfile b/Gemfile index 3ba3e7fc..8390b648 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby "2.4.3" # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2.10' +gem 'rails', '5.0.0' # Use Puma as the app server gem 'puma' @@ -73,7 +73,7 @@ group :development do gem "binding_of_caller" # Disable logging Assets in the Server log - gem 'quiet_assets' + # gem 'quiet_assets' # Code Linting gem 'rubocop', require: false @@ -108,7 +108,7 @@ group :development, :test do gem 'faker' # gem 'rspec' - gem "rspec-rails", "~> 3.4.0" + gem "rspec-rails", "~> 3.8" # Test / Code quality utils diff --git a/Gemfile.lock b/Gemfile.lock index b195aea4..93d5a805 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,89 +2,93 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionmailer (4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) + actioncable (5.0.0) + actionpack (= 5.0.0) + nio4r (~> 1.2) + websocket-driver (~> 0.6.1) + actionmailer (5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.10) - actionview (= 4.2.10) - activesupport (= 4.2.10) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.0.0) + actionview (= 5.0.0) + activesupport (= 5.0.0) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.10) - activesupport (= 4.2.10) + actionview (5.0.0) + activesupport (= 5.0.0) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.10) - activesupport (= 4.2.10) - globalid (>= 0.3.0) - activemodel (4.2.10) - activesupport (= 4.2.10) - builder (~> 3.1) - activerecord (4.2.10) - activemodel (= 4.2.10) - activesupport (= 4.2.10) - arel (~> 6.0) - activesupport (4.2.10) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (5.0.0) + activesupport (= 5.0.0) + globalid (>= 0.3.6) + activemodel (5.0.0) + activesupport (= 5.0.0) + activerecord (5.0.0) + activemodel (= 5.0.0) + activesupport (= 5.0.0) + arel (~> 7.0) + activesupport (5.0.0) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - annotate (2.7.2) + annotate (2.7.4) activerecord (>= 3.2, < 6.0) rake (>= 10.4, < 13.0) - arel (6.0.4) + arel (7.1.4) arrayfields (4.9.2) - ast (2.3.0) - autoprefixer-rails (7.2.3) + ast (2.4.0) + autoprefixer-rails (9.1.4) execjs awesome_print (1.8.0) - better_errors (2.4.0) + better_errors (2.5.0) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - binding_of_caller (0.7.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - blazer (1.8.0) + blazer (1.9.0) + activerecord (>= 4) chartkick - rails + railties (>= 4) safely_block (>= 0.1.1) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - brakeman (4.1.1) + brakeman (4.3.1) builder (3.2.3) - bullet (5.7.0) + bullet (5.7.6) activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) + uniform_notifier (~> 1.11.0) bundler-audit (0.6.0) bundler (~> 1.2) thor (~> 0.18) - byebug (9.1.0) + byebug (10.0.2) cane (2.6.2) parallel canvas-api (1.1.1) json typhoeus - capybara (2.16.1) + capybara (3.7.1) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - chartkick (2.2.5) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.1) + chartkick (3.0.1) chronic (0.10.2) churn (0.0.35) chronic (>= 0.2.3) @@ -104,45 +108,45 @@ GEM concurrent-ruby (1.0.5) coolline (0.5.0) unicode_utils (~> 1.4) - crass (1.0.3) + crass (1.0.4) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) - domain_name (0.5.20170404) + docile (1.3.1) + domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - dotenv (2.2.1) - dotenv-rails (2.2.1) - dotenv (= 2.2.1) - railties (>= 3.2, < 5.2) + dotenv (2.5.0) + dotenv-rails (2.5.0) + dotenv (= 2.5.0) + railties (>= 3.2, < 6.0) equalizer (0.0.11) - errbase (0.0.3) - erubi (1.7.0) + errbase (0.1.0) + erubi (1.7.1) erubis (2.7.0) ethon (0.11.0) ffi (>= 1.3.0) execjs (2.7.0) - factory_bot (4.8.2) + factory_bot (4.11.1) activesupport (>= 3.0.0) - factory_bot_rails (4.8.2) - factory_bot (~> 4.8.2) + factory_bot_rails (4.11.1) + factory_bot (~> 4.11.1) railties (>= 3.0.0) - faker (1.8.7) + faker (1.9.1) i18n (>= 0.7) faraday (0.12.2) multipart-post (>= 1.2, < 3) - fattr (2.3.0) - ffi (1.9.18) - flay (2.10.0) + fattr (2.4.0) + ffi (1.9.25) + flay (2.12.0) erubis (~> 2.7.0) path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flog (4.6.1) + flog (4.6.2) path_expander (~> 1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.8) flutie (2.0.0) - foreman (0.84.0) + foreman (0.85.0) thor (~> 0.19.1) formulaic (0.4.0) activesupport @@ -150,34 +154,33 @@ GEM i18n globalid (0.4.1) activesupport (>= 4.2.0) - gon (6.2.0) + gon (6.2.1) actionpack (>= 3.0) multi_json request_store (>= 1.0) hashie (3.5.7) - high_voltage (3.0.0) + high_voltage (3.1.0) hirb (0.7.3) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (0.9.1) + i18n (0.9.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) ims-lti (1.2.2) builder oauth (>= 0.4.5, < 0.6) - jazz_fingers (4.0.1) + jaro_winkler (1.5.1) + jazz_fingers (5.0.0) awesome_print (~> 1.6) - hirb (~> 0.7) pry (~> 0.10) pry-byebug (~> 3.4) pry-coolline (~> 0.2) - pry-doc (~> 0.6) json (2.1.0) json_pure (2.1.0) jwt (1.5.6) launchy (2.4.3) addressable (~> 2.3) - loofah (2.1.1) + loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -206,165 +209,161 @@ GEM reek (>= 1.3.4, < 3.0) roodi (~> 3.1) metric_fu-Saikuro (1.1.3) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (1.0.0) + mime-types-data (3.2018.0812) + mini_mime (1.0.1) mini_portile2 (2.3.0) - minitest (5.10.3) - multi_json (1.12.2) + minitest (5.11.3) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) netrc (0.11.0) - newrelic_rpm (4.7.1.340) - nokogiri (1.8.1) + newrelic_rpm (5.4.0.347) + nio4r (1.2.1) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) - oauth (0.5.2) + oauth (0.5.4) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.7.1) + omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) - omniauth-google-oauth2 (0.5.2) - jwt (~> 1.5) - multi_json (~> 1.3) + omniauth-google-oauth2 (0.5.3) + jwt (>= 1.5) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.3.1) + omniauth-oauth2 (>= 1.5) omniauth-oauth2 (1.5.0) oauth2 (~> 1.1) omniauth (~> 1.2) p3p (2.0.0) rack (>= 1.6.2) parallel (1.12.1) - parser (2.4.0.2) - ast (~> 2.3) - path_expander (1.0.2) + parser (2.5.1.2) + ast (~> 2.4.0) + path_expander (1.0.3) pg (0.20.0) - pghero (2.1.0) + pghero (2.2.0) activerecord - powerpack (0.1.1) + powerpack (0.1.2) procto (0.0.3) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.5.1) - byebug (~> 9.1) + pry-byebug (3.6.0) + byebug (~> 10.0) pry (~> 0.10) pry-coolline (0.2.5) coolline (~> 0.5) - pry-doc (0.11.1) - pry (~> 0.9) - yard (~> 0.9) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (3.0.1) - puma (3.11.0) - quiet_assets (1.1.0) - railties (>= 3.1, < 5.0) - rack (1.6.8) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.5) rack-canonical-host (0.2.3) addressable (> 0, < 3) rack (>= 1.0.0, < 3) - rack-plastic (0.1.3) - nokogiri (~> 1.4) - rack (~> 1.0) + rack-plastic (0.1.2) + nokogiri (>= 1.4.0) + rack (>= 1.0.0) rack-test (0.6.3) rack (>= 1.0) - rack-timeout (0.4.2) - rails (4.2.10) - actionmailer (= 4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) - activemodel (= 4.2.10) - activerecord (= 4.2.10) - activesupport (= 4.2.10) + rack-timeout (0.5.1) + rails (5.0.0) + actioncable (= 5.0.0) + actionmailer (= 5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) + activemodel (= 5.0.0) + activerecord (= 5.0.0) + activesupport (= 5.0.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.10) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + railties (= 5.0.0) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + 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_best_practices (1.19.0) + rails_best_practices (1.19.3) activesupport code_analyzer (>= 0.4.8) erubis i18n json - require_all + require_all (~> 2.0) ruby-progressbar rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (4.2.10) - actionpack (= 4.2.10) - activesupport (= 4.2.10) + railties (5.0.0) + actionpack (= 5.0.0) + activesupport (= 5.0.0) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - rake (12.3.0) - rb-fsevent (0.10.2) + rake (12.3.1) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) redcard (1.1.0) - redis (3.3.5) - redis-session-store (0.9.2) - actionpack (>= 3, < 5.2) - redis (~> 3) + redis (4.0.2) + redis-session-store (0.11.0) + actionpack (>= 3, < 6) + redis (>= 3, < 5) reek (2.2.1) parser (~> 2.2) rainbow (~> 2.0) unparser (~> 0.2.2) - request_store (1.3.2) - require_all (1.4.0) + request_store (1.4.1) + rack (>= 1.4) + require_all (2.0.0) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) roodi (3.3.1) ruby_parser (~> 3.2, >= 3.2.2) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.2) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) - rubocop (0.52.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + rubocop (0.59.0) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.4.0.2, < 3.0) + parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.9.0) - ruby_parser (3.10.1) + ruby-progressbar (1.10.0) + ruby_parser (3.11.0) sexp_processor (~> 4.9) - safely_block (0.2.0) + safely_block (0.2.1) errbase - sass (3.5.4) + sass (3.5.7) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -375,11 +374,11 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sexp_processor (4.10.0) + sexp_processor (4.11.0) shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - simplecov (0.15.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) @@ -394,7 +393,7 @@ GEM activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -405,32 +404,34 @@ GEM thor (0.19.4) thread_safe (0.3.6) tilt (2.0.8) - turbolinks (5.0.1) - turbolinks-source (~> 5) - turbolinks-source (5.0.3) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) typhoeus (1.3.0) ethon (>= 0.9.0) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.0.2) + uglifier (4.1.19) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.4) - unicode-display_width (1.3.0) + unf_ext (0.0.7.5) + unicode-display_width (1.4.0) unicode_utils (1.4.0) - uniform_notifier (1.10.0) - unparser (0.2.6) + uniform_notifier (1.11.0) + unparser (0.2.8) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) concord (~> 0.1.5) diff-lcs (~> 1.3) equalizer (~> 0.0.9) - parser (>= 2.3.1.2, < 2.5) + parser (>= 2.3.1.2, < 2.6) procto (~> 0.0.2) - xpath (2.1.0) - nokogiri (~> 1.3) - yard (0.9.12) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.1.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -469,15 +470,14 @@ DEPENDENCIES pry-byebug pry-rails puma - quiet_assets rack-canonical-host rack-plastic rack-timeout - rails (= 4.2.10) + rails (= 5.0.0) rails_12factor rails_stdout_logging redis-session-store - rspec-rails (~> 3.4.0) + rspec-rails (~> 3.8) rubocop sass-rails (~> 5.0) shoulda-matchers From a251e468051677cace4d2811a08de05590466491 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 12 Sep 2018 09:15:37 -0700 Subject: [PATCH 2/2] make rake work with factory_bot --- lib/tasks/dev.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index 88efda55..7a94175f 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -1,10 +1,10 @@ if Rails.env.development? || Rails.env.test? - require "factory_girl" + require "factory_bot" namespace :dev do desc "Sample data for local development environment" task prime: "db:setup" do - include FactoryGirl::Syntax::Methods + include FactoryBot::Syntax::Methods # create(:user, email: "user@example.com", password: "password") end