log_slice 0.3 → 0.4

data/bin/log_slice_date

@@ -1,17 +1,25 @@
 #!/usr/bin/env ruby
 require 'date'
 require File.expand_path("../lib/log_slice", File.dirname(__FILE__))
-find_date = begin
-  DateTime.parse(ARGV[0])
-rescue
-  $stderr.puts "USAGE:   #{$0} DATE FILEPATH\n\n"
-  $stderr.puts "EXAMPLE: #{$0} '2012-08-31 12:00:00' /tmp/something.log\n\n"
+if ARGV.length < 2
+  $stderr.puts "USAGE:   #{$0} DATE [END_DATE] FILEPATH\n\n"
+  $stderr.puts "EXAMPLE: #{$0} '2012-08-31 12:00:00' /tmp/something.log\n"
+  $stderr.puts "EXAMPLE: #{$0} '2012-08-31 12:00:00' '2012-08-31 12:05:00' /tmp/something.log\n"
   $stderr.puts "Expects log lines to contain a DateTime string enclosed in [square brackets] \n\n"
-  $stderr.puts "Could not parse date argument\n\n"
-  raise
 end
-file = LogSlice.new(ARGV[1]).find do |line|
-    date_string = line.match(/\[([^\]]+)\]/)[1]
-    find_date <=> DateTime.parse(date_string)
+
+start_date = ARGV[0]
+(end_date, file) = begin
+  if ARGV.length == 2
+    [nil, ARGV[1]]
+  else
+    [ARGV[1], ARGV[2]]
+  end
+end
+
+begin
+  LogSlice::DateRange.new(file, start_date, end_date).each do |line|
+    puts line
+  end
+rescue Errno::EPIPE
 end
-puts file.readline until file.eof?

data/lib/log_slice/date_range.rb

@@ -0,0 +1,37 @@
+require 'date'
+
+class LogSlice
+  class DateRange
+
+    # @param file [File, String]
+    # @param start_date [DateTime, String]
+    # @param end_date [DateTime, String, nil]
+    def initialize file, start_date, end_date=nil
+      @file = file
+      @start_date = start_date.is_a?(DateTime) ? start_date : DateTime.parse(start_date)
+      @end_date = (end_date.is_a?(DateTime) || end_date.nil?) ? end_date : DateTime.parse(end_date)
+    end
+
+    def each
+      file = LogSlice.new(@file).find do |line|
+        date_compare @start_date, line
+      end
+      begin
+        line = file.readline
+        if @end_date.nil? || date_compare(@end_date, line) == 1
+          yield line
+        else
+          break
+        end
+      end until file.eof?
+    end
+
+    private
+
+    def date_compare date, line
+      date_string = line.match(/\[([^\]]+)\]/)[1]
+      date <=> DateTime.parse(date_string)
+    end
+
+  end
+end

data/lib/log_slice.rb

@@ -1,4 +1,5 @@
 require File.expand_path("log_slice/search_boundary", File.dirname(__FILE__))
+require File.expand_path("log_slice/date_range", File.dirname(__FILE__))
 
 class LogSlice
 

data/log_slice.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'log_slice'
-  s.version     = '0.3'
+  s.version     = '0.4'
   s.authors     = ["Joel Plane"]
   s.email       = ["joel.plane@gmail.com"]
   s.homepage    = 'https://github.com/joelplane/log_slice'

data/spec/helper.rb

@@ -4,7 +4,7 @@ RSpec.configure do |c|
   c.include(Module.new do
 
     def enumerable_to_file range
-      file = Tempfile.new("test-#{range}")
+      file = Tempfile.new("test-enum")
       file.write(range.to_a.join("\n"))
       file.flush
       file.seek(0)

data/spec/log_slice_date_range_spec.rb

@@ -0,0 +1,48 @@
+require File.expand_path('../lib/log_slice', File.dirname(__FILE__))
+require 'helper'
+
+describe LogSlice::DateRange do
+
+  let(:file_contents) {
+    %{
+[2012-08-31 17:19:45] test 1
+[2012-08-31 17:19:57] test 2
+[2012-08-31 17:19:57] test 3
+[2012-08-31 17:20:12] test 4
+[2012-08-31 17:20:24] test 5
+[2012-08-31 17:20:35] test 6
+[2012-08-31 17:21:02] test 7
+[2012-08-31 17:21:09] test 8
+    }.strip
+  }
+
+  it "works" do
+    start_date = '2012-08-31 17:20:00'
+    end_date = '2012-08-31 17:21:00'
+    lines = []
+    LogSlice::DateRange.new(string_to_file(file_contents), start_date, end_date).each do |line|
+      lines << line.strip
+    end
+    lines.should == [
+      "[2012-08-31 17:20:12] test 4",
+      "[2012-08-31 17:20:24] test 5",
+      "[2012-08-31 17:20:35] test 6"
+    ]
+  end
+
+  it "works without an end date" do
+    start_date = '2012-08-31 17:20:00'
+    lines = []
+    LogSlice::DateRange.new(string_to_file(file_contents), start_date, nil).each do |line|
+      lines << line.strip
+    end
+    lines.should == [
+      "[2012-08-31 17:20:12] test 4",
+      "[2012-08-31 17:20:24] test 5",
+      "[2012-08-31 17:20:35] test 6",
+      "[2012-08-31 17:21:02] test 7",
+      "[2012-08-31 17:21:09] test 8"
+    ]
+  end
+
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: log_slice
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Joel Plane
@@ -45,9 +45,11 @@ files:
 - README.md
 - bin/log_slice_date
 - lib/log_slice.rb
+- lib/log_slice/date_range.rb
 - lib/log_slice/search_boundary.rb
 - log_slice.gemspec
 - spec/helper.rb
+- spec/log_slice_date_range_spec.rb
 - spec/log_slice_spec.rb
 homepage: https://github.com/joelplane/log_slice
 licenses: []