lwes 0.6.1 → 0.7.0

data/ChangeLog

@@ -1,3 +1,6 @@
+Version 0.7.0 (erik-s-chang)
+  * rely on lwes-c 0.23.1 instead of patching 0.22.3
+
 Version 0.6.1 (erik-s-chang)
   * fix broken 0.6.0 release, no code changes
 

data/README

@@ -48,7 +48,7 @@ gem.
   emitter = LWES::Emitter.new(:address => '224.1.1.11',
                               :port => 12345,
                               :heartbeat => 30, # nil to disable
-                              :ttl => 1) # nil for no ttl
+                              :ttl => 1) # nil for default TTL(3)
 
   # parse your ESF file at startup, the example below assumes you
   # have "Event1" and "Event2" defined in your ESF file:
@@ -86,7 +86,7 @@ just use an emitter to send Hash objects:
   emitter = LWES::Emitter.new(:address => '224.1.1.11',
                               :port => 12345,
                               :heartbeat => 30, # nil to disable
-                              :ttl => 1) # nil for no ttl
+                              :ttl => 1) # nil for default TTL(3)
 
   # Since we can't reliably map certain Ruby types to LWES types, you'll
   # have to specify them explicitly for IP addresses and all Integer

data/ext/lwes/extconf.rb

@@ -4,13 +4,27 @@ require 'fileutils'
 dir_config('lwes')
 
 pwd = File.expand_path(File.dirname(__FILE__))
-v = '0.22.3'
+v = '0.23.1'
 dir = "lwes-#{v}"
 diff = "#{pwd}/#{dir}.diff"
 inst = "#{pwd}/.inst"
 tgz = "#{dir}.tar.gz"
 url = "http://sourceforge.net/projects/lwes/files/lwes-c/#{v}/#{tgz}/download"
 
+def sub_cd(dir, &b)
+  oldpwd = ENV["PWD"]
+  begin
+    ENV["PWD"] = dir
+    Dir.chdir(dir, &b)
+  ensure
+    if oldpwd
+      ENV["PWD"] = oldpwd
+    else
+      ENV.delete("PWD")
+    end
+  end
+end
+
 # from Net::HTTP example
 def fetch(uri_str, limit = 10)
   raise ArgumentError, 'HTTP redirect too deep' if limit == 0
@@ -26,7 +40,7 @@ end
 
 unless have_library('lwes') && have_header('lwes.h')
   warn "LWES library not found, building locally"
-  Dir.chdir(pwd) do
+  sub_cd(pwd) do
     unless test ?r, tgz
       response = fetch(url)
       File.open("#{tgz}.#{$$}.#{rand}.tmp", "wb") do |fp|
@@ -37,8 +51,10 @@ unless have_library('lwes') && have_header('lwes.h')
     unless test ?r, "#{inst}/.ok"
       FileUtils.rm_rf(dir)
       system('tar', 'zxf', tgz) or abort "tar failed with #{$?}"
-      Dir.chdir(dir) do
-        system("patch", "-p1", "-i", diff) or abort "patch failed: #{$?}"
+      sub_cd(dir) do
+        if File.exist?(diff)
+          system("patch", "-p1", "-i", diff) or abort "patch failed: #{$?}"
+        end
         args = %w(--disable-shared
                   --disable-hardcore
                   --with-pic

data/lib/lwes.rb

@@ -1,6 +1,6 @@
 module LWES
-  # version of our library, currently 0.4.0
-  VERSION = "0.4.0"
+  # version of our library, currently 0.7.0
+  VERSION = "0.7.0"
 
   autoload :TypeDB, "lwes/type_db"
   autoload :Struct, "lwes/struct"

data/lwes.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{lwes}
-  s.version = "0.6.1"
+  s.version = "0.7.0"
   s.date = Time.now
   s.authors = ["Erik S. Chang", "Frank Maritato"]
   s.email = %q{lwes-devel@lists.sourceforge.net}
@@ -24,7 +24,6 @@ examples/my_events.esf
 ext/lwes/emitter.c
 ext/lwes/event.c
 ext/lwes/extconf.rb
-ext/lwes/lwes-0.22.3.diff
 ext/lwes/lwes.c
 ext/lwes/lwes_ruby.h
 ext/lwes/numeric.c
@@ -46,7 +45,7 @@ test/unit/test_event.rb
 test/unit/test_struct.rb
 test/unit/test_type_db.rb
 ) + %w(
-ext/lwes/lwes-0.22.3.tar.gz
+ext/lwes/lwes-0.23.1.tar.gz
 )
   s.rubyforge_project = 'lwes'
   s.test_files = s.files.grep(%r{\Atest/unit/test_})

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Erik S. Chang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 +00:00
+date: 2011-01-27 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -42,7 +42,6 @@ files:
 - ext/lwes/emitter.c
 - ext/lwes/event.c
 - ext/lwes/extconf.rb
