jls-grok 0.1.2840 → 0.1.3068

data/ext/Makefile

@@ -45,7 +45,7 @@ LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
 RUBY_EXTCONF_H = 
 CFLAGS   =  -fPIC -fno-strict-aliasing -g -g -O2  -fPIC $(cflags) 
-INCFLAGS = -I. -I. -I/usr/lib/ruby/1.8/x86_64-linux -I. -I../../
+INCFLAGS = -I. -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.
 DEFS     = 
 CPPFLAGS =    
 CXXFLAGS = $(CFLAGS) 
@@ -86,7 +86,7 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -lrt -ldl -lcrypt -lm   -lc
+LIBS = $(LIBRUBYARG_SHARED) -lgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc
 SRCS = ruby_grok.c ruby_grokmatch.c ruby_grokdiscover.c
 OBJS = ruby_grok.o ruby_grokmatch.o ruby_grokdiscover.o
 TARGET = Grok

data/ext/extconf.rb

@@ -2,5 +2,5 @@ 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")
+find_library("grok", "grok_init", "../", "../../", "/usr/local/lib")
 create_makefile("Grok")

data/ext/mkmf.log

@@ -21,20 +21,6 @@ checked program was:
 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"
-conftest.c:1:18: error: grok.h: No such file or directory
-checked program was:
-/* begin */
-1: #include <grok.h>
-/* end */
-
-"gcc -E -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC   -I/usr/local/include conftest.c -o conftest.i"
-conftest.c:1:18: error: grok.h: No such file or directory
-checked program was:
-/* begin */
-1: #include <grok.h>
-/* end */
-
-"gcc -E -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.    -fno-strict-aliasing -g -g -O2  -fPIC   -I../../ conftest.c -o conftest.i"
 checked program was:
 /* begin */
 1: #include <grok.h>
@@ -42,53 +28,9 @@ checked program was:
 
 --------------------
 
-find_library: checking for grok_init() in -lgrok... -------------------- no
-
-"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I. -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"
-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 -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I. -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"
-/usr/bin/ld: cannot find -lgrok
-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. -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 -lgrok  -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 -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I. -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 -lgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-/usr/bin/ld: cannot find -lgrok
-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_library: checking for grok_init() in -lgrok... -------------------- yes
 
-"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I. -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 -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. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lgrok  -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
@@ -100,9 +42,7 @@ 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. -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 -lgrok  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-/usr/bin/ld: cannot find -lgrok
-collect2: ld returned 1 exit status
+"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"
 checked program was:
 /* begin */
 1: /*top*/

data/ext/ruby_grok.c

@@ -5,6 +5,39 @@
 
 VALUE cGrok; /* Grok class object */
 
+/*
+ * Document-class: Grok
+ * Grok ruby bindings.
+ *
+ * For an intro to grok, see:
+ * See http://code.google.com/p/semicomplete/wiki/Grok
+ * and http://code.google.com/p/semicomplete/wiki/GrokRuby
+ *
+ * General usage of grok is as follows:
+ *
+ *    grok = Grok.new
+ *    grok.add_patterns_from_file("/path/to/patterns")
+ *    grok.add_pattern("WORD", "\b\w+\b")
+ *    grok.compile("%{WORD} world!")
+ *    m = grok.match("Hello world!")
+ *    if m
+ *      puts m.captures["WORD"]
+ *     else
+ *       puts "No match."
+ *    fi
+ *
+ * Grok autodiscovery:
+ *    grok = Grok.new
+ *    grok.add_patterns_from_file("/path/to/patterns")
+ *
+ *    # Assuming you loaded the default pattern set
+ *    grok.discover("2009-04-18")   
+ *    #=> "\\Q\\E%{DATE_EU}\\Q\\E"
+ *    grok.discover("Visit http://www.google.com/")   
+ *    #=> "\\QVisit \\E%{URI}\\Q\\E"
+ *
+ */
+
 extern VALUE cGrokMatch;
 extern VALUE cGrokDiscover;
 extern void Init_GrokMatch();
