rubocop-minitest 0.9.0 → 0.11.0

data/relnotes/v0.5.1.md

@@ -1,5 +1,5 @@
 ### Bug fixes
 
-* [#42](https://github.com/rubocop-hq/rubocop-minitest/issues/42): Fix an incorrect autocorrect for some cops of `Minitest` department when using heredoc message. ([@koic][])
+* [#42](https://github.com/rubocop/rubocop-minitest/issues/42): Fix an incorrect autocorrect for some cops of `Minitest` department when using heredoc message. ([@koic][])
 
 [@koic]: https://github.com/koic

data/relnotes/v0.6.0.md

@@ -1,5 +1,5 @@
 ### New features
 
-* [#49](https://github.com/rubocop-hq/rubocop-minitest/pull/49): New cops `AssertMatch` and `RefuteMatch` check for use of `assert_match`/`refute_match` instead of `assert(foo.match(bar))`/`refute(foo.match(bar))`. ([@fsateler][])
+* [#49](https://github.com/rubocop/rubocop-minitest/pull/49): New cops `AssertMatch` and `RefuteMatch` check for use of `assert_match`/`refute_match` instead of `assert(foo.match(bar))`/`refute(foo.match(bar))`. ([@fsateler][])
 
 [@fsateler]: https://github.com/fsateler

data/relnotes/v0.6.1.md

@@ -1,6 +1,6 @@
 ### Bug fixes
 
-* [#52](https://github.com/rubocop-hq/rubocop-minitest/issues/52): Make `Minitest/RefuteFalse` cop aware of `assert(!test)`. ([@koic][])
-* [#52](https://github.com/rubocop-hq/rubocop-minitest/issues/52): Fix a false negative for `Minitest/AssertIncludes` and `Minitest/RefuteIncludes` when an argument is enclosed in redundant parentheses. ([@koic][])
+* [#52](https://github.com/rubocop/rubocop-minitest/issues/52): Make `Minitest/RefuteFalse` cop aware of `assert(!test)`. ([@koic][])
+* [#52](https://github.com/rubocop/rubocop-minitest/issues/52): Fix a false negative for `Minitest/AssertIncludes` and `Minitest/RefuteIncludes` when an argument is enclosed in redundant parentheses. ([@koic][])
 
 [@koic]: https://github.com/koic

data/relnotes/v0.6.2.md

@@ -1,5 +1,5 @@
 ### Bug fixes
 
-* [#55](https://github.com/rubocop-hq/rubocop-minitest/issues/55): Fix an error for `Minitest/AssertIncludes` when using local variable argument. ([@koic][])
+* [#55](https://github.com/rubocop/rubocop-minitest/issues/55): Fix an error for `Minitest/AssertIncludes` when using local variable argument. ([@koic][])
 
 [@koic]: https://github.com/koic

data/relnotes/v0.7.0.md

@@ -1,13 +1,13 @@
 ### New features
 
-* [#60](https://github.com/rubocop-hq/rubocop-minitest/issues/60): Add new cop `Minitest/GlobalExpectations` to check for deprecated global expectations. ([@tejasbubane][])
+* [#60](https://github.com/rubocop/rubocop-minitest/issues/60): Add new cop `Minitest/GlobalExpectations` to check for deprecated global expectations. ([@tejasbubane][])
 
 ### Bug fixes
 
-* [#58](https://github.com/rubocop-hq/rubocop-minitest/pull/58): Fix a false negative for `Minitest/AssertMatch` and `Minitest/RefuteMatch` when an argument is enclosed in redundant parentheses. ([@koic][])
-* [#59](https://github.com/rubocop-hq/rubocop-minitest/pull/59): Fix a false negative for `Minitest/AssertRespondTo` and `Minitest/RefuteRespondTo` when an argument is enclosed in redundant parentheses. ([@koic][])
-* [#61](https://github.com/rubocop-hq/rubocop-minitest/pull/61): Fix a false negative for `Minitest/AssertInstanceOf` and `Minitest/RefuteInstanceOf` when an argument is enclosed in redundant parentheses. ([@koic][])
-* [#62](https://github.com/rubocop-hq/rubocop-minitest/pull/62): Fix a false negative for `Minitest/AssertEmpty` and `Minitest/RefuteEmpty` when an argument is enclosed in redundant parentheses. ([@koic][])
+* [#58](https://github.com/rubocop/rubocop-minitest/pull/58): Fix a false negative for `Minitest/AssertMatch` and `Minitest/RefuteMatch` when an argument is enclosed in redundant parentheses. ([@koic][])
+* [#59](https://github.com/rubocop/rubocop-minitest/pull/59): Fix a false negative for `Minitest/AssertRespondTo` and `Minitest/RefuteRespondTo` when an argument is enclosed in redundant parentheses. ([@koic][])
+* [#61](https://github.com/rubocop/rubocop-minitest/pull/61): Fix a false negative for `Minitest/AssertInstanceOf` and `Minitest/RefuteInstanceOf` when an argument is enclosed in redundant parentheses. ([@koic][])
+* [#62](https://github.com/rubocop/rubocop-minitest/pull/62): Fix a false negative for `Minitest/AssertEmpty` and `Minitest/RefuteEmpty` when an argument is enclosed in redundant parentheses. ([@koic][])
 
 [@tejasbubane]: https://github.com/tejasbubane
 [@koic]: https://github.com/koic

data/relnotes/v0.8.0.md

@@ -1,12 +1,12 @@
 ### New features
 
-* [#66](https://github.com/rubocop-hq/rubocop-minitest/issues/66): Support all expectations of `Minitest::Expectations` for `Minitest/GlobalExpectations` cop. ([@koic][])
+* [#66](https://github.com/rubocop/rubocop-minitest/issues/66): Support all expectations of `Minitest::Expectations` for `Minitest/GlobalExpectations` cop. ([@koic][])
 
 ### Bug fixes
 
-* [#60](https://github.com/rubocop-hq/rubocop-minitest/issues/60): Fix `Minitest/GlobalExpectations` autocorrection for chained methods. ([@tejasbubane][])
-* [#69](https://github.com/rubocop-hq/rubocop-minitest/pull/69): Fix a false negative for `Minitest/GlobalExpectations` cop when using a variable or a hash index for receiver. ([@koic][])
-* [#71](https://github.com/rubocop-hq/rubocop-minitest/pull/71): Fix a false negative for `Minitest/AssertEqual` when an argument is enclosed in redundant parentheses. ([@koic][])
+* [#60](https://github.com/rubocop/rubocop-minitest/issues/60): Fix `Minitest/GlobalExpectations` autocorrection for chained methods. ([@tejasbubane][])
+* [#69](https://github.com/rubocop/rubocop-minitest/pull/69): Fix a false negative for `Minitest/GlobalExpectations` cop when using a variable or a hash index for receiver. ([@koic][])
+* [#71](https://github.com/rubocop/rubocop-minitest/pull/71): Fix a false negative for `Minitest/AssertEqual` when an argument is enclosed in redundant parentheses. ([@koic][])
 
 [@koic]: https://github.com/koic
 [@tejasbubane]: https://github.com/tejasbubane

data/relnotes/v0.8.1.md

@@ -1,5 +1,5 @@
 ### Bug fixes
 
-* [#72](https://github.com/rubocop-hq/rubocop-minitest/pull/72): Fix some false negatives for `Minitest/GlobalExpectations`. ([@andrykonchin][])
+* [#72](https://github.com/rubocop/rubocop-minitest/pull/72): Fix some false negatives for `Minitest/GlobalExpectations`. ([@andrykonchin][])
 
 [@andrykonchin]: https://github.com/andrykonchin

data/relnotes/v0.9.0.md

@@ -1,10 +1,10 @@
 ### Bug fixes
 
-* [#75](https://github.com/rubocop-hq/rubocop-minitest/issues/75): Fix a false negative for `Minitest/GlobalExpectations` when using global expectation methods with no arguments. ([@koic][])
+* [#75](https://github.com/rubocop/rubocop-minitest/issues/75): Fix a false negative for `Minitest/GlobalExpectations` when using global expectation methods with no arguments. ([@koic][])
 
 ### Changes
 
-* [#73](https://github.com/rubocop-hq/rubocop-minitest/issues/73): The Minitest department works on file names end with `_test.rb` by default. ([@koic][])
-* [#77](https://github.com/rubocop-hq/rubocop-minitest/pull/77): **(BREAKING)** Drop support for Ruby 2.3. ([@koic][])
+* [#73](https://github.com/rubocop/rubocop-minitest/issues/73): The Minitest department works on file names end with `_test.rb` by default. ([@koic][])
+* [#77](https://github.com/rubocop/rubocop-minitest/pull/77): **(BREAKING)** Drop support for Ruby 2.3. ([@koic][])
 
 [@koic]: https://github.com/koic

data/rubocop-minitest.gemspec

@@ -6,7 +6,7 @@ require 'rubocop/minitest/version'
 
 Gem::Specification.new do |spec|
   spec.name = 'rubocop-minitest'
-  spec.version = RuboCop::Minitest::VERSION
+  spec.version = RuboCop::Minitest::Version::STRING
   spec.authors = ['Bozhidar Batsov', 'Jonas Arvidsson', 'Koichi ITO']
 
   spec.summary = 'Automatic Minitest code style checking tool.'
@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.4.0'
   spec.metadata = {
-    'homepage_uri' => 'https://docs.rubocop.org/projects/minitest/',
-    'changelog_uri' => 'https://github.com/rubocop-hq/rubocop-minitest/blob/master/CHANGELOG.md',
-    'source_code_uri' => 'https://github.com/rubocop-hq/rubocop-minitest',
-    'documentation_uri' => 'https://docs.rubocop.org/projects/minitest/',
-    'bug_tracker_uri' => 'https://github.com/rubocop-hq/rubocop-minitest/issues'
+    'homepage_uri' => 'https://docs.rubocop.org/rubocop-minitest/',
+    'changelog_uri' => 'https://github.com/rubocop/rubocop-minitest/blob/master/CHANGELOG.md',
+    'source_code_uri' => 'https://github.com/rubocop/rubocop-minitest',
+    'documentation_uri' => "https://docs.rubocop.org/rubocop-minitest/#{RuboCop::Minitest::Version.document_version}",
+    'bug_tracker_uri' => 'https://github.com/rubocop/rubocop-minitest/issues'
   }
 
   # Specify which files should be added to the gem when it is released.
@@ -34,6 +34,6 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rubocop', '>= 0.74'
+  spec.add_runtime_dependency 'rubocop', '>= 0.90', '< 2.0'
   spec.add_development_dependency 'minitest', '~> 5.11'
 end

data/tasks/cops_documentation.rake

@@ -3,6 +3,7 @@
 require 'yard'
 require 'rubocop'
 require 'rubocop-minitest'
+require 'rubocop/cops_documentation_generator'
 
 YARD::Rake::YardocTask.new(:yard_for_generate_documentation) do |task|
   task.files = ['lib/rubocop/cop/**/*.rb']
@@ -11,273 +12,23 @@ end
 
 desc 'Generate docs of all cops departments'
 task generate_cops_documentation: :yard_for_generate_documentation do
-  def cops_of_department(cops, department)
-    cops.with_department(department).sort!
-  end
-
-  def cops_body(config, cop, description, examples_objects, pars)
-    content = h2(cop.cop_name)
-    content << properties(config, cop)
-    content << "#{description}\n"
-    content << examples(examples_objects) if examples_objects.count.positive?
-    content << configurations(pars)
-    content << references(config, cop)
-    content
-  end
-
-  def examples(examples_object)
-    examples_object.each_with_object(h3('Examples').dup) do |example, content|
-      content << h4(example.name) unless example.name == ''
-      content << code_example(example)
-    end
-  end
-
-  # rubocop:disable Metrics/MethodLength
-  def properties(config, cop)
-    header = [
-      'Enabled by default', 'Safe', 'Supports autocorrection', 'VersionAdded',
-      'VersionChanged'
-    ]
-    config = config.for_cop(cop)
-    safe_auto_correct = config.fetch('SafeAutoCorrect', true)
-    autocorrect = if cop.new.support_autocorrect?
-                    "Yes #{'(Unsafe)' unless safe_auto_correct}"
-                  else
-                    'No'
-                  end
-    content = [[
-      config.fetch('Enabled') ? 'Enabled' : 'Disabled',
-      config.fetch('Safe', true) ? 'Yes' : 'No',
-      autocorrect,
-      config.fetch('VersionAdded', '-'),
-      config.fetch('VersionChanged', '-')
-    ]]
-    to_table(header, content) + "\n"
-  end
-  # rubocop:enable Metrics/MethodLength
-
-  def h2(title)
-    content = +"\n"
-    content << "## #{title}\n"
-    content << "\n"
-    content
-  end
-
-  def h3(title)
-    content = +"\n"
-    content << "### #{title}\n"
-    content << "\n"
-    content
-  end
-
-  def h4(title)
-    content = +"#### #{title}\n"
-    content << "\n"
-    content
-  end
-
-  def code_example(ruby_code)
-    content = +"```ruby\n"
-    content << ruby_code.text
-                        .gsub('@good', '# good').gsub('@bad', '# bad').strip
-    content << "\n```\n"
-    content
-  end
-
-  def configurations(pars)
-    return '' if pars.empty?
-
-    header = ['Name', 'Default value', 'Configurable values']
-    configs = pars.each_key.reject { |key| key.start_with?('Supported') }
-    content = configs.map do |name|
-      configurable = configurable_values(pars, name)
-      default = format_table_value(pars[name])
-      [name, default, configurable]
-    end
-
-    h3('Configurable attributes') + to_table(header, content)
-  end
-
-  # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength
-  def configurable_values(pars, name)
-    case name
-    when /^Enforced/
-      supported_style_name = RuboCop::Cop::Util.to_supported_styles(name)
-      format_table_value(pars[supported_style_name])
-    when 'IndentationWidth'
-      'Integer'
-    when 'Database'
-      format_table_value(pars['SupportedDatabases'])
-    else
-      case pars[name]
-      when String
-        'String'
-      when Integer
-        'Integer'
-      when Float
-        'Float'
-      when true, false
-        'Boolean'
-      when Array
-        'Array'
-      else
-        ''
-      end
-    end
-  end
-  # rubocop:enable Metrics/CyclomaticComplexity,Metrics/MethodLength
-
-  def to_table(header, content)
-    table = [
-      header.join(' | '),
-      Array.new(header.size, '---').join(' | ')
-    ]
-    table.concat(content.map { |c| c.join(' | ') })
-    table.join("\n") + "\n"
-  end
-
-  def format_table_value(val)
-    value =
-      case val
-      when Array
-        if val.empty?
-          '`[]`'
-        else
-          val.map { |config| format_table_value(config) }.join(', ')
-        end
-      else
-        "`#{val.nil? ? '<none>' : val}`"
-      end
-    value.gsub("#{Dir.pwd}/", '').rstrip
-  end
-
-  def references(config, cop)
-    cop_config = config.for_cop(cop)
-    urls = RuboCop::Cop::MessageAnnotator.new(
-      config, cop.name, cop_config, {}
-    ).urls
-    return '' if urls.empty?
-
-    content = h3('References')
-    content << urls.map { |url| "* [#{url}](#{url})" }.join("\n")
-    content << "\n"
-    content
-  end
-
-  def print_cops_of_department(cops, department, config)
-    selected_cops = cops_of_department(cops, department).select do |cop|
-      cop.to_s.start_with?('RuboCop::Cop::Minitest')
-    end
-    return if selected_cops.empty?
-
-    content = +"# #{department}\n"
-    selected_cops.each do |cop|
-      content << print_cop_with_doc(cop, config)
-    end
-    file_name = "#{Dir.pwd}/manual/cops_#{department.downcase}.md"
-    File.open(file_name, 'w') do |file|
-      puts "* generated #{file_name}"
-      file.write(content.strip + "\n")
-    end
-  end
-
-  def print_cop_with_doc(cop, config)
-    t = config.for_cop(cop)
-    non_display_keys = %w[
-      Description Enabled StyleGuide Reference Safe SafeAutoCorrect VersionAdded
-      VersionChanged
-    ]
-    pars = t.reject { |k| non_display_keys.include? k }
-    description = 'No documentation'
-    examples_object = []
-    YARD::Registry.all(:class).detect do |code_object|
-      next unless RuboCop::Cop::Badge.for(code_object.to_s) == cop.badge
-
-      description = code_object.docstring unless code_object.docstring.blank?
-      examples_object = code_object.tags('example')
-    end
-    cops_body(config, cop, description, examples_object, pars)
-  end
-
-  # rubocop:disable Metrics/AbcSize
-  def table_of_content_for_department(cops, department)
-    selected_cops = cops_of_department(cops, department.to_sym).select do |cop|
-      cop.to_s.start_with?('RuboCop::Cop::Minitest')
-    end
-    return if selected_cops.empty?
-
-    type_title = department[0].upcase + department[1..-1]
-    filename = "cops_#{department.downcase}.md"
-    content = +"#### Department [#{type_title}](#{filename})\n\n"
-    selected_cops.each do |cop|
-      anchor = cop.cop_name.sub('/', '').downcase
-      content << "* [#{cop.cop_name}](#{filename}##{anchor})\n"
-    end
-
-    content
-  end
-  # rubocop:enable Metrics/AbcSize
-
-  def print_table_of_contents(cops)
-    path = "#{Dir.pwd}/manual/cops.md"
-    original = File.read(path)
-    content = +"<!-- START_COP_LIST -->\n"
-
-    content << table_contents(cops)
-
-    content << "\n<!-- END_COP_LIST -->"
-
-    content = if original.empty?
-                content
-              else
-                original.sub(
-                  /<!-- START_COP_LIST -->.+<!-- END_COP_LIST -->/m, content
-                )
-              end
-    File.write(path, content)
-  end
-
-  def table_contents(cops)
-    cops
-      .departments
-      .map(&:to_s)
-      .sort
-      .map { |department| table_of_content_for_department(cops, department) }
-      .reject(&:nil?)
-      .join("\n")
-  end
-
-  def assert_manual_synchronized
-    # Do not print diff and yield whether exit code was zero
-    sh('git diff --quiet manual') do |outcome, _|
-      return if outcome
-
-      # Output diff before raising error
-      sh('GIT_PAGER=cat git diff manual')
-
-      warn 'The manual directory is out of sync. ' \
-        'Run `rake generate_cops_documentation` and commit the results.'
-      exit!
-    end
-  end
-
-  def main
-    cops   = RuboCop::Cop::Cop.registry
-    config = RuboCop::ConfigLoader.load_file('config/default.yml')
+  deps = ['Minitest']
+  CopsDocumentationGenerator.new(departments: deps).call
+end
 
-    YARD::Registry.load!
-    cops.departments.sort!.each do |department|
-      print_cops_of_department(cops, department, config)
-    end
+desc 'Verify that documentation is up to date'
+task verify_cops_documentation: :generate_cops_documentation do
+  # Do not print diff and yield whether exit code was zero
+  sh('git diff --quiet docs') do |outcome, _|
+    exit if outcome
 
-    print_table_of_contents(cops)
+    # Output diff before raising error
+    sh('GIT_PAGER=cat git diff docs')
 
-    assert_manual_synchronized if ENV['CI'] == 'true'
-  ensure
-    RuboCop::ConfigLoader.default_configuration = nil
+    warn 'The docs directory is out of sync. ' \
+      'Run `rake generate_cops_documentation` and commit the results.'
+    exit!
   end
-
-  main
 end
 
 desc 'Syntax check for the documentation comments'
@@ -286,7 +37,7 @@ task documentation_syntax_check: :yard_for_generate_documentation do
 
   ok = true
   YARD::Registry.load!
-  cops = RuboCop::Cop::Cop.registry
+  cops = RuboCop::Cop::Registry.global
   cops.each do |cop|
     examples = YARD::Registry.all(:class).find do |code_object|
       next unless RuboCop::Cop::Badge.for(code_object.to_s) == cop.badge

data/tasks/cut_release.rake

@@ -35,6 +35,21 @@ namespace :cut_release do
     end
   end
 
+  def update_antora_yml(new_version)
+    antora_metadata = File.read('docs/antora.yml')
+
+    File.open('docs/antora.yml', 'w') do |f|
+      f << antora_metadata.sub(
+        'version: master',
+        "version: '#{version_sans_patch(new_version)}'"
+      )
+    end
+  end
+
+  def version_sans_patch(version)
+    version.split('.').take(2).join('.')
+  end
+
   def new_version_changes
     changelog = File.read('CHANGELOG.md')
     _, _, new_changes, _older_changes = changelog.split(/^## .*$/, 4)
@@ -54,6 +69,7 @@ namespace :cut_release do
 
     add_header_to_changelog(new_version)
     create_release_notes(new_version)
+    update_antora_yml(new_version)
 
     puts "Changed version from #{old_version} to #{new_version}."
   end