optimum-energy-rubocop 0.7.6 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8726b8b080718a8b442e9d5f75eba2aabbbf0301b00c933fc73b1961478b0bc
-  data.tar.gz: 240abb4b944aec7430e689be998d77455d32c56a5d1c666d9779368ca4c06a22
+  metadata.gz: cd865dfa79f2eac897b296ee5efb95dac1dd443eb8a568e144fb7e210a2ea997
+  data.tar.gz: 5aee7163dcde6412625ded39ab7319205c6ed6ee947ba46258bb0959fbb64a79
 SHA512:
-  metadata.gz: 04c60bb88653560cd32d0f97ba47023a3c60bc46e1a8385277ceafaf53ac5cab95c82d04754654a1f4f365326ebcc249d4878fc9d723d73922abad6a55ed1755
-  data.tar.gz: 5ec4dd663df7e9e8343de39847fe94a8abfdd51295779467cea77d0a94f9dfe3f191e41c0d555c34e520aa9bb410b7b5cb78f94d65ba3f74a1495b4a0e865099
+  metadata.gz: ffcf76af502be730c2471e46ac92e5a66f3f7a5d5b4de9212a067b54dff034c5d377ad75a407c615af5d11904d7bd6cbcf1ee60e6caec9a959d5e51ecbd00b8a
+  data.tar.gz: 73430a1c3a880ec279e9cbc76ee08e6ff3ba3764bd203150fe9147be22c6d367df07924953aded3b85ff18b382b045934876ef49eac3a3c36182ff7ed47b5f73

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.10)
       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.6
+0.7.10

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,9 +4,19 @@
 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/*'
+    - 'node_modules/**/*'
+    - 'vendor/**/*'
+    - 'tmp/**/*'
+
 
 ##########
 # LAYOUT #
@@ -72,6 +82,7 @@ Layout/LineLength:
   Max: 100
   AllowHeredoc: false
   AllowURI: false
+  AutoCorrect: true
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
@@ -79,6 +90,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
 
@@ -177,6 +195,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
 
@@ -193,6 +216,9 @@ Rails/TimeZone:
 Style/AccessModifierDeclarations:
   EnforcedStyle: inline
 
+Style/ClassAndModuleChildren:
+  Enabled: false
+
 Style/ConditionalAssignment:
   EnforcedStyle: assign_to_condition
 
@@ -218,6 +244,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:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optimum-energy-rubocop
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.10
 platform: ruby
 authors:
 - Optimum Energy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2021-12-08 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:
   - - ">="