jls-grok 0.4.4 → 0.4.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. data/grok.gemspec +3 -1
  2. data/lib/grok/match.rb +1 -1
  3. data/lib/grok.rb +1 -1
  4. data/test/Makefile +10 -2
  5. data/test/general/basic_test.rb +1 -1
  6. data/test/general/captures_test.rb +1 -1
  7. data/test/patterns/quotedstring.rb +1 -1
  8. data/test/speedtest.rb +1 -1
  9. metadata +69 -51
data/grok.gemspec CHANGED
@@ -38,13 +38,15 @@ Gem::Specification.new do |spec|
38
38
 
39
39
  #svnrev = %x{svn info}.split("\n").grep(/Revision:/).first.split(" ").last.to_i
40
40
  spec.name = "jls-grok"
41
- spec.version = "0.4.4"
41
+ spec.version = "0.4.5"
42
42
 
43
43
  spec.summary = "grok bindings for ruby"
44
44
  spec.description = "Grok ruby bindings - pattern match/extraction tool"
45
45
  spec.files = files
46
46
 
47
47
  spec.add_dependency("ffi", "~> 0.6.3")
48
+ spec.require_paths << "lib"
49
+ spec.require_paths << "ext" # for "Grok.rb" giving backwards compat to Grok.so
48
50
 
49
51
  spec.authors = ["Jordan Sissel", "Pete Fritchman"]
50
52
  spec.email = ["jls@semicomplete.com", "petef@databits.net"]
data/lib/grok/match.rb CHANGED
@@ -5,7 +5,7 @@ require "grok"
5
5
  class Grok::Match < FFI::Struct
6
6
  module CGrokMatch
7
7
  extend FFI::Library
8
- ffi_lib "libgrok.so"
8
+ ffi_lib "libgrok"
9
9
 
10
10
  attach_function :grok_match_get_named_substring,
11
11
  [:pointer, :pointer], :pointer
data/lib/grok.rb CHANGED
@@ -4,7 +4,7 @@ require "ffi"
4
4
  class Grok < FFI::Struct
5
5
  module CGrok
6
6
  extend FFI::Library
7
- ffi_lib "libgrok.so"
7
+ ffi_lib "libgrok"
8
8
 
9
9
  attach_function :grok_new, [], :pointer
10
10
  attach_function :grok_compilen, [:pointer, :pointer, :int], :int
data/test/Makefile CHANGED
@@ -1,9 +1,17 @@
1
1
 
2
+ PLATFORM=$(shell (uname -o || uname -s) 2> /dev/null)
3
+
4
+ ifeq ($(PLATFORM), Darwin)
5
+ LIBSUFFIX=dylib
6
+ else
7
+ LIBSUFFIX=so
8
+ endif
9
+
2
10
  .PHONY: test
3
11
  test:
4
- $(MAKE) -C ../../ libgrok.so
12
+ $(MAKE) -C ../../ libgrok.$(LIBSUFFIX)
5
13
  LD_LIBRARY_PATH="$${LD_LIBRARY_PATH}:$$PWD/../../" RUBYLIB="$$PWD/../lib" ruby alltests.rb
6
14
 
7
15
  test_jruby:
8
- $(MAKE) -C ../../ libgrok.so
16
+ $(MAKE) -C ../../ libgrok.$(LIBSUFFIX)
9
17
  LD_LIBRARY_PATH="$${LD_LIBRARY_PATH}:$$PWD/../../" RUBYLIB="$$PWD/../lib" jruby alltests.rb
data/test/general/basic_test.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #require 'rubygems'
2
- require 'Grok'
2
+ require 'grok'
3
3
  require 'test/unit'
4
4
 
5
5
  class GrokBasicTests < Test::Unit::TestCase
data/test/general/captures_test.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #require 'rubygems'
2
- require 'Grok'
2
+ require 'grok'
3
3
  require 'test/unit'
4
4
 
5
5
  class GrokPatternCapturingTests < Test::Unit::TestCase
data/test/patterns/quotedstring.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #require 'rubygems'
2
- require 'Grok'
2
+ require 'grok'
3
3
  require 'test/unit'
4
4
 
5
5
  class QuotedStringPatternsTest < Test::Unit::TestCase
data/test/speedtest.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
3
  require 'rubygems'
4
- require 'Grok'
4
+ require 'grok'
5
5
  #require 'ruby-prof'
6
6
  require 'pp'
7
7
 
metadata CHANGED
@@ -1,34 +1,44 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jls-grok
3
3
  version: !ruby/object:Gem::Version
4
+ hash: 5
4
5
  prerelease:
5
- version: 0.4.4
6
+ segments:
7
+ - 0
8
+ - 4
9
+ - 5
10
+ version: 0.4.5
6
11
  platform: ruby
7
12
  authors:
8
- - Jordan Sissel
9
- - Pete Fritchman
13
+ - Jordan Sissel
14
+ - Pete Fritchman
10
15
  autorequire:
