win32-autogui 0.4.1 → 0.4.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    win32-autogui (0.4.1)
+    win32-autogui (0.4.2)
       log4r (>= 1.1.9)
       win32-clipboard (= 0.5.2)
       win32-process (= 0.6.4)

data/HISTORY.markdown

@@ -6,6 +6,10 @@ Most recent changes are at the top
 Changes
 -------
 
+### 0.4.2 - 02/07/2011 ###
+
+* Add logger.trunc attribute to control log truncation, defaults to true
+
 ### 0.4.1 - 02/03/2011 ###
 
 * Window.wait_for_close yields if a block is given allowing callbacks during

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/win32/autogui/application.rb

@@ -103,7 +103,7 @@ class Application
     #
     # @example initialize with logging to file at the default WARN level  (STDOUT logging is the default)
     #
-    #   app = Application.new :name => "calc", :logger_logfile => 'log/calc.log'
+    #   app = Application.new :name => "calc", :logger_logfile => 'log/calc.log', :logger_trunc => false
     #
     # @example initialize with logging to file at DEBUG level
     #
@@ -122,6 +122,7 @@ class Application
     # @option options [Number] :parameters command line parameters used by Process.create
     # @option options [Number] :create_process_timeout (10) timeout in seconds to wait for the create_process to return
     # @option options [Number] :main_window_timeout (10) timeout in seconds to wait for main_window to appear
+    # @option options [String] :logger_trunc (true) truncate the logger logfile at logfile initialization
     # @option options [String] :logger_logfile (nil) initialize logger's output filename
     # @option options [String] :logger_level (Autogui::Logging::WARN) initialize logger's initial level
     #
@@ -138,6 +139,9 @@ def initialize(options = {})
       @parameters = options[:parameters]
 
       # logger setup
+      if options.include?(:logger_logfile)
+        logger.trunc = options.include?(:logger_trunc) ? options[:logger_trunc] : true
+      end
       logger.logfile = options[:logger_logfile] if options[:logger_logfile]
       logger.level = options[:logger_level] if options[:logger_level]
 

data/lib/win32/autogui/logging.rb

@@ -6,23 +6,34 @@
 #
 #   include Autogui::Logging
 #
+#   logger.trunc = false
 #   logger.filename = 'log/autogui.log'
 #   logger.warn "warning message goes to log file"
 #
 module Log4r
   class Logger
 
+    # @return [Boolean] truncate logfile
+    def trunc
+      @trunc.nil? ? true : @trunc
+    end
+
+    def trunc=(value)
+      raise "Setting trunc has no effect since logfile is already initialized" if @filename
+      @trunc = value
+    end
+
     # @return [String] filename of the logfile
     def logfile
       @filename
     end
 
     def logfile=(fn)
+      fn = nil if fn == ''
       if fn == nil
-        puts "removing log to file"
         remove(:logfile) if @filename
       else
-        FileOutputter.new(:logfile, :filename => fn, :trunc => true)
+        FileOutputter.new(:logfile, :filename => fn, :trunc => @trunc)
         Outputter[:logfile].formatter = Log4r::PatternFormatter.new(:pattern => "[%5l %d] %M [%t]")
         add(:logfile)
       end
@@ -73,6 +84,7 @@ def logger
     # Initialize the logger, defaults to log4r::Warn
     def init_logger
       log = Log4r::Logger.new(STANDARD_LOGGER)
+      log.trunc = true
 
       # sanity checks since we defined log4r's dynamic levels statically
       unless (Log4r::DEBUG == DEBUG) &&

data/spec/auto_gui/logging_spec.rb

@@ -16,7 +16,7 @@
       @application.close(:wait_for_close => true) if @application.running?
       @application.should_not be_running
     end
-    logger.remove(:logfile)
+    logger.logfile = nil
   end
   after(:all) do
     logger.add(:console)
@@ -24,12 +24,19 @@
 
   describe "to file" do
 
-    it "should truncate the log on create" do
+    it "should truncate the log on create by default" do
       get_file_contents(@logfile).should == 'the quick brown fox'
       @application = Calculator.new :logger_logfile => fullpath(@logfile)
       get_file_contents(@logfile).should == ''
     end
 
+    it "should not truncate the log on create if 'logger.trunc' is false" do
+      get_file_contents(@logfile).should == 'the quick brown fox'
+      @application = Calculator.new :logger_logfile => fullpath(@logfile), :logger_trunc => false
+      logger.trunc.should be_false
+      get_file_contents(@logfile).should == 'the quick brown fox'
+    end
+
     it "should not log unless 'logger.logfile' is set" do
       @application = Calculator.new
       get_file_contents(@logfile).should == 'the quick brown fox'
@@ -45,6 +52,7 @@
 
     it "should log warnings" do
       @application = Calculator.new :logger_logfile => fullpath(@logfile)
+      logger.trunc.should be_true
       get_file_contents(@logfile).should == ''
       logger.warn "warning message here"
       get_file_contents(@logfile).should match(/warning message here/)
@@ -64,6 +72,7 @@
       level_save = logger.level
       begin
         logger.level = Autogui::Logging::WARN
+        logger.trunc.should be_true
         get_file_contents(@logfile).should == ''
         logger.debug "debug message here 1"
         get_file_contents(@logfile).should_not match(/debug message here 1/)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: win32-autogui
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Robert Wahler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -05:00
+date: 2011-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency