logtwuncator 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.2 / 2008-01-16
+
+* Lock dependency to win32-service gem version 0.5.2, later version breaks. Will update later.
+
 == 0.1.1 / 2007-10-24
 
 * Some minor documentation updates

data/Rakefile

@@ -13,7 +13,7 @@ Hoe.new('logtwuncator', LogTwuncator::VERSION) do |p|
   p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
   p.remote_rdoc_dir = ''
-  p.extra_deps << ['win32-service', '>= 0.5.2']  
+  p.extra_deps << ['win32-service', '= 0.5.2']  
 end
 
 # vim: syntax=Ruby

data/lib/log_twuncator.rb

@@ -1,3 +1,3 @@
 class LogTwuncator
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/log_twuncator/daemon.rb

@@ -1,7 +1,8 @@
+gem 'win32-service', '=0.5.2'
+require 'win32/service'
 require 'yaml'
 require 'erb'
 require 'logger'
-require 'win32/service'
 require 'log_twuncator/truncator'
 require 'log_twuncator/options'
 

data/lib/log_twuncator/options.rb

@@ -3,7 +3,7 @@ require 'optparse'
 module LogTwuncator
   class Options
     
-    def self.parse(args = ARGV)
+    def self.parse(args = ARGV, validate = true)
       options = {}
       options[:delay] = 5      
       opts = OptionParser.new do |opts|
@@ -29,7 +29,7 @@ module LogTwuncator
         end
       end
       opts.parse!(args)
-      validate_options options
+      validate_options(options) if validate
       options
     end
     

data/lib/log_twuncator/service.rb

@@ -1,5 +1,6 @@
-require 'optparse'
+gem 'win32-service', '=0.5.2'
 require 'win32/service'
+require 'optparse'
 
 module LogTwuncator
   class ServiceCommand
@@ -31,17 +32,19 @@ module LogTwuncator
           opts.on("-N", "--name SERVICE_NAME", String, "Name of windows service") do |v|
             @options[:name] = v
           end
-        
-          opts.on("-c", "--config FILE", String, "Config file with log file truncation settings") do |v|
-            @options[:config] = v
-          end
-        
-          opts.on("-d", "--delay N", Integer, "Check files for truncation every N minutes") do |v|
-            @options[:delay] = v
-          end
-    
-          opts.on("-l", "--log FILE", String, "Log file for truncator") do |v|
-            @options[:log] = v
+          
+          if @command == 'install'
+            opts.on("-c", "--config FILE", String, "Config file with log file truncation settings") do |v|
+              @options[:config] = v
+            end
+          
+            opts.on("-d", "--delay N", Integer, "Check files for truncation every N minutes") do |v|
+              @options[:delay] = v
+            end
+      
+            opts.on("-l", "--log FILE", String, "Log file for truncator") do |v|
+              @options[:log] = v
+            end
           end
           
           opts.on_tail("-h", "--help", "Show this message") do
@@ -49,7 +52,7 @@ module LogTwuncator
             exit
           end
         end
-        opts.parse!(args)
+        opts.parse!(args)        
         validate_options
       rescue OptionParser::ParseError => e
         puts e
@@ -60,9 +63,11 @@ module LogTwuncator
     def validate_options
       errors = []
       errors << "Service name is required (switch -N)" unless @options[:name]
-      errors << "Delay is required (switch -d)" if !@options[:delay] && @command == 'install'      
-      errors << "Config file is required (switch -c)" if !@options[:config] && @command == 'install'
-      errors << "Config file does not exist" if @options[:config] && !FileTest.exists?(@options[:config])
+      if @command == 'install'
+        errors << "Delay is required (switch -d)" unless @options[:delay]
+        errors << "Config file is required (switch -c)" unless @options[:config]
+        errors << "Config file does not exist" if @options[:config] && !FileTest.exists?(@options[:config])
+      end    
       
       if errors.size > 0
         puts "Error found."

data/test/test_win32_file.rb

@@ -6,7 +6,7 @@ class TestWin32File < Test::Unit::TestCase
   def setup
     setup_paths_and_files
     @test_file = File.join(@log_path, 'test.txt')
-    @yesterday = yesterday = Time.now - 86400
+    @hour_ago = yesterday = Time.now - 3600
   end
   
   def test_set_file_time_with_no_changes
@@ -20,24 +20,24 @@ class TestWin32File < Test::Unit::TestCase
   def test_set_file_times_on_closed_file
     file = File.open(@test_file, File::CREAT)
     file.close    
