indy 0.1.3 → 0.1.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.4 / 2011-01-19
+
+* Add support for Ruby 1.8.5
+
 === 0.1.3 / 2011-01-18
 
 * Faster (than a turtle)

data/indy.gemspec

@@ -30,14 +30,14 @@ Gem::Specification.new do |s|
   s.name        = 'indy'
   s.version     = ::Indy::VERSION
   s.authors     = ["Franklin Webber","Brandon Faloona"]
-  s.description = %{ Indy is a log archelogy tool explore logs like objects and search by field and/or time.}
-  s.summary     = "Log Search Tool"
+  s.description = %{ Indy is a log archelogy library that treats logs like data structures. Search fixed format or custom logs by field and/or time. }
+  s.summary     = "Log Search Library"
   s.email       = 'franklin.webber@gmail.com'
   s.homepage    = "http://github.com/burtlo/Indy"
   s.license     = 'MIT'
 
   s.platform    = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 1.8.5'
   s.add_dependency('activesupport', '>= 2.3.5')
 
   s.add_development_dependency('cucumber', '>= 0.9.2')

data/lib/indy/indy.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext'
 
 class Indy
 
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 
   #
   # hash with one key (:string, :file, or :cmd) set to the string that defines the log
@@ -296,7 +296,7 @@ class Indy
     time_search = use_time_criteria?
 
     source_io = open_source
-    results = source_io.each.collect do |line|
+    results = source_io.collect do |line|
 
       hash = parse_line(line)
 
@@ -356,8 +356,10 @@ class Indy
   #
   def parse_line( line )
 
-    if /#{@log_regexp}/.match(line)
-      values = /#{@log_regexp}/.match(line).captures
+    match_data = /#{@log_regexp}/.match(line)
+
+    if match_data
+      values = match_data.captures
       raise "Field mismatch between log pattern and log data. The data is: '#{values.join(':::')}'" unless values.length == @log_fields.length
 
       hash = Hash[ *@log_fields.zip( values ).flatten ]

data/spec/indy_spec.rb

@@ -30,7 +30,7 @@ describe Indy do
         :source => "1-13-2000 yes",
         :pattern => ['^([^\s]+) (\w+)$', :time, :message]}
       lambda{ @indy = Indy.search( hash ) }.should_not raise_error
-      @indy.for(:all).count.should == 1
+      @indy.for(:all).length.should == 1
     end
 
 
@@ -156,7 +156,7 @@ describe Indy do
     end
 
     it "should find all 3 rows" do
-      @indy.for(:all).count.should == 3
+      @indy.for(:all).length.should == 3
     end
 
   end
@@ -181,7 +181,7 @@ describe Indy do
     end
 
     it "with() should use default log pattern when passed :default" do
-      @indy.with(:default).for(:all).count.should == 3
+      @indy.with(:default).for(:all).length.should == 3
     end
 
     it "with() should accept no params without error" do

data/spec/log_format_spec.rb

@@ -43,13 +43,13 @@ describe Indy do
       it "#{format[:name]} should work" do
         indy = Indy.new(:source => format[:source], :pattern => [format[:regexp],format[:fields]].flatten)
         result = indy.for(format[:test_field] => 'louie')
-        result.count.should == 1
+        result.length.should == 1
       end
 
       it "#{format[:name]} @pattern can be set to the Indy::LogFormat const" do
         indy = Indy.new(:source => format[:source], :pattern => eval('Indy::' + format[:name].upcase))
         result = indy.for(format[:test_field] => 'louie')
-        result.count.should == 1
+        result.length.should == 1
 
       end
     end

data/spec/time_spec.rb

@@ -15,19 +15,135 @@ describe Indy do
 
     it "should parse dates when log includes non-conforming data" do
       logdata = [ "12-03-2000 message1",
-                  "13-03-2000 message2",
-                  "14-03-2000 ",
-                  " message4",
-                  "a14-03-2000 message5",
-                  "14-03-2000 message6\n\n\n\n",
-                  "15-03-2000 message7",
-                  "16-03-2000 message8\r\n",
-                  "17-03-2000 message9"].join("\n")
+        "13-03-2000 message2",
+        "14-03-2000 ",
+        " message4",
+        "a14-03-2000 message5",
+        "14-03-2000 message6\n\n\n\n",
+        "15-03-2000 message7",
+        "16-03-2000 message8\r\n",
+        "17-03-2000 message9"].join("\n")
       @indy = Indy.new(:source => logdata, :pattern => ['^(\d[^\s]+\d) (.+)$', :time, :message])
       @indy.after(:time => '13-03-2000')
-      @indy.for(:all).count.should == 4
+      @indy.for(:all).length.should == 4
     end
 
