iruby 0.1.13 → 0.2.0

data/lib/iruby/logger.rb

@@ -0,0 +1,17 @@
+require 'logger'
+
+module IRuby
+  class << self
+    attr_accessor :logger
+  end
+
+  class MultiLogger < BasicObject
+    def initialize(*loggers)
+      @loggers = loggers
+    end
+
+    def method_missing(name, *args, &b)
+      @loggers.map {|x| x.respond_to?(name) && x.public_send(name, *args, &b) }.any?
+    end
+  end
+end

data/lib/iruby/ostream.rb

@@ -1,14 +1,14 @@
 module IRuby
   # IO-like object that publishes to 0MQ socket.
   class OStream
-    def initialize(session, socket, name)
-      @session = session
-      @socket = socket
-      @name = name
+    attr_accessor :sync
+
+    def initialize(session, name)
+      @session, @name = session, name
     end
 
     def close
-      @socket = nil
+      @session = nil
     end
 
     def flush
@@ -26,15 +26,17 @@ module IRuby
     alias_method :readline, :read
 
     def write(s)
-      raise 'I/O operation on closed file' unless @socket
-      @session.send(@socket, 'stream', { name: @name, data: s.to_s })
+      raise 'I/O operation on closed file' unless @session
+      @session.send(:publish, 'stream', { name: @name, text: s.to_s })
       nil
     end
     alias_method :<<, :write
     alias_method :print, :write
 
-    def puts(s)
-      write "#{s}\n"
+    def puts(*lines)
+      lines = [''] if lines.empty?
+      lines.each { |s| write("#{s}\n")}
+      nil
     end
 
     def writelines(lines)

data/lib/iruby/session.rb

@@ -2,8 +2,9 @@ module IRuby
   class Session
     DELIM = '<IDS|MSG>'
 
-    def initialize(username, config)
+    def initialize(username, config, sockets)
       @username = username
+      @sockets = sockets
       @session = SecureRandom.uuid
       @msg_id = 0
       if config['key'] && config['signature_scheme']
@@ -18,32 +19,17 @@ module IRuby
         msg_type: type,
         msg_id:   @msg_id,
         username: @username,
-        session:  @session
+        session:  @session,
+        version:  '5.0'
       }
       @msg_id += 1
 
-      list = serialize(header, content, ident)
-      list.each_with_index do |part, i|
-        socket.send_string(part, i == list.size - 1 ? 0 : ZMQ::SNDMORE)
-      end
+      @sockets[socket].send_message(serialize(header, content, ident))
     end
 
     # Receive a message and decode it
-    def recv(socket, mode)
-      msg = []
-      while msg.empty? || socket.more_parts?
-        begin
-          frame = ''
-          rc = socket.recv_string(frame, mode)
-          ZMQ::Util.error_check('zmq_msg_send', rc)
-          msg << frame
-        rescue
-        end
-      end
-
-      i = msg.index(DELIM)
-      idents, msg_list = msg[0..i-1], msg[i+1..-1]
-      msg = unserialize(msg_list)
+    def recv(socket)
+      idents, msg = unserialize(@sockets[socket].recv_message)
       @last_received_header = msg[:header]
       return idents, msg
     end
@@ -55,15 +41,26 @@ module IRuby
              MultiJson.dump(@last_received_header || {}),
              '{}',
              MultiJson.dump(content || {})]
-      ([ident].flatten.compact << DELIM << sign(msg)) + msg
+      #STDERR.puts "SEND #{(([ident].flatten.compact << DELIM << sign(msg)) + msg).inspect}"
+      ZMQ::Message(*(([ident].flatten.compact << DELIM << sign(msg)) + msg))
     end
 
-    def unserialize(msg_list)
+    def unserialize(msg)
+      raise 'no message received' unless msg
+      parts = []
+      while frame = msg.popstr
+        parts << frame
+      end
+      #STDERR.puts "RECV #{parts.inspect}"
+
+      i = parts.index(DELIM)
+      idents, msg_list = parts[0..i-1], parts[i+1..-1]
+
       minlen = 5
       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),
         parent_header: MultiJson.load(parent_header),
         metadata: MultiJson.load(metadata),

data/lib/iruby/utils.rb

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

data/lib/iruby/version.rb

@@ -1,3 +1,3 @@
 module IRuby
-  VERSION = '0.1.13'
+  VERSION = '0.2.0'
 end

data/test/integration_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+require 'open3'
+require 'expect'
+
+class IntegrationTest < IRubyTest
+  def setup
+    @stdin, @stdout, @stderr, @process = Open3.popen3('bin/iruby')
+    expect 'In [', 30
+    expect '1'
+    expect ']:'
+  end
+
+  def teardown
+    @stdin.close
+    @stdout.close
+    @stderr.close
+    @process.kill
+  end
+
+  def write(input)
+    @stdin.puts input
+  end
+
+  def expect(pattern, timeout = 1)
+    assert @stdout.expect(pattern, timeout), "#{pattern} expected"
+  end
+
+  def test_interaction
+    write '"Hello, world!"'
+    expect '"Hello, world!"'
+
+    write 'puts "Hello!"'
+    expect 'Hello!'
+
+    write '12 + 12'
+    expect '24'
+
+    write 'ls'
+    expect 'self.methods'
+  end
+end

