summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Koronen <koronen@kth.se>2015-08-08 17:09:04 +0200
committerVictor Koronen <koronen@kth.se>2015-08-14 12:29:44 +0200
commita43b23955edec4ea4913f0d6960930f6b6cd9516 (patch)
tree82b5387fe55b8f41a3cb30dddf4e7e3f78e5dc01
parent452691f4c0dfb802c120b8d2f6a6f43f2319e02e (diff)
downloadbundler-a43b23955edec4ea4913f0d6960930f6b6cd9516.tar.gz
Fix Style/IndentationConsistency
-rw-r--r--.rubocop_todo.yml6
-rw-r--r--lib/bundler/cli.rb36
2 files changed, 18 insertions, 24 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a8869c00df..498b36fa20 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -191,12 +191,6 @@ Style/IfUnlessModifier:
Style/IndentArray:
Enabled: false
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/IndentationConsistency:
- Enabled: false
-
# Offense count: 2
Style/ModuleFunction:
Enabled: false
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index c481ac7322..00df870e28 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -411,24 +411,24 @@ module Bundler
private
- # Automatically invoke `bundle install` and resume if
- # Bundler.settings[:auto_install] exists. This is set through config cmd
- # `bundle config auto_install 1`.
- #
- # Note that this method `nil`s out the global Definition object, so it
- # should be called first, before you instantiate anything like an
- # `Installer` that'll keep a reference to the old one instead.
- def auto_install
- return unless Bundler.settings[:auto_install]
-
- begin
- Bundler.definition.specs
- rescue GemNotFound
- Bundler.ui.info "Automatically installing missing gems."
- Bundler.reset!
- invoke :install, []
- Bundler.reset!
- end
+ # Automatically invoke `bundle install` and resume if
+ # Bundler.settings[:auto_install] exists. This is set through config cmd
+ # `bundle config auto_install 1`.
+ #
+ # Note that this method `nil`s out the global Definition object, so it
+ # should be called first, before you instantiate anything like an
+ # `Installer` that'll keep a reference to the old one instead.
+ def auto_install
+ return unless Bundler.settings[:auto_install]
+
+ begin
+ Bundler.definition.specs
+ rescue GemNotFound
+ Bundler.ui.info "Automatically installing missing gems."
+ Bundler.reset!
+ invoke :install, []
+ Bundler.reset!
end
+ end
end
end