0
@@ -61,7 +61,8 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
0
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
0
   p.extra_deps = [
0
     ["main", "~> 2.8.0"],
0
-    ["open4", "~> 0.9.6"]
0
+    ["open4", "~> 0.9.6"],
0
+    ["log4r", "~> 1.0.5"]
0
   ]
0
 
0
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.

0
@@ -1,4 +1,5 @@
0
 require "main"
0
+require "log4r"
0
 require "piston/version"
0
 require "piston/commands"
0
 
0
@@ -61,12 +62,12 @@ Main {
0
 
0
     logger_level Logger::DEBUG
0
     def run
0
+      configure_logging!
0
+
0
       if params["revision"].given? && params["commit"].given? then
0
         raise ArgumentError, "Only one of --revision or --commit can be given.  Received both."
0
       end
0
 
0
-      set_loggers!
0
-
0
       cmd = Piston::Commands::Import.new(:lock => params["lock"].value,
0
                                          :verbose => params["verbose"].value,
0
                                          :quiet => params["quiet"].value,
0
@@ -92,9 +93,17 @@ Main {
0
     end
0
   end
0
 
0
-  def set_loggers!
0
-    Piston::Repository.logger = logger
0
-    Piston::WorkingCopy.logger = logger
0
-    Piston::Commands::Base.logger = logger
0
+  def configure_logging!
0
+    Log4r::Logger.root.level = Log4r::DEBUG
0
+
0
+    Log4r::Logger.new("main", Log4r::DEBUG)
0
+    Log4r::Logger.new("handler", Log4r::DEBUG)
0
+    Log4r::Logger.new("handler::backend", Log4r::DEBUG)
0
+
0
+    Log4r::StderrOutputter.new("console", :level => Log4r::WARN)
0
+    Log4r::StdoutOutputter.new("main", :level => params["verbose"].value ? Log4r::DEBUG : Log4r::INFO)
0
+
0
+    Log4r::Logger["main"].add "console", "main"
0
+    Log4r::Logger["handler"].add "console", "main"
0
   end
0
 }

0
@@ -2,12 +2,8 @@ module Piston
0
   module Commands
0
     class Base
0
       class << self
0
-        def logger=(logger)
0
-          @@logger = logger
0
-        end
0
-
0
         def logger
0
-          @@logger
0
+          @@logger ||= Log4r::Logger["main"]
0
         end
0
       end
0
 

0
@@ -6,12 +6,7 @@ module Piston
0
 
0
     class << self
0
       def logger
0
-        @@logger
0
-      end
0
-
0
-      def logger=(logger)
0
-        @@logger = logger
0
-        Piston::Revision.logger = @@logger
0
+        @@logger ||= Log4r::Logger["handler"]
0
       end
0
 
0
       def guess(url)

0
@@ -3,12 +3,8 @@ module Piston
0
     include Enumerable
0
 
0
     class << self
0
-      def logger=(logger)
0
-        @@logger = logger
0
-      end
0
-
0
       def logger
0
-        @@logger
0
+        @@logger ||= Log4r::Logger["handler"]
0
       end
0
     end
0
 

0
@@ -3,12 +3,8 @@ module Piston
0
     class UnhandledWorkingCopy < RuntimeError; end
0
 
0
     class << self
0
-      def logger=(logger)
0
-        @@logger = logger
0
-      end
0
-
0
       def logger
0
-        @@logger
0
+        @@logger ||= Log4r::Logger["handler"]
0
       end
0
 
0
       def guess(path)

0
@@ -1,7 +1,7 @@
0
 require "test/unit"
0
 require "rubygems"
0
 require "mocha"
0
-require "logger"
0
+require "log4r"
0
 
0
 require File.dirname(__FILE__) + "/../config/requirements"
0
 
0
@@ -19,7 +19,7 @@ module Test
0
     class TestCase
0
       class << self
0
         def logger
0
-          @@logger ||= Logger.new("log/test.log")
0
+          @@logger ||= Log4r::Logger["test"]
0
         end
0
       end
0
 
0
@@ -30,8 +30,18 @@ module Test
0
   end
0
 end
0
 
0
-Pathname.new(File.dirname(__FILE__) + "/../log").mkdir rescue nil
0
-Piston::WorkingCopy.logger =
0
-  Piston::Repository.logger =
0
-  Piston::Commands::Base.logger =
0
-  Test::Unit::TestCase.logger
0
+LOG_DIR = Pathname.new(File.dirname(__FILE__) + "/../log")
0
+LOG_DIR.mkdir rescue nil
0
+
0
+Log4r::Logger.root.level = Log4r::DEBUG
0
+
0
+Log4r::Logger.new("main", Log4r::DEBUG)
0
+Log4r::Logger.new("handler", Log4r::DEBUG)
0
+Log4r::Logger.new("handler::backend", Log4r::DEBUG)
0
+Log4r::Logger.new("test", Log4r::DEBUG)
0
+
0
+Log4r::FileOutputter.new("log", :trunc => true, :filename => (LOG_DIR + "test.log").realpath.to_s)
0
+
0
+Log4r::Logger["main"].add "log"
0
+Log4r::Logger["handler"].add "log"
0
+Log4r::Logger["test"].add "log"