data/test/iruby/multi_logger_test.rb

@@ -0,0 +1,15 @@
+require 'stringio'
+require 'test_helper'
+require 'iruby/logger'
+
+class MultiLoggerTest < IRubyTest
+  def test_multilogger
+    out, err = StringIO.new, StringIO.new
+    logger = IRuby::MultiLogger.new(Logger.new(out), Logger.new(err))
+    logger.warn 'You did a bad thing'
+    assert_match 'WARN', out.string
+    assert_match 'WARN', err.string
+    assert_match 'bad thing', out.string
+    assert_match 'bad thing', err.string
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,5 @@
+require 'iruby'
+require 'minitest/autorun'
+
+class IRubyTest < Minitest::Test
+end

metadata

@@ -1,104 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: iruby
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.0
 platform: ruby
 authors:
-- Damián Silvani
-- Min RK
-- Martin Sarsale
-- Josh Adams
 - Daniel Mendler
+- The SciRuby developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.6'
 - !ruby/object:Gem::Dependency
   name: bond
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: ffi-rzmq
+  name: rbczmq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.3'
 description: Ruby Kernel for IPython
 email:
-- benjaminrk@gmail.com
+- mail@daniel-mendler.de
 executables:
 - iruby
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGES
 - CONTRIBUTORS
 - Gemfile
 - IRuby-Example.ipynb
-- LICENSE
-- README.md
+- LICENSE.txt
+- README.rdoc
 - Rakefile
 - bin/iruby
 - examples/display.ipynb
@@ -107,22 +119,25 @@ files:
 - iruby.gemspec
 - lib/iruby.rb
 - lib/iruby/backend.rb
+- lib/iruby/comm.rb
 - lib/iruby/command.rb
 - lib/iruby/display.rb
 - lib/iruby/formatter.rb
 - lib/iruby/kernel.rb
+- lib/iruby/logger.rb
 - lib/iruby/ostream.rb
 - lib/iruby/session.rb
-- lib/iruby/static/base/images/favicon.ico
-- lib/iruby/static/base/images/ipynblogo.png
-- lib/iruby/static/base/images/src/ipynblogo.svg
-- lib/iruby/static/base/images/src/ruby.svg
-- lib/iruby/static/custom/custom.css
-- lib/iruby/static/custom/custom.js
 - lib/iruby/utils.rb
 - lib/iruby/version.rb
+- logo/favicon.ico
+- logo/iruby.png
+- logo/iruby.svg
+- logo/ruby.svg
 - screenshot.png
-homepage: https://github.com/minad/iruby
+- test/integration_test.rb
+- test/iruby/multi_logger_test.rb
+- test/test_helper.rb
+homepage: https://github.com/SciRuby/iruby
 licenses:
 - MIT
 metadata: {}
@@ -131,13 +146,10 @@ post_install_message: |+
     * pry
     * pry-doc
     * pry-theme
-    * pry-syntax-hacks
-    * pry-git
     * awesome_print
-    * gruff
-    * rmagick
     * gnuplot
     * rubyvis
+    * nyaplot
 
 rdoc_options: []
 require_paths:
@@ -146,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -158,4 +170,8 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby kernel for IPython frontends (notebook console, etc.)
-test_files: []
+test_files:
+- test/integration_test.rb
+- test/iruby/multi_logger_test.rb
+- test/test_helper.rb
+has_rdoc: 

data/README.md

@@ -1,24 +0,0 @@
-# IRuby
-
-This is a Ruby kernel for IPython.
-
-![IRuby Notebook](screenshot.png)
-
-### Quick start
-
-At first install the packages `ipython`, `python-jinja`, `python-tornado`, `python-pyzmq` so that you get a working `ipython notebook`.
-Maybe the packages are called slightly different on your Unix.
-
-Now install the rubygem using `gem install iruby` and then run `iruby notebook` or `iruby`.
-
-Take a look at the [Example Notebook](http://nbviewer.ipython.org/urls/raw.github.com/minad/iruby/master/IRuby-Example.ipynb).
-
-The IRuby notebook requires `ipython` >= 1.2.0. Furthermore we need `libzmq` >= 3.2 to work. Version 2.2.0 will not work. If you're using an old Debian without a new enough version of `libzmq`, you can install [Anaconda](https://store.continuum.io/), a Python distribution with newer versions.
-
-### Authors
-
-See the [CONTRIBUTORS](CONTRIBUTORS) file.
-
-### License
-
-See the [LICENSE](LICENSE) file.