+  end
+
+  context "search time scope" do
+
+    before(:each) do
+      @indy = Indy.search(
+        [ "2000-09-07 14:07:41 INFO  MyApp - Entering APPLICATION.",
+          "2000-09-07 14:07:42 INFO  MyApp - Initializing APPLICATION.",
+          "2000-09-07 14:07:43 INFO  MyApp - Configuring APPLICATION.",
+          "2000-09-07 14:07:44 INFO  MyApp - Running APPLICATION.",
+          "2000-09-07 14:07:45 INFO  MyApp - Exiting APPLICATION."
+        ].join("\n") )
+    end
+
+    context "after method" do
+
+      it "should find the correct entries" do
+        @indy.after(:time => '2000-09-07 14:07:42').for(:all).count.should == 3
+      end
+
+      it "should find 0 entries with a time that is past the log" do
+        @indy.after(:time => '2000-09-07 14:07:46').for(:all).length.should == 0
+      end
+
+      it "should find all entries with a time that is before the log" do
+        @indy.after(:time => '2000-09-07 14:07:40').for(:all).length.should == 5
+      end
+
+      it "should find entries using inclusive" do
+        @indy.after(:time => '2000-09-07 14:07:42', :inclusive => true).for(:all).length.should == 4
+      end
+
+    end
+
+    context "before method" do
+
+      it "should find the correct entries" do
+        @indy.before(:time => '2000-09-07 14:07:44').for(:all).count.should == 3
+      end
+
+      it "should find 0 entries with a time that is before the log" do
+        @indy.before(:time => '2000-09-07 14:07:40').for(:all).length.should == 0
+      end
+
+      it "should find all entries with a time that is after the log" do
+        @indy.before(:time => '2000-09-07 14:07:47').for(:all).length.should == 5
+      end
+
+      it "should find entries using inclusive" do
+        @indy.before(:time => '2000-09-07 14:07:44', :inclusive => true).for(:all).length.should == 4
+      end
+
+    end
+
+    context "within method" do
+
+      it "should find the correct entries" do
+        @indy.within(:time => ['2000-09-07 14:07:41', '2000-09-07 14:07:43']).for(:all).count.should == 1
+      end
+
+      it "should find the correct entries using inclusive" do
+        @indy.within(:time => ['2000-09-07 14:07:41', '2000-09-07 14:07:43'], :inclusive => true).for(:all).count.should == 3
+      end
+
+    end
+
+  end
+
+  context "search time scopes with span" do
+
+    before(:each) do
+      @indy = Indy.search(
+        [ "2000-09-07 14:07:41 INFO  MyApp - Entering APPLICATION.",
+          "2000-09-07 14:08:41 INFO  MyApp - Initializing APPLICATION.",
+          "2000-09-07 14:09:41 INFO  MyApp - Configuring APPLICATION.",
+          "2000-09-07 14:10:50 INFO  MyApp - Running APPLICATION.",
+          "2000-09-07 14:11:42 INFO  MyApp - Exiting APPLICATION.",
+          "2000-09-07 14:12:15 INFO  MyApp - Exiting APPLICATION."
+        ].join("\n") )
+    end
+
+    it "using after should find the correct entries" do
+      @indy.after(:time => '2000-09-07 14:07:42', :span => 1).for(:all).count.should == 1
+    end
+
+    it "using before should find the correct entries" do
+      @indy.before(:time => '2000-09-07 14:12:00', :span => 4).for(:all).count.should == 4
+    end
+
+    it "using around should find the correct entries" do
+      puts @indy.around(:time => '2000-09-07 14:11:00', :span => 2).inspect
+      @indy.for(:all).count.should == 3
+    end
+
+    it "using after and inclusive should find the correct entries" do
+      @indy.after(:time => '2000-09-07 14:07:41', :span => 1, :inclusive => true).for(:all).count.should == 1
+    end
+
+  end
+
+  context "multiple time scope methods on the same instance" do
+
+    before(:all) do
+      @indy = Indy.search(
+        [ "2000-09-07 14:07:41 INFO  MyApp - Entering APPLICATION.",
+          "2000-09-07 14:07:42 INFO  MyApp - Initializing APPLICATION.",
+          "2000-09-07 14:07:43 INFO  MyApp - Configuring APPLICATION.",
+          "2000-09-07 14:07:44 INFO  MyApp - Running APPLICATION.",
+          "2000-09-07 14:07:45 INFO  MyApp - Exiting APPLICATION."
+        ].join("\n") )
+    end
+
+    it "should find the correct entries" do
+      @indy.after(:time => '2000-09-07 14:07:42').for(:all).length.should == 3
+      @indy.before(:time => '2000-09-07 14:07:43').for(:all).length.should == 2
+    end
 
   end
 
@@ -58,7 +174,7 @@ describe Indy do
     end
 
     it "should accept standard time format searches even while using an explicit log time format" do
-      @indy.after(:time => 'Jan 13 2002').for(:all).count.should == 2
+      @indy.after(:time => 'Jan 13 2002').for(:all).length.should == 2
       @indy.after(:time => 'Jan 14 2002').for(:all).last._time.mday.should == 15
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: indy
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: 19
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Franklin Webber
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 -08:00
+date: 2011-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -163,7 +163,7 @@ dependencies:
         version: 2.5.0
   type: :development
   version_requirements: *id009
-description: " Indy is a log archelogy tool explore logs like objects and search by field and/or time."
+description: " Indy is a log archelogy library that treats logs like data structures. Search fixed format or custom logs by field and/or time. "
 email: franklin.webber@gmail.com
 executables: []
 
@@ -221,7 +221,7 @@ has_rdoc: true
 homepage: http://github.com/burtlo/Indy
 licenses: 
 - MIT
-post_install_message: "\n    [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>]\n\n    Thank you for installing Indy 0.1.3 / 2011-01-18.\n\n    Changes:\n      \n  * Faster (than a turtle)\n  * Lighter (than a tank)\n  \n\n    [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>]\n\n  "
+post_install_message: "\n    [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>]\n\n    Thank you for installing Indy 0.1.4 / 2011-01-19.\n\n    Changes:\n      \n  * Add support for Ruby 1.8.5\n  \n\n    [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>]\n\n  "
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -231,12 +231,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
+      hash: 61
       segments: 
       - 1
       - 8
-      - 7
-      version: 1.8.7
+      - 5
+      version: 1.8.5
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -249,9 +249,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Log Search Tool
+summary: Log Search Library
 test_files: []