rbczmq 1.7.7 → 1.7.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzJlMDlhZjZkMTkxYzBlOWQyODZjZTQ1ODEwMjk3YWY0ZGEwNGUzZA==
-  data.tar.gz: !binary |-
-    ODVlN2VkYTUxOTMyOWQ5MTBhMzJkNWZhM2JjNDAxODRkNzc2ODk4Yw==
+SHA1:
+  metadata.gz: 01f7a617098dab8cb3800f01bd8a4c24af8aaedf
+  data.tar.gz: 701f90292c7bfd1ca2ff846ce6388e43e5350868
 SHA512:
-  metadata.gz: !binary |-
-    Y2Y1NDUwOWU5OTY1M2FjZDY0NDdiMjUxMTFhMjRkZWU5MzA0ZTg4ODdiMTA4
-    YTFiMzg4ZGNkMzRjZTRmNTIwMzQ1NzJlYmYyZjU2NjdlZjRiNDJhZmJiNGFl
-    MTBjNzBhMmUxZjNjZTZjMGU3OWQxYjg0ZWZhOTJkYjM4NDM2NzM=
-  data.tar.gz: !binary |-
-    ZTk1NTgzMjU1NTM4ZmQ3ZDdkYWE2OWYyMjgyYmIwZTFlM2MxZWFlNzAxYTA2
-    OWNjZTRlZmM5ZWExNzg3MTI5MTY3NjRlNWQyYjNjNTM3NWNlYTQ3MDc3OTZk
-    M2NlMWRjN2JhYzg4MmMwY2M3YmU3NGQ5ODc2NTRkM2U4YTg5YjI=
+  metadata.gz: b8bef93adec081ac3039a90ab3fb6387c2873ae48ece830c10e66cbadf2abac2f67cf63271783045a9329bfa8796ddcc94b3b11353e4f095a5cf78fc6a2d4b6b
+  data.tar.gz: bb85824630315a6f89d16609649f2c1f97ae34ba46db847cee43594ceafc4ff2add9fb0a7b64d87f8dfd780726d985061093bb0282c142b901ef0261a9cd519c

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - 2.0.0
   - 2.1.1
   - 2.1.2
+  - 2.2.0-rc1
   - ruby-head
 script: "bundle exec rake"
 gemfile:

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = Changelog
 
+== 1.7.8 (December 24, 2014)
+
+* clean up beacon tests to bind to port 0 to get an automatically assigned free port (Erkki Eilonen)
+* Support rubies > 2.1
+
 == 1.7.7 (August 29, 2014)
 
 * Add the ability to use system libraries for hosts that already have libzmq and libczmq installed by passing the

data/Gemfile

@@ -8,6 +8,4 @@ gem 'rdoc'
 # required for testing rubinius on travis:
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
-  gem 'minitest', '~> 4.7'
-  gem 'rubysl-test-unit', '~> 2.0'
 end

data/Gemfile.lock

@@ -1,20 +1,21 @@
 PATH
   remote: .
   specs:
-    rbczmq (1.7.7)
+    rbczmq (1.7.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ffi2-generators (0.1.1)
     json (1.8.1)
-    minitest (4.7.5)
-    rake (10.1.1)
+    minitest (5.5.0)
+    rake (10.4.2)
     rake-compiler (0.8.3)
       rake
-    rdoc (4.1.0)
+    rb-readline (0.5.1)
+    rdoc (4.2.0)
       json (~> 1.4)
-    rubysl (2.0.15)
+    rubysl (2.1.0)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
       rubysl-benchmark (~> 2.0)
@@ -48,7 +49,7 @@ GEM
       rubysl-io-nonblock (~> 2.0)
       rubysl-io-wait (~> 2.0)
       rubysl-ipaddr (~> 2.0)
-      rubysl-irb (~> 2.0)
+      rubysl-irb (~> 2.1)
       rubysl-logger (~> 2.0)
       rubysl-mathn (~> 2.0)
       rubysl-matrix (~> 2.0)
@@ -77,7 +78,6 @@ GEM
       rubysl-pstore (~> 2.0)
       rubysl-pty (~> 2.0)
       rubysl-rational (~> 2.0)
-      rubysl-readline (~> 2.0)
       rubysl-resolv (~> 2.0)
       rubysl-rexml (~> 2.0)
       rubysl-rinda (~> 2.0)
@@ -119,14 +119,14 @@ GEM
     rubysl-csv (2.0.2)
       rubysl-english (~> 2.0)
     rubysl-curses (2.0.1)
-    rubysl-date (2.0.6)
+    rubysl-date (2.0.8)
     rubysl-delegate (2.0.1)
     rubysl-digest (2.0.3)
     rubysl-drb (2.0.1)
     rubysl-e2mmap (2.0.0)
     rubysl-english (2.0.0)
     rubysl-enumerator (2.0.0)
-    rubysl-erb (2.0.1)
+    rubysl-erb (2.0.2)
     rubysl-etc (2.0.3)
       ffi2-generators (~> 0.1)
     rubysl-expect (2.0.0)
@@ -144,12 +144,12 @@ GEM
     rubysl-io-nonblock (2.0.0)
     rubysl-io-wait (2.0.0)
     rubysl-ipaddr (2.0.0)
-    rubysl-irb (2.0.4)
+    rubysl-irb (2.1.0)
+      rb-readline (~> 0.5)
       rubysl-e2mmap (~> 2.0)
       rubysl-mathn (~> 2.0)
-      rubysl-readline (~> 2.0)
       rubysl-thread (~> 2.0)
-    rubysl-logger (2.0.0)
+    rubysl-logger (2.1.0)
     rubysl-mathn (2.0.0)
     rubysl-matrix (2.1.0)
       rubysl-e2mmap (~> 2.0)
@@ -172,22 +172,21 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.0.5)
+    rubysl-openssl (2.2.1)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
     rubysl-ostruct (2.0.4)
-    rubysl-pathname (2.0.0)
-    rubysl-prettyprint (2.0.2)
+    rubysl-pathname (2.1.0)
+    rubysl-prettyprint (2.0.3)
     rubysl-prime (2.0.1)
     rubysl-profile (2.0.0)
     rubysl-profiler (2.0.1)
     rubysl-pstore (2.0.0)
-    rubysl-pty (2.0.2)
+    rubysl-pty (2.0.3)
     rubysl-rational (2.0.1)
