ezcater_rubocop 1.4.1 → 2.0.0.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2626666be301038771507fd6f16b7692e5cfec95d95c390af0549ad51362beb5
-  data.tar.gz: 51743b8cad931afabb760f6e6febba320b88319a6fa614edc4711fb88cc92a4a
+  metadata.gz: 25b91003c623532c7bfef151198086556d2cea77e615469397f80e7f012c0359
+  data.tar.gz: 8ef8be0def6078e2410a5876df56e0a1f91d88508e3ff2aa4b7dfdf1aecb565f
 SHA512:
-  metadata.gz: c0eedbd9d68682219bb3a2b2e221f1cdab8a06ab43c5dde9fc52dbfba7f66ab8cf4ad737fd1ba437d83c66308784d30e0916677eea5094212c3b6f21a4f42bb0
-  data.tar.gz: 2881e1d3b53b4ced6aa8c5beb4c82fda57ddd1b0da6582c7820e690a4e29e13eecb128f49db02526122789b3e1eeda48f3b7c3709e20dd1d05ab76f211219841
+  metadata.gz: 865378735794cbb0e60e0f6ff4ff84a50ae0b95c9db016bf5d237f5464049f2246b56b1a0932f1851e73f6797fe6c4ab11784df555d224f50f6bdf32ff956760
+  data.tar.gz: 48b0a31fc611f52e9103f9e3f7168f02d7e44a4937bf3fda294af32abf1ec04b13defdebdb97413fe3c3586d720514b44f80f65e4bb1cfb04d791395c7b28e31

data/CHANGELOG.md

