lib/rubocop/cop/style/special_global_vars.rb in rubocop-0.19.1 vs lib/rubocop/cop/style/special_global_vars.rb in rubocop-0.20.0

@@ -3,13 +3,13 @@
 module Rubocop
   module Cop
     module Style
       # This cop looks for uses of Perl-style global variables.
       class SpecialGlobalVars < Cop
-        MSG_BOTH = 'Prefer %s from the English library, or %s over %s.'
-        MSG_ENGLISH = 'Prefer %s from the English library over %s.'
-        MSG_REGULAR = 'Prefer %s over %s.'
+        MSG_BOTH = 'Prefer `%s` from the English library, or `%s` over `%s`.'
+        MSG_ENGLISH = 'Prefer `%s` from the English library over `%s`.'
+        MSG_REGULAR = 'Prefer `%s` over `%s`.'
 
         PREFERRED_VARS = {
           '$:' => ['$LOAD_PATH'],
           '$"' => ['$LOADED_FEATURES'],
           '$0' => ['$PROGRAM_NAME'],
@@ -54,18 +54,18 @@
           regular, english = PREFERRED_VARS[global_var].partition do |var|
             NON_ENGLISH_VARS.include? var
           end
 
           # For now, we assume that lists are 2 items or less.  Easy grammar!
-          regular_msg = regular.join(' or ')
-          english_msg = english.join(' or ')
+          regular_msg = regular.join('` or `')
+          english_msg = english.join('` or `')
 
           if regular.length > 0 && english.length > 0
-            MSG_BOTH.format(english_msg, regular_msg, global_var)
+            format(MSG_BOTH, english_msg, regular_msg, global_var)
           elsif regular.length > 0
-            MSG_REGULAR.format(regular_msg, global_var)
+            format(MSG_REGULAR, regular_msg, global_var)
           elsif english.length > 0
-            MSG_ENGLISH.format(english_msg, global_var)
+            format(MSG_ENGLISH, english_msg, global_var)
           else
             fail 'Bug in SpecialGlobalVars - global var w/o preferred vars!'
           end
         end