jls-grok 0.2.3071 → 0.2.3089

data/ext/extconf.rb

@@ -1,6 +1,21 @@
 require "mkmf"
-find_header("tcutil.h", "/usr/local/include")
-find_header("pcre.h", "/usr/local/include")
-find_header("grok.h", "/usr/local/include", "../../")
-find_library("grok", "grok_init", "../", "../../", "/usr/local/lib")
+
+# TODO(sissel): I don't think we need these two headers.
+#if !find_header("tcutil.h", "/usr/local/include")
+#if !find_header("pcre.h", "/usr/local/include")
+
+if !find_header("grok.h", "/usr/local/include", "../../")
+  raise "Could not find grok.h"
+end
+
+if !find_library("sgrok", "grok_init", "../", "../../", "/usr/local/lib")
+  raise "Could not find libgrok, is it installed?"
+end
+
 create_makefile("Grok")
+
+#with_cflags("-g") do
+  #with_ldflags("-g") do
+    #create_makefile("Grok")
+  #end
+#end

data/ext/mkmf.log

@@ -1,36 +1,82 @@
-find_header: checking for tcutil.h in /usr/local/include... -------------------- yes
+find_header: checking for grok.h in /usr/local/include,../../... -------------------- yes
 
 "gcc -E -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC    conftest.c -o conftest.i"
 checked program was:
 /* begin */
-1: #include <tcutil.h>
+1: #include <grok.h>
 /* end */
 
 --------------------
 
-find_header: checking for pcre.h in /usr/local/include... -------------------- yes
+find_library: checking for grok_init() in -lsgrok... -------------------- no
 
-"gcc -E -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC    conftest.c -o conftest.i"
+"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC   conftest.c  -L. -L/usr/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lsgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+conftest.c: In function 't':
+conftest.c:3: error: 'grok_init' undeclared (first use in this function)
+conftest.c:3: error: (Each undeclared identifier is reported only once
+conftest.c:3: error: for each function it appears in.)
 checked program was:
 /* begin */
-1: #include <pcre.h>
+1: /*top*/
+2: int main() { return 0; }
+3: int t() { void ((*volatile p)()); p = (void ((*)()))grok_init; return 0; }
 /* end */
 
---------------------
+"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC   conftest.c  -L. -L/usr/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lsgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+/usr/bin/ld: cannot find -lsgrok
+collect2: ld returned 1 exit status
+checked program was:
+/* begin */
+1: /*top*/
+2: int main() { return 0; }
+3: int t() { grok_init(); return 0; }
+/* end */
 
-find_header: checking for grok.h in /usr/local/include,../../... -------------------- yes
+"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC   conftest.c  -L. -L/usr/lib -L../ -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lsgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+conftest.c: In function 't':
+conftest.c:3: error: 'grok_init' undeclared (first use in this function)
+conftest.c:3: error: (Each undeclared identifier is reported only once
+conftest.c:3: error: for each function it appears in.)
+checked program was:
+/* begin */
+1: /*top*/
+2: int main() { return 0; }
+3: int t() { void ((*volatile p)()); p = (void ((*)()))grok_init; return 0; }
+/* end */
 
-"gcc -E -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC    conftest.c -o conftest.i"
+"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC   conftest.c  -L. -L/usr/lib -L../ -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lsgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+/usr/bin/ld: cannot find -lsgrok
+collect2: ld returned 1 exit status
 checked program was:
 /* begin */
-1: #include <grok.h>
+1: /*top*/
+2: int main() { return 0; }
+3: int t() { grok_init(); return 0; }
 /* end */
 
---------------------
+"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC   conftest.c  -L. -L/usr/lib -L../../ -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lsgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+conftest.c: In function 't':
+conftest.c:3: error: 'grok_init' undeclared (first use in this function)
+conftest.c:3: error: (Each undeclared identifier is reported only once
+conftest.c:3: error: for each function it appears in.)
+checked program was:
+/* begin */
+1: /*top*/
+2: int main() { return 0; }
+3: int t() { void ((*volatile p)()); p = (void ((*)()))grok_init; return 0; }
+/* end */
 
-find_library: checking for grok_init() in -lgrok... -------------------- yes
+"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC   conftest.c  -L. -L/usr/lib -L../../ -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lsgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+/usr/bin/ld: cannot find -lsgrok
+collect2: ld returned 1 exit status
+checked program was:
+/* begin */
+1: /*top*/
+2: int main() { return 0; }
+3: int t() { grok_init(); return 0; }
+/* end */
 
