summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2015-11-26 12:26:00 -0600
committerSamuel Giddins <segiddins@segiddins.me>2015-11-26 12:26:00 -0600
commit6c06b2366ff239aaaa24d3d3a4ce84d7736afcc6 (patch)
treeff3ff7c838ad4e12625c2c222ee9d11358c2ae19
parent521c81dc8e91b5f584b9692328b61da55c782fb2 (diff)
downloadbundler-6c06b2366ff239aaaa24d3d3a4ce84d7736afcc6.tar.gz
[RuboCop] Enable Style/CaseIndentation
-rw-r--r--.rubocop_todo.yml6
-rw-r--r--lib/bundler/definition.rb24
2 files changed, 12 insertions, 18 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b1a4af13ef..b40e1004f1 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -73,12 +73,6 @@ Style/CaseEquality:
- 'lib/bundler/match_platform.rb'
- 'lib/bundler/rubygems_ext.rb'
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep.
-Style/CaseIndentation:
- Enabled: false
-
# Offense count: 22
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/ClassAndModuleChildren:
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index a3196d9124..437d075123 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -390,18 +390,18 @@ module Bundler
problem, expected, actual = diff
msg = case problem
- when :engine
- "Your Ruby engine is #{actual}, but your Gemfile specified #{expected}"
- when :version
- "Your Ruby version is #{actual}, but your Gemfile specified #{expected}"
- when :engine_version
- "Your #{Bundler.ruby_version.engine} version is #{actual}, but your Gemfile specified #{ruby_version.engine} #{expected}"
- when :patchlevel
- if !expected.is_a?(String)
- "The Ruby patchlevel in your Gemfile must be a string"
- else
- "Your Ruby patchlevel is #{actual}, but your Gemfile specified #{expected}"
- end
+ when :engine
+ "Your Ruby engine is #{actual}, but your Gemfile specified #{expected}"
+ when :version
+ "Your Ruby version is #{actual}, but your Gemfile specified #{expected}"
+ when :engine_version
+ "Your #{Bundler.ruby_version.engine} version is #{actual}, but your Gemfile specified #{ruby_version.engine} #{expected}"
+ when :patchlevel
+ if !expected.is_a?(String)
+ "The Ruby patchlevel in your Gemfile must be a string"
+ else
+ "Your Ruby patchlevel is #{actual}, but your Gemfile specified #{expected}"
+ end
end
raise RubyVersionMismatch, msg