ws-style 6.1.1 → 6.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a655c650097aee04578896ec65002116b0b0b19e78663024fa732825fe2ca175
-  data.tar.gz: ae259d51706c8191e2651c1292163625a1bcddd50a2edda2bd29a02ed6134d18
+  metadata.gz: 4a605b5e2240f475f0d822ece0003a3b28c824d6778bbae60dc0be53225d31cf
+  data.tar.gz: f75e46a2c110efbadf47c9b4f3fb544c2477c3940bbb67b031455ce9bc94ca33
 SHA512:
-  metadata.gz: 63ac417ec06ba2ad39b5286f4b1f4946612a60be8fdf55a0c27d6ad0e89cbc3b75e3f018ebc750ab3da8500a4916151ea1ba9cf681c4dabfc45d1ed54383507e
-  data.tar.gz: 9829019947308da98658521fffe595a1a17a4fd46267b1fc4e1e1cc9ade58df4d041025a2206a41cb7a5070eb452ed018e2a919ce8e26b423e6f7361cb1bdd84
+  metadata.gz: 9101a95f343a4ec65a25b14ac79f455ed8c10297d4343db28b91edaef5455ede575141cdb894967e597054eea34f31dd02d6e8270e87992c8c6e27cb80628230
+  data.tar.gz: e2383ed5c76230f7a3d045463378e5832707c77ca45d6f5fb6c60d867e5f413d8c8b984f90c0799f46c8a5c6ab4ddd02d9fa9ac0ad84a8641c80ab11e32e3ada

data/.circleci/config.yml

@@ -73,12 +73,15 @@ workflows:
       - checkout_and_bundle:
           context: wealthsimple
       - rspec:
+          context: wealthsimple
           requires:
             - checkout_and_bundle
       - lint_check:
+          context: wealthsimple
           requires:
             - checkout_and_bundle
       - vulnerability_check:
+          context: wealthsimple
           requires:
             - checkout_and_bundle
       - release:
@@ -87,9 +90,9 @@ workflows:
             branches:
               only: master
           requires:
-          - rspec
-          - lint_check
-          - vulnerability_check
+            - rspec
+            - lint_check
+            - vulnerability_check
 
   security-audit:
     triggers:
@@ -103,5 +106,6 @@ workflows:
       - checkout_and_bundle:
           context: wealthsimple
       - vulnerability_check:
+          context: wealthsimple
           requires:
             - checkout_and_bundle

data/.ruby-version

@@ -1 +1 @@
-2.5.7
+2.5.8

data/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.5.0 - 2020-10-26
+- Upgrade RuboCop and RuboCop RSpec
+
+## 6.4.0 - 2020-10-07
+- Upgrade RuboCop
+
+## 6.3.0 - 2020-10-06
+- Upgrade RuboCop and enable cops that were voted in
+
+## 6.2.0 - 2020-09-04
+- Disable Cops enabled in 6.1.0 until we can confirm we want them
+
 ## 6.1.1 - 2020-09-04
 - Disable RSpec/MultipleMemoizedHelpers cop
 

data/Rakefile

@@ -1,6 +1,31 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "rubocop"
+require "rubocop-performance"
+require "rubocop-rails"
+require "rubocop-rspec"
 
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
+
+desc 'Print out comments that can be used for a GitHub cop election'
+task :election do # rubocop:disable Rails/RakeEnvironment
+  configuration_path = File.expand_path('default.yml', File.dirname(__FILE__))
+  RuboCop::ConfigLoader.load_file(configuration_path).pending_cops.each do |pending_cop|
+    base_urls = {
+      'layout' => 'https://docs.rubocop.org/rubocop/cops_layout.html#layout',
+      'lint' => 'https://docs.rubocop.org/rubocop/cops_lint.html#lint',
+      'style' => 'https://docs.rubocop.org/rubocop/cops_style.html#style',
+      'performance' => 'https://docs.rubocop.org/rubocop-performance/cops_performance.html#performance',
+      'rails' => 'https://docs.rubocop.org/rubocop-rails/cops_rails.html#rails',
+      'rspec' => 'https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspec',
+    }
+    department, anchor = pending_cop.name.downcase.split('/')
+    puts <<~COMMENT
+      [**#{pending_cop.name}**](#{base_urls.fetch(department)}#{anchor})
+      #{pending_cop.metadata.fetch('Description')}
+
+    COMMENT
+  end
+end

data/core.yml

@@ -48,6 +48,9 @@ Layout/CaseIndentation:
 Layout/ElseAlignment:
   Enabled: false
 
+Layout/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+
 Layout/EndAlignment:
   Enabled: false
 
@@ -279,7 +282,7 @@ Style/ExplicitBlockArgument:
   Enabled: True
 
 Style/GlobalStdStream:
-  Enabled: True
+  Enabled: False
 
 Style/OptionalBooleanParameter:
   Enabled: True
@@ -314,3 +317,32 @@ Performance/Squeeze:
 
 Performance/StringInclude:
   Enabled: True
+
+# 0.90
+Lint/DuplicateRequire:
+  Enabled: True
+
+Lint/EmptyFile:
+  Enabled: True
+
+Lint/TrailingCommaInAttributeDeclaration:
+  Enabled: True
+
+Lint/UselessMethodDefinition:
+  Enabled: True
+
+Style/CombinableLoops:
+  Enabled: True
+
+Style/KeywordParametersOrder:
+  Enabled: True
+
+Style/RedundantSelfAssignment:
+  Enabled: True
+
+Style/SoleNestedConditional:
+  Enabled: True
+
+# rubocop-performance 1.7
+Performance/Sum:
+  Enabled: True

data/lib/ws/style/version.rb

@@ -1,5 +1,5 @@
 module Ws
   module Style
-    VERSION = '6.1.1'.freeze
+    VERSION = '6.5.1'.freeze
   end
 end

data/rails.yml

@@ -45,8 +45,17 @@ Rails/RenderPlainText:
   Enabled: True
 
 Rails/ShortI18n:
-  Enabled: True
+  Enabled: False
 
 Rails/WhereExists:
   Enabled: True
 
+# rubocop-rails 2.8
+Rails/AfterCommitOverride:
+  Enabled: True
+
+Rails/SquishedSQLHeredocs:
+  Enabled: False
+
+Rails/WhereNot:
+  Enabled: True

data/ws-style.gemspec

@@ -22,15 +22,15 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.required_ruby_version = '>= 2.5.7'
 
-  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', '>= 1.0.0'
+  s.add_dependency 'rubocop-performance', '>= 1.8.1'
+  s.add_dependency 'rubocop-rails', '>= 2.8.1'
+  s.add_dependency 'rubocop-rspec', '>= 1.44.1'
   s.add_dependency 'rubocop-vendor', '~> 0'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'bundler-audit'
   s.add_development_dependency 'git'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rspec', '~> 3.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ws-style
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.5.1
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.89'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.89'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.32'
+        version: 1.44.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.32'
+        version: 1.44.1
 - !ruby/object:Gem::Dependency
   name: rubocop-vendor
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.9.0
 description: Shared config to enforce Ruby style consistently across Wealthsimple
   services.
 email: