Upgrading easy gems

Fixing new rubocop rules
agile-alliance-brazil · Mar 24, 2018 · 60267fe · 60267fe
1 parent 327be32
commit 60267fe
Show file tree

Hide file tree

Showing 43 changed files with 111 additions and 37 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 ruby '2.4.3'
 
 def linux_only(require_as)
-  RbConfig::CONFIG['host_os'] =~ /linux/ ? require_as : false
+  RbConfig::CONFIG['host_os'].match?(/linux/) ? require_as : false
 end
 
 # Mac OS X
 def darwin_only(require_as)
-  RbConfig::CONFIG['host_os'] =~ /darwin/ ? require_as : false
+  RbConfig::CONFIG['host_os'].match?(/darwin/) ? require_as : false
 end
 
 gem 'attribute_normalizer'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -43,7 +43,7 @@ GEM
     arel (8.0.0)
     ast (2.4.0)
     attribute_normalizer (1.2.0)
-    autoprefixer-rails (8.0.0)
+    autoprefixer-rails (8.2.0)
       execjs
     aws-ses (0.6.0)
       builder
@@ -55,20 +55,20 @@ GEM
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    brakeman (4.1.1)
+    brakeman (4.2.1)
     builder (3.2.3)
-    bullet (5.7.3)
+    bullet (5.7.5)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11.0)
-    byebug (10.0.0)
+    byebug (10.0.1)
     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
-    childprocess (0.8.0)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
     codeclimate-test-reporter (1.0.8)
@@ -83,17 +83,17 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
     crass (1.0.3)
-    devise (4.4.1)
+    devise (4.4.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
-    devise-i18n (1.6.0)
+    devise-i18n (1.6.1)
       devise (>= 4.4)
     diff-lcs (1.3)
     docile (1.1.5)
-    doorkeeper (4.2.6)
+    doorkeeper (4.3.1)
       railties (>= 4.2)
     doorkeeper-i18n (4.0.0)
     dotenv (2.2.1)
@@ -107,7 +107,7 @@ GEM
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
       mail (~> 2.6)
-    erubi (1.7.0)
+    erubi (1.7.1)
     eventmachine (1.2.5)
     execjs (2.7.0)
     factory_bot (4.8.2)
@@ -117,7 +117,7 @@ GEM
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.21)
+    ffi (1.9.23)
     foreman (0.84.0)
       thor (~> 0.19.1)
     formatador (0.2.5)
@@ -168,11 +168,11 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lol_dba (2.1.4)
+    lol_dba (2.1.5)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       railties (>= 3.0)
-    loofah (2.2.0)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.12)
@@ -190,7 +190,7 @@ GEM
     multipart-post (2.0.0)
     nenv (0.3.0)
     newrelic_rpm (4.8.0.341)
-    nio4r (2.2.0)
+    nio4r (2.3.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
@@ -219,7 +219,7 @@ GEM
       rack
     orm_adapter (0.5.0)
     parallel (1.12.1)
-    parser (2.5.0.0)
+    parser (2.5.0.5)
       ast (~> 2.4.0)
     pg (1.0.0)
     poltergeist (1.17.0)
@@ -236,7 +236,7 @@ GEM
     rack (2.0.4)
     rack-livereload (0.3.16)
       rack
-    rack-test (0.8.2)
+    rack-test (0.8.3)
       rack (>= 1.0, < 3)
     rails (5.1.5)
       actioncable (= 5.1.5)
@@ -253,8 +253,8 @@ GEM
     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
@@ -267,8 +267,8 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
-    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)
     ref (2.0.0)
@@ -301,17 +301,17 @@ GEM
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.52.1)
+    rubocop (0.54.0)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5)
       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_dep (1.5.0)
     rubyzip (1.2.1)
-    sass (3.5.5)
+    sass (3.5.6)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -322,7 +322,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    selenium-webdriver (3.9.0)
+    selenium-webdriver (3.11.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
     shellany (0.0.1)
@@ -358,7 +358,7 @@ GEM
     turbolinks-source (5.1.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.6)
+    uglifier (4.1.8)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)
     uniform_notifier (1.11.0)

diff --git a/Gemfile.lock.md5 b/Gemfile.lock.md5
@@ -1 +1 @@
-3f57e0c51571501c3ee7313ad9868c1d
+d7aab15d5fc3a42422ea804c5a66ad78
diff --git a/Guardfile b/Guardfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 

diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # 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
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Base controller with common actions/methods
 class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Users
   # Callback controller to handle omniauth returns with token
   class OmniauthCallbacksController < Devise::OmniauthCallbacksController

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Controller to list users and show a specific one
 class UsersController < ApplicationController
   def index; end

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Basic helper for the whole application
 module ApplicationHelper
 end
diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Helper regarding to layout. Any method needed in the application layout.
 module LayoutHelper
   def title(page_title, show_title = true)

diff --git a/app/models/application_record.rb b/app/models/application_record.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # ApplicationRecord is an extra layer of indirection to ActiveRecord::Base
 # which allows us to customize its behavior per application without monkey
 # patching

diff --git a/app/models/authentication.rb b/app/models/authentication.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Represents an authentication coming from OAuth
 class Authentication < ApplicationRecord
   belongs_to :user

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1,10 +1,9 @@
 # frozen_string_literal: true
-# encoding: UTF-8
 
 # Represents a user in the system
 class User < ApplicationRecord
   AUTH_PROVIDERS = Rails.application.secrets.omniauth.keys
-  SESSION_DATA_KEY = 'devise.omniauth_data'.freeze
+  SESSION_DATA_KEY = 'devise.omniauth_data'
   devise :database_authenticatable, :registerable, :recoverable,
          :trackable, :rememberable, :validatable, :omniauthable,
          :confirmable,
@@ -30,7 +29,7 @@ class User < ApplicationRecord
   validates :email, length: { within: 6..100 }
 
   before_validation do |user|
-    if user.twitter_username =~ /\A@/
+    if user.twitter_username&.match?(/\A@/)
       user.twitter_username = user.twitter_username[1..-1]
     end
     user.state = nil unless in_brazil?

diff --git a/config.ru b/config.ru
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment', __FILE__)

diff --git a/config/application.rb b/config/application.rb
@@ -1,4 +1,6 @@
-require File.expand_path('../boot', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('boot', __dir__)
 
 require 'rails/all'
 

diff --git a/config/boot.rb b/config/boot.rb
@@ -1,3 +1,5 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+# frozen_string_literal: true
+
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/environment.rb b/config/environment.rb
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the Rails application.
 Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in
   # config/application.rb.

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in
   # config/application.rb.

diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in
   # config/application.rb.

diff --git a/config/initializers/amazon_ses.rb b/config/initializers/amazon_ses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActionMailer::Base.add_delivery_method(
   :ses, AWS::SES::Base,
   access_key_id: ENV['AWS_ACCESS_KEY_ID'],

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.

diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't

diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.action_dispatch.cookies_serializer = :json
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|

diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Doorkeeper.configure do
   # Change the ORM that doorkeeper will use (needs plugins)
   orm :active_record

diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.

diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :cookie_store, key: '_identity_session'
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

diff --git a/config/routes.rb b/config/routes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   use_doorkeeper
 

diff --git a/db/migrate/20150121044347_create_users.rb b/db/migrate/20150121044347_create_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable Metrics/MethodLength
 # rubocop:disable Metrics/AbcSize
 # rubocop:disable Metrics/BlockLength
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		3f57e0c51571501c3ee7313ad9868c1d
		d7aab15d5fc3a42422ea804c5a66ad78