ws-style 6.2.0 → 6.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04c36fcc000cf48774650d6edbf34c51959aa7d7f50cfe1e87892a4f88d49e94
-  data.tar.gz: 6e85312d35bafe7122ec4223791b1f5338fcd87b9f89d0285b039f465a0212ba
+  metadata.gz: '080f20dbb2a789dae262e81c9bf0212430bae72c7e731d401f311b8b102a7a50'
+  data.tar.gz: 5907fa3bfa4c9ad521a58b4aeb37ee602d4751dac3fce90c8aaee63fa69a55bb
 SHA512:
-  metadata.gz: 8b84cc475ff90a16efab3f4a2f4829e1e8e3137d245675f6e8d88e1f16bd15876afcab7bff4fdfbb3a97090ae6a7be4abb6509d814c242d2c488db99c9c69e16
-  data.tar.gz: c8c2be2e97a14b0196ad7a73e8c4f0cd287a1c3202dde0a06771a4c91f79354ca889a85bac26a26bb73c9be9ba165bf56910116d342fa2b443fb618cf0654933
+  metadata.gz: 9d6280ff2f2c040a8a8e4419e10c22b1664f3d2f4e7a15f5371d06fbc10b30495a66bebfbef85da8baabcc436e57a1e2e40a4b20390b3b849a68ad88c65d3d2c
+  data.tar.gz: 3ec5c0a81583012046c85be1f8e29f56f43511669e04baea75336e278225e228bef0f122b18c4012e5f4ac1d29bd38e518bcb8d23c44dc3ea955927a70645c6c

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,21 @@ 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.2 - 2020-12-17
+- Add backstage catalog file + sonarqube project settings
+
+## 6.5.1 - 2020-11-30
+- Disable EmptyLineBetweenClassDefs added in rubocop 1.4
+
+## 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
 

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/catalog-info.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: ws-style
+  description: Ruby style for services & libraries (using Rubocop)
+  tags:
+    - ruby
+    - open-source
+spec:
+  type: library
+  lifecycle: production

data/core.yml

@@ -48,6 +48,9 @@ Layout/CaseIndentation:
 Layout/ElseAlignment:
   Enabled: false
 
+Layout/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+
 Layout/EndAlignment:
   Enabled: false
 
@@ -81,7 +84,7 @@ Metrics/CyclomaticComplexity:
   Max: 7
 
 Metrics/MethodLength:
-  ExcludedMethods: ["extended"]
+  IgnoredMethods: ["extended"]
   Max: 15
 
 Metrics/ModuleLength:
@@ -218,3 +221,128 @@ Style/RedundantRegexpEscape:
 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: False
+
+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
+
+# 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.2.0'.freeze
+    VERSION = '6.5.2'.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/sonar-project.properties

@@ -0,0 +1,4 @@
+sonar.projectKey=ws-style
+sonar.ruby.coverage.reportPaths=coverage/.resultset.json
+sonar.sources=lib
+sonar.tests=spec

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.2.0
+  version: 6.5.2
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2021-01-06 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:
@@ -172,11 +172,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- catalog-info.yaml
 - core.yml
 - default.yml
 - lib/ws/style.rb
 - lib/ws/style/version.rb
 - rails.yml
+- sonar-project.properties
 - ws-style.gemspec
 homepage: https://github.com/wealthsimple/ws-style
 licenses: []