@@ -44,6 +77,13 @@ VALUE rGrok_new_from_grok(grok_t *grok) {
   return rgrok;
 }
 
+/*
+ * Compiles an expression.
+ *
+ * call-seq:
+ *  grok.compile(pattern) 
+ *
+ */
 VALUE rGrok_compile(VALUE self, VALUE pattern) {
   grok_t *grok;
   char *c_pattern = NULL;
@@ -53,7 +93,9 @@ VALUE rGrok_compile(VALUE self, VALUE pattern) {
   Data_Get_Struct(self, grok_t, grok);
 
   /* Need strdup here in case 'pattern' object is deleted later in 
-   * the ruby code */
+   * the ruby code 
+   * TODO(sissel): Really, just mark that we are using this string
+   * rather than strduping. */
   str = rb_str2cstr(pattern, &len);
   c_pattern = malloc(len);
   memcpy(c_pattern, str, len);

data/lib/grok.rb

@@ -1,13 +1,16 @@
 require "Grok"
+require "grok/pile"
 
 # extend Grok to add simpler access to the discover feature.
 class Grok
+  public
   def discover(input)
     init_discover if @discover == nil
 
     return @discover.discover(input)
   end
 
+  private
   def init_discover
     @discover = GrokDiscover.new(self)
   end

data/lib/pile.rb

@@ -0,0 +1,43 @@
+require "grok"
+
+# A grok pile is an easy way to have multiple patterns together so that
+# you can try to match against each one.
+class Grok::Pile
+  def initialize
+    @groks = []
+    @patterns = {}
+    @pattern_files = []
+  end # def initialize
+
+  def add_pattern(name, string)
+    @patterns[name] = string
+  end # def add_pattern
+
+  def add_patterns_from_file(path)
+    if !File.exists?(path)
+      raise "File does not exist: #{path}"
+    end
+    @pattern_files << path
+  end # def add_patterns_from_file
+
+  def compile(pattern)
+    grok = Grok.new
+    @patterns.each do |name, value|
+      grok.add_patterne(name, value)
+    end
+    @pattern_files.each do |path|
+      grok.add_patterns_from_file(path)
+    end
+    grok.compile(pattern)
+    @groks << grok
+  end # def compile
+
+  def match(string)
+    @groks.each do |grok|
+      match = grok.match(string)
+      if match
+        return [grok, match]
+      end
+    end
+  end # def match
+end # class Grok::Pile

data/test/patterns/prog.rb

@@ -0,0 +1,21 @@
+require 'grok'
+require 'test/unit'
+
+class ProgPatternsTest < Test::Unit::TestCase
+  def setup
+    @grok = Grok.new
+    path = "#{File.dirname(__FILE__)}/../../../patterns/base"
+    @grok.add_patterns_from_file(path)
+    @grok.compile("^%{PROG}$")
+  end
+
+  def test_progs
+    progs = %w{kernel foo-bar foo_bar foo/bar/baz}
+    progs.each do |prog|
+      match = @grok.match(prog)
+      assert_not_equal(false, prog, "Expected #{prog} to match.")
+      assert_equal(prog, match.captures["PROG"][0], "Expected #{prog} to match capture.")
+    end
+  end
+
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: jls-grok
 version: !ruby/object:Gem::Version 
-  version: 0.1.2840
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3068
+  version: 0.1.3068
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 -07:00
+date: 2010-10-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -49,8 +54,10 @@ files:
 - test/patterns/path.rb
 - test/patterns/month.rb
 - test/patterns/uri.rb
+- test/patterns/prog.rb
 - test/run.sh
 - lib/grok.rb
+- lib/pile.rb
 has_rdoc: true
 homepage: http://code.google.com/p/semicomplete/wiki/Grok
 licenses: []
@@ -65,18 +72,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: grok bindings for ruby