Merge pull request #58 from lxxxvi/update-require-with-plugins

Update require with plugins

Author: lxxxvi

README.md

@@ -6,7 +6,7 @@
 
 **ruboclean** puts `.rubocop.yml` into order. It groups the configuration into three groups:
 
-1. "Base"-configuration like `require`, `inherit_from`, etc.
+1. "Base"-configuration like `plugins`, `inherit_from`, etc.
 2. `Namespaces`
 3. `Namespace/Cops`
 
@@ -34,7 +34,7 @@ AllCops:
   - path_without_files/**/* # Will be removed if no files within pattern exist. Skip with --preserve-paths option.
 
 # Preceding comments will be removed unless the --preserve-comments option is used.
-require:
+plugins:
 - rubocop-rails # Inline comments will always be removed.
 ```
 
@@ -43,7 +43,7 @@ require:
 ```yml
 ---
 
-require:
+plugins:
 - rubocop-rails
 
 AllCops:

lib/ruboclean/grouper.rb

@@ -2,7 +2,7 @@
 
 module Ruboclean
   # Groups the rubocop configuration items into three categories:
-  #   - base: base configuration like 'require', 'inherit_from', etc
+  #   - base: base configuration like 'plugins', 'inherit_from', etc
   #   - namespaces: every item which does **not** include an "/"
   #   - cops: every item which **includes** an "/"
   class Grouper

test/fixtures/00_expected_output.yml

@@ -3,7 +3,7 @@
 inherit_from:
 - shared.yml
 
-require:
+plugins:
 - rubocop-rails
 
 AllCops:

test/fixtures/00_expected_output_with_preserved_comments.yml

@@ -4,8 +4,8 @@
 inherit_from:
 - shared.yml
 
-# preceding require: comment, wrongly indented
-require:
+# preceding plugins: comment, wrongly indented
+plugins:
 - rubocop-rails
 
 # multiline

test/fixtures/00_expected_output_with_preserved_paths.yml

@@ -3,7 +3,7 @@
 inherit_from:
 - shared.yml
 
-require:
+plugins:
 - rubocop-rails
 
 AllCops:

test/fixtures/00_input.yml

@@ -25,8 +25,8 @@ AllCops:
   - file_exists.rb
   - subdirectory/file_exists.rb
 
-  # preceding require: comment, wrongly indented
-require:
+  # preceding plugins: comment, wrongly indented
+plugins:
 - rubocop-rails
 
 

…xpected_output_without_require_block.yml …xpected_output_without_plugins_block.ymltest/fixtures/01_expected_output_without_require_block.yml renamed to test/fixtures/01_expected_output_without_plugins_block.yml test/fixtures/01_expected_output_without_require_block.yml renamed to test/fixtures/01_expected_output_without_plugins_block.yml

@@ -16,7 +16,7 @@ def test_group_config_with_empty_configuration
     end
 
     def test_group_config_only_base
-      config_hash = { "require" => ["rubocop-rails"] }
+      config_hash = { "plugins" => ["rubocop-rails"] }
 
       group_config_with(config_hash).tap do |result|
         assert_equal 3, result.keys.size

…tures/01_input_without_require_block.yml …tures/01_input_without_plugins_block.ymltest/fixtures/01_input_without_require_block.yml renamed to test/fixtures/01_input_without_plugins_block.yml test/fixtures/01_input_without_require_block.yml renamed to test/fixtures/01_input_without_plugins_block.yml

@@ -6,8 +6,8 @@ module Ruboclean
   class OrdererTest < BaseTest
     def test_order_all
       input = { "Foo/Foo" => nil, "Foo/Faa" => nil, "Baz" => nil,
-                "Bar" => nil, "require" => nil, "inherit_from" => nil }
-      output = { "inherit_from" => nil, "require" => nil, "Bar" => nil,
+                "Bar" => nil, "plugins" => nil, "inherit_from" => nil }
+      output = { "inherit_from" => nil, "plugins" => nil, "Bar" => nil,
                  "Baz" => nil, "Foo/Faa" => nil, "Foo/Foo" => nil }
 
       assert_ordered input, output
@@ -28,8 +28,8 @@ def test_order_without_namespaces
     end
 
     def test_order_without_cops
-      input = { "Baz" => nil, "Bar" => nil, "require" => nil }
-      output = { "require" => nil, "Bar" => nil, "Baz" => nil }
+      input = { "Baz" => nil, "Bar" => nil, "plugins" => nil }
+      output = { "plugins" => nil, "Bar" => nil, "Baz" => nil }
 
       assert_ordered input, output
     end