jls-grok 0.9.0 → 0.9.1

data/lib/grok-pure.rb

@@ -1,12 +1,15 @@
 require "rubygems"
+require "logger"
+require "cabin"
 
 # TODO(sissel): Check if 'grok' c-ext has been loaded and abort?
 class Grok
   attr_accessor :pattern
   attr_accessor :expanded_pattern
+  attr_accessor :logger
   
   PATTERN_RE = \
-    /%{    # match '%{' not prefixed with '\'
+    /%\{    # match '%{' not prefixed with '\'
        (?<name>     # match the pattern name
          (?<pattern>[A-z0-9]+)
          (?::(?<subname>[A-z0-9_:]+))?
@@ -19,7 +22,7 @@ class Grok
          )+
        ))?
        [^}]*
-     }/x
+     \}/x
 
   GROK_OK = 0
   GROK_ERROR_FILE_NOT_ACCESSIBLE = 1
@@ -33,13 +36,15 @@ class Grok
   public
   def initialize
     @patterns = {}
+    @logger = Cabin::Channel.new
+    @logger.subscribe(Logger.new(STDOUT))
 
     # TODO(sissel): Throw exception if we aren't using Ruby 1.9.2 or newer.
   end # def initialize
 
   public
   def add_pattern(name, pattern)
-    #puts "#{name} => #{pattern}"
+    @logger.info("Adding pattern", name => pattern)
     @patterns[name] = pattern
     return nil
   end
@@ -49,7 +54,6 @@ class Grok
     file = File.new(path, "r")
     file.each do |line|
       next if line =~ /^\s*#/
-      #puts "Pattern: #{line}"
       name, pattern = line.gsub(/^\s*/, "").split(/\s+/, 2)
       next if pattern.nil?
       add_pattern(name, pattern.chomp)
@@ -96,6 +100,8 @@ class Grok
     end
 
     @regexp = Regexp.new(@expanded_pattern)
+    @logger.debug("Grok compiled OK", :pattern => pattern,
+                  :expanded_pattern => @expanded_pattern)
   end # def compile
 
   public
@@ -108,6 +114,7 @@ class Grok
       grokmatch.start, grokmatch.end = match.offset(0)
       grokmatch.grok = self
       grokmatch.match = match
+      @logger.debug("Regexp match object", :names => match.names, :captures => match.captures)
       return grokmatch
     else
       return false

data/lib/grok/pure/pile.rb

@@ -1,4 +1,6 @@
 require "grok-pure"
+require "logger"
+require "cabin"
 
 # A grok pile is an easy way to have multiple patterns together so
 # that you can try to match against each one.
@@ -7,12 +9,21 @@ require "grok-pure"
 # try each one until a match is found.
 class Grok
   class Pile
+    attr_accessor :logger
+
     def initialize
       @groks = []
       @patterns = {}
       @pattern_files = []
+      @logger = Cabin::Channel.new
+      @logger.subscribe(Logger.new(STDOUT))
     end # def initialize
 
+    def logger=(logger)
+      @logger = logger
+      @groks.each { |g| g.logger = logger }
+    end
+
     # see Grok#add_pattern
     def add_pattern(name, string)
       @patterns[name] = string
@@ -29,6 +40,7 @@ class Grok
     # see Grok#compile
     def compile(pattern)
       grok = Grok.new
+      grok.logger = @logger unless @logger.nil?
       @patterns.each do |name, value|
         grok.add_pattern(name, value)
       end
@@ -36,6 +48,8 @@ class Grok
         grok.add_patterns_from_file(path)
       end
       grok.compile(pattern)
+      @logger.info("Pile compiled new grok", :pattern => pattern,
+                   :expanded_pattern => grok.expanded_pattern)
       @groks << grok
     end # def compile
 

metadata

@@ -1,66 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jls-grok
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.1
   prerelease: 
-  version: 0.9.0
 platform: ruby
-authors: 
-  - Jordan Sissel
-  - Pete Fritchman
+authors:
+- Jordan Sissel
+- Pete Fritchman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-21 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
+date: 2011-10-25 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: cabin
+  requirement: &17510060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *17510060
 description: Grok ruby bindings - pattern match/extraction tool
-email: 
-  - jls@semicomplete.com
-  - petef@databits.net
+email:
+- jls@semicomplete.com
+- petef@databits.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - lib/Grok.rb
-  - lib/grok-pure.rb
-  - lib/grok.rb
-  - lib/grok/c-ext/pile.rb
-  - lib/grok/c-ext/match.rb
-  - lib/grok/pure/pile.rb
-  - lib/grok/pure/match.rb
-has_rdoc: true
+files:
+- lib/grok-pure.rb
+- lib/grok.rb
+- lib/grok/c-ext/pile.rb
+- lib/grok/c-ext/match.rb
+- lib/grok/pure/pile.rb
+- lib/grok/pure/match.rb
+- lib/Grok.rb
 homepage: http://code.google.com/p/semicomplete/wiki/Grok
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
-  - lib
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: grok bindings for ruby
 test_files: []
-