Clean up method signature on ask* methods

Author: justincampbell

lib/thor/shell/basic.rb

@@ -47,8 +47,13 @@ def padding=(value)
       #
       def ask(statement, *args)
         options = args.last.is_a?(Hash) ? args.pop : {}
+        color = args.first
 
-        options[:limited_to] ? ask_filtered(statement, options, *args) : ask_simply(statement, options, *args)
+        if options[:limited_to]
+          ask_filtered(statement, color, options)
+        else
+          ask_simply(statement, color, options)
+        end
       end
 
       # Say (print) something to the user. If the sentence ends with a whitespace
@@ -372,7 +377,7 @@ def as_unicode
         end
       end
 
-      def ask_simply(statement, options = {}, color=nil)
+      def ask_simply(statement, color, options)
         default = options[:default]
         message = [statement, ("(#{default.inspect})" if default), nil].uniq.join(" ")
         say(message, color)
@@ -389,11 +394,11 @@ def ask_simply(statement, options = {}, color=nil)
         end
       end
 
-      def ask_filtered(statement, options = {}, *args)
+      def ask_filtered(statement, color, options)
         answer_set = options[:limited_to]
         correct_answer = nil
         until correct_answer
-          answer = ask_simply("#{statement} #{answer_set.inspect}", options, *args)
+          answer = ask_simply("#{statement} #{answer_set.inspect}", color, options)
           correct_answer = answer_set.include?(answer) ? answer : nil
           answers = answer_set.map(&:inspect).join(", ")
           say("Your response must be one of: [#{answers}]. Please try again.") unless correct_answer