makandra-rubocop 6.2.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 971fab26cb30baaf1d55688257511cefde34e0dc57c10e02ec85615847e41503
-  data.tar.gz: 149c349a25dc128a613ef58fc99704d2c3c55a2ff3edd4208328edb227344b47
+  metadata.gz: 28161b56e8af9d29a442ce0c1f7829ed92e59f787caeec6e0a5e32460c359c4b
+  data.tar.gz: 33bc2c6f17befe461f55c31c7a0388612b48c265fa975e2f2c1f544620c92848
 SHA512:
-  metadata.gz: b3f28b134d26a8e8aef1faabb8d7e4c664a24fa2545cd6ee1afe4c46307537a1f3306542abd9da4357016fc6d2dd8b172e6eb4dc81534641490e4230ccfd343b
-  data.tar.gz: 222230ed722ba70d485e2d52379e953e302b6f00178868499a8022bb81e09571b7fa91593f37b92ef2c7823e452da358fc486e0e7b91ad9d474734dedb237537
+  metadata.gz: b0747ea7979874775af93ab0e2f00f6489293268974cff820b5abbd7b00732250e0451150fa1a402450418dd666660f22884988a0a4504447aae47e10c1b8d12
+  data.tar.gz: 9e86aa89d4c3168d7a5f5e1f50a5a705f418d75547ec2715b77e9a188caa47e15ff110954b4e6563204f9ff3175616ea998fb53c2185597b44e84f85c5ee5676

data/CHANGELOG.md

@@ -8,6 +8,37 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Compatible changes
 
+
+## 8.0.0 - 2022-01-25
+
+## Breaking changes
+- Upgrade rubocop from version `1.18.4` to `1.25.1` (adds support for Ruby 3.1).
+
+
+## 7.2.0 - 2021-12-07
+
+### Compatible changes
+
+- Disable `Rails/LinkToBlank`
+
+
+## 7.1.0 - 2021-11-29
+
+### Compatible changes
+
+- Disable `RSpec/ExpectChange`
+
+
+## 7.0.0 - 2021-09-16
+
+### Breaking changes
+
+- Dropped support for Ruby < `2.5.0`.
+- Upgrade `rubocop` from version `1.9.1` to `1.18.4`.
+- Upgrade `rubocop-rails` from version `2.9.1` to `2.11.3`.
+- Upgrade `rubocop-rspec` from version `2.2.0` to `2.4.0`.
+
+
 ## 6.2.0 - 2021-06-20
 
 ### Compatible changes
@@ -52,7 +83,6 @@ rubocop itself, so there would be never a stdout, too.
   ```
 
 
-
 ## 6.1.0 - 2021-04-30
 
 ### Compatible changes

data/Gemfile.lock

@@ -1,56 +1,56 @@
 PATH
   remote: .
   specs:
-    makandra-rubocop (6.2.0)
-      rubocop (~> 1.9.1)
-      rubocop-rails (~> 2.9.1)
-      rubocop-rspec (~> 2.2.0)
+    makandra-rubocop (8.0.0)
+      rubocop (~> 1.25.0)
+      rubocop-rails (~> 2.11.3)
+      rubocop-rspec (~> 2.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3)
+    activesupport (6.1.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
-    concurrent-ruby (1.1.8)
-    i18n (1.8.9)
+    concurrent-ruby (1.1.9)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    minitest (5.15.0)
+    parallel (1.21.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     rack (2.2.3)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (12.3.2)
-    regexp_parser (2.1.1)
-    rexml (3.2.4)
-    rubocop (1.9.1)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
+    rubocop (1.25.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-rails (2.9.1)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    rubocop-rails (2.11.3)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rspec (2.2.0)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rspec (2.4.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby
@@ -61,4 +61,4 @@ DEPENDENCIES
   rake (~> 12.3)
 
 BUNDLED WITH
-   2.1.2
+   2.2.30

data/README.md

@@ -116,6 +116,13 @@ Note that disabling cops should be an exception for extremely rare cases where y
 If our defaults don't match your opinion, you should discuss with the team.
 
 
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/makandra/makandra-rubocop.
+
+If you make any changes to this gem's Ruby code, make sure to run `rubocop`.
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -123,29 +130,40 @@ After checking out the repo, run `bin/setup` to install dependencies. You can al
 To install this gem onto your local machine, run `bundle exec rake install`.
 
 When you're making changes, update the version number in `version.rb`:
-- Increase the major version when you're upgrading the Rubocop dependency
+- Increase the major version when you're upgrading a Rubocop dependency (see below)
 - Increase the minor version e.g. when disabling a cop
 
-For release run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-### Upgrading Rubocop version being used
-1. Change `rubocop` dependency in gemspec to the release you want to upgrade to.
-2. `bundle`
-3. `git add remote rubocop https://github.com/rubocop-hq/rubocop.git`
-4. `git fetch rubocop --no-tags` (we can't import their tags or they would clash with ours)
-5. Find out the commit SHA of the release you put into the gemspec and the commit SHA of the newest release (with a tag).
-6. `git diff $OLDER_SHA $NEWER_SHA config/default.yml | git apply --3way`
-7. Resolve the merge conflicts carefully and review all changes. We do not want to loose our overrides.
-8. Commit.
-
-This procedure is the same for `rubocop-rails`.
-
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/makandra/makandra-rubocop.
-
-If you make any changes to this gem's Ruby code, make sure to run `rubocop`.
+For release run `bundle exec rake release`, which will create a git tag for the
+version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+### Upgrading Rubocop dependencies
+The following procedure works for either `rubocop`, `rubocop-rails` or
+`rubocopo-rspec`. (Replace `rubocop` with the respective dependency name.)
+
+1. Change the `rubocop` dependency in the Gemspec to the version you want to
+   upgrade to.
+2. `bundle update rubocop`
+
+Next, we need to update our config file to match their updated config. If
+you have not added the Rubocop remote yet (check with `git remote -v`), do a
+`git remote add rubocop https://github.com/rubocop-hq/rubocop.git`. Then:
+
+1. Update the local copy of the Rubocop repository: `git fetch rubocop --no-tags`
+   (we can't import their tags or they would clash with ours)
+2. Find the commit SHA of the previous and of the new Rubocop version in our
+   Gemspec. The easiest way is to look them up on their [releases page](https://github.com/rubocop/rubocop/releases).
+3. Diff their config/default.yml between the previously used and the new Rubocop
+   version, and write it to a file: `git diff $OLDER_SHA $NEWER_SHA config/default.yml > config_diff`
+4. If you are updating `rubocop-rails` or `rubocop-rspec`, edit the config_diff
+   file now and replace `config/default.yml` with `config/ext/{rails,rspec}.yml`
+   (respectively).
+5. Apply the diff with `git apply ./config_diff --3way`
+6. Resolve merge conflicts carefully and review all changes. We do not want to
+   loose changes in [our config files](https://github.com/makandra/makandra-rubocop/tree/master/config).
+7. Delete the patch file
+8. Increase the major version (see above)
+9. Update the CHANGELOG
+10. Commit
 
 
 ## License

data/Rakefile

@@ -1,2 +1,2 @@
 require 'bundler/gem_tasks'
-task default: :spec
+# task default: :spec