Merge pull request #3890 from esasse/fix-align-parameters

Fix Style/AlignParameters

7 files changed, 15 insertions, 20 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
index cc1c9f461b..8b9a20f661 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -21,6 +21,9 @@ Lint/EndAlignment:
 Style/AccessModifierIndentation:
   EnforcedStyle: outdent
 
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
 Style/MultilineOperationIndentation:
   EnforcedStyle: indented
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 89dfe6e09c..3888248328 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -63,12 +63,6 @@ Style/AccessorMethodName:
 Style/AlignHash:
   Enabled: false
 
-# Offense count: 12
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AlignParameters:
-  Enabled: false
-
 # Offense count: 16
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
index bae6ab06b8..de673fa69d 100644
--- a/lib/bundler/cli/gem.rb
+++ b/lib/bundler/cli/gem.rb
@@ -88,22 +88,20 @@ module Bundler
       end
 
       if ask_and_set(:mit, "Do you want to license your code permissively under the MIT license?",
-          "This means that any other developer or company will be legally allowed to use your code " \
-          "for free as long as they admit you created it. You can read more about the MIT license " \
-          "at choosealicense.com/licenses/mit."
-        )
+        "This means that any other developer or company will be legally allowed to use your code " \
+        "for free as long as they admit you created it. You can read more about the MIT license " \
+        "at choosealicense.com/licenses/mit.")
         config[:mit] = true
         Bundler.ui.info "MIT License enabled in config"
         templates.merge!("LICENSE.txt.tt" => "LICENSE.txt")
       end
 
       if ask_and_set(:coc, "Do you want to include a code of conduct in gems you generate?",
-          "Codes of conduct can increase contributions to your project by contributors who " \
-          "prefer collaborative, safe spaces. You can read more about the code of conduct at " \
-          "contributor-covenant.org. Having a code of conduct means agreeing to the responsibility " \
-          "of enforcing it, so be sure that you are prepared to do that. For suggestions about " \
-          "how to enforce codes of conduct, see bit.ly/coc-enforcement."
-        )
+        "Codes of conduct can increase contributions to your project by contributors who " \
+        "prefer collaborative, safe spaces. You can read more about the code of conduct at " \
+        "contributor-covenant.org. Having a code of conduct means agreeing to the responsibility " \
+        "of enforcing it, so be sure that you are prepared to do that. For suggestions about " \
+        "how to enforce codes of conduct, see bit.ly/coc-enforcement.")
         config[:coc] = true
         Bundler.ui.info "Code of conduct enabled in config"
         templates.merge!("CODE_OF_CONDUCT.md.tt" => "CODE_OF_CONDUCT.md")
diff --git a/lib/bundler/source/rubygems/remote.rb b/lib/bundler/source/rubygems/remote.rb
index da52128a72..1e1a932d30 100644
--- a/lib/bundler/source/rubygems/remote.rb
+++ b/lib/bundler/source/rubygems/remote.rb
@@ -3,7 +3,7 @@ module Bundler
     class Rubygems
       class Remote
         attr_reader :uri,
-                    :anonymized_uri
+          :anonymized_uri
 
         def initialize(uri)
           uri = Bundler.settings.mirror_for(uri)
diff --git a/lib/bundler/source_list.rb b/lib/bundler/source_list.rb
index 60625bb7f3..c0336bfdd6 100644
--- a/lib/bundler/source_list.rb
+++ b/lib/bundler/source_list.rb
@@ -1,7 +1,7 @@
 module Bundler
   class SourceList
     attr_reader :path_sources,
-                :git_sources
+      :git_sources
 
     def initialize
       @path_sources       = []
diff --git a/spec/bundler/remote_specification_spec.rb b/spec/bundler/remote_specification_spec.rb
index ce1e4e0358..0e95df094e 100644
--- a/spec/bundler/remote_specification_spec.rb
+++ b/spec/bundler/remote_specification_spec.rb
@@ -57,7 +57,7 @@ describe Bundler::RemoteSpecification do
     context "comparing another Bundler::RemoteSpecification" do
       let(:other) do
         Bundler::RemoteSpecification.new(other_name, other_version,
-                                         other_platform, nil)
+          other_platform, nil)
       end
 
       it_should_behave_like "a comparison"
diff --git a/spec/realworld/edgecases_spec.rb b/spec/realworld/edgecases_spec.rb
index 008eab28d2..1af311e233 100644
--- a/spec/realworld/edgecases_spec.rb
+++ b/spec/realworld/edgecases_spec.rb
@@ -12,7 +12,7 @@ describe "real world edgecases", :realworld => true, :sometimes => true do
 
   # https://github.com/bundler/bundler/issues/1202
   it "bundle cache works with rubygems 1.3.7 and pre gems",
-      :ruby => "~> 1.8.7", :rubygems => "~> 1.3.7" do
+    :ruby => "~> 1.8.7", :rubygems => "~> 1.3.7" do
     install_gemfile <<-G
       source :rubygems
       gem "rack",          "1.3.0.beta2"