-    rubysl-readline (2.0.2)
-    rubysl-resolv (2.0.0)
-    rubysl-rexml (2.0.2)
-    rubysl-rinda (2.0.0)
+    rubysl-resolv (2.1.0)
+    rubysl-rexml (2.0.4)
+    rubysl-rinda (2.0.1)
     rubysl-rss (2.0.0)
     rubysl-scanf (2.0.0)
     rubysl-securerandom (2.0.0)
@@ -198,16 +197,14 @@ GEM
     rubysl-stringio (2.0.0)
     rubysl-strscan (2.0.0)
     rubysl-sync (2.0.0)
-    rubysl-syslog (2.0.1)
+    rubysl-syslog (2.1.0)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
-    rubysl-test-unit (2.0.3)
-      minitest (~> 4.7)
     rubysl-thread (2.0.2)
     rubysl-thwait (2.0.0)
     rubysl-time (2.0.3)
     rubysl-timeout (2.0.0)
-    rubysl-tmpdir (2.0.0)
+    rubysl-tmpdir (2.0.1)
     rubysl-tsort (2.0.1)
     rubysl-un (2.0.0)
       rubysl-fileutils (~> 2.0)
@@ -223,10 +220,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  minitest (~> 4.7)
+  minitest (~> 5.5.0)
   rake
   rake-compiler (~> 0.8.0)
   rbczmq!
   rdoc
   rubysl (~> 2.0)
-  rubysl-test-unit (~> 2.0)

data/Rakefile

@@ -34,7 +34,8 @@ end
 
 desc 'Run rbczmq tests'
 Rake::TestTask.new(:test) do |t|
-  t.test_files = Dir.glob("test/**/test_*.rb")
+  t.libs << 'test'
+  t.pattern = "test/**/test_*.rb"
   t.verbose = true
   t.warning = true
 end

data/ext/rbczmq/beacon.c

@@ -24,7 +24,7 @@ static void rb_czmq_free_beacon_gc(void *ptr)
 {
     zmq_beacon_wrapper *beacon = (zmq_beacon_wrapper *)ptr;
     if (beacon) {
-        rb_thread_blocking_region(rb_czmq_nogvl_beacon_destroy, beacon, RUBY_UBF_IO, 0);
+        rb_thread_call_without_gvl(rb_czmq_nogvl_beacon_destroy, beacon, RUBY_UBF_IO, 0);
         xfree(beacon);
     }
 }
@@ -57,7 +57,7 @@ static VALUE rb_czmq_beacon_s_new(VALUE beacon, VALUE port)
     Check_Type(port, T_FIXNUM);
     beacon = Data_Make_Struct(rb_cZmqBeacon, zmq_beacon_wrapper, 0, rb_czmq_free_beacon_gc, bcn);
     prt = FIX2INT(port);
-    bcn->beacon = (zbeacon_t*)rb_thread_blocking_region(rb_czmq_nogvl_new_beacon, (void *)prt, RUBY_UBF_IO, 0);
+    bcn->beacon = (zbeacon_t*)rb_thread_call_without_gvl(rb_czmq_nogvl_new_beacon, (void *)prt, RUBY_UBF_IO, 0);
     ZmqAssertObjOnAlloc(bcn->beacon, bcn);
     rb_obj_call_init(beacon, 0, NULL);
     return beacon;
@@ -77,7 +77,7 @@ static VALUE rb_czmq_beacon_s_new(VALUE beacon, VALUE port)
 static VALUE rb_czmq_beacon_destroy(VALUE obj)
 {
     GetZmqBeacon(obj);
-    rb_thread_blocking_region(rb_czmq_nogvl_beacon_destroy, beacon, RUBY_UBF_IO, 0);
+    rb_thread_call_without_gvl(rb_czmq_nogvl_beacon_destroy, beacon, RUBY_UBF_IO, 0);
     return Qnil;
 }
 
@@ -127,7 +127,7 @@ static VALUE rb_czmq_beacon_set_interval(VALUE obj, VALUE interval)
     Check_Type(interval, T_FIXNUM);
     args.beacon = beacon;
     args.interval = FIX2INT(interval);
-    rb_thread_blocking_region(rb_czmq_nogvl_set_interval, (void *)&args, RUBY_UBF_IO, 0);
+    rb_thread_call_without_gvl(rb_czmq_nogvl_set_interval, (void *)&args, RUBY_UBF_IO, 0);
     return Qnil;
 }
 
@@ -156,7 +156,7 @@ static VALUE rb_czmq_nogvl_noecho(void *ptr)
 static VALUE rb_czmq_beacon_noecho(VALUE obj)
 {
     GetZmqBeacon(obj);
-    rb_thread_blocking_region(rb_czmq_nogvl_noecho, (void *)beacon, RUBY_UBF_IO, 0);
+    rb_thread_call_without_gvl(rb_czmq_nogvl_noecho, (void *)beacon, RUBY_UBF_IO, 0);
     return Qnil;
 }
 
@@ -191,7 +191,7 @@ static VALUE rb_czmq_beacon_publish(VALUE obj, VALUE transmit)
     args.beacon = beacon;
     args.transmit = RSTRING_PTR(transmit);
     args.length = (int)RSTRING_LEN(transmit);
-    rb_thread_blocking_region(rb_czmq_nogvl_publish, (void *)&args, RUBY_UBF_IO, 0);
+    rb_thread_call_without_gvl(rb_czmq_nogvl_publish, (void *)&args, RUBY_UBF_IO, 0);
     return Qnil;
 }
 
@@ -220,7 +220,7 @@ static VALUE rb_czmq_nogvl_silence(void *ptr)
 static VALUE rb_czmq_beacon_silence(VALUE obj)
 {
     GetZmqBeacon(obj);
-    rb_thread_blocking_region(rb_czmq_nogvl_silence, (void *)beacon, RUBY_UBF_IO, 0);
+    rb_thread_call_without_gvl(rb_czmq_nogvl_silence, (void *)beacon, RUBY_UBF_IO, 0);
     return Qnil;
 }
 
@@ -260,7 +260,7 @@ static VALUE rb_czmq_beacon_subscribe(VALUE obj, VALUE filter)
         args.filter = RSTRING_PTR(filter);
         args.length = (int)RSTRING_LEN(filter);
     }
-    rb_thread_blocking_region(rb_czmq_nogvl_subscribe, (void *)&args, RUBY_UBF_IO, 0);
+    rb_thread_call_without_gvl(rb_czmq_nogvl_subscribe, (void *)&args, RUBY_UBF_IO, 0);
     return Qnil;
 }
 
