Upgrade deps (#68)

* upgrade paperclip and loofah * Upgrade ruby_spec_helpers * Get Rubocop happy * Don't mess with slashes in File.join
Betterment · Apr 12, 2018 · d4fe28b · d4fe28b
1 parent 4d7c67f
commit d4fe28b
Show file tree

Hide file tree

Showing 54 changed files with 502 additions and 311 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,8 +1,4 @@
-# See full list of defaults here: https://github.com/bbatsov/rubocop/blob/master/config/default.yml
-# To see all cops used see here: https://github.com/bbatsov/rubocop/blob/master/config/enabled.yml
-
-require:
-  - ruby_spec_helpers/rubocop
+# please keep this file alphabetically ordered!
 
 AllCops:
   Exclude:
@@ -12,28 +8,58 @@ AllCops:
     - 'vendor/**/*'
     - 'frontend/**/*'
     - 'build/**/*'
+    - 'node_modules/**/*'
+    - 'tmp/**/*'
+    - 'Gemfile'
   DisplayStyleGuide: true
   DisplayCopNames: true
 
-Rails:
-  Enabled: true
+Layout/AlignParameters:
+  Enabled: false
 
-Metrics/ClassLength:
-  Max: 250
+Layout/CaseIndentation:
+  IndentOneStep: true
 
-Metrics/ModuleLength:
-  Max: 250
+Layout/ClosingParenthesisIndentation:
+  Enabled: false
 
-Metrics/AbcSize:
+Layout/IndentArray:
+  EnforcedStyle: consistent
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'spec/**/*'
 
-Metrics/CyclomaticComplexity:
-  Max: 10
+Lint/AmbiguousOperator:
   Exclude:
     - 'spec/**/*'
 
-Metrics/PerceivedComplexity:
+Lint/AmbiguousRegexpLiteral:
+  Exclude:
+    - 'spec/**/*'
+
+Lint/BooleanSymbol:
+  Exclude:
+    - 'spec/**/*'
+
+Metrics/AbcSize:
+  Exclude:
+    - 'spec/**/*'
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/ClassLength:
+  Max: 250
+
+Metrics/CyclomaticComplexity:
+  Max: 10
   Exclude:
     - 'spec/**/*'
 
@@ -44,63 +70,86 @@ Metrics/MethodLength:
   Exclude:
     - 'spec/**/*'
 
-Lint/AmbiguousOperator:
-  Exclude:
-    - 'spec/**/*'
+Metrics/ModuleLength:
+  Max: 250
 
-Lint/AmbiguousRegexpLiteral:
+Metrics/PerceivedComplexity:
   Exclude:
     - 'spec/**/*'
 
-Style/Documentation:
+Performance/RedundantMatch:
   Enabled: false
 
-Style/StringLiterals:
-  Enabled: false
+Rails:
+  Enabled: true
 
-Style/SignalException:
+Rails/ApplicationRecord:
   Enabled: false
 
-Style/SymbolProc:
+Rails/Delegate:
+  EnforceForPrefixed: false
+
+Rails/FilePath:
   Enabled: false
 
-Style/CaseIndentation:
-  IndentOneStep: true
+Rails/FindEach:
+  Enabled: false
 
-Style/LambdaCall:
-  Exclude:
-    - 'app/views/**/*.jbuilder'
+Rails/HttpPositionalArguments:
+  Enabled: false
 
-Style/MissingElse:
+Rails/OutputSafety:
   Enabled: true
-  EnforcedStyle: case
+
+Style/BlockDelimiters:
+  EnforcedStyle: braces_for_chaining
 
 Style/ClassAndModuleChildren:
   Enabled: false
 
-Style/AlignParameters:
+Style/Documentation:
   Enabled: false
 
-Style/ClosingParenthesisIndentation:
+Style/FrozenStringLiteralComment:
   Enabled: false
 
-Style/MultilineOperationIndentation:
-  EnforcedStyle: indented
+Style/GuardClause:
+  Enabled: false
+
+Style/Lambda:
+  Enabled: false
 
-Style/PredicateName:
+Style/LambdaCall:
+  Exclude:
+    - 'app/views/**/*.jbuilder'
+
+Style/MissingElse:
+  Enabled: true
+  EnforcedStyle: case
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    default: '()'
+    '%i': '()'
+    '%I': '()'
+    '%r': '{}'
+    '%w': '()'
+    '%W': '()'
+
+Naming/PredicateName:
   NamePrefix:
     - is_
   NamePrefixBlacklist:
     - is_
 
-Style/Lambda:
+Style/SignalException:
   Enabled: false
 
-Rails/FindEach:
+Style/StringLiterals:
   Enabled: false
 
-Style/GuardClause:
+Style/SymbolProc:
   Enabled: false
 
-Style/FrozenStringLiteralComment:
+Style/YodaCondition:
   Enabled: false
diff --git a/Gemfile b/Gemfile
@@ -40,7 +40,7 @@ gem 'omniauth-saml'
 
 gem 'simple_form'
 
-gem 'paperclip', '~> 5.0.0'
+gem 'paperclip', '~> 5.2'
 gem 'aws-sdk', '~> 2.3.0'
 
 gem 'attribute_normalizer', '~> 1.2.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,10 +2,11 @@ PATH
   remote: vendor/gems/ruby_spec_helpers
   specs:
     ruby_spec_helpers (0.0.1)
-      capybara (>= 2.4.0)
+      capybara (~> 2.16.0)
+      rspec-collection_matchers
       rspec-rails
       rspec-retry (~> 0.4.5)
-      rubocop (< 0.42)
+      rspec_junit_formatter
       selenium-webdriver
       site_prism
       webmock
@@ -63,7 +64,7 @@ GEM
       builder
       multi_json
     arel (7.1.4)
-    ast (2.3.0)
+    ast (2.4.0)
     attribute_normalizer (1.2.0)
     aws-sdk (2.3.22)
       aws-sdk-resources (= 2.3.22)
@@ -91,8 +92,6 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     climate_control (0.2.0)
     cliver (0.3.2)
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.2)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
@@ -104,7 +103,7 @@ GEM
     concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.3)