-"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC   conftest.c  -L. -L/usr/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC   conftest.c  -L. -L/usr/lib -L/usr/local/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lsgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc"
 conftest.c: In function 't':
 conftest.c:3: error: 'grok_init' undeclared (first use in this function)
 conftest.c:3: error: (Each undeclared identifier is reported only once
@@ -42,7 +88,9 @@ checked program was:
 3: int t() { void ((*volatile p)()); p = (void ((*)()))grok_init; return 0; }
 /* end */
 
-"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC   conftest.c  -L. -L/usr/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC   conftest.c  -L. -L/usr/lib -L/usr/local/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lsgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+/usr/bin/ld: cannot find -lsgrok
+collect2: ld returned 1 exit status
 checked program was:
 /* begin */
 1: /*top*/

data/lib/grok/pile.rb

@@ -45,7 +45,6 @@ class Grok::Pile
   def match(string)
     @groks.each do |grok|
       match = grok.match(string)
-      #puts "Trying #{grok.pattern} against #{string}"
       if match
         return [grok, match]
       end

data/test/patterns/iso8601.rb

@@ -0,0 +1,68 @@
+require 'grok'
+require 'test/unit'
+
+class ISO8601PatternsTest < Test::Unit::TestCase
+  def setup
+    @grok = Grok.new
+    path = "#{File.dirname(__FILE__)}/../../../patterns/base"
+    @grok.add_patterns_from_file(path)
+    @grok.compile("^%{TIMESTAMP_ISO8601}$")
+  end
+
+  def test_iso8601
+    times = [
+      "2001-01-01T00:00:00",
+      "1974-03-02T04:09:09",
+      "2010-05-03T08:18:18+00:00",
+      "2004-07-04T12:27:27-00:00",
+      "2001-09-05T16:36:36+0000",
+      "2001-11-06T20:45:45-0000",
+      "2001-12-07T23:54:54Z",
+      "2001-01-01T00:00:00.123456",
+      "1974-03-02T04:09:09.123456",
+      "2010-05-03T08:18:18.123456+00:00",
+      "2004-07-04T12:27:27.123456-00:00",
+      "2001-09-05T16:36:36.123456+0000",
+      "2001-11-06T20:45:45.123456-0000",
+      "2001-12-07T23:54:54.123456Z",
+      "2001-12-07T23:54:60.123456Z", # '60' second is a leap second.
+    ]
+    times.each do |time|
+      match = @grok.match(time)
+      assert_not_equal(false, match, "Expected #{time} to match TIMESTAMP_ISO8601")
+      assert_equal(time, match.captures["TIMESTAMP_ISO8601"][0])
+    end
+  end
+
+  def test_iso8601_nomatch
+    times = [
+      "2001-13-01T00:00:00", # invalid month
+      "2001-00-01T00:00:00", # invalid month
+      "2001-01-00T00:00:00", # invalid day
+      "2001-01-32T00:00:00", # invalid day
+      "2001-01-aT00:00:00", # invalid day
+      "2001-01-1aT00:00:00", # invalid day
+      "2001-01-01Ta0:00:00", # invalid hour
+      "2001-01-01T0:00:00", # invalid hour
+      "2001-01-01T25:00:00", # invalid hour
+      "2001-01-01T01:60:00", # invalid minute
+      "2001-01-01T00:aa:00", # invalid minute
+      "2001-01-01T00:00:aa", # invalid second
+      "2001-01-01T00:00:-1", # invalid second
+      "2001-01-01T00:00:61", # invalid second
+      "2001-01-01T00:00:00A", # invalid timezone
+      "2001-01-01T00:00:00+", # invalid timezone
+      "2001-01-01T00:00:00+25", # invalid timezone
+      "2001-01-01T00:00:00+2500", # invalid timezone
+      "2001-01-01T00:00:00+25:00", # invalid timezone
+      "2001-01-01T00:00:00-25", # invalid timezone
+      "2001-01-01T00:00:00-2500", # invalid timezone
+      "2001-01-01T00:00:00-00:61", # invalid timezone
+    ]
+    times.each do |time|
+      match = @grok.match(time)
+      assert_equal(false, match, "Expected #{time} to not match TIMESTAMP_ISO8601")
+    end
+  end
+
+end

data/test/speedtest.rb

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 
-#require 'rubygems'
+require 'rubygems'
 require 'Grok'
 #require 'ruby-prof'
 require 'pp'
 
 #RubyProf.start  
 
-iterations = 20000
+iterations = 100000
 pattern = "[A-z0-9_-]*\\[[0-9]+\\]"
 
 grok = Grok.new
@@ -35,7 +35,7 @@ groktime = time(iterations) do |line|
     matches[:grok] += 1
     m.captures["FOO"]
   else
-    puts line
+    #puts line
     failures[:grok] +=1
   end
 end
@@ -49,6 +49,7 @@ end
 #end
 
 puts "Grok: #{matches[:grok] / groktime}"
+puts matches.inspect
 puts failures.inspect
 #puts "rubyre: #{rubyretime}"
 #puts matches.inspect

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3071
-  version: 0.2.3071
+  - 3089
+  version: 0.2.3089
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -07:00
+date: 2010-10-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -42,6 +42,7 @@ files:
 - ext/ruby_grokmatch.o
 - test/general/basic_test.rb
 - test/general/captures_test.rb
+- test/core
 - test/Makefile
 - test/alltests.rb
 - test/speedtest.rb
@@ -49,6 +50,7 @@ files:
 - test/patterns/day.rb
 - test/patterns/host.rb
 - test/patterns/number.rb
+- test/patterns/iso8601.rb
 - test/patterns/ip.input
 - test/patterns/ip.rb
 - test/patterns/path.rb