ws-style 6.6.1 → 6.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abe84e96213f192d2391e16ebed078c926b389d9805b307e3c32c54cb8737abe
-  data.tar.gz: '018e79383b41b5160578f3990dfeada90281707c938188760c027aed6fd0febb'
+  metadata.gz: 5c3052065b3051c117f5c7b7c61595251dcf7f8a570a2466b6e49cdba05576f5
+  data.tar.gz: 56ccc78ce8d6eef314dc82a08a979de0f7bf60d43edb5fcd5b9dd467399e42f9
 SHA512:
-  metadata.gz: f2899c5225396cc1e720fc596d620afa78594d7f6572f2f24eccf5e71ff9a67a0a5b16e660db5454380bdde19b17b08fed23b891868a07651f0140d02c35e480
-  data.tar.gz: 9dad673788f66cea027aef97e33abde49052f1e21f54d4ee5c598114e49d7be8e331ab4c93e8f442a6104d0b82ee176bcf1f1b565cd25bd0795507e6771235e5
+  metadata.gz: 76d5a74efb8384b113edfe82577dc2297b63ce6e2082e1bc6d2ac707a02f5cbf3f8fbc2734de39e42645db57ea1545994a091e1446f1eb8de9458c3caa545b97
+  data.tar.gz: b48a8e1f03c3bc0a6079177ce0cd81593d6bfa9bd9f68257fe43c5924eb0e6fbc9cc1f85e4d8866db96cfb7eaa282be2bbccd9a3b0fe165ec8916de2f5ef5d2a

data/.github/workflows/pipeline.yml

@@ -12,18 +12,27 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5.8
+          ruby-version: 2.7.2
           bundler-cache: true
       - 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' }}
         run: |
-          git config user.name "Wolfbot"
+          mkdir -p ~/.gem
+          cat << EOF > ~/.gem/credentials
+          ---
+          :github: Bearer ${GITHUB_TOKEN}
+          :rubygems_api_key: ${RUBYGEMS_API_KEY}
+          EOF
+          chmod 0600 ~/.gem/credentials
           git config user.email "noreply@wealthsimple.com"
+          git config user.name "Wolfbot"
           bundle exec rake release
         env:
           RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}

data/.ruby-version

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

data/CHANGELOG.md

@@ -4,6 +4,33 @@ 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.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
+
+## 6.6.2 - 2021-03-01
+- Use GitHub Actions to publish gem
+
 ## 6.6.1 - 2021-03-01
 - Mostly just trying to get the version number bumped
 

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.1'.freeze
+    VERSION = '6.9.0'.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,16 @@ 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 '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.1
+  version: 6.9.0
 platform: ruby
 authors:
 - Peter Graham
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-04-07 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
@@ -128,14 +128,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:
@@ -156,6 +156,9 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rake
+- bin/rspec
+- bin/rubocop
 - bin/setup
 - catalog-info.yaml
 - core.yml
@@ -169,7 +172,7 @@ files:
 homepage: https://github.com/wealthsimple/ws-style
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -177,16 +180,15 @@ 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
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Shared rubocop config
 test_files: []