ws-style 6.0.4 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2955628c06e002b018ec8451e9d1fcfd43f0a22501383d341771b7ac373ed6cf
-  data.tar.gz: e49723abec5f8fdb46b9fcd1c786e593395faefcc9ce156e0a9ba5414367fea6
+  metadata.gz: b5210fc8649116d987ca8139168c9962a38ff06c0e5fb1e345c2c131f7884842
+  data.tar.gz: d10be9d6f856a40b4f2217c5497fccea304a96238af6ad2039bfacd8c9caf408
 SHA512:
-  metadata.gz: 196fd3b83a83c57e58f749563b68dcda67a1186bff5a60e7316236ca5090fe5d11d6ceb6aef06db8b49660310236e1f79eef0c849f02403cda9f2e6e6387674d
-  data.tar.gz: 34edfec89865b890b42065eca5c60c3449bded522d7405dfcdb8f3adbfc87ab527302f6918f3f7b9ec1c0a25fcc508b4b13fb7f9b6a942f55da96a7b748a0a3c
+  metadata.gz: 1db89b905a23779cfd611eb18eb10655308cde5a9fd2745f278bfcec9f3a6b04bb7bbcf7f0ad3079c7735ca5138b8d47c712e07fef738563173b3fddaa37ed62
+  data.tar.gz: d6797dd1e5014b482d3d9da9cabf3fb3197fd525d915f1dc1337138c291fdb5be6806710a4a1bbb5ad1c6a558c3d1b7093ab9b5e3ed9da01aa5381db9a4825eb

data/.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 defaults: &defaults
   working_directory: ~/wealthsimple
   docker:
-    - image: circleci/ruby:2.5.3
+    - image: circleci/ruby:2.5.7
 
 references:
   attach_code_workspace: &attach_code_workspace

data/.ruby-version

@@ -1 +1 @@
-2.5.3
+2.5.7

data/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 6.1.0 - 2020-08-27
+- Upgraded rubocop to 0.89
+- Upgraded rubocop-performance to 1.7
+- Upgraded rubocop-rails to 2.7
+- Split out Rails cops into their own configuration to improve installation for non-Rails projects
+
 ## 6.0.4 - 2020-07-06
 ### Changed
 - Upgraded rubocop to >= 0.86 and opted into the new cops.

data/README.md

@@ -59,6 +59,14 @@ Style/HashSyntax:
   EnforcedStyle: hash_rockets
 ```
 
+If you're using `ws-style` in a non-Rails project, inherit from the core configuration file instead:
+
+```yaml
+inherit_gem:
+  ws-style:
+    - core.yml
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/core.yml

