ws-style 6.6.3 → 6.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43ac7cc95d29bacbf61a562e3b42c8351c14a43aacfe35c334126681b60c22e6
-  data.tar.gz: 5ebb79032a460b9e6958d65b58180ebea006790660e71d5f5d288e122e928f0c
+  metadata.gz: 1534b8c72fed6c2716b540649f4545d259d2303d0a2856b627164a987d41c689
+  data.tar.gz: 1322e12769f39ef63f623dbf27034562a4b066862dca6e1425dbdf74eeb2e76e
 SHA512:
-  metadata.gz: 8f61c1dd01a81a63377fbeecce6b0ab6239ad2599d5c8a6f1481dafcde07784df008e6b6970bcd06583dd394e3757d03631aced90a14bd6fac053daf81cc1b98
-  data.tar.gz: e6f36351210b34603489cae3d6949d2533c1b7857989753a09c5fd809c7539dbde46b8136308b1e8752cef9379ac48d71c0d95723810b4f43eabbd745061dd14
+  metadata.gz: f99397106605ef6dff276d0fe650b9fb3bd5a9edd32dd5823919033a847c975b6df5500f6dca9ee9b339e660ae78f926e696f684d7e3e07d789f9265937b95f6
+  data.tar.gz: 176c0bcca798e5944a109b1b2b1597933cf4d1dc6ee930be52c8c4fc7945f705590f079078e2417c7b869e507375c745ad9415087e572dfc30080578901acd5c

data/.github/workflows/pipeline.yml

@@ -12,15 +12,18 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5.8
           bundler-cache: true
+      - name: Fetch main branch
+        run: git fetch origin main
       - uses: r7kamura/rubocop-problem-matchers-action@v1
-      - name: Rubocop
-        run: bundle exec rubocop
+      - uses: wealthsimple/toolbox-script@main
+        name: RuboCop
+        with:
+          script: toolbox.ruby.lint.run()
       - name: Run rspec
         run: bundle exec rspec
       - name: Release the gem
-        if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' }}
+        if: ${{ github.ref == 'refs/heads/main' }}
         run: |
           mkdir -p ~/.gem
           cat << EOF > ~/.gem/credentials

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.ruby-version

@@ -1 +1 @@
-2.5.8
+2.7.2

data/CHANGELOG.md

@@ -4,6 +4,31 @@ 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.9.1 - 2021-05-06
+- Migrate CI from CircleCI to GitHub Actions
+- Change default GitHub branch to `main`
+
+## 6.9.0 - 2021-04-06
+- Upgraded rubocop to 1.12.1
+- Upgraded rubocop-performance to 1.10.2
+- Upgraded rubocop-vendor to 0.6.0
+
+## 6.8.9 - 2021-04-02
+- Set minimum required ruby version to 2.7.2
+
+## 6.7.2 - 2021-03-15
+- Increase Metrics/MethodLength to 25 (1/6 of class length).
+
+## 6.7.1 - 2021-03-09
+- Disable Lint/EmptyBlock
+
+## 6.7.0 - 2021-03-05
+- Upgraded rubocop to 1.11.0
+- Upgraded rubocop-performance to 1.10.1
+- Upgraded rubocop-rails to 2.9.1
+- Upgraded rubocop-rspec to 2.2.0
+- Upgraded rubocop-vendor to 0.5.0
+
 ## 6.6.3 - 2021-03-01
 - One more version bump to get it published
 

data/Gemfile.lock

