iruby 0.2.1 → 0.2.2

data/lib/iruby/ostream.rb

@@ -27,7 +27,7 @@ module IRuby
 
     def write(s)
       raise 'I/O operation on closed file' unless @session
-      @session.send(:publish, 'stream', { name: @name, text: s.to_s })
+      @session.send(:publish, :stream, name: @name, text: s.to_s)
       nil
     end
     alias_method :<<, :write

data/lib/iruby/session.rb

@@ -2,11 +2,28 @@ module IRuby
   class Session
     DELIM = '<IDS|MSG>'
 
-    def initialize(username, config, sockets)
-      @username = username
-      @sockets = sockets
+    def initialize(config)
+      c = ZMQ::Context.new
+
+      connection = "#{config['transport']}://#{config['ip']}:%d"
+      reply_socket = c.socket(:ROUTER)
+      reply_socket.bind(connection % config['shell_port'])
+
+      pub_socket = c.socket(:PUB)
+      pub_socket.bind(connection % config['iopub_port'])
+
+      Thread.new do
+        begin
+          hb_socket = c.socket(:REP)
+          hb_socket.bind(connection % config['hb_port'])
+          ZMQ.proxy(hb_socket, hb_socket)
+        rescue Exception => ex
+          IRuby.logger.fatal "Kernel heartbeat died: #{ex.message}\n#{ex.backtrace.join("\n")}"
+        end
+      end
+
+      @sockets = { publish: pub_socket, reply: reply_socket }
       @session = SecureRandom.uuid
-      @msg_id = 0
       if config['key'] && config['signature_scheme']
         raise 'Unknown signature scheme' unless config['signature_scheme'] =~ /\Ahmac-(.*)\Z/
         @hmac = OpenSSL::HMAC.new(config['key'], OpenSSL::Digest.new($1))
@@ -14,35 +31,37 @@ module IRuby
     end
 
     # Build and send a message
-    def send(socket, type, content, ident=nil)
+    def send(socket, type, content)
+      idents =
+        if socket == :reply && @last_recvd_msg
+          @last_recvd_msg[:idents]
+        else
+          type == :stream ? "stream.#{content[:name]}" : type
+        end
       header = {
         msg_type: type,
-        msg_id:   @msg_id,
-        username: @username,
+        msg_id:   SecureRandom.uuid,
+        username: 'kernel',
         session:  @session,
         version:  '5.0'
       }
-      @msg_id += 1
-
-      @sockets[socket].send_message(serialize(header, content, ident))
+      @sockets[socket].send_message(serialize(idents, header, content))
     end
 
     # Receive a message and decode it
     def recv(socket)
-      idents, msg = unserialize(@sockets[socket].recv_message)
-      @last_received_header = msg[:header]
-      return idents, msg
+      @last_recvd_msg = unserialize(@sockets[socket].recv_message)
     end
 
     private
 
-    def serialize(header, content, ident)
+    def serialize(idents, header, content)
       msg = [MultiJson.dump(header),
-             MultiJson.dump(@last_received_header || {}),
+             MultiJson.dump(@last_recvd_msg ? @last_recvd_msg[:header] : {}),
              '{}',
              MultiJson.dump(content || {})]
-      #STDERR.puts "SEND #{(([ident].flatten.compact << DELIM << sign(msg)) + msg).inspect}"
-      ZMQ::Message(*(([ident].flatten.compact << DELIM << sign(msg)) + msg))
+      #STDERR.puts "SEND #{(([*idents].compact << DELIM << sign(msg)) + msg).inspect}"
+      ZMQ::Message(*(([*idents].compact.map(&:to_s) << DELIM << sign(msg)) + msg))
     end
 
     def unserialize(msg)
@@ -60,12 +79,13 @@ module IRuby
       raise 'malformed message, must have at least #{minlen} elements' unless msg_list.length >= minlen
       s, header, parent_header, metadata, content, buffers = *msg_list
       raise 'Invalid signature' unless s == sign(msg_list[1..-1])
-      return idents, {
-        header: MultiJson.load(header),
+      {
+        idents:        idents,
+        header:        MultiJson.load(header),
         parent_header: MultiJson.load(parent_header),
-        metadata: MultiJson.load(metadata),
-        content: MultiJson.load(content),
-        buffers: buffers
+        metadata:      MultiJson.load(metadata),
+        content:       MultiJson.load(content),
+        buffers:       buffers
       }
     end
 

data/lib/iruby/utils.rb

@@ -4,7 +4,7 @@ module IRuby
   end
 
   def self.display(obj, options = {})
-    Kernel.instance.session.send(:publish, 'display_data', data: Display.display(obj, options), metadata: {}) unless obj.nil?
+    Kernel.instance.session.send(:publish, :display_data, data: Display.display(obj, options), metadata: {}, source: 'ruby') unless obj.nil?
   end
 
   def self.table(s, **options)

data/lib/iruby/version.rb

@@ -1,3 +1,3 @@
 module IRuby
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Daniel Mendler
@@ -114,6 +114,7 @@ files:
 - Rakefile
 - bin/iruby
 - examples/display.ipynb
+- examples/history.ipynb
 - examples/stdout.ipynb
 - examples/table.ipynb
 - iruby.gemspec