@@ -289,7 +289,7 @@ static VALUE rb_czmq_nogvl_unsubscribe(void *ptr)
 static VALUE rb_czmq_beacon_unsubscribe(VALUE obj)
 {
     GetZmqBeacon(obj);
-    rb_thread_blocking_region(rb_czmq_nogvl_unsubscribe, (void *)beacon, RUBY_UBF_IO, 0);
+    rb_thread_call_without_gvl(rb_czmq_nogvl_unsubscribe, (void *)beacon, RUBY_UBF_IO, 0);
     return Qnil;
 }
 

data/ext/rbczmq/context.c

@@ -54,7 +54,7 @@ static void rb_czmq_free_ctx(zmq_ctx_wrapper *ctx)
     }
 
     // finally, shutdown the context.
-    rb_thread_blocking_region(rb_czmq_nogvl_zctx_destroy, ctx, RUBY_UBF_IO, 0);
+    rb_thread_call_without_gvl(rb_czmq_nogvl_zctx_destroy, (void *)ctx, RUBY_UBF_IO, 0);
 
     ctx->ctx = NULL;
     rb_hash_aset(ctx_map, ctx->pidValue, Qnil);
@@ -108,7 +108,7 @@ void rb_czmq_context_destroy_socket(zmq_sock_wrapper* socket)
             zlist_remove(ctx->sockets, socket);
 
             if (socket->socket) {
-                rb_thread_blocking_region(rb_czmq_nogvl_zsocket_destroy, socket, RUBY_UBF_IO, 0);
+                rb_thread_call_without_gvl(rb_czmq_nogvl_zsocket_destroy, (void *)socket, RUBY_UBF_IO, 0);
             }
         }
     }
@@ -178,19 +178,26 @@ static VALUE rb_czmq_nogvl_zctx_new(ZMQ_UNUSED void *ptr)
 
 static VALUE rb_czmq_ctx_s_new(int argc, VALUE *argv, VALUE context)
 {
+    VALUE process_ctx;
     VALUE ctx_map;
     VALUE io_threads;
     zmq_ctx_wrapper *ctx = NULL;
     rb_scan_args(argc, argv, "01", &io_threads);
     ctx_map = rb_ivar_get(rb_mZmq, intern_zctx_process);
-    if (!NIL_P(rb_hash_aref(ctx_map, get_pid()))) rb_raise(rb_eZmqError, "single ZMQ context per process allowed");
+    process_ctx = rb_hash_aref(ctx_map, get_pid());
+    if (!NIL_P(process_ctx)){
+      Data_Get_Struct(process_ctx, zmq_ctx_wrapper, ctx);
+      rb_raise(rb_eZmqError, "single ZMQ context per process allowed (previous context created at %s:%d)", ctx->file, ctx->line);
+    }
     context = Data_Make_Struct(rb_cZmqContext, zmq_ctx_wrapper, rb_czmq_mark_ctx_gc, rb_czmq_free_ctx_gc, ctx);
-    ctx->ctx = (zctx_t*)rb_thread_blocking_region(rb_czmq_nogvl_zctx_new, NULL, RUBY_UBF_IO, 0);
+    ctx->ctx = (zctx_t*)rb_thread_call_without_gvl(rb_czmq_nogvl_zctx_new, NULL, RUBY_UBF_IO, 0);
     ZmqAssertObjOnAlloc(ctx->ctx, ctx);
     ctx->flags = 0;
     ctx->pid = getpid();
     ctx->pidValue = get_pid();
     ctx->sockets = zlist_new();
+    ctx->file = rb_sourcefile();
+    ctx->line = rb_sourceline();
     rb_obj_call_init(context, 0, NULL);
     rb_hash_aset(ctx_map, ctx->pidValue, context);
     if (!NIL_P(io_threads)) rb_czmq_ctx_set_iothreads(context, io_threads);
@@ -372,6 +379,7 @@ static VALUE rb_czmq_ctx_socket(VALUE obj, VALUE type)
     int socket_type;
     struct nogvl_socket_args args;
     errno = 0;
+    void *socket;
     ZmqGetContext(obj);
     ZmqAssertContextPidMatches(ctx);
     if (TYPE(type) != T_FIXNUM && TYPE(type) != T_SYMBOL) rb_raise(rb_eTypeError, "wrong socket type %s (expected Fixnum or Symbol)", RSTRING_PTR(rb_obj_as_string(type)));
@@ -379,7 +387,8 @@ static VALUE rb_czmq_ctx_socket(VALUE obj, VALUE type)
 
     args.ctx = ctx->ctx;
     args.type = socket_type;
-    VALUE socket_object = rb_czmq_socket_alloc(obj, ctx->ctx, (void*)rb_thread_blocking_region(rb_czmq_nogvl_socket_new, (void *)&args, RUBY_UBF_IO, 0));
+    socket = rb_thread_call_without_gvl(rb_czmq_nogvl_socket_new, (void *)&args, RUBY_UBF_IO, 0);
+    VALUE socket_object = rb_czmq_socket_alloc(obj, ctx->ctx, socket);
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(socket_object);
     zlist_push(ctx->sockets, sock);

data/ext/rbczmq/context.h

@@ -10,6 +10,8 @@ typedef struct {
     int flags;
     pid_t pid; /* this is the pid for the process that created the context. Only this process can use the context. */
     VALUE pidValue; /* this is the key used to ensure one context per process */
+    const char *file; /* Source file where the context for this process was created */
+    int line; /* Source line where the context for this process was created */
     zlist_t* sockets; /* list of socket wrapper objects owned by this context. */
 } zmq_ctx_wrapper;
 

data/ext/rbczmq/extconf.rb

@@ -124,7 +124,9 @@ end
 
 dir_config('rbczmq')
 
+have_header('ruby/thread.h')
 have_func('rb_thread_blocking_region')
+have_func('rb_thread_call_without_gvl')
 
 $INCFLAGS << " -I#{zmq_include_path}" if find_header("zmq.h", zmq_include_path)
 $INCFLAGS << " -I#{czmq_include_path}" if find_header("czmq.h", czmq_include_path)

data/ext/rbczmq/loop.c

@@ -301,7 +301,7 @@ static VALUE rb_czmq_loop_start(VALUE obj)
     rb_thread_schedule();
     zloop_timer(loop->loop, 1, 1, rb_czmq_loop_started_callback, loop);
 
-    rc = (int)rb_thread_blocking_region(rb_czmq_loop_start_nogvl, (void *)loop, rb_czmq_loop_start_ubf, (void*)loop);
+    rc = (int)rb_thread_call_without_gvl(rb_czmq_loop_start_nogvl, (void *)loop, rb_czmq_loop_start_ubf, (void*)loop);
 	
     if (rc > 0) rb_raise(rb_eZmqError, "internal event loop error!");
     return INT2NUM(rc);

data/ext/rbczmq/poller.c

@@ -157,7 +157,7 @@ VALUE rb_czmq_poller_poll(int argc, VALUE *argv, VALUE obj)
     rb_ary_clear(poller->readables);
     rb_ary_clear(poller->writables);
 
-    rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_poll, (void *)&args, RUBY_UBF_IO, 0);
+    rc = (int)rb_thread_call_without_gvl(rb_czmq_nogvl_poll, (void *)&args, RUBY_UBF_IO, 0);
 
     /* only call ZmqAssert if return code is less than zero since zmq_poll returns the number of pollers on success */
     if (rc < 0) {

data/ext/rbczmq/rbczmq_ext.c

@@ -67,6 +67,22 @@ static VALUE rb_czmq_m_version(ZMQ_UNUSED VALUE obj)
     return rb_ary_new3(3, INT2NUM(major), INT2NUM(minor), INT2NUM(patch));
 }
 
