Fix pyzmq adapter

Author: mrkn

Gemfile

@@ -17,4 +17,5 @@ group :test do
   gem 'cztop'
   gem 'rbczmq'
   gem 'ffi-rzmq'
+  gem 'pycall', '>= 1.2.1'
 end

ci/Dockerfile.base.erb

@@ -8,6 +8,7 @@ RUN apt-get update \
                python3 \
                python3-pip \
                python3-setuptools \
+               libpython3.6 \
     && pip3 install wheel \
     && pip3 install -r /tmp/requirements.txt \
     && rm -f /tmp/requirements.txt

lib/iruby/session_adapter/pyzmq_adapter.rb

@@ -24,26 +24,29 @@ def make_pub_socket(protocol, host, port)
         make_socket(:REP, protocol, host, port)
       end
 
+      def heartbeat_loop(sock)
+        PyCall.sys.path.append(File.expand_path('../pyzmq', __FILE__))
+        heartbeat = PyCall.import_module('iruby.heartbeat')
+        @heartbeat_thread = heartbeat.Heartbeat.new(sock)
+        @heartbeat_thread.start
+      end
 
       private
 
       def socket_type(type_symbol)
         case type_symbol
-        when :ROUTER, :PUB
-          zmq.__getattr__(type_symbol)
+        when :ROUTER, :PUB, :REP
+          zmq[type_symbol]
         else
-          if zmq.__hasattr__(type_symbol)
-            raise ArgumentError, "Unsupported ZMQ socket type: #{type_symbol}"
-          else
-            raise ArgumentError, "Unknown ZMQ socket type: #{type_symbol}"
-          end
+          raise ArgumentError, "Unknown ZMQ socket type: #{type_symbol}"
         end
       end
 
       def make_socket(type_symbol, protocol, host, port)
         type = socket_type(type_symbol)
-        zmq_context.socket(type)
+        sock = zmq_context.socket(type)
         bind_socket(sock, protocol, host, port)
+        sock
       end
 
       def bind_socket(sock, protocol, host, port)
@@ -62,7 +65,7 @@ def bind_socket(sock, protocol, host, port)
       end
 
       def zmq_context
-        zmq.Context.instance.()
+        zmq.Context.instance
       end
 
       def zmq

run-test.sh

@@ -2,8 +2,9 @@
 
 set -ex
 
-# ADAPTERS="cztop rbczmq ffi-rzmq pyzmq"
-ADAPTERS="cztop rbczmq ffi-rzmq"
+export PYTHON=python3
+
+ADAPTERS="cztop rbczmq ffi-rzmq pyzmq"
 
 for adapter in $ADAPTERS; do
   export IRUBY_TEST_SESSION_ADAPTER_NAME=$adapter