From 9deda1ccb71d624d74168e8932d7dccfccf18337 Mon Sep 17 00:00:00 2001 From: Postmodern Date: Wed, 30 May 2012 17:23:16 -0700 Subject: [PATCH] Renamed Helpers#format_message to Helpers.format, to prevent it from being included. --- lib/ronin/ui/output/helpers.rb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/ronin/ui/output/helpers.rb b/lib/ronin/ui/output/helpers.rb index a08e41785..51fc13ad9 100644 --- a/lib/ronin/ui/output/helpers.rb +++ b/lib/ronin/ui/output/helpers.rb @@ -132,7 +132,7 @@ def printf(format,*data) # def print_info(*message) unless Output.silent? - Output.handler.print_info(format_message(message)) + Output.handler.print_info(Helpers.format(message)) return true end @@ -157,7 +157,7 @@ def print_info(*message) # def print_debug(*message) if (Output.verbose? && !(Output.silent?)) - Output.handler.print_debug(format_message(message)) + Output.handler.print_debug(Helpers.format(message)) return true end @@ -185,7 +185,7 @@ def print_debug(*message) # def print_warning(*message) unless Output.silent? - Output.handler.print_warning(format_message(message)) + Output.handler.print_warning(Helpers.format(message)) return true end @@ -213,7 +213,7 @@ def print_warning(*message) # def print_error(*message) unless Output.silent? - Output.handler.print_error(format_message(message)) + Output.handler.print_error(Helpers.format(message)) return true end @@ -265,15 +265,13 @@ def print_exception(exception) # @return [String] # The formatted message. # - # @since 1.0.0 - # # @api private # - def format_message(message) - unless message.length == 1 - message.first % message[1..-1] + def Helpers.format(arguments) + unless arguments.length == 1 + arguments.first % arguments[1..-1] else - message.first + arguments.first end end end