optimum-energy-rubocop 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67794bb0bf4239bffcd5d8098073d3e2b526685d744dd321c5a917774756f719
-  data.tar.gz: ec01c103cb68d0d241e8c2941c7b17bee7540e8e62b16b40384b6fd9280457a9
+  metadata.gz: 3953de0cf2ab9f2ed23d74bb0e50eced6a4d1ed1f345131c6c27148ee62c8da1
+  data.tar.gz: 4434b3408b9cb0530aecc398ed9946043632799e47ae06e6ab73ddee3803fc0e
 SHA512:
-  metadata.gz: 29a8664fc60b495fb6a31d9401de685033939651ea3cf13a00a3e71e54661628710da5c1d96b0ee3a5e519880f70d8b51e8428cf4dbf23579f5af060ea83f9da
-  data.tar.gz: cc0bde362a48327490611af3059a276424605eb33044b95fd3a68311aba982094146c017699c4121d336a7609051dfd49082e712191941ad3c7f176208ab256f
+  metadata.gz: 48de0712de1a7f59adbdfed64af0c896644342914e0ca763fffc4a41a5ba1a7537c4b8a79d2bf179cc290c3ec1e652b3d65afe060f66f76409d324d98eb2d993
+  data.tar.gz: 1a39c1b9d255d418e7851d1deab5d5fab4c190604ba15532f82db25a629e690a4fbc18714d526c5d831cd3fb0556db8d591b141ed0877e4836810f7024e60ab4

data/.ruby-version

@@ -1 +1 @@
-2.6.4
+2.6.5

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6.4
+FROM ruby:2.6.5
 
 # Install the dependencies
 ADD Gemfile Gemfile.lock .ruby-version optimum-energy-rubocop.gemspec VERSION.txt /app/

data/Gemfile.lock

@@ -1,25 +1,30 @@
 PATH
   remote: .
   specs:
