Merge pull request #24 from rainforestapp/2.5-support

Blind update to 2.5

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   push_to_rubygems:
     docker:
-      - image: circleci/ruby:2.4.4
+      - image: circleci/ruby:2.5.1
     steps:
       - checkout
       - run:

.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.5.1
+  - 2.4.4
 before_install: gem install bundler -v 1.10.6

lib/rf/stylez/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Rf
   module Stylez
-    VERSION = '0.2.9'
+    VERSION = '0.2.10'
   end
 end

rf-stylez.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rubocop', '~> 0.51.0'
+  spec.add_runtime_dependency 'rubocop', '~> 0.59.0'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'

ruby/rubocop.yml

@@ -1,9 +1,12 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   DisabledByDefault: true
   Include:
+    - '**/*.rb'
+    - '**/*.rake'
     - '**/Rakefile'
-    - '**/config.ru'
+    - '**/Guardfile'
+    - '**/*.ru'
     - '**/Gemfile'
   Exclude:
     - 'db/**/*'
@@ -14,6 +17,14 @@ inherit_from:
   ./rubocop_lint.yml
 
 # Good style cops
+Layout/BlockAlignment:
+  Enabled: true
+Layout/EndAlignment:
+  Enabled: true
+Layout/DefEndAlignment:
+  Enabled: true
+Layout/ConditionPosition:
+  Enabled: true
 Layout/TrailingBlankLines:
   Enabled: true
 Layout/TrailingWhitespace:
@@ -110,7 +121,10 @@ Style/RedundantFreeze:
 Style/TrailingCommaInArguments:
   Enabled: true
   EnforcedStyleForMultiline: no_comma
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInHashLiteral:
   Enabled: true
   EnforcedStyleForMultiline: consistent_comma
 Style/MultilineIfThen:

ruby/rubocop_lint.yml

@@ -16,29 +16,14 @@ Lint/AssignmentInCondition:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#safe-assignment-in-condition'
   Enabled: true
 
-Lint/BlockAlignment:
-  Description: 'Align block ends correctly.'
-  Enabled: true
-
 Lint/CircularArgumentReference:
   Description: "Default values in optional keyword arguments and optional ordinal arguments should not refer back to the name of the argument."
   Enabled: true
 
-Lint/ConditionPosition:
-  Description: >-
-                 Checks for condition placed in a confusing position relative to
-                 the keyword.
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#same-line-condition'
-  Enabled: true
-
 Lint/Debugger:
   Description: 'Check for debugger calls.'
   Enabled: true
 
-Lint/DefEndAlignment:
-  Description: 'Align ends corresponding to defs correctly.'
-  Enabled: true
-
 Lint/DeprecatedClassMethods:
   Description: 'Check for deprecated class method calls.'
   Enabled: true
@@ -67,10 +52,6 @@ Lint/EmptyInterpolation:
   Description: 'Checks for empty string interpolation.'
   Enabled: true
 
-Lint/EndAlignment:
-  Description: 'Align ends correctly.'
-  Enabled: true
-
 Lint/EndInMethod:
   Description: 'END blocks should not be placed inside method definitions.'
   Enabled: true
@@ -176,7 +157,7 @@ Lint/UnderscorePrefixedVariableName:
   Description: 'Do not use prefix `_` for a variable that is used.'
   Enabled: true
 
-Lint/UnneededDisable:
+Lint/UnneededCopDisableDirective:
   Description: >-
                  Checks for rubocop:disable comments that can be removed.
                  Note: this cop is not disabled when disabling all cops.