+/*
+ *  call-seq:
+ *     ZMQ.czmq_version    =>  Array
+ *
+ *  Returns the czmq version linked against.
+ *
+ * === Examples
+ *     ZMQ.czmq_version    =>  [3,0,0]
+ *
+*/
+
+static VALUE rb_czmq_m_czmq_version(ZMQ_UNUSED VALUE obj)
+{
+    return rb_ary_new3(3, INT2NUM(CZMQ_VERSION_MAJOR), INT2NUM(CZMQ_VERSION_MINOR), INT2NUM(CZMQ_VERSION_PATCH));
+}
+
 /*
  *  call-seq:
  *     ZMQ.now    =>  Fixnum
@@ -207,7 +223,7 @@ static VALUE rb_czmq_m_proxy(int argc, VALUE *argv, ZMQ_UNUSED VALUE klass)
         sockets[2] = NULL;
     }
 
-    rc = (int)rb_thread_blocking_region(rb_czmq_m_proxy_nogvl, (void *)sockets, RUBY_UBF_IO, 0);
+    rc = (int)rb_thread_call_without_gvl(rb_czmq_m_proxy_nogvl, (void *)sockets, RUBY_UBF_IO, 0);
 
     // int result = zmq_proxy(frontend_socket, backend_socket, capture_socket);
     return INT2NUM(rc);
@@ -228,6 +244,7 @@ void Init_rbczmq_ext()
 
     rb_define_module_function(rb_mZmq, "interrupted?", rb_czmq_m_interrupted_p, 0);
     rb_define_module_function(rb_mZmq, "version", rb_czmq_m_version, 0);
+    rb_define_module_function(rb_mZmq, "czmq_version", rb_czmq_m_czmq_version, 0);
     rb_define_module_function(rb_mZmq, "now", rb_czmq_m_now, 0);
     rb_define_module_function(rb_mZmq, "log", rb_czmq_m_log, 1);
     rb_define_module_function(rb_mZmq, "error", rb_czmq_m_error, 0);

data/ext/rbczmq/rbczmq_prelude.h

@@ -11,8 +11,8 @@
 #ifdef JRUBY
 #include "jruby.h"
 #else
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
-#include "ruby19.h"
+#if HAVE_RB_THREAD_BLOCKING_REGION || HAVE_RB_THREAD_CALL_WITHOUT_GVL
+#include "ruby2.h"
 #else
 #include "ruby18.h"
 #endif

data/ext/rbczmq/ruby2.h

@@ -0,0 +1,13 @@
+#ifndef RBCZMQ_RUBY2_H
+#define RBCZMQ_RUBY2_H
+
+#ifdef HAVE_RUBY_THREAD_H
+#include <ruby/thread.h>
+#endif
+
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#define rb_thread_call_without_gvl(func, data1, ubf, data2) \
+  rb_thread_blocking_region((rb_blocking_function_t *)func, data1, ubf, data2)
+#endif
+
+#endif

data/ext/rbczmq/socket.c

@@ -211,7 +211,7 @@ static VALUE rb_czmq_socket_bind(VALUE obj, VALUE endpoint)
     Check_Type(endpoint, T_STRING);
     args.socket = sock;
     args.endpoint = StringValueCStr(endpoint);
-    rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_socket_bind, (void *)&args, RUBY_UBF_IO, 0);
+    rc = (int)rb_thread_call_without_gvl(rb_czmq_nogvl_socket_bind, (void *)&args, RUBY_UBF_IO, 0);
     /* ZmqAssert will return false on any non-zero return code. Bind returns the port number */
     if (rc < 0) {
         ZmqAssert(rc);
@@ -252,7 +252,7 @@ static VALUE rb_czmq_socket_connect(VALUE obj, VALUE endpoint)
     Check_Type(endpoint, T_STRING);
     args.socket = sock;
     args.endpoint = StringValueCStr(endpoint);
-    rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_socket_connect, (void *)&args, RUBY_UBF_IO, 0);
+    rc = (int)rb_thread_call_without_gvl(rb_czmq_nogvl_socket_connect, (void *)&args, RUBY_UBF_IO, 0);
     ZmqAssert(rc);
     /* get the endpoint name with any ephemeral ports filled in. */
     char* endpoint_string = zsocket_last_endpoint(sock->socket);
@@ -306,7 +306,7 @@ static VALUE rb_czmq_socket_disconnect(VALUE obj, VALUE endpoint)
     Check_Type(endpoint, T_STRING);
     args.socket = sock;
     args.endpoint = StringValueCStr(endpoint);
-    rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_socket_disconnect, (void *)&args, RUBY_UBF_IO, 0);
+    rc = (int)rb_thread_call_without_gvl(rb_czmq_nogvl_socket_disconnect, (void *)&args, RUBY_UBF_IO, 0);
     ZmqAssert(rc);
     if (sock->verbose)
         zclock_log ("I: %s socket %p: disconnected \"%s\"", zsocket_type_str(sock->socket), obj, StringValueCStr(endpoint));
@@ -360,7 +360,7 @@ static VALUE rb_czmq_socket_unbind(VALUE obj, VALUE endpoint)
     Check_Type(endpoint, T_STRING);
     args.socket = sock;
     args.endpoint = StringValueCStr(endpoint);