-    optimum-energy-rubocop (0.6.0)
-      rubocop (~> 0.74)
+    optimum-energy-rubocop (0.7.0)
+      rubocop (~> 0.78)
+      rubocop-rails (~> 2.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    jaro_winkler (1.5.3)
-    parallel (1.17.0)
-    parser (2.6.4.1)
+    jaro_winkler (1.5.4)
+    parallel (1.19.1)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
+    rack (2.0.8)
     rainbow (3.0.0)
-    rubocop (0.74.0)
+    rubocop (0.78.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-rails (2.4.0)
+      rack (>= 1.1)
+      rubocop (>= 0.72.0)
     ruby-progressbar (1.10.1)
     unicode-display_width (1.6.0)
 
@@ -30,7 +35,7 @@ DEPENDENCIES
   optimum-energy-rubocop!
 
 RUBY VERSION
-   ruby 2.6.4p104
+   ruby 2.6.5p114
 
 BUNDLED WITH
    1.17.2

data/README.md

@@ -30,4 +30,4 @@ version is not changed, repos consuming this gem will not get the updates.
 
 ## Running Rubocop
 
-To run the cops, run `rubocop` from the command line.
+To run the cops locally for this repo, run `bundle exec rubocop` from the command line.

data/VERSION.txt

@@ -1 +1 @@
-0.6.0
+0.7.0

data/optimum-energy-rubocop.gemspec

@@ -9,5 +9,6 @@ Gem::Specification.new do |spec|
 
   spec.files = `git ls-files -z`.split("\x0")
 
-  spec.add_dependency "rubocop", "~> 0.74"
+  spec.add_dependency "rubocop", "~> 0.78"
+  spec.add_dependency "rubocop-rails", "~> 2.4.0"
 end

data/optimum_energy_rubocop.yml

@@ -1,31 +1,36 @@
 # This styleguide is built on top of the default Rubocop styleguide, located here:
 # https://github.com/bbatsov/rubocop/blob/master/config/default.yml.
 
+require: rubocop-rails
+
 AllCops:
   Exclude:
     - 'db/schema.rb'
     - 'bin/*'
 
-Rails:
-  Enabled: true
-
-Metrics/AbcSize:
-  Enabled: false
-
-Layout/AlignHash:
-  Enabled: false
+##########
+# LAYOUT #
+##########
 
-Layout/AlignArguments:
+Layout/ArgumentAlignment:
   EnforcedStyle: with_fixed_indentation
 
+Layout/BlockAlignment:
+  EnforcedStyleAlignWith: start_of_block
+
 Layout/CaseIndentation:
   EnforcedStyle: end
 
+# Unfortuantely, this rule can't be refined to the point of being useful.
+Layout/EmptyLinesAroundMethodBody:
+  Enabled: false
+
+Layout/EmptyLinesAroundExceptionHandlingKeywords:
+  Enabled: false
+
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
-# Ideally, I would like to insert empty lines at the beginning on a class definition, but not at the
-# end. https://github.com/bbatsov/rubocop/issues/4812
 Layout/EmptyLinesAroundClassBody:
   Enabled: false
 
@@ -39,6 +44,8 @@ Layout/EmptyLineBetweenDefs:
   AllowAdjacentOneLineDefs: true
   NumberOfEmptyLines: 1
 
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: start_of_line
 
 Layout/EndOfLine:
   EnforcedStyle: lf
@@ -46,15 +53,23 @@ Layout/EndOfLine:
 Layout/ExtraSpacing:
   AllowForAlignment: false
 
-Layout/IndentFirstArgument:
+Layout/FirstArgumentIndentation:
   EnforcedStyle: consistent
 
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
+Layout/HashAlignment:
+  Enabled: false
+
+Layout/LineLength:
+  Max: 100
+  AllowHeredoc: false
+  AllowURI: false
+
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
@@ -73,6 +88,39 @@ Layout/SpaceBeforeFirstArg:
 Layout/SpaceInsideStringInterpolation:
   EnforcedStyle: space
 
+###########
+# METRICS #
+###########
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: true
+  Max: 100
+  Exclude:
+    - 'spec/**/*'
+
+Metrics/ClassLength:
+  Enabled: true
+  Max: 300
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/MethodLength:
+  Max: 50
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+##########
+# NAMING #
+##########
+
 Naming/FileName:
   ExpectMatchingDefinition: true
   Exclude:
@@ -86,9 +134,35 @@ Naming/FileName:
 Naming/RescuedExceptionsVariableName:
   PreferredName: exception
 
+#########
+# RAILS #
+#########
+
+Rails:
+  Enabled: true
+
 Rails/BulkChangeTable:
   Enabled: false
 
+Rails/Date:
+  EnforcedStyle: strict
+
+Rails/FilePath:
+  Enabled: false
+
+Rails/NotNullColumn:
+  Enabled: false
+
+Rails/RequestReferer:
+  EnforcedStyle: referrer
+
+Rails/TimeZone:
+  EnforcedStyle: strict
+
+#########
+# STYLE #
+#########
+
 Style/AccessModifierDeclarations:
   EnforcedStyle: inline
 
@@ -98,8 +172,6 @@ Style/ConditionalAssignment:
 Style/Copyright:
   Enabled: false
 
-# TODO: Consider turning this on for controller methods in the future if we extract Swagger
-# documentation from them.
 Style/Documentation:
   Enabled: false
 
@@ -109,8 +181,8 @@ Style/DoubleNegation:
 Style/FormatString:
   EnforcedStyle: percent
 
-# This won't be necessary when we upgrade to Ruby 3.0. Until then, rather than adding a comment to
-# every file, we should not mutate strings.
+# TODO: This won't be necessary when we upgrade to Ruby 3.0. Until then, rather than adding a
+# comment to every file, we should only add it to the files where it's necessary.
 Style/FrozenStringLiteralComment:
   EnforcedStyle: never
 
@@ -137,52 +209,3 @@ Style/SymbolArray:
 
 Style/WordArray:
   MinSize: 3
-
-Metrics/BlockLength:
-  Enabled: true
-  Max: 100
-  Exclude:
-    - 'spec/**/*'
-
-Metrics/ClassLength:
-  Enabled: true
-  Max: 300
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/MethodLength:
-  Max: 50
-
-Metrics/LineLength:
-  Max: 100
-  AllowHeredoc: false
-  AllowURI: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false
-
-Layout/BlockAlignment:
-  EnforcedStyleAlignWith: start_of_block
-
-Layout/EndAlignment:
-  EnforcedStyleAlignWith: start_of_line
-
-Rails/Date:
-  EnforcedStyle: strict
-
-Rails/FilePath:
-  Enabled: false
-
-# TODO: Enable once this is fixed: https://github.com/bbatsov/rubocop/issues/5236
-Rails/InverseOf:
-  Enabled: false
-
-Rails/NotNullColumn:
-  Enabled: false
-
-Rails/RequestReferer:
-  EnforcedStyle: referrer
-
-Rails/TimeZone:
-  EnforcedStyle: strict

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optimum-energy-rubocop
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Optimum Energy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '0.78'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '0.78'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 description: 
 email: 
 executables: []