logmerge 1.0.2 → 1.0.3

data/Rakefile

@@ -7,7 +7,7 @@ $VERBOSE = nil
 
 spec = Gem::Specification.new do |s|
   s.name = 'logmerge'
-  s.version = '1.0.2'
+  s.version = '1.0.3'
   s.summary = 'Resolves IP addresses and merges Apache access logs.'
   s.authors = [ 'Eric Hodel', 'Klaas Jan Wierenga' ]
   s.email = [ 'eric@robotcoop.com', 'k.j.wierenga@gmail.com' ]

data/lib/logmerge/merger.rb

@@ -1,6 +1,7 @@
 $TESTING = defined? $TESTING
 
 require 'logmerge'
+require 'zlib'
 
 ##
 # Merges multiple Apache log files by date.
@@ -12,7 +13,13 @@ class LogMerge::Merger
 
   def self.merge(output = STDOUT, *files)
     files = ARGV if files.empty?
-    merger = LogMerge::Merger.new files.map { |file| File.open file }
+    merger = LogMerge::Merger.new files.map { |file|
+      if file =~ /\.gz$/
+        Zlib::GzipReader.open file
+      else
+        File.open file
+      end
+    }
     merger.merge output
   end
 

data/test/test_merger.rb

@@ -102,6 +102,61 @@ class TestMerger < Test::Unit::TestCase
     assert_equal true, merger.all_closed?
     assert_equal expected, output.string
   end
+  
+  def test_merge_files
+    require 'tempfile'
+    file1 = Tempfile.open('gzip_file1')
+    file1.puts " [17/Jan/2006:00:00:02 -0800] "
+    file1.close
+    
+    file2 = Tempfile.open('gzip_file2')
+    file2.puts " [17/Jan/2006:00:00:01 -0800] "
+    file2.close
+    
+    # puts file1.path, file2.path
+    # STDOUT.flush
+    
+    output = StringIO.new
+    LogMerge::Merger.merge output, *[file1.path, file2.path]
+    
+    expected = <<-EOF
+ [17/Jan/2006:00:00:01 -0800] 
+ [17/Jan/2006:00:00:02 -0800] 
+EOF
+
+    assert_equal expected, output.string
+  end
+
+  def test_merge_gzip_files
+    begin
+      require 'tempfile'
+      file1 = Tempfile.new('logmerge_test1')
+      gzipped_file1 = file1.path + '.gz'
+      Zlib::GzipWriter.open(gzipped_file1) do |gz|
+        gz.write " [17/Jan/2006:00:00:02 -0800] \n"
+      end
+
+      file2 = Tempfile.new('logmerge_test2')
+      gzipped_file2 = file2.path + '.gz'
+      Zlib::GzipWriter.open(gzipped_file2) do |gz|
+        gz.write " [17/Jan/2006:00:00:01 -0800] \n"
+      end
+    
+      gzipped_files = [ gzipped_file1, gzipped_file2 ]
+    
+      output = StringIO.new
+      LogMerge::Merger.merge output, *gzipped_files
+    
+      expected = <<-EOF
+ [17/Jan/2006:00:00:01 -0800] 
+ [17/Jan/2006:00:00:02 -0800] 
+EOF
+
+      assert_equal expected, output.string
+    ensure
+      File.unlink(*gzipped_files)
+    end
+  end
 
 end
 

data/test/test_resolver.rb

@@ -142,7 +142,7 @@ class TestResolver < Test::Unit::TestCase
 
     assert_equal ['0.0.0.0'], @resolver.failures
 
-    assert_equal ['0.0.0.0', '65.61.137.67'], @resolver.cache.keys
+    assert_equal ['0.0.0.0', '65.61.137.67'].sort, @resolver.cache.keys.sort
     assert_equal 0, @resolver.cache['0.0.0.0'].last
     assert_operator 0, :<, @resolver.cache['65.61.137.67'].last
   end
@@ -156,8 +156,7 @@ class TestResolver < Test::Unit::TestCase
 
     assert_equal ['0.0.0.0'], @resolver.failures
 
-    assert_equal ['0.0.0.0', '65.61.137.67', '65.61.137.68'],
-                 @resolver.cache.keys
+    assert_equal ['0.0.0.0', '65.61.137.67', '65.61.137.68'].sort, @resolver.cache.keys.sort
     assert_equal 0, @resolver.cache['0.0.0.0'].last
     assert_operator 0, :<, @resolver.cache['65.61.137.67'].last
     assert_equal 0, @resolver.cache['65.61.137.68'].last

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logmerge
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Eric Hodel
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 +02:00
+date: 2010-06-02 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -60,23 +61,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Resolves IP addresses and merges Apache access logs.