-    rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_socket_unbind, (void *)&args, RUBY_UBF_IO, 0);
+    rc = (int)rb_thread_call_without_gvl(rb_czmq_nogvl_socket_unbind, (void *)&args, RUBY_UBF_IO, 0);
     ZmqAssert(rc);
     if (sock->verbose)
         zclock_log ("I: %s socket %p: unbound \"%s\"", zsocket_type_str(sock->socket), obj, StringValueCStr(endpoint));
@@ -468,7 +468,7 @@ static VALUE rb_czmq_socket_send(VALUE obj, VALUE msg)
     Check_Type(msg, T_STRING);
     args.msg = RSTRING_PTR(msg);
     args.length = RSTRING_LEN(msg);
-    rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_zstr_send, (void *)&args, RUBY_UBF_IO, 0);
+    rc = (int)rb_thread_call_without_gvl(rb_czmq_nogvl_zstr_send, (void *)&args, RUBY_UBF_IO, 0);
     ZmqAssert(rc);
     if (sock->verbose)
         zclock_log ("I: %s socket %p: send \"%s\"", zsocket_type_str(sock->socket), obj, StringValueCStr(msg));
@@ -503,7 +503,7 @@ static VALUE rb_czmq_socket_sendm(VALUE obj, VALUE msg)
     Check_Type(msg, T_STRING);
     args.msg = RSTRING_PTR(msg);
     args.length = RSTRING_LEN(msg);
-    rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_zstr_sendm, (void *)&args, RUBY_UBF_IO, 0);
+    rc = (int)rb_thread_call_without_gvl(rb_czmq_nogvl_zstr_sendm, (void *)&args, RUBY_UBF_IO, 0);
     ZmqAssert(rc);
     if (sock->verbose)
         zclock_log ("I: %s socket %p: sendm \"%s\"", zsocket_type_str(sock->socket), sock->socket, StringValueCStr(msg));
@@ -555,7 +555,7 @@ static VALUE rb_czmq_socket_recv(VALUE obj)
     args.socket = sock;
     zmq_msg_init(&args.message);
 