+    crass (1.0.4)
     database_cleaner (1.6.2)
     db-query-matchers (0.9.0)
       activesupport (>= 4.0, <= 6.0)
@@ -155,7 +154,7 @@ GEM
     hashdiff (0.3.7)
     hashie (3.5.6)
     highline (1.7.8)
-    i18n (0.9.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
@@ -169,7 +168,7 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.19)
-    loofah (2.1.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
@@ -181,7 +180,7 @@ GEM
     mimemagic (0.3.2)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
+    minitest (5.11.3)
     multi_json (1.13.1)
     multipart-post (2.0.0)
     neat (1.7.2)
@@ -191,7 +190,7 @@ GEM
     net-http-pipeline (1.0.1)
     newrelic_rpm (4.5.0.337)
     nio4r (2.1.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     omniauth (1.7.1)
       hashie (>= 3.4.6, < 3.6.0)
@@ -200,14 +199,15 @@ GEM
       omniauth (~> 1.3)
       ruby-saml (~> 1.4, >= 1.4.3)
     orm_adapter (0.5.0)
-    paperclip (5.0.0)
+    paperclip (5.3.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
-      cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
+      terrapin (~> 0.6.0)
+    parallel (1.12.1)
+    parser (2.5.0.5)
+      ast (~> 2.4.0)
     pg (0.21.0)
     poltergeist (1.16.0)
       capybara (~> 2.1)
@@ -256,9 +256,8 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
-    rake (12.3.0)
+    rainbow (3.0.0)
+    rake (12.3.1)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -271,6 +270,8 @@ GEM
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
+    rspec-collection_matchers (1.1.3)
+      rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.7.0)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
@@ -290,10 +291,13 @@ GEM
     rspec-retry (0.4.6)
       rspec-core
     rspec-support (3.7.0)
-    rubocop (0.41.2)
-      parser (>= 2.3.1.1, < 3.0)
+    rspec_junit_formatter (0.3.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (0.54.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
@@ -341,6 +345,8 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
@@ -362,7 +368,7 @@ GEM
     turbolinks-source (5.0.3)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
@@ -374,7 +380,7 @@ GEM
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    webmock (3.1.0)
+    webmock (3.3.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -410,7 +416,7 @@ DEPENDENCIES
   newrelic_rpm
   nokogiri
   omniauth-saml
-  paperclip (~> 5.0.0)
+  paperclip (~> 5.2)
   pg
   poltergeist
   pry-rails
@@ -439,4 +445,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.16.0
+   1.16.1
diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 
 Rails.application.load_tasks
 
@@ -10,5 +10,5 @@ if %w(development test).include? Rails.env
   RuboCop::RakeTask.new
 
   task(:default).clear
-  task default: [:rubocop, :spec]
+  task default: %i(rubocop spec)
 end