@@ -0,0 +1,313 @@
+# See documentation for details on definitions:
+# https://rubocop.readthedocs.io
+
+require:
+  - rubocop-performance
+  - rubocop-rspec
+  - rubocop-vendor
+
+inherit_mode:
+  merge:
+    - AllowedNames
+    - Exclude
+
+AllCops:
+  Exclude:
+    - "bin/**/*"
+    - "data/**/*"
+    - "db/data/**/*"
+    - "db/migrate/**/*"
+    - "db/schema.rb"
+    - "gemfiles/**/*"
+    - "lib/tasks/circle_0.rake"
+    - "log/**/*"
+    - "node_modules/**/*"
+    - "public/**/*"
+    - "tmp/**/*"
+    - "vendor/**/*"
+
+Layout/HashAlignment:
+  EnforcedLastArgumentHashStyle: ignore_implicit
+
+Layout/ParameterAlignment:
+  Enabled: false
+
+Layout/ArgumentAlignment:
+  Enabled: false
+
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - "spec/**/*"
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/CaseIndentation:
+  Enabled: false
+
+Layout/ElseAlignment:
+  Enabled: false
+
+Layout/EndAlignment:
+  Enabled: false
+
+Layout/FirstArrayElementIndentation:
+  EnforcedStyle: consistent
+
+Layout/IndentationWidth:
+  Enabled: true
+  Width: 2
+
+Layout/LineLength:
+  IgnoredPatterns: ['(\A|\s)#']
+  Max: 100
+
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Metrics/AbcSize:
+  Max: 18
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/ClassLength:
+  Max: 150
+
+Metrics/CyclomaticComplexity:
+  Max: 7
+
+Metrics/MethodLength:
+  ExcludedMethods: ["extended"]
+  Max: 15
+
+Metrics/ModuleLength:
+  Exclude:
+    - "spec/**/*"
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Max: 8
+
+Style/AndOr:
+  EnforcedStyle: conditionals
+
+Style/BlockDelimiters:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/FormatStringToken:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/WordArray:
+  Enabled: false
+
+Style/NegatedIf:
+  Enabled: false
+
+RSpec/AnyInstance:
+  Enabled: false
+
+RSpec/ContextWording:
+  Enabled: false
+
+RSpec/EmptyExampleGroup:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Max: 15
+
+RSpec/LetSetup:
+  Enabled: false
+
+RSpec/MessageChain:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/NamedSubject:
+  Enabled: false
+
+RSpec/NestedGroups:
+  Max: 6
+
+# Cops added in Rubocop 0.80 or later need to be enabled one-by-one below.
+# For more information: https://docs.rubocop.org/en/latest/versioning/
+
+# 0.80
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+# 0.81
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+# 0.82
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+# 0.83
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: True
+
+Style/SlicingWithRange:
+  Enabled: True
+
+# 0.84
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: True
+
+# 0.85
+Lint/MixedRegexpCaptureTypes:
+  Enabled: True
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: True
+
+Style/RedundantRegexpEscape:
+  Enabled: True
+
+# 0.86
+Style/RedundantFetchBlock:
+  Enabled: True
+
+# 0.87
+Style/AccessorGrouping:
+  Enabled: True
+
+Style/BisectedAttrAccessor:
+  Enabled: True
+
+Style/RedundantAssignment:
+  Enabled: True
+
+# 0.88
+Lint/DuplicateElsifCondition:
+  Enabled: True
+
+Style/ArrayCoercion:
+  Enabled: True
+
+Style/CaseLikeIf:
+  Enabled: True
+
+Style/HashAsLastArrayItem:
+  Enabled: True
+
+Style/HashLikeCase:
+  Enabled: True
+
+Style/RedundantFileExtensionInRequire:
+  Enabled: True
+
+# 0.89
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: True
+
+Lint/DuplicateRescueException:
+  Enabled: True
+
+Lint/EmptyConditionalBody:
+  Enabled: True
+
+Lint/FloatComparison:
+  Enabled: True
+
+Lint/MissingSuper:
+  Enabled: True
+
+Lint/OutOfRangeRegexpRef:
+  Enabled: True
+
+Lint/SelfAssignment:
+  Enabled: True
+
+Lint/TopLevelReturnWithArgument:
+  Enabled: True
+
+Lint/UnreachableLoop:
+  Enabled: True
+
+Style/ExplicitBlockArgument:
+  Enabled: True
+
+Style/GlobalStdStream:
+  Enabled: True
+
+Style/OptionalBooleanParameter:
+  Enabled: True
+
+Style/SingleArgumentDig:
+  Enabled: True
+
+Style/StringConcatenation:
+  Enabled: True
+
+# rubocop-performance 1.7
+Performance/AncestorsInclude:
+  Enabled: True
+
+Performance/BigDecimalWithNumericArgument:
+  Enabled: True
+
+Performance/RedundantSortBlock:
+  Enabled: True
+
+Performance/RedundantStringChars:
+  Enabled: True
+
+Performance/ReverseFirst:
+  Enabled: True
+
+Performance/SortReverse:
+  Enabled: True
+
+Performance/Squeeze:
+  Enabled: True
+
+Performance/StringInclude:
+  Enabled: True

data/default.yml

