[RuboCop] Enable Lint/LiteralInInterpolation

2 files changed, 55 insertions, 100 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 530dd873aa..26a51aff2f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,19 +1,15 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-07-15 20:31:40 -0700 using RuboCop version 0.32.1.
+# on 2015-07-15 20:39:25 -0700 using RuboCop version 0.32.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-Lint/EnsureReturn:
-  Enabled: false
-
 # Offense count: 4
 Lint/Eval:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 5
 Lint/HandleExceptions:
   Enabled: false
 
@@ -21,12 +17,6 @@ Lint/HandleExceptions:
 Lint/LiteralInCondition:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect.
-Lint/LiteralInInterpolation:
-  Enabled: false
-
 # Offense count: 1
 Lint/Loop:
   Enabled: false
@@ -39,7 +29,7 @@ Lint/NestedMethodDefinition:
 Lint/NonLocalExitFromIterator:
   Enabled: false
 
-# Offense count: 7
+# Offense count: 6
 Lint/RescueException:
   Enabled: false
 
@@ -48,20 +38,16 @@ Lint/RescueException:
 Lint/StringConversionInInterpolation:
   Enabled: false
 
-# Offense count: 33
-Lint/UnneededDisable:
-  Enabled: false
-
 # Offense count: 2
 Lint/UnreachableCode:
   Enabled: false
 
-# Offense count: 19
+# Offense count: 15
 # Cop supports --auto-correct.
 Lint/UnusedBlockArgument:
   Enabled: false
 
-# Offense count: 69
+# Offense count: 38
 # Cop supports --auto-correct.
 Lint/UnusedMethodArgument:
   Enabled: false
@@ -70,12 +56,12 @@ Lint/UnusedMethodArgument:
 Lint/UselessAssignment:
   Enabled: false
 
-# Offense count: 1241
+# Offense count: 959
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 221
+  Max: 207
 
-# Offense count: 8
+# Offense count: 4
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
   Max: 363
@@ -85,7 +71,7 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 69
+# Offense count: 49
 Metrics/PerceivedComplexity:
   Max: 54
 
@@ -94,17 +80,17 @@ Metrics/PerceivedComplexity:
 Performance/ReverseEach:
   Enabled: false
 
-# Offense count: 63
+# Offense count: 38
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/AccessModifierIndentation:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 1
 Style/AccessorMethodName:
   Enabled: false
 
-# Offense count: 24
+# Offense count: 18
 # Cop supports --auto-correct.
 Style/Alias:
   Enabled: false
@@ -126,13 +112,13 @@ Style/AlignHash:
 Style/AlignParameters:
   Enabled: false
 
-# Offense count: 34
+# Offense count: 16
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/AndOr:
   Enabled: false
 
-# Offense count: 23
+# Offense count: 22
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
 Style/BlockDelimiters:
@@ -159,21 +145,17 @@ Style/CaseEquality:
 Style/CaseIndentation:
   Enabled: false
 
-# Offense count: 63
+# Offense count: 22
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/ClassAndModuleChildren:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/ClassCheck:
   Enabled: false
 
-# Offense count: 1
-Style/ClassVars:
-  Enabled: false
-
 # Offense count: 3
 # Cop supports --auto-correct.
 Style/ClosingParenthesisIndentation:
@@ -184,7 +166,7 @@ Style/ClosingParenthesisIndentation:
 Style/ColonMethodCall:
   Enabled: false
 
-# Offense count: 4
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerBackticks.
 Style/CommandLiteral:
@@ -201,31 +183,22 @@ Style/CommentAnnotation:
 Style/DeprecatedHashMethods:
   Enabled: false
 
-# Offense count: 185
+# Offense count: 153
 Style/Documentation:
   Enabled: false
 
-# Offense count: 5
-Style/DoubleNegation:
-  Enabled: false
-
-# Offense count: 19
-# Cop supports --auto-correct.
-Style/ElseAlignment:
-  Enabled: false
-
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/EmptyElse:
   Enabled: false
 
-# Offense count: 16
+# Offense count: 14
 # Cop supports --auto-correct.
 Style/EmptyLines:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 4
 # Cop supports --auto-correct.
 Style/EmptyLinesAroundAccessModifier:
   Enabled: false
@@ -236,7 +209,7 @@ Style/EmptyLinesAroundAccessModifier:
 Style/EmptyLinesAroundBlockBody:
   Enabled: false
 
-# Offense count: 65
+# Offense count: 61
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/EmptyLinesAroundClassBody:
@@ -253,7 +226,7 @@ Style/EmptyLinesAroundMethodBody:
 Style/EmptyLinesAroundModuleBody:
   Enabled: false
 
-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/EmptyLiteral:
   Enabled: false
@@ -268,22 +241,17 @@ Style/FileName:
 Style/For:
   Enabled: false
 
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/FormatString:
-  Enabled: false
-
-# Offense count: 9
+# Offense count: 4
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Enabled: false
 
-# Offense count: 40
+# Offense count: 29
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
 
-# Offense count: 21
+# Offense count: 20
 # Cop supports --auto-correct.
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
@@ -300,7 +268,7 @@ Style/IndentArray:
 Style/IndentationConsistency:
   Enabled: false
 
-# Offense count: 22
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: Width.
 Style/IndentationWidth:
@@ -316,17 +284,17 @@ Style/InfiniteLoop:
 Style/LeadingCommentSpace:
   Enabled: false
 
-# Offense count: 8
+# Offense count: 4
 # Cop supports --auto-correct.
 Style/LineEndConcatenation:
   Enabled: false
 