-    int rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_recv, (void *)&args, RUBY_UBF_IO, 0);
+    int rc = (int)rb_thread_call_without_gvl(rb_czmq_nogvl_recv, (void *)&args, RUBY_UBF_IO, 0);
     if (rc < 0) {
         zmq_msg_close(&args.message);
         return Qnil;
@@ -677,7 +677,7 @@ static VALUE rb_czmq_socket_send_frame(int argc, VALUE *argv, VALUE obj)
     args.socket = sock;
     args.frame = frame->frame;
     args.flags = flgs;
-    rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_send_frame, (void *)&args, RUBY_UBF_IO, 0);
+    rc = (int)rb_thread_call_without_gvl(rb_czmq_nogvl_send_frame, (void *)&args, RUBY_UBF_IO, 0);
     ZmqAssert(rc);
     if ((flgs & ZFRAME_REUSE) == 0) {
         /* frame has been destroyed, clear the owns flag */
@@ -730,7 +730,7 @@ static VALUE rb_czmq_socket_send_message(VALUE obj, VALUE message_obj)
     if (sock->verbose) print_message = zmsg_dup(message->message);
     args.socket = sock;
     args.message = message->message;
-    rb_thread_blocking_region(rb_czmq_nogvl_send_message, (void *)&args, RUBY_UBF_IO, 0);
+    rb_thread_call_without_gvl(rb_czmq_nogvl_send_message, (void *)&args, RUBY_UBF_IO, 0);
     message->flags &= ~ZMQ_MESSAGE_OWNED;
     if (sock->verbose) ZmqDumpMessage("send_message", print_message);
     return Qnil;
@@ -774,7 +774,7 @@ static VALUE rb_czmq_socket_recv_frame(VALUE obj)
     ZmqAssertSocketNotPending(sock, "can only receive on a bound or connected socket!");
     ZmqSockGuardCrossThread(sock);
     args.socket = sock;
-    frame = (zframe_t *)rb_thread_blocking_region(rb_czmq_nogvl_recv_frame, (void *)&args, RUBY_UBF_IO, 0);
+    frame = (zframe_t *)rb_thread_call_without_gvl(rb_czmq_nogvl_recv_frame, (void *)&args, RUBY_UBF_IO, 0);
     if (frame == NULL) return Qnil;
     if (sock->verbose) {
         cur_time = rb_czmq_formatted_current_time();
@@ -852,7 +852,7 @@ static VALUE rb_czmq_socket_recv_message(VALUE obj)
     ZmqAssertSocketNotPending(sock, "can only receive on a bound or connected socket!");
     ZmqSockGuardCrossThread(sock);
     args.socket = sock;
-    message = (zmsg_t *)rb_thread_blocking_region(rb_czmq_nogvl_recv_message, (void *)&args, RUBY_UBF_IO, 0);
+    message = (zmsg_t *)rb_thread_call_without_gvl(rb_czmq_nogvl_recv_message, (void *)&args, RUBY_UBF_IO, 0);
     if (message == NULL) return Qnil;
     if (sock->verbose) ZmqDumpMessage("recv_message", message);
     return rb_czmq_alloc_message(message);
@@ -894,7 +894,7 @@ static VALUE rb_czmq_socket_poll(VALUE obj, VALUE timeout)
     ZmqSockGuardCrossThread(sock);
     args.socket = sock;
     args.timeout = FIX2INT(timeout);
-    readable = (bool)rb_thread_blocking_region(rb_czmq_nogvl_poll, (void *)&args, RUBY_UBF_IO, 0);
+    readable = (bool)rb_thread_call_without_gvl(rb_czmq_nogvl_poll, (void *)&args, RUBY_UBF_IO, 0);
     return (readable == true) ? Qtrue : Qfalse;
 }
 
@@ -1788,7 +1788,7 @@ static VALUE rb_czmq_socket_monitor_thread(void *arg)
     while (1) {
         zmq_msg_init (&args.msg_event);
         zmq_msg_init (&args.msg_endpoint);
-        rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_monitor_recv, (void *)&args, RUBY_UBF_IO, 0);
+        rc = (int)rb_thread_call_without_gvl(rb_czmq_nogvl_monitor_recv, (void *)&args, RUBY_UBF_IO, 0);
         if (rc == -1 && (zmq_errno() == ETERM || zmq_errno() == ENOTSOCK || zmq_errno() == EINTR)) break;
         if (rc == -1 && (sock->flags & ZMQ_SOCKET_DESTROYED)) break;
         assert (rc != -1);

data/lib/zmq/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module ZMQ
-  VERSION = "1.7.7"
+  VERSION = "1.7.8"
 end

data/rbczmq.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files test`.split("\n")
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.add_development_dependency('minitest', '~> 5.5.0')
   s.add_development_dependency('rake-compiler', '~> 0.8.0')
 
   # get an array of submodule dirs by executing 'pwd' inside each submodule

data/test/helper.rb

@@ -1,14 +1,12 @@
 # encoding: utf-8
 
-require 'test/unit'
 require 'zmq'
+require 'minitest/autorun'
 require 'stringio'
 
 Thread.abort_on_exception = true
 
-class ZmqTestCase < Test::Unit::TestCase
-  undef_method :default_test if method_defined? :default_test
-
+class ZmqTestCase < Minitest::Test
   if ENV['STRESS_GC']
     def setup
       GC.stress = true

data/test/test_beacon.rb

@@ -6,23 +6,10 @@ require 'socket'
 class TestZmqBeacon < ZmqTestCase
   def setup
     GC.start
-    r = Random.new
-    begin
-      # find a random port number that we are able to bind to, and use this port
-      # for the beacon tests.
-      udp = UDPSocket.new
-      @port = 10000 + r.rand(50000)
-      udp.bind('0.0.0.0', @port)
-    rescue Errno::EADDRINUSE
-      udp.close
-      retry
-    ensure
-      udp.close
-    end
   end
 
   def test_beacon
-    beacon = ZMQ::Beacon.new(@port)
+    beacon = ZMQ::Beacon.new(0)
     assert_instance_of ZMQ::Beacon, beacon
     assert_nil beacon.destroy
     assert_raises TypeError do
@@ -33,14 +20,14 @@ class TestZmqBeacon < ZmqTestCase
   end
 
   def test_hostname
-    beacon = ZMQ::Beacon.new(@port)
+    beacon = ZMQ::Beacon.new(0)
     assert_instance_of String, beacon.hostname
   ensure
     beacon.destroy
   end
 
   def test_set_interval
-    beacon = ZMQ::Beacon.new(@port)
+    beacon = ZMQ::Beacon.new(0)
     beacon.interval = 100
     assert_raises TypeError do
       beacon.interval = :invalid
@@ -50,14 +37,14 @@ class TestZmqBeacon < ZmqTestCase
   end
 
   def test_noecho
-    beacon = ZMQ::Beacon.new(@port)
+    beacon = ZMQ::Beacon.new(0)
     assert_nil beacon.noecho
   ensure
     beacon.destroy
   end
 
   def test_publish
-    beacon = ZMQ::Beacon.new(@port)
+    beacon = ZMQ::Beacon.new(0)
     assert_raises TypeError do
       beacon.publish :invalid
     end
@@ -68,7 +55,7 @@ class TestZmqBeacon < ZmqTestCase
   end
 
   def test_subscribe
-    beacon = ZMQ::Beacon.new(@port)
+    beacon = ZMQ::Beacon.new(0)
     assert_raises TypeError do
       beacon.subscribe :invalid
     end
@@ -80,7 +67,7 @@ class TestZmqBeacon < ZmqTestCase
 
   def test_pipe
     GC.start
-    beacon = ZMQ::Beacon.new(@port)
+    beacon = ZMQ::Beacon.new(0)
     assert_instance_of ZMQ::Socket::Pair, beacon.pipe
     GC.start # check GC cycle with "detached" socket
   ensure
@@ -89,17 +76,18 @@ class TestZmqBeacon < ZmqTestCase
 
   def test_announce_lookup
     ctx = ZMQ::Context.new
-    address = "tcp://127.0.0.1:90000"
-    rep = ctx.bind(:REP, address)
-    service_beacon = ZMQ::Beacon.new(@port)
-    service_beacon.publish(address)
+    rep = ctx.bind(:REP, "tcp://127.0.0.1:0")
+    # official ZRE port, don't know how to introspect beacon to get bound port
+    beacon_port = 5670
+    service_beacon = ZMQ::Beacon.new(beacon_port)
+    service_beacon.publish(rep.endpoint)
     sleep(0.5)
-    client_beacon = ZMQ::Beacon.new(@port)
+    client_beacon = ZMQ::Beacon.new(beacon_port)
     client_beacon.subscribe("tcp")
     client_beacon.pipe.rcvtimeo = 1000
     sender_address = client_beacon.pipe.recv
     client_address = client_beacon.pipe.recv
-    assert_equal address, client_address
+    assert_equal rep.endpoint, client_address
     req = ctx.connect(:REQ, client_address)
     req.send "ping"
     assert_equal "ping", rep.recv

data/test/test_context.rb

@@ -11,7 +11,7 @@ class TestZmqContext < ZmqTestCase
     end
     assert_equal ctx, ZMQ.context
   ensure
-    assert_nil ctx.destroy
+    ctx.destroy
   end
 
   def test_destroyed_context
@@ -30,7 +30,7 @@ class TestZmqContext < ZmqTestCase
     end
     assert_equal ctx, ZMQ.context
   ensure
-    assert_nil ctx.destroy
+    ctx.destroy
   end
 
   def test_iothreads

data/test/test_frame.rb

@@ -36,7 +36,7 @@ class TestZmqFrame < ZmqTestCase
   def test_dup
     frame =  ZMQ::Frame("message")
     dup_frame = frame.dup
-    assert_not_equal dup_frame.object_id, frame.object_id
+    assert_operator dup_frame.object_id, :!=, frame.object_id
     assert_equal frame.data, dup_frame.data
   end
 
@@ -54,7 +54,7 @@ class TestZmqFrame < ZmqTestCase
   def test_equals
     frame =  ZMQ::Frame("message")
     assert_equal frame, ZMQ::Frame("message")
-    assert_not_equal frame, ZMQ::Frame("msg")
+    assert_operator frame, :!=, ZMQ::Frame("msg")
   end
 
   def test_compare

data/test/test_logger.rb

@@ -3,39 +3,36 @@
 require File.expand_path("../helper.rb", __FILE__)
 
 class TestZmqLogger < ZmqTestCase
-
-  def setup
-    @ctx = ZMQ::Context.new
-  end
-
-  def teardown
-    @ctx.destroy
-  end
-
   def test_invalid_socket
-    socket = @ctx.socket(ZMQ::REQ)
+    ctx = ZMQ::Context.new
+    socket = ctx.socket(ZMQ::REQ)
     assert_raises ZMQ::Logger::InvalidSocketError do
       ZMQ::Logger.new(socket)
     end
+  ensure
+    ctx.destroy
   end
 
   def test_valid_socket
-    socket = @ctx.socket(ZMQ::PUSH)
-    assert_nothing_raised do
-      ZMQ::Logger.new(socket)
-    end
+    ctx = ZMQ::Context.new
+    socket = ctx.socket(ZMQ::PUSH)
+    assert ZMQ::Logger.new(socket)
+  ensure
+    ctx.destroy
   end
 
   def test_send_message
-    reader = @ctx.socket(ZMQ::PULL)
+    ctx = ZMQ::Context.new
+    reader = ctx.socket(ZMQ::PULL)
     port = reader.bind("tcp://*:*")
     assert port > 0
-    writer = @ctx.socket(ZMQ::PUSH)
+    writer = ctx.socket(ZMQ::PUSH)
     writer.connect("tcp://localhost:#{port}")
     logger = ZMQ::Logger.new(writer)
     assert logger.debug("hellö world")
     message = reader.recv.force_encoding Encoding::UTF_8
-    assert_not_nil message =~ /hellö world/
+    assert message =~ /hellö world/
+  ensure
+    ctx.destroy
   end
-
 end

data/test/test_message.rb

@@ -11,7 +11,7 @@ class TestZmqMessage < ZmqTestCase
 
   def test_destroyed
     msg = ZMQ::Message("one", "two")
-    assert_not_nil msg.encode
+    assert msg.encode
     assert !msg.gone?
     msg.destroy
     assert msg.gone?
@@ -162,7 +162,7 @@ class TestZmqMessage < ZmqTestCase
     msg =  ZMQ::Message.new
     msg.pushstr "header"
     dup_msg = msg.dup
-    assert_not_equal dup_msg.object_id, msg.object_id
+    assert_operator dup_msg.object_id, :!=, msg.object_id
     assert_equal msg.size, dup_msg.size
     assert_equal "header", msg.popstr
   end
@@ -195,7 +195,7 @@ class TestZmqMessage < ZmqTestCase
     other.pushstr "header"
     other.pushstr "body"
 
-    assert_not_equal msg, other
+    assert_operator msg, :!=, other
     assert !msg.eql?(other)
     assert other.eql?(other)
   end
@@ -244,7 +244,7 @@ class TestZmqMessage < ZmqTestCase
     msg.add ZMQ::Frame.new("world")
     push.send_message(msg)
     received = pull.recv_message
-    assert_not_nil received
+    assert received
     assert_equal 2, received.size
     assert_equal "hello", received.first.data
     assert_equal "world", received.next.data

data/test/test_socket.rb

@@ -124,9 +124,8 @@ class TestZmqSocket < ZmqTestCase
     assert sock.fd != -1
     assert(sock.state & ZMQ::Socket::BOUND)
     tcp_sock = nil
-    assert_nothing_raised do
-      tcp_sock = TCPSocket.new("127.0.0.1", port)
-    end
+    tcp_sock = TCPSocket.new("127.0.0.1", port)
+    assert tcp_sock
   ensure
     ctx.destroy
     tcp_sock.close if tcp_sock

data/test/test_threading.rb

@@ -2,8 +2,6 @@
 
 require File.expand_path("../helper.rb", __FILE__)
 
-Thread.abort_on_exception = true
-
 class TestZmqThreading < ZmqTestCase
   def test_threaded
     ctx = ZMQ::Context.new
@@ -30,5 +28,7 @@ class TestZmqThreading < ZmqTestCase
     threads.map!{|t| t.value }
     thread_vals = [0, 1, 2, 3, 4, 500_000, 500_000, 500_000, 500_000, 500_000, expected, true]
     assert_equal thread_vals, threads
+  ensure
+    ctx.destroy
   end
 end

data/test/test_zmq.rb

@@ -13,6 +13,12 @@ class TestZmq < ZmqTestCase
     assert version.all?{|v| Fixnum === v }
   end
 
+  def test_czmq_version
+    version = ZMQ.czmq_version
+    assert_instance_of Array, version
+    assert version.all?{|v| Fixnum === v }
+  end
+
   def test_now
     assert [Bignum, Fixnum].include?(ZMQ.now.class)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbczmq
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - Lourens Naudé
@@ -10,20 +10,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.5.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
 description: Ruby extension for ZeroMQ (ZMQ) using CZMQ - High-level C Binding for
@@ -37,9 +51,9 @@ extensions:
 - ext/rbczmq/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
@@ -51,101 +65,6 @@ files:
 - examples/pub_sub.rb
 - examples/push_pull.rb
 - examples/req_rep.rb
-- ext/rbczmq/beacon.c
-- ext/rbczmq/beacon.h
-- ext/rbczmq/context.c
-- ext/rbczmq/context.h
-- ext/rbczmq/extconf.rb
-- ext/rbczmq/frame.c
-- ext/rbczmq/frame.h
-- ext/rbczmq/jruby.h
-- ext/rbczmq/loop.c
-- ext/rbczmq/loop.h
-- ext/rbczmq/message.c
-- ext/rbczmq/message.h
-- ext/rbczmq/poller.c
-- ext/rbczmq/poller.h
-- ext/rbczmq/pollitem.c
-- ext/rbczmq/pollitem.h
-- ext/rbczmq/rbczmq_ext.c
-- ext/rbczmq/rbczmq_ext.h
-- ext/rbczmq/rbczmq_prelude.h
-- ext/rbczmq/rubinius.h
-- ext/rbczmq/ruby18.h
-- ext/rbczmq/ruby19.h
-- ext/rbczmq/socket.c
-- ext/rbczmq/socket.h
-- ext/rbczmq/timer.c
-- ext/rbczmq/timer.h
-- lib/rbczmq.rb
-- lib/zmq.rb
-- lib/zmq/context.rb
-- lib/zmq/default_handler.rb
-- lib/zmq/frame.rb
-- lib/zmq/handler.rb
-- lib/zmq/logger.rb
-- lib/zmq/loop.rb
-- lib/zmq/message.rb
-- lib/zmq/monitor.rb
-- lib/zmq/poller.rb
-- lib/zmq/pollitem.rb
-- lib/zmq/socket.rb
-- lib/zmq/socket/dealer.rb
-- lib/zmq/socket/pair.rb
-- lib/zmq/socket/pub.rb
-- lib/zmq/socket/pull.rb
-- lib/zmq/socket/push.rb
-- lib/zmq/socket/rep.rb
-- lib/zmq/socket/req.rb
-- lib/zmq/socket/router.rb
-- lib/zmq/socket/stream.rb
-- lib/zmq/socket/sub.rb
-- lib/zmq/timer.rb
-- lib/zmq/version.rb
-- perf/pair.rb
-- perf/pair/local.rb
-- perf/pair/remote.rb
-- perf/pub_sub.rb
-- perf/pub_sub/local.rb
-- perf/pub_sub/remote.rb
-- perf/push_pull.rb
-- perf/push_pull/local.rb
-- perf/push_pull/remote.rb
-- perf/req_rep.rb
-- perf/req_rep/local.rb
-- perf/req_rep/remote.rb
-- perf/runner.rb
-- rbczmq.gemspec
-- test/helper.rb
-- test/socket/test_dealer_socket.rb
-- test/socket/test_pair_socket.rb
-- test/socket/test_pair_sockets.rb
-- test/socket/test_pub_socket.rb
-- test/socket/test_pub_sub_sockets.rb
-- test/socket/test_pull_socket.rb
-- test/socket/test_push_pull_sockets.rb
-- test/socket/test_push_socket.rb
-- test/socket/test_rep_socket.rb
-- test/socket/test_req_rep_sockets.rb
-- test/socket/test_req_socket.rb
-- test/socket/test_router_socket.rb
-- test/socket/test_routing.rb
-- test/socket/test_stream_socket.rb
-- test/socket/test_sub_socket.rb
-- test/test_beacon.rb
-- test/test_context.rb
-- test/test_frame.rb
-- test/test_handler.rb
-- test/test_logger.rb
-- test/test_loop.rb
-- test/test_message.rb
-- test/test_monitoring.rb
-- test/test_poller.rb
-- test/test_pollitem.rb
-- test/test_socket.rb
-- test/test_threading.rb
-- test/test_timer.rb
-- test/test_zmq.rb
 - ext/czmq/.gitignore
 - ext/czmq/.travis.yml
 - ext/czmq/AUTHORS
@@ -282,6 +201,32 @@ files:
 - ext/czmq/src/zthread.c
 - ext/czmq/src/ztree.c
 - ext/czmq/version.sh
+- ext/rbczmq/beacon.c
+- ext/rbczmq/beacon.h
+- ext/rbczmq/context.c
+- ext/rbczmq/context.h
+- ext/rbczmq/extconf.rb
+- ext/rbczmq/frame.c
+- ext/rbczmq/frame.h
+- ext/rbczmq/jruby.h
+- ext/rbczmq/loop.c
+- ext/rbczmq/loop.h
+- ext/rbczmq/message.c
+- ext/rbczmq/message.h
+- ext/rbczmq/poller.c
+- ext/rbczmq/poller.h
+- ext/rbczmq/pollitem.c
+- ext/rbczmq/pollitem.h
+- ext/rbczmq/rbczmq_ext.c
+- ext/rbczmq/rbczmq_ext.h
+- ext/rbczmq/rbczmq_prelude.h
+- ext/rbczmq/rubinius.h
+- ext/rbczmq/ruby18.h
+- ext/rbczmq/ruby2.h
+- ext/rbczmq/socket.c
+- ext/rbczmq/socket.h
+- ext/rbczmq/timer.c
+- ext/rbczmq/timer.h
 - ext/zeromq/.gitignore
 - ext/zeromq/.hgeol
 - ext/zeromq/.travis.yml
@@ -629,28 +574,97 @@ files:
 - ext/zeromq/tools/Makefile.am
 - ext/zeromq/tools/curve_keygen.c
 - ext/zeromq/version.sh
+- lib/rbczmq.rb
+- lib/zmq.rb
+- lib/zmq/context.rb
+- lib/zmq/default_handler.rb
+- lib/zmq/frame.rb
+- lib/zmq/handler.rb
+- lib/zmq/logger.rb
+- lib/zmq/loop.rb
+- lib/zmq/message.rb
+- lib/zmq/monitor.rb
+- lib/zmq/poller.rb
+- lib/zmq/pollitem.rb
+- lib/zmq/socket.rb
+- lib/zmq/socket/dealer.rb
+- lib/zmq/socket/pair.rb
+- lib/zmq/socket/pub.rb
+- lib/zmq/socket/pull.rb
+- lib/zmq/socket/push.rb
+- lib/zmq/socket/rep.rb
+- lib/zmq/socket/req.rb
+- lib/zmq/socket/router.rb
+- lib/zmq/socket/stream.rb
+- lib/zmq/socket/sub.rb
+- lib/zmq/timer.rb
+- lib/zmq/version.rb
+- perf/pair.rb
+- perf/pair/local.rb
+- perf/pair/remote.rb
+- perf/pub_sub.rb
+- perf/pub_sub/local.rb
+- perf/pub_sub/remote.rb
+- perf/push_pull.rb
+- perf/push_pull/local.rb
+- perf/push_pull/remote.rb
+- perf/req_rep.rb
+- perf/req_rep/local.rb
+- perf/req_rep/remote.rb
+- perf/runner.rb
+- rbczmq.gemspec
+- test/helper.rb
+- test/socket/test_dealer_socket.rb
+- test/socket/test_pair_socket.rb
+- test/socket/test_pair_sockets.rb
+- test/socket/test_pub_socket.rb
+- test/socket/test_pub_sub_sockets.rb
+- test/socket/test_pull_socket.rb
+- test/socket/test_push_pull_sockets.rb
+- test/socket/test_push_socket.rb
+- test/socket/test_rep_socket.rb
+- test/socket/test_req_rep_sockets.rb
+- test/socket/test_req_socket.rb
+- test/socket/test_router_socket.rb
+- test/socket/test_routing.rb
+- test/socket/test_stream_socket.rb
+- test/socket/test_sub_socket.rb
+- test/test_beacon.rb
+- test/test_context.rb
+- test/test_frame.rb
+- test/test_handler.rb
+- test/test_logger.rb
+- test/test_loop.rb
+- test/test_message.rb
+- test/test_monitoring.rb
+- test/test_poller.rb
+- test/test_pollitem.rb
+- test/test_socket.rb
+- test/test_threading.rb
+- test/test_timer.rb
+- test/test_zmq.rb
 homepage: http://github.com/methodmissing/rbczmq
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby extension for ZeroMQ (ZMQ) using CZMQ - High-level C Binding for ØMQ
@@ -686,4 +700,3 @@ test_files:
 - test/test_threading.rb
 - test/test_timer.rb
 - test/test_zmq.rb
-has_rdoc: true

data/ext/rbczmq/ruby19.h

@@ -1,4 +0,0 @@
-#ifndef RBCZMQ_RUBY19_H
-#define RBCZMQ_RUBY19_H
-
-#endif