-    LogTwuncator::Win32File.set_file_time(file.path, @yesterday, nil, nil)
-    assert_equal @yesterday.to_s, File.stat(file.path).ctime.to_s
-    LogTwuncator::Win32File.set_file_time(file.path, nil, @yesterday, nil)
-    assert_equal @yesterday.to_s, File.stat(file.path).atime.to_s
-    LogTwuncator::Win32File.set_file_time(file.path, nil, nil, @yesterday)
-    assert_equal @yesterday.to_s, File.stat(file.path).mtime.to_s
+    LogTwuncator::Win32File.set_file_time(file.path, @hour_ago, nil, nil)
+    assert_equal @hour_ago.to_s, File.stat(file.path).ctime.to_s
+    LogTwuncator::Win32File.set_file_time(file.path, nil, @hour_ago, nil)
+    assert_equal @hour_ago.to_s, File.stat(file.path).atime.to_s
+    LogTwuncator::Win32File.set_file_time(file.path, nil, nil, @hour_ago)
+    assert_equal @hour_ago.to_s, File.stat(file.path).mtime.to_s
   end
      
   def test_set_file_times_on_open_file
     File.open(@test_file, File::CREAT) do |file|      
-      LogTwuncator::Win32File.set_file_time(file.path, @yesterday, nil, nil)
-      assert_equal @yesterday.to_s, File.stat(file.path).ctime.to_s
+      LogTwuncator::Win32File.set_file_time(file.path, @hour_ago, nil, nil)
+      assert_equal @hour_ago.to_s, File.stat(file.path).ctime.to_s
       
       # FIXME: these fail and I think its because of the file interaction which changes the dates
-        # LogTwuncator::Win32File.set_file_time(file.path, nil, @yesterday, nil)
-      # assert_equal @yesterday.to_s, File.stat(file.path).atime.to_s
-      # LogTwuncator::Win32File.set_file_time(file.path, nil, nil, @yesterday)
-      # assert_equal @yesterday.to_s, File.stat(file.path).mtime.to_s
+        # LogTwuncator::Win32File.set_file_time(file.path, nil, @hour_ago, nil)
+      # assert_equal @hour_ago.to_s, File.stat(file.path).atime.to_s
+      # LogTwuncator::Win32File.set_file_time(file.path, nil, nil, @hour_ago)
+      # assert_equal @hour_ago.to_s, File.stat(file.path).mtime.to_s
     end
   end   
    

metadata

@@ -1,33 +1,46 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: logtwuncator
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-10-24 00:00:00 +10:00
-summary: A win32 log file truncator and archiver with windows service
-require_paths: 
-- lib
-email: adam.meehan@gmail.com
-homepage: "    by Adam Meehan (adam.meehan@gmail.com)"
-rubyforge_project: logtwuncator
-description: "It comes with a windows service to install and leave running to monitor  the directories you specify in the config file. The config file allows the specification of many directories to monitor for log file age and size.  File age is monitored by using the file creation date. In *nix programs like  logrotate the log file can be moved and recreated using POSIX signalling to  restart the process, and hence starting with a new file and creation date. On  windows this is not possible without getting really intimate with the running  process, so to get around it this program uses win32 API call to change the  created date after arching and truncating the file, leaving it in plave.  This seems to work fine with Rails and Apache but may cause problems  depending on how the running application has opened the log file to append  to it.   Please report any problems/suggestions you have.  Credits:"
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.1.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Adam Meehan
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-01-17 00:00:00 +11:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: win32-service
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.5.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+    version: 
+description: "It comes with a windows service to install and leave running to monitor  the directories you specify in the config file. The config file allows the specification of many directories to monitor for log file age and size.  File age is monitored by using the file creation date. In *nix programs like  logrotate the log file can be moved and recreated using POSIX signalling to  restart the process, and hence starting with a new file and creation date. On  windows this is not possible without getting really intimate with the running  process, so to get around it this program uses win32 API call to change the  created date after arching and truncating the file, leaving it in plave.  This seems to work fine with Rails and Apache but may cause problems  depending on how the running application has opened the log file to append  to it.   Please report any problems/suggestions you have.  Credits:"
+email: adam.meehan@gmail.com
+executables: 
+- log_twuncator_service
+- log_twuncator_daemon
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -48,42 +61,36 @@ files:
 - test/test_win32_file.rb
 - test/test_service.rb
 - test/test_helper.rb
-test_files: 
-- test/test_daemon.rb
-- test/test_helper.rb
-- test/test_service.rb
-- test/test_truncator.rb
-- test/test_win32_file.rb
+has_rdoc: true
+homepage: "    by Adam Meehan (adam.meehan@gmail.com)"
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-executables: 
-- log_twuncator_service
-- log_twuncator_daemon
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: win32-service
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: 
+rubyforge_project: logtwuncator
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: A win32 log file truncator and archiver with windows service
+test_files: 
+- test/test_service.rb
+- test/test_truncator.rb
+- test/test_win32_file.rb
+- test/test_helper.rb
+- test/test_daemon.rb