-# Offense count: 7
+# Offense count: 1
 # Cop supports --auto-correct.
 Style/MethodCallParentheses:
   Enabled: false
 
-# Offense count: 38
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/MethodDefParentheses:
@@ -345,12 +313,12 @@ Style/MultilineBlockChain:
 Style/MultilineBlockLayout:
   Enabled: false
 
-# Offense count: 25
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/MultilineIfThen:
   Enabled: false
 
-# Offense count: 23
+# Offense count: 13
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/MultilineOperationIndentation:
@@ -369,17 +337,17 @@ Style/NegatedIf:
 Style/NestedTernaryOperator:
   Enabled: false
 
-# Offense count: 11
+# Offense count: 10
 # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
 Style/Next:
   Enabled: false
 
-# Offense count: 9
+# Offense count: 1
 # Cop supports --auto-correct.
 Style/Not:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 3
 # Cop supports --auto-correct.
 Style/NumericLiterals:
   MinDigits: 8
@@ -392,7 +360,7 @@ Style/OneLineConditional:
 Style/OpMethod:
   Enabled: false
 
-# Offense count: 38
+# Offense count: 22
 # Cop supports --auto-correct.
 Style/ParallelAssignment:
   Enabled: false
@@ -403,18 +371,18 @@ Style/ParallelAssignment:
 Style/ParenthesesAroundCondition:
   Enabled: false
 
-# Offense count: 67
+# Offense count: 63
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Enabled: false
 
-# Offense count: 32
+# Offense count: 22
 # Cop supports --auto-correct.
 Style/PerlBackrefs:
   Enabled: false
 
-# Offense count: 9
+# Offense count: 8
 # Configuration parameters: NamePrefix, NamePrefixBlacklist.
 Style/PredicateName:
   Enabled: false
@@ -424,7 +392,7 @@ Style/PredicateName:
 Style/Proc:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 8
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/RaiseArgs:
   Enabled: false
@@ -445,7 +413,7 @@ Style/RedundantReturn:
 Style/RedundantSelf:
   Enabled: false
 
-# Offense count: 26
+# Offense count: 24
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
 Style/RegexpLiteral:
@@ -455,7 +423,7 @@ Style/RegexpLiteral:
 Style/RescueModifier:
   Enabled: false
 
-# Offense count: 4
+# Offense count: 3
 # Cop supports --auto-correct.
 Style/SelfAssignment:
   Enabled: false
@@ -466,7 +434,7 @@ Style/SelfAssignment:
 Style/Semicolon:
   Enabled: false
 
-# Offense count: 34
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/SignalException:
@@ -483,12 +451,12 @@ Style/SingleLineBlockParams:
 Style/SingleLineMethods:
   Enabled: false
 
-# Offense count: 11
+# Offense count: 10
 # Cop supports --auto-correct.
 Style/SingleSpaceBeforeFirstArg:
   Enabled: false
 
-# Offense count: 20
+# Offense count: 18
 # Cop supports --auto-correct.
 Style/SpaceAfterComma:
   Enabled: false
@@ -499,7 +467,7 @@ Style/SpaceAfterComma:
 Style/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 
-# Offense count: 61
+# Offense count: 55
 # Cop supports --auto-correct.
 # Configuration parameters: MultiSpaceAllowedForOperators.
 Style/SpaceAroundOperators:
@@ -527,64 +495,51 @@ Style/SpaceBeforeSemicolon:
 Style/SpaceInsideBlockBraces:
   Enabled: false
 
-# Offense count: 18
+# Offense count: 15
 # Cop supports --auto-correct.
 Style/SpaceInsideBrackets:
   Enabled: false
 
-# Offense count: 80
+# Offense count: 72
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
 Style/SpaceInsideHashLiteralBraces:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SpaceInsideParens:
-  Enabled: false
-
 # Offense count: 4
 # Cop supports --auto-correct.
 Style/SpaceInsideStringInterpolation:
   Enabled: false
 
-# Offense count: 1482
+# Offense count: 1390
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/StringLiterals:
   Enabled: false
 
-# Offense count: 111
+# Offense count: 106
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/StringLiteralsInInterpolation:
   Enabled: false
 
-# Offense count: 1
-Style/StructInheritance:
-  Enabled: false
-
-# Offense count: 52
+# Offense count: 45
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 Style/SymbolProc:
   Enabled: false
 
-# Offense count: 24
+# Offense count: 14
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
 Style/TrailingComma:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Style/TrailingUnderscoreVariable:
   Enabled: false
 
-# Offense count: 1
-Style/UnlessElse:
-  Enabled: false
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/UnneededPercentQ:
diff --git a/lib/bundler/friendly_errors.rb b/lib/bundler/friendly_errors.rb
index 9d4389e398..8838ac8467 100644
--- a/lib/bundler/friendly_errors.rb
+++ b/lib/bundler/friendly_errors.rb
@@ -44,7 +44,7 @@ module Bundler
 
   def self.request_issue_report_for(e)
     Bundler.ui.info <<-EOS.gsub(/^ {6}/, '')
-      #{'--- ERROR REPORT TEMPLATE -------------------------------------------------------'}
+      --- ERROR REPORT TEMPLATE -------------------------------------------------------
       - What did you do?
 
         I ran the command `#{$PROGRAM_NAME} #{ARGV.join(' ')}`
@@ -64,7 +64,7 @@ module Bundler
             #{e.backtrace.join("\n            ")}
 
       #{Bundler::Env.new.report(:print_gemfile => false).gsub(/\n/, "\n      ").strip}
-      #{'--- TEMPLATE END ----------------------------------------------------------------'}
+      --- TEMPLATE END ----------------------------------------------------------------
 
     EOS