@@ -6,22 +6,25 @@ This gem is moving onto its own [Semantic Versioning](https://semver.org/) schem
 
 Prior to v1.0.0 this gem was versioned based on the `MAJOR`.`MINOR` version of RuboCop. The first release of the ezcater_rubocop gem was `v0.49.0`.
 
-## v1.4.1
-- Correct a matching syntax issue with `Ezcater/RubyTimeout` so that it applies in the expected cases.
+## v2.0.0 (unreleased)
+- Update to `rubocop` v0.78.0, `rubocop-rspec` v1.37.1 and `rubocop-rails`.
+- This is being released as a major update because cops have been renamed so this is unlikely to be
+  a drop-in replacement.
 
-## v1.4.0
-- Add `Ezcater/RubyTimeout` cop.
+## v1.3.0 (Unreleased)
 
-## v1.3.0
 - Add `Ezcater/GraphqlFieldsNaming` cop.
 
 ## v1.2.0
+
 - Add `Ezcater/RailsTopLevelSqlExecute` to replace `ActiveRecord::Base.connection.execute` with `execute` in `db/migrate/`.
 
 ## v1.1.1
+
 - Exclude `lib/tasks/` for `Ezcater/RailsEnv` and `Ezcater/DirectEnvCheck`.
 
 ## v1.1.0
+
 - Add `Ezcater/RailsEnv` cop.
 - Add `Ezcater/DirectEnvCheck` cop.
 

data/bin/circle_rubocop.rb

@@ -39,7 +39,7 @@ begin
       run("bundle exec rubocop --force-exclusion #{changed_files}")
     end
   end
-rescue StandardError => ex
-  puts "Error: #{ex.message}"
+rescue StandardError => e
+  puts "Error: #{e.message}"
   rubocop_everything
 end

data/conf/rubocop.yml

@@ -3,10 +3,10 @@ require: ezcater_rubocop
 AllCops:
   DisplayCopNames: true
 
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
 Layout/MultilineMethodCallIndentation:
@@ -26,7 +26,7 @@ Metrics/BlockLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
   Exclude:
   - "Gemfile"
@@ -42,7 +42,7 @@ Metrics/PerceivedComplexity:
 Naming/MemoizedInstanceVariableName:
   EnforcedStyleForLeadingUnderscores: required
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   AllowedNames:
   - e
   - ex
@@ -89,7 +89,7 @@ Style/EmptyLiteral:
 
 Style/FrozenStringLiteralComment:
   Enabled: true
-  EnforcedStyle: when_needed
+  EnforcedStyle: always
 
 Style/GuardClause:
   Enabled: false

data/conf/rubocop_rails.yml

@@ -6,7 +6,7 @@ inherit_mode:
     - Exclude
 
 AllCops:
-  TargetRailsVersion: 5.1
+  TargetRailsVersion: 5.2
   Exclude:
     - tmp/cache/**/*
 

data/config/default.yml

@@ -51,7 +51,3 @@ Ezcater/StyleDig:
   Description: 'Recommend `dig` for deeply nested access.'
   Enabled: true
   AutoCorrect: false
-
-Ezcater/RubyTimeout:
-  Description: 'Disallow use of `Timeout.timeout` because it is unsafe and can cause unexpected behavior.'
-  Enabled: true

data/ezcater_rubocop.gemspec

@@ -43,13 +43,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "mry"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec_junit_formatter"
-  spec.add_development_dependency "simplecov", "< 0.18.0"
+  spec.add_development_dependency "simplecov"
 
   spec.add_runtime_dependency "parser", "!= 2.5.1.1"
-  spec.add_runtime_dependency "rubocop", "~> 0.61.1"
-  spec.add_runtime_dependency "rubocop-rspec", "~> 1.30.1"
+  spec.add_runtime_dependency "rubocop", "~> 0.78.0"
+  spec.add_runtime_dependency "rubocop-rails", "~> 2.4.1"
+  spec.add_runtime_dependency "rubocop-rspec", "~> 1.37.1"
 end

data/lib/ezcater_rubocop.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "ezcater_rubocop/version"
+require "rubocop-rails"
 require "rubocop-rspec"
 
 # Because RuboCop doesn't yet support plugins, we have to monkey patch in a
@@ -18,7 +19,6 @@ require "rubocop/cop/ezcater/direct_env_check"
 require "rubocop/cop/ezcater/graphql_fields_naming"
 require "rubocop/cop/ezcater/rails_configuration"
 require "rubocop/cop/ezcater/rails_env"
-require "rubocop/cop/ezcater/ruby_timeout"
 require "rubocop/cop/ezcater/rails_top_level_sql_execute"
 require "rubocop/cop/ezcater/require_gql_error_helpers"
 require "rubocop/cop/ezcater/rspec_match_ordered_array"

data/lib/ezcater_rubocop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EzcaterRubocop
-  VERSION = "1.4.1"
+  VERSION = "2.0.0.pre0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezcater_rubocop
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0.pre0
 platform: ruby
 authors:
 - ezCater, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: mry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +98,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +128,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 0.78.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 0.78.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.1
+        version: 1.37.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.1
+        version: 1.37.1
 description: ezCater custom cops and shared configuration
 email:
 - engineering@ezcater.com
@@ -169,7 +197,6 @@ files:
 - lib/rubocop/cop/ezcater/rspec_require_browser_mock.rb
 - lib/rubocop/cop/ezcater/rspec_require_feature_flag_mock.rb
 - lib/rubocop/cop/ezcater/rspec_require_http_status_matcher.rb
-- lib/rubocop/cop/ezcater/ruby_timeout.rb
 - lib/rubocop/cop/ezcater/style_dig.rb
 - lib/rubocop/rspec/language/each_selector.rb
 homepage: https://github.com/ezcater/ezcater_rubocop
@@ -188,11 +215,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ezCater custom cops and shared configuration

data/lib/rubocop/cop/ezcater/ruby_timeout.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Ezcater
-      # Don't use Timeout.timeout because it can cause transient errors
-      #
-      # @example
-      #   # bad
-      #   Timeout.timeout(5) do
-      #     ...
-      #   end
-      #
-      #   # good
-      #   expiry_time = Time.current + 5.seconds
-      #   while Time.current < expiry_time
-      #     ...
-      #   end
-      #
-      class RubyTimeout < Cop
-        MSG = <<~END_MESSAGE.split("\n").join(" ")
-          `Timeout.timeout` is unsafe. Find an alternative to achieve the same goal.
-           Ex. Use the timeout capabilities of a networking library.
-           Ex. Iterate and check runtime after each iteration.
-        END_MESSAGE
-
-        def_node_matcher "timeout", <<-PATTERN
-          (send (const _ :Timeout) :timeout ...)
-        PATTERN
-
-        def on_send(node)
-          timeout(node) do
-            add_offense(node, location: :expression, message: MSG)
-          end
-        end
-      end
-    end
-  end
-end