0
@@ -9,7 +9,13 @@
0
   version Piston::VERSION::STRING
0
 
0
   mixin :standard_options do
0
-    option("verbose", "v") { default false }
0
+    option("verbose", "v") { 
0
+      argument_optional
0
+      cast :integer
0
+      default 0
0
+      validate {|value| (0..5).include?(value)}
0
+      description "Verbosity level (0 to 5, 0 being the default)"
0
+    }
0
     option("quiet", "q") { default false }
0
     option("force") { default false }
0
     option("dry-run") { default false }
0
0
0
0
@@ -94,18 +100,52 @@
0
   end
0
 
0
   def configure_logging!
0
-    Log4r::Logger.root.level = params["verbose"].value ? Log4r::DEBUG : Log4r::INFO
0
+    Log4r::Logger.root.level =  Log4r::INFO
0
 
0
-    Log4r::Logger.new("main", Log4r::INFO)
0
-    Log4r::Logger.new("handler", Log4r::WARN)
0
-    Log4r::Logger.new("handler::client", Log4r::WARN)
0
-    Log4r::Logger.new("handler::client::out", Log4r::WARN)
0
+    case params["verbose"].value
0
+    when 0
0
+      main_level = Log4r::INFO
0
+      handler_level = Log4r::WARN
0
+      client_level = Log4r::WARN
0
+      client_out_level = Log4r::WARN
0
+      stdout_level = Log4r::INFO
0
+    when 1
0
+      main_level = Log4r::DEBUG
0
+      handler_level = Log4r::INFO
0
+      client_level = Log4r::WARN
0
+      client_out_level = Log4r::WARN
0
+      stdout_level = Log4r::DEBUG
0
+    when 2
0
+      main_level = Log4r::DEBUG
0
+      handler_level = Log4r::DEBUG
0
+      client_level = Log4r::INFO
0
+      client_out_level = Log4r::WARN
0
+      stdout_level = Log4r::DEBUG
0
+    when 3
0
+      main_level = Log4r::DEBUG
0
+      handler_level = Log4r::DEBUG
0
+      client_level = Log4r::DEBUG
0
+      client_out_level = Log4r::INFO
0
+      stdout_level = Log4r::DEBUG
0
+    when 4, 5
0
+      main_level = Log4r::DEBUG
0
+      handler_level = Log4r::DEBUG
0
+      client_level = Log4r::DEBUG
0
+      client_out_level = Log4r::DEBUG
0
+      stdout_level = Log4r::DEBUG
0
+    else
0
+      raise ArgumentError, "Did not expect verbosity to be outside 0..5: #{params["verbose"].value}"
0
+    end
0
 
0
-    Log4r::StderrOutputter.new("stderr", :level => Log4r::WARN)
0
-    Log4r::StdoutOutputter.new("stdout")
0
+    Log4r::Logger.new("main", main_level)
0
+    Log4r::Logger.new("handler", handler_level)
0
+    Log4r::Logger.new("handler::client", client_level)
0
+    Log4r::Logger.new("handler::client::out", client_out_level)
0
 
0
-    Log4r::Logger["main"].add "stdout", "stderr"
0
-    Log4r::Logger["handler"].add "stdout", "stderr"
0
+    Log4r::StdoutOutputter.new("stdout", :level => stdout_level)
0
+
0
+    Log4r::Logger["main"].add "stdout"
0
+    Log4r::Logger["handler"].add "stdout"
0
   end
0
 }