indy 0.2.0 → 0.3.0

data/spec/log_format_spec.rb

@@ -4,8 +4,8 @@ describe Indy do
 
   context "common logging format" do
 
-    common_log_pattern = {
-      :name => 'common_log_pattern',
+    common_log_format = {
+      :name => 'common_log_format',
       :source => ["127.0.0.1 - frank [10/Oct/2000:13:55:36 -0700] \"GET /apache_pb1.gif HTTP/1.0\" 200 2326",
                   "127.0.0.1 - louie [10/Oct/2000:13:55:37 -0700] \"GET /apache_pb2.gif HTTP/1.0\" 200 2327",
                   "127.0.0.1 - frank [10/Oct/2000:13:55:38 -0700] \"GET /apache_pb3.gif HTTP/1.0\" 404 300"].join("\n"),
@@ -14,8 +14,8 @@ describe Indy do
       :test_field => :authuser
     }
 
-    combined_log_pattern = {
-      :name => 'combined_log_pattern',
+    combined_log_format = {
+      :name => 'combined_log_format',
       :source => ["127.0.0.1 - frank [10/Oct/2000:13:55:36 -0700] \"GET /apache_pb1.gif HTTP/1.0\" 200 2326 \"http://www.example.com/start.html\" \"Mozilla/4.08 [en] (Win98; I ;Nav)\"",
                   "127.0.0.1 - louie [10/Oct/2000:13:55:37 -0700] \"GET /apache_pb2.gif HTTP/1.0\" 200 2327 \"http://www.example.com/start.html\" \"Mozilla/4.08 [en] (Win98; I ;Nav)\"",
                   "127.0.0.1 - frank [10/Oct/2000:13:55:38 -0700] \"GET /apache_pb3.gif HTTP/1.0\" 404 300 \"http://www.example.com/start.html\" \"Mozilla/4.08 [en] (Win98; I ;Nav)\""].join("\n"),
@@ -24,8 +24,8 @@ describe Indy do
       :test_field => :authuser
     }
 
-    log4r_default_pattern = {
-      :name => 'log4r_default_pattern',
+    log4r_default_format = {
+      :name => 'log4r_default_format',
       :source => ["DEBUG mylog: This is a message with level DEBUG",
                   " INFO mylog: This is a message with level INFO",
                   " WARN louie: This is a message with level WARN",
@@ -36,18 +36,18 @@ describe Indy do
       :test_field => :application
     }
     
-    [ common_log_pattern,
-      combined_log_pattern,
-      log4r_default_pattern ].each do |format|
+    [ common_log_format,
+      combined_log_format,
+      log4r_default_format ].each do |format|
       
       it "#{format[:name]} should work" do
-        indy = Indy.new(:source => format[:source], :pattern => [format[:regexp],format[:fields]].flatten)
+        indy = Indy.new(:source => format[:source], :log_format => [format[:regexp],format[:fields]].flatten)
         result = indy.for(format[:test_field] => 'louie')
         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))
+        indy = Indy.new(:source => format[:source], :log_format => eval('Indy::' + format[:name].upcase))
         result = indy.for(format[:test_field] => 'louie')
         result.length.should == 1
 

data/spec/multiline.log

@@ -0,0 +1,10 @@
+2000-09-07 14:07:41 INFO  MyApp - Entering application with data:
+multi-line data.
+2001-09-07 14:07:41 INFO  MyApp - Initializing application
+2002-09-07 14:07:42 INFO  MyApp - Exiting application with data:
+multi-line data (2003-09-07 14:07:42) ....
+
+    2004-09-07 14:07:42 even more data
+    end of multi-line data
+2005-09-07 14:07:43 INFO  MyApp - Entering application with data:
+multi-line data.

data/spec/search_spec.rb

@@ -24,40 +24,17 @@ describe Indy do
 
   end
 
-  context "file operations" do
-
-    before(:all) do
-    end
-
-    it "should open and close file once per search" do
-      file_path =  File.join( File.dirname(__FILE__), 'data.log')
-      file_io1 = File.open(file_path)
-      file_io2 = File.open(file_path)
-
-      File.should_receive( :exist? ).with(file_path).ordered.and_return(true)
-      File.should_receive( :open ).ordered.and_return( file_io1 )
-      file_io1.should_receive( :close ).ordered
-      File.should_receive( :open ).ordered.and_return( file_io2 )
-      file_io2.should_receive( :close ).ordered
-
-      @indy = Indy.search(file_path)
-      @indy.for(:all).length.should == 2
-      @indy.for(:all).length.should == 2
-    end
-
-  end
-
   context "search file" do
 
     before(:all) do
       @file = Tempfile.new('file_search_spec')
-      @file_path = @file.path
       @file.write([ "2000-09-07 14:07:41 INFO  MyApp - Entering APPLICATION.",
                     "2000-09-07 14:08:41 INFO  MyOtherApp - Exiting APPLICATION.",
                     "2000-09-07 14:10:55 INFO  MyApp - Exiting APPLICATION."
                   ].join("\n"))
       @file.flush
-      @indy = Indy.search(@file_path)
+      @file.rewind
+      @indy = Indy.search(:file => @file)
     end
 
     it "should return 2 records" do

data/spec/source_spec.rb

@@ -0,0 +1,85 @@
+require "#{File.dirname(__FILE__)}/helper"
+
+class Indy
+
+  describe Source do
+
+    it "should raise without parameter" do
+      lambda{ Source.new }.should raise_error( ArgumentError )
+    end
+
+    it "should raise with nil parameter" do
+      lambda{ Source.new(nil) }.should raise_error( Indy::Source::Invalid )
+    end
+
+    it "should raise with bad parameter" do
+      class NotString;end
+      lambda{ Source.new(NotString.new) }.should raise_error( Indy::Source::Invalid )
+    end
+
+    it "should return Indy::Source object" do
+      Source.new('logdata').class.should == Indy::Source
+    end
+
+    it "should respond to :open" do
+      Source.new('logdata').should respond_to(:open)
+    end
+
+    it "should respond to :num_lines" do
+      Source.new('logdata').should respond_to(:num_lines)
+    end
+
+    it "should respond to :lines" do
+      Source.new('logdata').should respond_to(:num_lines)
+    end
+
+    it "should handle Files" do
+      require 'tempfile'
+      Source.new(Tempfile.new('x')).class.should == Indy::Source
+    end
+
+    context "instance" do
+      
+      before(:each) do
+        log = [ "2000-09-07 14:07:41 INFO MyApp - Entering APPLICATION.",
+                "2000-09-07 14:07:42 DEBUG MyApp - Initializing APPLICATION.",
+                "2000-09-07 14:07:43 INFO MyApp - Exiting APPLICATION."
+              ].join("\n")
+        @source = Source.new(log)
+      end
+      
+      it "should return StringIO from :open" do
+        @source.open.class.should == StringIO
+      end
+
+      it "should return lines array from :lines" do
+        @source.lines.class.should == Array
+        @source.lines.length.should == 3
+      end
+
+      it "should return 3 from :num_lines" do
+        @source.num_lines.should == 3
+      end
+
+    end
+
+    it "should handle a :file hash key with File object value" do
+      require 'tempfile'
+      file = Tempfile.new('x')
+      Source.new(:file => file).class.should == Indy::Source
+    end
+
+    it "should handle a bare File object" do
+      require 'tempfile'
+      file = Tempfile.new('y')
+      Source.new(file).class.should == Indy::Source
+    end
+
+    it "should handle a real file" do
+      log_file = "#{File.dirname(__FILE__)}/data.log"
+      Indy.search(:file => File.open(log_file, 'r')).for(:application => 'MyApp').length.should == 2
+    end
+
+  end
+
+end

data/spec/time_spec.rb

@@ -23,7 +23,9 @@ describe Indy do
         "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 = Indy.new(
+        :source => logdata,
+        :log_format => ['^(\d[^\s]+\d) (.+)$', :time, :message])
       @indy.after(:time => '13-03-2000')
       @indy.for(:all).length.should == 4
     end
@@ -157,7 +159,8 @@ describe Indy do
 
     before(:all) do
       pattern = "(\w+) (\d{4}-\d{2}-\d{2}) (\w+) - (.*)"
-      @indy = Indy.new(:source => "INFO 2000-09-07 MyApp - Entering APPLICATION.", :pattern => [pattern, :severity, :time, :application, :message])
+      @indy = Indy.new(:source => "INFO 2000-09-07 MyApp - Entering APPLICATION.", 
+        :log_format => [pattern, :severity, :time, :application, :message])
     end
 
     it "should parse a non-standard date" do
@@ -171,7 +174,9 @@ describe Indy do
 
     before(:each) do
       pattern = "^([^\s]+) (.*)$"
-      @indy = Indy.new(:time_format => '%m-%d-%Y', :source => "1-13-2002 message\n1-14-2002 another message\n1-15-2002 another message", :pattern => [pattern, :time, :message])
+      @indy = Indy.new(:time_format => '%m-%d-%Y', 
+        :source => "1-13-2002 message\n1-14-2002 another message\n1-15-2002 another message",
+        :log_format => [pattern, :time, :message])
     end
 
     it "should parse a US style date when given a time format by using DateTime" do
@@ -198,7 +203,7 @@ describe Indy do
       @time_search_result = Indy.search(log_string).before(:time => "2020-09-07").for(:application => 'MyApp')
     end
 
-    it "should not exist as an attribute when unless performing a time search" do
+    it "should not exist as an attribute unless performing a time search" do
       @search_result.first._time.class.should == NilClass
       @time_search_result.first._time.class.should == Time
     end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: indy
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Franklin Webber
@@ -16,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -08:00
-default_executable: 
+date: 2011-08-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -27,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
         version: 2.3.5
   type: :runtime
   version_requirements: *id001
@@ -43,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
         version: 0.10.0
   type: :development
   version_requirements: *id002
@@ -59,12 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 6
-        - 4
-        version: 0.6.4
+        version: 0.7.2
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -75,11 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
   type: :development
   version_requirements: *id004
@@ -91,11 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
         version: 2.4.0
   type: :development
   version_requirements: *id005
@@ -107,11 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
         version: 2.4.0
   type: :development
   version_requirements: *id006
@@ -123,46 +87,42 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 0
-        - 3
         version: 0.0.3
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: simplecov
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
-        version: 0.9.9
+        version: 0.4.0
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: flog
+  name: ruby-debug19
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
+        version: 0.11.0
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: flog
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.5.0
+  type: :development
+  version_requirements: *id010
 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: brandon@faloona.net
 executables: []
@@ -205,10 +165,13 @@ files:
 - features/within_time.feature
 - indy.gemspec
 - lib/indy.rb
+- lib/indy/formats.rb
 - lib/indy/indy.rb
 - lib/indy/log_formats.rb
-- lib/indy/patterns.rb
+- lib/indy/notes.txt
 - lib/indy/result_set.rb
+- lib/indy/source.rb
+- lib/scanf.rb
 - performance/helper.rb
 - performance/profile_spec.rb
 - spec/data.log
@@ -216,14 +179,15 @@ files:
 - spec/indy_spec.rb
 - spec/last_spec.rb
 - spec/log_format_spec.rb
+- spec/multiline.log
 - spec/result_set_spec.rb
 - spec/search_spec.rb
+- spec/source_spec.rb
 - spec/time_spec.rb
-has_rdoc: true
 homepage: http://github.com/burtlo/Indy
 licenses: 
 - MIT
-post_install_message: "\n    [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>]\n\n    Thank you for installing Indy 0.2.0 / 2011-03-08.\n\n    Changes:\n      \n  * Support for Multiline log entries. See README.md\n  * Time scopes now respect inclusive flag\n  * #last() no longer supports number of rows as a parameter. Use :span => minutes.\n  * Fixes for Ruby 1.9.2\n  \n\n    [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>]\n\n  "
+post_install_message: "\n    [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>]\n\n    Thank you for installing Indy 0.3.0 / 2011-08-02.\n\n    Changes:\n      \n  * To search a file, specify a File object as the source.\n    (Support for file paths will be restored in the future.)\n  * Use :log_format as the key to specify your custom format and fields (:pattern is deprecated).\n  \n\n    [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>]\n\n  "
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -233,25 +197,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 61
-      segments: 
-      - 1
-      - 8
-      - 5
       version: 1.8.5
 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.4.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Log Search Library