logm 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8268e85c780fcb505648e7f36ef915b0b82a253907148a2f95485a690bef294
-  data.tar.gz: 90042d98654e802e6c694de035297c120c2fbc74c65a0d69f95a330d3927a312
+  metadata.gz: 4dca096ee5abe2f77c4f7ff1e746d3a62392ff51cdad344aded0d170abcc4aaa
+  data.tar.gz: cdb8027b35fe79d15be8918ab52f8e10a616528755c9d07c8bb2952c0bc58f36
 SHA512:
-  metadata.gz: e6966a36051254dee8b55b0196250b4d682f8e136f8da76525dbab6a045953873915d541523827e74f8d6e6b7a4c0760f0758a4da94d1f2fa5ecedb953bfa340
-  data.tar.gz: 3d163efc23ee1868c288074ab553dbc2622fbc8b17b1401213eea97b6e7e77e4e9eddba2988de6274164931b8a2932f3698562fd118cc9f18fd143b49db3e439
+  metadata.gz: 665aad4a847b0de8537c0e0e137d401165f0dc62014a4b79123f871838dff4a46acdc142c0a7340b25f58e9e9394281863ccbb3308ea1b32c3c2451b68d2f9b6
+  data.tar.gz: 6657a1b8d915cfb2e07fb2eebfde55c88032b2b4c0fbcd81dde2f2bac792fc01f655788d0d8468c863d2113a841092553746aac3db63c7d5f34ccd1df1f45b40

data/bin/logm

@@ -11,10 +11,14 @@ OptionParser.new do |opts|
   opts.on("-eENDTIME", "--endTime=ENDTIME", "endTime") do |time|
      options[:endTime] = time
   end
+  opts.on("-a", "--autotag", "endTime") do
+     options[:autotag] = true
+  end
 end.parse!
 
 options[:startTime] ||= Time.at(0)
 options[:endTime] ||= Time.at(2000000000000)
+options[:autotag] ||= false
 
-merge = LogMerge.new(ARGV, options[:startTime], options[:endTime])
+merge = LogMerge.new(ARGV, options[:startTime], options[:endTime], options[:autotag])
 merge.merge

data/lib/logmerge.rb

@@ -36,7 +36,7 @@ end
 
 class Log
   attr_accessor :file, :line, :next, :offet, :tag, :timestamp, :next_timestamp, :finished
-  def initialize(path)
+  def initialize(path, autotag=false)
     @offset = 0
     if path.include?(':')
       parts = path.split(':')
@@ -46,6 +46,9 @@ class Log
         @tag = parts[2]
       end
     end
+    if @tag.nil? && autotag
+      @tag = File.basename(path)
+    end
     @file = File.open(path)
     @finished = false
     buffer
@@ -79,12 +82,8 @@ class Log
     elsif current =~ /^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\d[+-]\d\d\d\d/
       current[0...28] = "[#{timestamp.to_s}]"
     end
-    current
-  end
-
-  def append(current, timestamp=nil)
     current.prepend("[#{@tag}]") if @tag && timestamp
-    @line.push(current)
+    current
   end
 
   def buffer
@@ -102,7 +101,7 @@ class Log
       # puts "current: #{current}"
       @timestamp = parseTimestamp(current)
       # puts "timestamp: #{@timestamp}"
-      append(current, @timestamp)
+      @line.push(current)
       timestamp_index = timestamp_index + 1 if @timestamp.nil?
     end
 
@@ -115,7 +114,7 @@ class Log
       next_timestamp = parseTimestamp(current)
       # puts "next_timestamp: #{next_timestamp}"
       file.unreadline(current + "\n") && break unless next_timestamp.nil?
-      append(current)
+      @line.push(current)
     end
   rescue EOFError
     @finished = true if @line.empty?
@@ -130,8 +129,8 @@ end
 
 class LogMerge
   attr_reader :logs, :startTime, :endTime
-  def initialize(files, startTime=Time.at(0), endTime=Time.at(2000000000000))
-    @logs = files.map {|f| Log.new(f)}
+  def initialize(files, startTime=Time.at(0), endTime=Time.at(2000000000000), autotag=false)
+    @logs = files.map {|f| Log.new(f, autotag)}
     @startTime = DateTime.parse(startTime.to_s)
     @endTime = DateTime.parse(endTime.to_s)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logm
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Peter Vertenten