11
16
  bindir: bin
12
17
  cert_chain: []
13
18
 
14
- date: 2011-03-03 00:00:00 -08:00
19
+ date: 2011-03-08 00:00:00 -08:00
15
20
  default_executable:
16
21
  dependencies:
17
- - !ruby/object:Gem::Dependency
18
- name: ffi
19
- prerelease: false
20
- requirement: &id001 !ruby/object:Gem::Requirement
21
- none: false
22
- requirements:
23
- - - ~>
24
- - !ruby/object:Gem::Version
25
- version: 0.6.3
26
- type: :runtime
27
- version_requirements: *id001
22
+ - !ruby/object:Gem::Dependency
23
+ name: ffi
24
+ prerelease: false
25
+ requirement: &id001 !ruby/object:Gem::Requirement
26
+ none: false
27
+ requirements:
28
+ - - ~>
29
+ - !ruby/object:Gem::Version
30
+ hash: 1
31
+ segments:
32
+ - 0
33
+ - 6
34
+ - 3
35
+ version: 0.6.3
36
+ type: :runtime
37
+ version_requirements: *id001
28
38
  description: Grok ruby bindings - pattern match/extraction tool
29
39
  email:
30
- - jls@semicomplete.com
31
- - petef@databits.net
40
+ - jls@semicomplete.com
41
+ - petef@databits.net
32
42
  executables: []
33
43
 
34
44
  extensions: []
@@ -36,32 +46,32 @@ extensions: []
36
46
  extra_rdoc_files: []
37
47
 
38
48
  files:
39
- - INSTALL
40
- - Rakefile
41
- - examples/grok-web.rb
42
- - examples/pattern-discovery.rb
43
- - examples/test.rb
44
- - grok.gemspec
45
- - lib/grok.rb
46
- - lib/grok/match.rb
47
- - lib/grok/pile.rb
48
- - test/Makefile
49
- - test/alltests.rb
50
- - test/general/basic_test.rb
51
- - test/general/captures_test.rb
52
- - test/patterns/day.rb
53
- - test/patterns/host.rb
54
- - test/patterns/ip.input
55
- - test/patterns/ip.rb
56
- - test/patterns/iso8601.rb
57
- - test/patterns/month.rb
58
- - test/patterns/number.rb
59
- - test/patterns/path.rb
60
- - test/patterns/prog.rb
61
- - test/patterns/quotedstring.rb
62
- - test/patterns/uri.rb
63
- - test/run.sh
64
- - test/speedtest.rb
49
+ - INSTALL
50
+ - Rakefile
51
+ - examples/grok-web.rb
52
+ - examples/pattern-discovery.rb
53
+ - examples/test.rb
54
+ - grok.gemspec
55
+ - lib/grok.rb
56
+ - lib/grok/match.rb
57
+ - lib/grok/pile.rb
58
+ - test/Makefile
59
+ - test/alltests.rb
60
+ - test/general/basic_test.rb
61
+ - test/general/captures_test.rb
62
+ - test/patterns/day.rb
63
+ - test/patterns/host.rb
64
+ - test/patterns/ip.input
65
+ - test/patterns/ip.rb
66
+ - test/patterns/iso8601.rb
67
+ - test/patterns/month.rb
68
+ - test/patterns/number.rb
69
+ - test/patterns/path.rb
70
+ - test/patterns/prog.rb
71
+ - test/patterns/quotedstring.rb
72
+ - test/patterns/uri.rb
73
+ - test/run.sh
74
+ - test/speedtest.rb
65
75
  has_rdoc: true
66
76
  homepage: http://code.google.com/p/semicomplete/wiki/Grok
67
77
  licenses: []
@@ -70,23 +80,31 @@ post_install_message:
70
80
  rdoc_options: []
71
81
 
72
82
  require_paths:
73
- - lib
83
+ - lib
84
+ - lib
85
+ - ext
74
86
  required_ruby_version: !ruby/object:Gem::Requirement
75
87
  none: false
76
88
  requirements:
77
- - - ">="
78
- - !ruby/object:Gem::Version
79
- version: "0"
89
+ - - ">="
90
+ - !ruby/object:Gem::Version
91
+ hash: 3
92
+ segments:
93
+ - 0
94
+ version: "0"
80
95
  required_rubygems_version: !ruby/object:Gem::Requirement
81
96
  none: false
82
97
  requirements:
83
- - - ">="
84
- - !ruby/object:Gem::Version
85
- version: "0"
98
+ - - ">="
99
+ - !ruby/object:Gem::Version
100
+ hash: 3
101
+ segments:
102
+ - 0
103
+ version: "0"
86
104
  requirements: []
87
105
 
88
106
  rubyforge_project:
89
- rubygems_version: 1.5.0
107
+ rubygems_version: 1.6.0
90
108
  signing_key:
91
109
  specification_version: 3
92
110
  summary: grok bindings for ruby