@@ -0,0 +1,100 @@
+PATH
+  remote: .
+  specs:
+    ws-style (6.9.1)
+      rubocop (>= 1.12.1)
+      rubocop-performance (>= 1.10.2)
+      rubocop-rails (>= 2.9.1)
+      rubocop-rspec (>= 2.2.0)
+      rubocop-vendor (>= 0.6.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.1.3.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    bundler-audit (0.7.0.1)
+      bundler (>= 1.2.0, < 3)
+      thor (>= 0.18, < 2)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    json (2.5.1)
+    keepachangelog (0.6.1)
+      json (~> 2.1)
+      thor (~> 0.20)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    rchardet (1.8.0)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.14.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.5.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.10.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rspec (2.3.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    rubocop-vendor (0.6.0)
+      rubocop (>= 0.53.0)
+    ruby-progressbar (1.11.0)
+    thor (0.20.3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  bundler-audit
+  git
+  keepachangelog
+  rake
+  rspec (~> 3.10.0)
+  ws-style!
+
+BUNDLED WITH
+   2.2.16

data/README.md

@@ -1,4 +1,5 @@
-# ws-style [![CircleCI](https://circleci.com/gh/wealthsimple/ws-style.svg?style=svg)](https://circleci.com/gh/wealthsimple/ws-style) [![Gem Version](https://badge.fury.io/rb/ws-style.svg)](https://rubygems.org/gems/ws-style)
+# ws-style
+[![Github Actions Badge](https://github.com/wealthsimple/ws-style/actions/workflows/pipeline.yml/badge.svg)](https://github.com/wealthsimple/ws-style/actions)
 
 Shared [rubocop](https://github.com/bbatsov/rubocop) config to enforce Ruby style consistently across Wealthsimple libraries and services.
 
@@ -73,4 +74,4 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 
-New versions are automatically released by CI when merged to `master`.
+New versions are automatically released by CI when merged to `main`.

data/Rakefile

@@ -12,15 +12,19 @@ task default: :spec
 desc 'Print out comments that can be used for a GitHub cop election'
 task :election do
   configuration_path = File.expand_path('default.yml', File.dirname(__FILE__))
-  RuboCop::ConfigLoader.load_file(configuration_path).pending_cops.each do |pending_cop|
+  configuration = RuboCop::ConfigLoader.load_file(configuration_path)
+  RuboCop::ConfigLoader.default_configuration.pending_cops.each do |pending_cop|
     base_urls = {
       'layout' => 'https://docs.rubocop.org/rubocop/cops_layout.html#layout',
+      'gemspec' => 'https://docs.rubocop.org/rubocop/cops_gemspec.html#gemspec',
       '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',
     }
+    next if configuration.key?(pending_cop.name)
+
     department, anchor = pending_cop.name.downcase.split('/')
     puts <<~COMMENT
       [**#{pending_cop.name}**](#{base_urls.fetch(department)}#{anchor})
@@ -29,3 +33,25 @@ task :election do
     COMMENT
   end
 end
+
+desc 'Print out comments that can be used for a GitHub cop election'
+task "election:config" do
+  configuration_path = File.expand_path('default.yml', File.dirname(__FILE__))
+  configuration = RuboCop::ConfigLoader.load_file(configuration_path)
+  pending_cops = RuboCop::ConfigLoader.default_configuration.pending_cops.reject { |cop|
+    configuration.key?(cop.name)
+  }
+  ascending_by_version = pending_cops.group_by { |cop|
+    cop.metadata.fetch('VersionAdded')
+  }.sort_by(&:first)
+  ascending_by_version.each do |(version, cops)|
+    puts "# #{version}"
+    cops.each do |cop|
+      puts <<~CONFIGURATION
+        #{cop.name}:
+          Enabled: True
+
+      CONFIGURATION
+    end
+  end
+end

data/bin/rake

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/bin/rubocop

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")

data/core.yml

@@ -86,7 +86,7 @@ Metrics/CyclomaticComplexity:
 
 Metrics/MethodLength:
   IgnoredMethods: ["extended"]
-  Max: 15
+  Max: 25
 
 Metrics/ModuleLength:
   Exclude:
@@ -347,3 +347,123 @@ Style/SoleNestedConditional:
 # rubocop-performance 1.7
 Performance/Sum:
   Enabled: True
+
+# rubocop 1.1
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: True
+
+Lint/EmptyBlock:
+  Enabled: False
+
+Lint/ToEnumArguments:
+  Enabled: True
+
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: True
+
+Style/ArgumentsForwarding:
+  Enabled: True
+
+Style/DocumentDynamicEvalDefinition:
+  Enabled: True
+
+Style/SwapValues:
+  Enabled: True
+
+# rubocop 1.2
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: True
+
+Style/CollectionCompact:
+  Enabled: True
+
+Style/NegatedIfElseCondition:
+  Enabled: True
+
+# rubocop 1.3
+Lint/DuplicateBranch:
+  Enabled: True
+
+Lint/EmptyClass:
+  Enabled: False
+
+Style/NilLambda:
+  Enabled: False
+
+# rubocop 1.4
+Style/RedundantArgument:
+  Enabled: True
+
+# rubocop 1.5
+Lint/UnexpectedBlockArity:
+  Enabled: True
+
+# rubocop 1.7
+Layout/SpaceBeforeBrackets:
+  Enabled: True
+
+Lint/AmbiguousAssignment:
+  Enabled: True
+
+Style/HashExcept:
+  Enabled: True
+
+# rubocop 1.8
+Lint/DeprecatedConstants:
+  Enabled: True
+
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: True
+
+Lint/RedundantDirGlobSort:
+  Enabled: True
+
+Style/EndlessMethod:
+  Enabled: True
+
+Performance/CollectionLiteralInLoop:
+  Enabled: True
+
+# rubocop 1.9
+Lint/NumberedParameterAssignment:
+  Enabled: False
+
+Lint/OrAssignmentToConstant:
+  Enabled: True
+
+Lint/SymbolConversion:
+  Enabled: True
+
+Lint/TripleQuotes:
+  Enabled: True
+
+Style/IfWithBooleanLiteralBranches:
+  Enabled: False
+
+# rubocop 1.10
+Gemspec/DateAssignment:
+  Enabled: True
+
+Style/HashConversion:
+  Enabled: True
+
+# rubocop-performance 1.9
+Performance/BlockGivenWithExplicitBlock:
+  Enabled: True
+
+Performance/ConstantRegexp:
+  Enabled: True
+
+Performance/MethodObjectAsBlock:
+  Enabled: True
+
+# rubocop-performance 1.10
+Performance/RedundantEqualityComparisonBlock:
+  Enabled: False
+
+Performance/RedundantSplitRegexpArgument:
+  Enabled: True
+
+# rubocop 1.12.0
+Style/StringChars:
+  Enabled: True

data/lib/ws/style/version.rb

@@ -1,5 +1,5 @@
 module Ws
   module Style
-    VERSION = '6.6.3'.freeze
+    VERSION = '6.9.1'.freeze
   end
 end

data/rails.yml

@@ -59,3 +59,10 @@ Rails/SquishedSQLHeredocs:
 
 Rails/WhereNot:
   Enabled: True
+
+# rubocop-rails 2.9
+Rails/AttributeDefaultBlockValue:
+  Enabled: True
+
+Rails/WhereEquals:
+  Enabled: True

data/ws-style.gemspec

@@ -20,16 +20,18 @@ 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.required_ruby_version = '>= 2.7.2'
 
-  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_dependency 'rubocop', '>= 1.12.1'
+  s.add_dependency 'rubocop-performance', '>= 1.10.2'
+  s.add_dependency 'rubocop-rails', '>= 2.9.1'
+  s.add_dependency 'rubocop-rspec', '>= 2.2.0'
+  s.add_dependency 'rubocop-vendor', '>= 0.6.0'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'bundler-audit'
+  s.add_development_dependency 'git'
+  s.add_development_dependency 'keepachangelog'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 3.9.0'
+  s.add_development_dependency 'rspec', '~> 3.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ws-style
 version: !ruby/object:Gem::Version
-  version: 6.6.3
+  version: 6.9.1
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.10.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.9.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.44.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.44.1
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rubocop-vendor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: git
+  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: keepachangelog
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
 description: Shared config to enforce Ruby style consistently across Wealthsimple
   services.
 email:
@@ -153,9 +181,13 @@ files:
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
+- bin/rake
+- bin/rspec
+- bin/rubocop
 - bin/setup
 - catalog-info.yaml
 - core.yml
@@ -177,15 +209,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.7
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Shared rubocop config