logmerge 1.0.0 → 1.0.2

data/LICENSE

@@ -1,5 +1,5 @@
-All original code copyright 2005 Eric Hodel, The Robot Co-op.  All rights
-reserved.
+All original code copyright 2005 Eric Hodel, The Robot Co-op, Klaas Jan Wierenga.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

data/README

@@ -1,6 +1,10 @@
 = logmerge
 
-Rubyforge Project:
+Logmerge is hosted on RubyGems.org starting with version 1.0.1
+
+http://rubygems.org/gems/logmerge
+
+(Original) Rubyforge Project:
 
 http://rubyforge.org/projects/rctools/
 

data/Rakefile

@@ -7,10 +7,16 @@ $VERBOSE = nil
 
 spec = Gem::Specification.new do |s|
   s.name = 'logmerge'
-  s.version = '1.0.0'
+  s.version = '1.0.2'
   s.summary = 'Resolves IP addresses and merges Apache access logs.'
-  s.author = 'Eric Hodel'
-  s.email = 'eric@robotcoop.com'
+  s.authors = [ 'Eric Hodel', 'Klaas Jan Wierenga' ]
+  s.email = [ 'eric@robotcoop.com', 'k.j.wierenga@gmail.com' ]
+  s.homepage = 'http://github.com/kjwierenga/logmerge'
+  s.description = "
+    Logmerge contains two utilities logmerge and ip2name.  logmerge merges Apache
+    access logs into one log ordered by date.  ip2name performs DNS lookups on
+    Apache access logs using multiple threads and Ruby's DNS resolver library to
+    speed through log files."
 
   s.files = File.read('Manifest.txt').split($/)
   s.require_path = 'lib'

data/bin/ip2name

@@ -1,4 +1,5 @@
-#!/usr/local/bin/ruby -w
+#!/usr/bin/env ruby -w
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'logmerge'
 

data/bin/logmerge

@@ -1,4 +1,5 @@
-#!/usr/local/bin/ruby -w
+#!/usr/bin/env ruby -w
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'logmerge'
 

data/lib/logmerge/merger.rb

@@ -23,8 +23,22 @@ class LogMerge::Merger
   def initialize(streams)
     @streams = streams
     @buf = []
-
-    @streams.each_index { |slot| buf_fill slot }
+    
+    # The next line causes failure when a stream is empty in the
+    # initial call to buf_fill. When @streams[slot].eof? == true buf_fill
+    # removes the element from from @streams and @buf causing the each_index
+    # iterator to terminate early.
+    #
+    #     @streams.each_index { |slot| buf_fill slot }
+    #
+    # Replace by
+    #
+    #     @streams.size.downto(1) { |slot| buf_fill slot-1 }
+    #
+    # which removes empty streams from the end of the @streams and @buf arrays
+    # making sure we iterate over all elements of @streams and @buf.
+
+    @streams.size.downto(1) { |slot| buf_fill slot-1 }
 
     @all_closed = @streams.empty?
   end

data/test/test_merger.rb

@@ -77,6 +77,27 @@ class TestMerger < Test::Unit::TestCase
  [17/Jan/2006:00:00:01 -0800] 
  [17/Jan/2006:00:00:02 -0800] 
     EOF
+ 
+    assert_equal true, merger.all_closed?
+    assert_equal expected, output.string
+  end
+  
+  def test_empty_files
+    require 'tempfile'
+    tf = Tempfile.new('test_empty_file')
+    tf.flush
+
+    stream1 = File.open(tf.path) # empty file1
+    stream2 = File.open(tf.path) # empty file2
+    stream3 = File.open(tf.path) # empty file3
+
+    merger = LogMerge::Merger.new [stream1, stream2, stream3]
+
+    output = StringIO.new
+
+    merger.merge output
+
+    expected = ""
 
     assert_equal true, merger.all_closed?
     assert_equal expected, output.string

metadata

@@ -1,32 +1,40 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11.6
-specification_version: 1
 name: logmerge
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2006-01-20 00:00:00 -08:00
-summary: Resolves IP addresses and merges Apache access logs.
-require_paths: 
-- lib
-email: eric@robotcoop.com
-homepage: 
-rubyforge_project: 
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
 - Eric Hodel
+- Klaas Jan Wierenga
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-05-04 00:00:00 +02:00
+default_executable: 
+dependencies: []
+
+description: |-
+  
+      Logmerge contains two utilities logmerge and ip2name.  logmerge merges Apache
+      access logs into one log ordered by date.  ip2name performs DNS lookups on
+      Apache access logs using multiple threads and Ruby's DNS resolver library to
+      speed through log files.
+email: 
+- eric@robotcoop.com
+- k.j.wierenga@gmail.com
+executables: 
+- ip2name
+- logmerge
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - LICENSE
 - Manifest.txt
@@ -42,18 +50,35 @@ files:
 - test/access.log
 - test/test_merger.rb
 - test/test_resolver.rb
-test_files: []
+has_rdoc: true
+homepage: http://github.com/kjwierenga/logmerge
+licenses: []
 
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: 
-- ip2name
-- logmerge
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
-dependencies: []
+rubyforge_project: 
+rubygems_version: 1.3.6
+signing_key: 
+specification_version: 3
+summary: Resolves IP addresses and merges Apache access logs.
+test_files: []