ws-style 6.6.0 → 6.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2fe0de6e603b530aa15208a2a9c22653a1b178fbc1005c8ab59df1f49f0a5b6
-  data.tar.gz: 94c59ec39f55216baef7bf2d1315b611b94cc05b62887b2de639e357f768f213
+  metadata.gz: b77f6c91b249be2d59a1c8be1a6b24c1c913adbcceab499d5be6f8b442066abb
+  data.tar.gz: b43ee891cfb071bcf14c0c41094406c94d75b42c622b8045c401d74065df42af
 SHA512:
-  metadata.gz: b61f5f3f5669b8fcab03b3ee25d39fe607fddc0b65a30524f9bdf6bd5140d9a5b43c758b9c24bb4b71a920bd6f857708a3599570f8f39b7b932e138da642d8a5
-  data.tar.gz: a55c28a6ceb7ccf750cada70ea482cb351cd78617a6c378be8a16ba76a636c21f241877d2bbc43bbc6a8dfbb418153c66b4b8acc4e5b7b4c5d3102c4c11c655b
+  metadata.gz: 3888de94b1538e704443fb0c412e03fd4ed168d82e3296ad431ff59e5edbb97e2781ec6069d3a4c076c4ce9b72de8a4f066814e9892e65576150233a128a4cf5
+  data.tar.gz: 517e73d438f9b374c4328a17daea19c714b2c59198736bf5fc48685b17e72a5d431835d7b19b74b1e2b29a91a6af979427a20b3092bb72f2d3e9e780f89fda97

data/.github/workflows/pipeline.yml

@@ -0,0 +1,36 @@
+---
+name: Pipeline
+on:
+  - push
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5.8
+          bundler-cache: true
+      - uses: r7kamura/rubocop-problem-matchers-action@v1
+      - name: Rubocop
+        run: bundle exec rubocop
+      - name: Run rspec
+        run: bundle exec rspec
+      - name: Release the gem
+        if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' }}
+        run: |
+          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/.rubocop.yml

@@ -1,2 +1,2 @@
 inherit_from:
-  - default.yml
+  - core.yml

data/CHANGELOG.md

@@ -4,6 +4,28 @@ 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.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
+
 ## 6.6.0 - 2021-01-16
 - Rubocop FilePath should respect ActiveSupport::Inflector config if included
 

data/Rakefile

@@ -10,17 +10,21 @@ 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
+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 # rubocop:disable Rails/RakeEnvironment
     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,119 @@ 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

data/lib/ws/style/version.rb

@@ -1,5 +1,5 @@
 module Ws
   module Style
-    VERSION = '6.6.0'.freeze
+    VERSION = '6.7.2'.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

@@ -22,15 +22,14 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.required_ruby_version = '>= 2.5.7'
 
-  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.11.0'
+  s.add_dependency 'rubocop-performance', '>= 1.10.1'
+  s.add_dependency 'rubocop-rails', '>= 2.9.1'
+  s.add_dependency 'rubocop-rspec', '>= 2.2.0'
+  s.add_dependency 'rubocop-vendor', '>= 0.5.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.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.0
+  version: 6.7.2
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-03-15 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.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.10.1
 - !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.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +108,6 @@ 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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,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:
@@ -158,10 +144,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".dependabot/config.yml"
 - ".github/CODEOWNERS"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/pipeline.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -171,6 +156,9 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rake
+- bin/rspec
+- bin/rubocop
 - bin/setup
 - catalog-info.yaml
 - core.yml
@@ -199,7 +187,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Shared rubocop config

data/.circleci/config.yml

@@ -1,111 +0,0 @@
-version: 2
-
-defaults: &defaults
-  working_directory: ~/wealthsimple
-  docker:
-    - image: circleci/ruby:2.5.7
-
-references:
-  attach_code_workspace: &attach_code_workspace
-    attach_workspace:
-      at: ~/wealthsimple
-
-  restore_bundle_dependencies: &restore_bundle_dependencies
-    run:
-      name: Restore bundle dependencies from workspace
-      command: bundle --path vendor/bundle
-
-jobs:
-  checkout_and_bundle:
-    <<: *defaults
-    steps:
-      - checkout
-      - run: bundle install --jobs=4 --retry=3 --path vendor/bundle
-      - persist_to_workspace:
-          root: .
-          paths: .
-
-  rspec:
-    <<: *defaults
-    steps:
-      - *attach_code_workspace
-      - *restore_bundle_dependencies
-      - run: bundle exec rspec
-
-  lint_check:
-    <<: *defaults
-    steps:
-      - *attach_code_workspace
-      - *restore_bundle_dependencies
-      - run: bundle exec rubocop --config=default.yml
-      - run:
-          name: Check default.yml for warnings
-          command: "! bundle exec rubocop --config=default.yml 2>&1 | grep 'Warning:'"
-
-  vulnerability_check:
-    <<: *defaults
-    steps:
-      - *attach_code_workspace
-      - *restore_bundle_dependencies
-      - run: bundle exec bundle-audit update && bundle exec bundle-audit check
-
-  release:
-    <<: *defaults
-    steps:
-      - add_ssh_keys:
-          fingerprints:
-            - "46:b5:cb:ee:57:dc:14:95:31:be:12:13:4f:11:94:a4"
-      - *attach_code_workspace
-      - *restore_bundle_dependencies
-      - run:
-          name: Release to rubygems.org
-          command: |
-            echo "github.com,192.30.253.112 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" >> ~/.ssh/known_hosts
-            mkdir ~/.gem
-            echo ":rubygems_api_key: ${RUBYGEMS_API_KEY}" >> ~/.gem/credentials
-            chmod 600 ~/.gem/credentials
-            bundle exec rake release
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - 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:
-          context: wealthsimple
-          filters:
-            branches:
-              only: master
-          requires:
-            - rspec
-            - lint_check
-            - vulnerability_check
-
-  security-audit:
-    triggers:
-      - schedule:
-          # 11:05 am UTC: 6:05 am EST / 7:05 am EDT
-          cron: "5 11 * * *"
-          filters:
-            branches:
-              only: master
-    jobs:
-      - checkout_and_bundle:
-          context: wealthsimple
-      - vulnerability_check:
-          context: wealthsimple
-          requires:
-            - checkout_and_bundle

data/.dependabot/config.yml

@@ -1,9 +0,0 @@
-version: 1
-update_configs:
-  - package_manager: "ruby:bundler"
-    directory: "/"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match:
-          dependency_type: "development"
-          update_type: "all"