lwes 0.8.4 → 0.8.5

data/ChangeLog

@@ -1,3 +1,6 @@
+Version 0.8.5 (erik-s-chang)
+  * Fix Ruby 2.0.0 compatibility
+
 Version 0.8.4 (erik-s-chang)
   * prevent -llwes in $LIBS when building local installation
 

data/ext/lwes_ext/listener.c

@@ -138,10 +138,14 @@ static VALUE listener_recv(int argc, VALUE *argv, VALUE self)
 	args.event = lwes_event_create_no_name(NULL);
 	args.timeout_ms = NIL_P(timeout) ? UINT_MAX : NUM2UINT(timeout);
 
+retry:
 	saved_errno = errno = 0;
 	r = (int)rb_thread_blocking_region(recv_event, &args, RUBY_UBF_IO, 0);
 	if (r >= 0)
 		return lwesrb_wrap_event(cLWES_Event, args.event);
+
+	if (errno == EINTR)
+		goto retry;
 	saved_errno = errno;
 	(void)lwes_event_destroy(args.event);
 	if (r == -2 && ! NIL_P(timeout))

data/ext/lwes_ext/type_conv.c

@@ -35,7 +35,7 @@ LWES_U_INT_32 lwesrb_uint32(VALUE val)
 
 	if (tmp != (LWES_U_INT_32)tmp) {
 		const char *s = tmp < 0 ? "negative" : "too big";
-		rb_raise(rb_eRangeError, ":uint32 %s: %lli", s, tmp);
+		rb_raise(rb_eRangeError, ":uint32 %s: %lld", s, tmp);
 	}
 	return (LWES_U_INT_32)tmp;
 }
@@ -46,7 +46,7 @@ LWES_INT_32 lwesrb_int32(VALUE val)
 
 	if (tmp != (LWES_INT_32)tmp) {
 		const char *s = tmp < 0 ? "small" : "big";
-		rb_raise(rb_eRangeError, ":int32 too %s: %lli", s, tmp);
+		rb_raise(rb_eRangeError, ":int32 too %s: %lld", s, tmp);
 	}
 	return (LWES_INT_32)tmp;
 }

data/lwes.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{lwes}
-  s.version = "0.8.4"
+  s.version = "0.8.5"
   s.date = Time.now
   s.authors = ["Erik S. Chang", "Frank Maritato"]
   s.email = %q{lwes-devel@lists.sourceforge.net}

data/test/unit/test_emitter.rb

@@ -35,8 +35,13 @@ class TestEmitter < Test::Unit::TestCase
   end
 
   def test_initialize_with_heartbeat
+    l = LWES::Listener.new(@options)
     heartbeat = @options.merge(:heartbeat => 30)
-    assert_instance_of LWES::Emitter, LWES::Emitter.new(heartbeat)
+    e = LWES::Emitter.new(heartbeat)
+    assert_instance_of LWES::Emitter, e
+    assert_nil e.close
+    assert_instance_of LWES::Event, l.recv
+    assert_nil l.close
   end
 
   def test_initialize_no_ttl

data/test/unit/test_listener.rb

@@ -60,14 +60,15 @@ class TestListener < Test::Unit::TestCase
   end
 
   def test_listen_each_signal
-    signaled = false
-    handler = trap(:USR1) { signaled = true }
+    pipe = IO.pipe
+    handler = trap(:USR1) { pipe[1].syswrite('.') }
     @listener = LWES::Listener.new @options
     @emitter = LWES::Emitter.new @options
     tmp = []
     thr = Thread.new do
       sleep 0.1
       Process.kill :USR1, $$
+      assert_equal '.', pipe[0].read(1)
       @emitter.emit("E1", :hello => "WORLD")
       :OK
     end
@@ -75,8 +76,9 @@ class TestListener < Test::Unit::TestCase
     assert thr.join
     assert_equal :OK, thr.value
     assert_equal 1, tmp.size
-    assert_equal "WORLD", tmp[0].to_hash[:hello]
+    assert_equal "WORLD", tmp[0].to_hash[:hello], tmp
     ensure
       trap(:USR1, handler)
+      pipe.each { |io| io.close }
   end
 end if LWES::Listener.method_defined?(:recv)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lwes
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: lwes
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for the Light Weight Event System