@@ -1,229 +1,3 @@
-# See documentation for details on definitions:
-# https://rubocop.readthedocs.io
-
-require:
-  - rubocop-performance
-  - rubocop-rails
-  - rubocop-rspec
-  - rubocop-vendor
-
-inherit_mode:
-  merge:
-    - AllowedNames
-    - Exclude
-
-AllCops:
-  Exclude:
-    - "bin/**/*"
-    - "data/**/*"
-    - "db/data/**/*"
-    - "db/migrate/**/*"
-    - "db/schema.rb"
-    - "gemfiles/**/*"
-    - "lib/tasks/circle_0.rake"
-    - "log/**/*"
-    - "node_modules/**/*"
-    - "public/**/*"
-    - "tmp/**/*"
-    - "vendor/**/*"
-
-Layout/HashAlignment:
-  EnforcedLastArgumentHashStyle: ignore_implicit
-
-Layout/ParameterAlignment:
-  Enabled: false
-
-Layout/ArgumentAlignment:
-  Enabled: false
-
-Lint/AmbiguousBlockAssociation:
-  Exclude:
-    - "spec/**/*"
-
-Layout/DotPosition:
-  EnforcedStyle: trailing
-
-Layout/CaseIndentation:
-  Enabled: false
-
-Layout/ElseAlignment:
-  Enabled: false
-
-Layout/EndAlignment:
-  Enabled: false
-
-Layout/FirstArrayElementIndentation:
-  EnforcedStyle: consistent
-
-Layout/IndentationWidth:
-  Enabled: true
-  Width: 2
-
-Layout/LineLength:
-  IgnoredPatterns: ['(\A|\s)#']
-  Max: 100
-
-Layout/FirstHashElementIndentation:
-  EnforcedStyle: consistent
-
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
-Metrics/AbcSize:
-  Max: 18
-
-Metrics/BlockLength:
-  Enabled: false
-
-Metrics/ClassLength:
-  Max: 150
-
-Metrics/CyclomaticComplexity:
-  Max: 7
-
-Metrics/MethodLength:
-  ExcludedMethods: ["extended"]
-  Max: 15
-
-Metrics/ModuleLength:
-  Exclude:
-    - "spec/**/*"
-
-Metrics/ParameterLists:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Max: 8
-
-Style/AndOr:
-  EnforcedStyle: conditionals
-
-Style/BlockDelimiters:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/FormatStringToken:
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/NumericPredicate:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: false
-
-Style/SymbolArray:
-  Enabled: false
-
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: comma
-
-Style/WordArray:
-  Enabled: false
-
-Style/NegatedIf:
-  Enabled: false
-
-Rails:
-  Enabled: true
-
-Rails/Delegate:
-  Enabled: false
-
-Rails/FilePath:
-  EnforcedStyle: arguments
-
-Rails/TimeZone:
-  Enabled: false
-
-RSpec/AnyInstance:
-  Enabled: false
-
-RSpec/ContextWording:
-  Enabled: false
-
-RSpec/EmptyExampleGroup:
-  Enabled: false
-
-RSpec/ExampleLength:
-  Max: 15
-
-RSpec/LetSetup:
-  Enabled: false
-
-RSpec/MessageChain:
-  Enabled: false
-
-RSpec/MultipleExpectations:
-  Enabled: false
-
-RSpec/NamedSubject:
-  Enabled: false
-
-RSpec/NestedGroups:
-  Max: 6
-
-# Cops added in Rubocop 0.80 or later need to be enabled one-by-one below.
-# For more information: https://docs.rubocop.org/en/latest/versioning/
-
-# 0.80
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
-
-# 0.81
-Lint/RaiseException:
-  Enabled: true
-
-Lint/StructNewOverride:
-  Enabled: true
-
-# 0.82
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-
-Style/ExponentialNotation:
-  Enabled: true
-
-# 0.83
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: True
-
-Style/SlicingWithRange:
-  Enabled: True
-
-# 0.84
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: True
-
-# 0.85
-Lint/MixedRegexpCaptureTypes:
-  Enabled: True
-
-Style/RedundantRegexpCharacterClass:
-  Enabled: True
-
-Style/RedundantRegexpEscape:
-  Enabled: True
-
-# 0.86
-Style/RedundantFetchBlock:
-  Enabled: True
+inherit_from:
+  - core.yml
+  - rails.yml

data/lib/ws/style/version.rb

@@ -1,5 +1,5 @@
 module Ws
   module Style
-    VERSION = '6.0.4'.freeze
+    VERSION = '6.1.0'.freeze
   end
 end

data/rails.yml

@@ -0,0 +1,52 @@
+require:
+  - rubocop-rails
+
+Rails:
+  Enabled: true
+
+Rails/Delegate:
+  Enabled: false
+
+Rails/FilePath:
+  EnforcedStyle: arguments
+
+Rails/TimeZone:
+  Enabled: false
+
+# rubocop-rails 2.7
+Rails/ActiveRecordCallbacksOrder:
+  Enabled: True
+
+Rails/FindById:
+  Enabled: True
+
+Rails/Inquiry:
+  Enabled: True
+
+Rails/MailerName:
+  Enabled: True
+
+Rails/MatchRoute:
+  Enabled: True
+
+Rails/NegateInclude:
+  Enabled: True
+
+Rails/Pluck:
+  Enabled: True
+
+Rails/PluckInWhere:
+  Enabled: True
+
+Rails/RenderInline:
+  Enabled: True
+
+Rails/RenderPlainText:
+  Enabled: True
+
+Rails/ShortI18n:
+  Enabled: True
+
+Rails/WhereExists:
+  Enabled: True
+

data/ws-style.gemspec

@@ -20,10 +20,11 @@ Gem::Specification.new do |s|
   s.bindir        = 'exe'
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
+  s.required_ruby_version = '>= 2.5.7'
 
-  s.add_dependency 'rubocop', '>= 0.86'
-  s.add_dependency 'rubocop-performance', '>= 1.1.0'
-  s.add_dependency 'rubocop-rails', '>= 2.4.2'
+  s.add_dependency 'rubocop', '>= 0.89'
+  s.add_dependency 'rubocop-performance', '>= 1.7'
+  s.add_dependency 'rubocop-rails', '>= 2.7'
   s.add_dependency 'rubocop-rspec', '~> 1.32'
   s.add_dependency 'rubocop-vendor', '~> 0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ws-style
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.1.0
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.86'
+        version: '0.89'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.86'
+        version: '0.89'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -172,9 +172,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- core.yml
 - default.yml
 - lib/ws/style.rb
 - lib/ws/style/version.rb
+- rails.yml
 - ws-style.gemspec
 homepage: https://github.com/wealthsimple/ws-style
 licenses: []
@@ -187,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="