optimum-energy-rubocop 0.7.5 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c454417488ef48388b278f7c88740b82f87cdd2a1285e97d28b0cf8007cb713
-  data.tar.gz: 189ae42c9ddb88d88f2d24ab2042953b4f6684479268db7ffeb88165472f2ce5
+  metadata.gz: 5f48e1d73997672eca1f7f9f9ed4e694a32699640fb5016a07b2d4e974dc8ff6
+  data.tar.gz: 3d89dfa187e9ed25d396885bfeec14fd81c928826d3e67950f33de198b310a9e
 SHA512:
-  metadata.gz: c346dde2f9ee531cfba0037a458d018978c90c2ab4f1e240157553762d581ac6cd634fb1ad51660c63b5ef1f2d1fe0768907b356ed9a45c8020c25a89d836c24
-  data.tar.gz: 0466e397ce83bd833b0c46d8386f1fa932e53af2f6881fc41ba9fe6b87c15ef9e21ff3d79829a9814a662e029ab8afc9a2ee6e9e755098ca227323d47d15265f
+  metadata.gz: ac23d19c60d717af09466c8a43e6b4fe6b6a3311949b1369262e00dd6b0d6e38cf804ca32b9fe002e55c5d50c7cb02660dc1d29507bdd634c639d462aed5ac39
+  data.tar.gz: 30619cc113971cfa0f0c93a532b1b3982f8a90b6f3735aaf22d4521bb8344943070c90c45e9b61b2dfad088da5a790bedd19873b8ba10ea8567b9168d94bb141

data/.ruby-version

@@ -1 +1 @@
-2.7.0
+2.7.1

data/Dockerfile

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

data/Gemfile.lock

@@ -1,34 +1,51 @@
 PATH
   remote: .
   specs:
-    optimum-energy-rubocop (0.7.4)
+    optimum-energy-rubocop (0.7.9)
       rubocop (~> 0.80)
-      rubocop-rails (~> 2.4.2)
+      rubocop-rails (~> 2.7.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    jaro_winkler (1.5.4)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
-    rack (2.2.2)
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    concurrent-ruby (1.1.9)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
     rainbow (3.0.0)
-    rexml (3.2.4)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
       rexml
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-rails (2.4.2)
+    rubocop-ast (1.8.0)
+      parser (>= 3.0.1.1)
+    rubocop-rails (2.7.1)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
-    ruby-progressbar (1.10.1)
+      rubocop (>= 0.87.0)
+    ruby-progressbar (1.11.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -37,7 +54,7 @@ DEPENDENCIES
   optimum-energy-rubocop!
 
 RUBY VERSION
-   ruby 2.7.0p0
+   ruby 2.7.1p83
 
 BUNDLED WITH
-   2.1.4
+   2.2.28

data/README.md

@@ -15,11 +15,8 @@ gem 'optimum-energy-rubocop'
 Create a `.rubocop.yml` file and add this configuration.
 
 ```
-require:
-  - optimum-energy-rubocop
-
-inherit_from:
-  - optimum_energy_rubocop.yml
+inherit_gem:
+  optimum-energy-rubocop: optimum_energy_rubocop.yml
 ```
 
 ## Updating This Gem

data/VERSION.txt

@@ -1 +1 @@
-0.7.5
+0.7.9

data/deployment.env.encrypted

@@ -1,2 +1,2 @@
 codeship:v2
-JjzJa5IPPlslZNYdlQaBuQwNLu1cNBVcIFyCqOQ1Bz9Rfmo/b673eak7fgsGFNs1cMIvp28L61IfIBKwRsy0x1lrGGIfdjo8lwIGA/JCyM5IpHrpsBazaVjaL0cHzOulATzlwQ==
+IKBJYRm4ObjGLsvovpL6Ov+IwE3JgQtN2ckNn2AbftoBWh9gEKXDRD9LPhZfKPiaDTNrUWIvNFKNqGI6eMNm6r5Uu/1iHZdnmwoP5t9pv+4t8S+dYsSfzNhvJ9psisoN1hTT/8+CtxyZ13BEhS4ejF2aUZ+8IePxKLr+NTk=

data/optimum-energy-rubocop.gemspec

@@ -1,6 +1,7 @@
 Gem::Specification.new do |spec|
   spec.name = "optimum-energy-rubocop"
   spec.version = File.read("VERSION.txt")
+  spec.required_ruby_version = "~> 2.7"
   spec.authors = [ "Optimum Energy" ]
 
   spec.summary = "The shared Rubocop configuration for Optimum Energy"
@@ -10,5 +11,5 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0")
 
   spec.add_dependency "rubocop", "~> 0.80"
-  spec.add_dependency "rubocop-rails", "~> 2.4.2"
+  spec.add_dependency "rubocop-rails", "~> 2.7.1"
 end

data/optimum_energy_rubocop.yml

@@ -4,6 +4,12 @@
 require: rubocop-rails
 
 AllCops:
+
+  # By default, Rubocop now displays warnings for all cops that are going to be enabled in the next
+  # minor version. This disables those cops. We'll pick them up when Rubocop decided they're good
+  # enough to enable by default for everyone.
+  NewCops: disable
+
   Exclude:
     - 'db/schema.rb'
     - 'bin/*'
@@ -21,6 +27,9 @@ Layout/BlockAlignment:
 Layout/CaseIndentation:
   EnforcedStyle: end
 
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
 # Unfortuantely, this rule can't be refined to the point of being useful.
 Layout/EmptyLinesAroundMethodBody:
   Enabled: false
@@ -69,6 +78,7 @@ Layout/LineLength:
   Max: 100
   AllowHeredoc: false
   AllowURI: false
+  AutoCorrect: true
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
@@ -76,6 +86,13 @@ Layout/MultilineMethodCallIndentation:
 Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
+# Ideally we'd be able to configure begin/rescue blocks to align how our other blocks do, but for
+# now there doesn't seem to be an option for it.
+#
+# TODO: Move this rule change to optimum-energy-rubocop-config.
+Layout/RescueEnsureAlignment:
+  Enabled: false
+
 Layout/SpaceInsideArrayLiteralBrackets:
   EnforcedStyle: space
 
@@ -174,6 +191,11 @@ Rails/Date:
 Rails/FilePath:
   Enabled: false
 
+# By default, the Rubocop Rails rules warn against using has_and_belongs_to_many. This disables that
+# behavior. Don't you tell me what to do Rubocop.
+Rails/HasAndBelongsToMany:
+  Enabled: false
+
 Rails/NotNullColumn:
   Enabled: false
 
@@ -190,6 +212,9 @@ Rails/TimeZone:
 Style/AccessModifierDeclarations:
   EnforcedStyle: inline
 
+Style/ClassAndModuleChildren:
+  Enabled: false
+
 Style/ConditionalAssignment:
   EnforcedStyle: assign_to_condition
 
@@ -215,6 +240,10 @@ Style/ExponentialNotation:
 Style/FormatString:
   EnforcedStyle: percent
 
+# This rule is wrong for Rails validation messages.
+Style/FormatStringToken:
+  Enabled: false
+
 # 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:
@@ -244,6 +273,9 @@ Style/RegexpLiteral:
 Style/ReturnNil:
   Enabled: true
 
+Style/SlicingWithRange:
+  Enabled: true
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optimum-energy-rubocop
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.9
 platform: ruby
 authors:
 - Optimum Energy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.7.1
 description: 
 email: 
 executables: []
@@ -70,9 +70,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="