-- ext/lwes/lwes-0.22.3.diff
 - ext/lwes/lwes.c
 - ext/lwes/lwes_ruby.h
 - ext/lwes/numeric.c
@@ -63,7 +62,7 @@ files:
 - test/unit/test_event.rb
 - test/unit/test_struct.rb
 - test/unit/test_type_db.rb
-- ext/lwes/lwes-0.22.3.tar.gz
+- ext/lwes/lwes-0.23.1.tar.gz
 has_rdoc: true
 homepage: http://www.lwes.org/
 licenses: []

data/ext/lwes/lwes-0.22.3.diff

@@ -1,287 +0,0 @@
-backport of several things from lwes trunk
-
-* ESF error handling (r344)
-* empty events in ESFs (inherited fields only) (r307)
-
-https://lwes.svn.sourceforge.net/svnroot/lwes/lwes/trunk
-
-diff -rup a/src/lwes_esf_parser_y.y b/src/lwes_esf_parser_y.y
---- a/src/lwes_esf_parser_y.y
-+++ b/src/lwes_esf_parser_y.y
-@@ -63,8 +63,10 @@ eventname: EVENTWORD  {
-   
-     ;
- 
--attributelist: attribute
--    |   attributelist attribute
-+attributelist:
-+      /* empty */
-+    | attribute
-+    | attributelist attribute
-     ;
- 
- attribute: type attributename ';'
-@@ -221,6 +223,7 @@ lwes_parse_esf
-   else
-   {
-     fprintf (stderr,"ERROR: No such file : \"%s\"\n",filename);
-+    state.errors++;
-   }
- 
-   if (state.errors)
-diff -rup a/src/lwes_event_type_db.c b/src/lwes_event_type_db.c
---- a/src/lwes_event_type_db.c
-+++ b/src/lwes_event_type_db.c
-@@ -36,7 +36,11 @@ lwes_event_type_db_create
-       db->events = lwes_hash_create ();
-       if (db->events != NULL)
-         {
--          lwes_parse_esf (db, db->esf_filename);
-+          if (lwes_parse_esf (db, db->esf_filename) != 0)
-+            {
-+              free (db);
-+              db = NULL;
-+            }
-         }
-       else
-         {
-diff -rup a/src/lwes_esf_parser_y.c b/src/lwes_esf_parser_y.c
---- a/src/lwes_esf_parser_y.c
-+++ b/src/lwes_esf_parser_y.c
-@@ -387,7 +387,7 @@ union yyalloc
- /* YYNNTS -- Number of nonterminals.  */
- #define YYNNTS  8
- /* YYNRULES -- Number of rules.  */
--#define YYNRULES  23
-+#define YYNRULES  24
- /* YYNRULES -- Number of states.  */
- #define YYNSTATES  32
- 
-@@ -435,9 +435,9 @@ static const yytype_uint8 yytranslate[] =
-    YYRHS.  */
- static const yytype_uint8 yyprhs[] =
- {
--       0,     0,     3,     5,     8,    13,    16,    19,    21,    23,
--      26,    30,    35,    40,    42,    44,    46,    48,    50,    52,
--      54,    56,    58,    60
-+       0,     0,     3,     5,     8,    13,    16,    19,    21,    22,
-+      24,    27,    31,    36,    41,    43,    45,    47,    49,    51,
-+      53,    55,    57,    59,    61
- };
- 
- /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-@@ -445,19 +445,19 @@ static const yytype_int8 yyrhs[] =
- {
-       18,     0,    -1,    19,    -1,    18,    19,    -1,    20,    14,
-       21,    15,    -1,     1,    16,    -1,     1,    15,    -1,    12,
--      -1,    22,    -1,    21,    22,    -1,    24,    23,    16,    -1,
--      24,    23,     1,    16,    -1,    24,    23,     1,    15,    -1,
--      13,    -1,     3,    -1,     4,    -1,     5,    -1,     6,    -1,
--      10,    -1,    11,    -1,     7,    -1,     8,    -1,     9,    -1,
--      13,    -1
-+      -1,    -1,    22,    -1,    21,    22,    -1,    24,    23,    16,
-+      -1,    24,    23,     1,    16,    -1,    24,    23,     1,    15,
-+      -1,    13,    -1,     3,    -1,     4,    -1,     5,    -1,     6,
-+      -1,    10,    -1,    11,    -1,     7,    -1,     8,    -1,     9,
-+      -1,    13,    -1
- };
- 
- /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
- static const yytype_uint8 yyrline[] =
- {
--       0,    35,    35,    36,    39,    47,    48,    51,    66,    67,
--      70,    71,    72,    75,    93,   104,   115,   125,   135,   145,
--     155,   165,   175,   185
-+       0,    35,    35,    36,    39,    47,    48,    51,    66,    68,
-+      69,    72,    73,    74,    77,    95,   106,   117,   127,   137,
-+     147,   157,   167,   177,   187
- };
- #endif
- 
-@@ -488,16 +488,16 @@ static const yytype_uint16 yytoknum[] =
- static const yytype_uint8 yyr1[] =
- {
-        0,    17,    18,    18,    19,    19,    19,    20,    21,    21,
--      22,    22,    22,    23,    24,    24,    24,    24,    24,    24,
--      24,    24,    24,    24
-+      21,    22,    22,    22,    23,    24,    24,    24,    24,    24,
-+      24,    24,    24,    24,    24
- };
- 
- /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
- static const yytype_uint8 yyr2[] =
- {
--       0,     2,     1,     2,     4,     2,     2,     1,     1,     2,
--       3,     4,     4,     1,     1,     1,     1,     1,     1,     1,
--       1,     1,     1,     1
-+       0,     2,     1,     2,     4,     2,     2,     1,     0,     1,
-+       2,     3,     4,     4,     1,     1,     1,     1,     1,     1,
-+       1,     1,     1,     1,     1
- };
- 
- /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-@@ -506,9 +506,9 @@ static const yytype_uint8 yyr2[] =
- static const yytype_uint8 yydefact[] =
- {
-        0,     0,     7,     0,     2,     0,     6,     5,     1,     3,
--       0,    14,    15,    16,    17,    20,    21,    22,    18,    19,
--      23,     0,     8,     0,     4,     9,    13,     0,     0,    10,
--      12,    11
-+       8,    15,    16,    17,    18,    21,    22,    23,    19,    20,
-+      24,     0,     9,     0,     4,    10,    14,     0,     0,    11,
-+      13,    12
- };
- 
- /* YYDEFGOTO[NTERM-NUM].  */
-@@ -1414,18 +1414,18 @@ yyreduce:
-                       }
-     break;
- 
--  case 11:
--#line 71 "lwes_esf_parser_y.y"
-+  case 12:
-+#line 73 "lwes_esf_parser_y.y"
-     { lweserror("Did you forget a ';'?"); }
-     break;
- 
--  case 12:
--#line 72 "lwes_esf_parser_y.y"
-+  case 13:
-+#line 74 "lwes_esf_parser_y.y"
-     { lweserror("Did you forget a semi-colon?"); }
-     break;
- 
--  case 13:
--#line 75 "lwes_esf_parser_y.y"
-+  case 14:
-+#line 77 "lwes_esf_parser_y.y"
-     {
-         if (((struct lwes_parser_state *) param)->lastType != NULL)
-         {
-@@ -1444,8 +1444,8 @@ yyreduce:
-                              }
-     break;
- 
--  case 14:
--#line 93 "lwes_esf_parser_y.y"
-+  case 15:
-+#line 95 "lwes_esf_parser_y.y"
-     {
-           /* allocate a string, and copy the type value into it */
-           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
-@@ -1459,8 +1459,8 @@ yyreduce:
-                  }
-     break;
- 
--  case 15:
--#line 104 "lwes_esf_parser_y.y"
-+  case 16:
-+#line 106 "lwes_esf_parser_y.y"
-     {
-           /* allocate a string, and copy the type value into it */
-           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
-@@ -1474,8 +1474,8 @@ yyreduce:
-                  }
-     break;
- 
--  case 16:
--#line 115 "lwes_esf_parser_y.y"
-+  case 17:
-+#line 117 "lwes_esf_parser_y.y"
-     {
-           /* allocate a string, and copy the type value into it */
-           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
-@@ -1488,8 +1488,8 @@ yyreduce:
-                  }
-     break;
- 
--  case 17:
--#line 125 "lwes_esf_parser_y.y"
-+  case 18:
-+#line 127 "lwes_esf_parser_y.y"
-     {
-           /* allocate a string, and copy the type value into it */
-           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
-@@ -1502,8 +1502,8 @@ yyreduce:
-                  }
-     break;
- 
--  case 18:
--#line 135 "lwes_esf_parser_y.y"
-+  case 19:
-+#line 137 "lwes_esf_parser_y.y"
-     {
-           /* allocate a string, and copy the type value into it */
-           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
-@@ -1516,8 +1516,8 @@ yyreduce:
-                  }
-     break;
- 
--  case 19:
--#line 145 "lwes_esf_parser_y.y"
-+  case 20:
-+#line 147 "lwes_esf_parser_y.y"
-     {
-           /* allocate a string, and copy the type value into it */
-           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
-@@ -1530,8 +1530,8 @@ yyreduce:
-                  }
-     break;
- 
--  case 20:
--#line 155 "lwes_esf_parser_y.y"
-+  case 21:
-+#line 157 "lwes_esf_parser_y.y"
-     {
-           /* allocate a string, and copy the type value into it */
-           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
-@@ -1544,8 +1544,8 @@ yyreduce:
-                  }
-     break;
- 
--  case 21:
--#line 165 "lwes_esf_parser_y.y"
-+  case 22:
-+#line 167 "lwes_esf_parser_y.y"
-     {
-           /* allocate a string, and copy the type value into it */
-           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
-@@ -1558,8 +1558,8 @@ yyreduce:
-                  }
-     break;
- 
--  case 22:
--#line 175 "lwes_esf_parser_y.y"
-+  case 23:
-+#line 177 "lwes_esf_parser_y.y"
-     {
-           /* allocate a string, and copy the type value into it */
-           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
-@@ -1572,8 +1572,8 @@ yyreduce:
-                  }
-     break;
- 
--  case 23:
--#line 185 "lwes_esf_parser_y.y"
-+  case 24:
-+#line 187 "lwes_esf_parser_y.y"
-     { char buffer[256];
-                       sprintf(buffer,"unknown type '%s'",lweslval); 
-                       lweserror(buffer);
-@@ -1797,7 +1797,7 @@ yyreturn:
- }
- 
- 
--#line 192 "lwes_esf_parser_y.y"
-+#line 194 "lwes_esf_parser_y.y"
- 
- 
- extern FILE *lwesin;
-@@ -1830,6 +1830,7 @@ lwes_parse_esf
-   else
-   {
-     fprintf (stderr,"ERROR: No such file : \"%s\"\n",filename);
-+    state.errors++;
-   }
- 
-   if (state.errors)