iruby 0.4.0 → 0.5.0

data/lib/iruby/input/label.rb

@@ -4,13 +4,13 @@ module IRuby
       needs label: nil, icon: nil
 
       def widget_label
-        div class: 'iruby-label input-group' do 
-          span class: 'input-group-addon' do 
+        div class: 'iruby-label input-group' do
+          span class: 'input-group-addon' do
             text @label || to_label(@key)
           end
-          
+
           yield
-          
+
           if @icon
             span @icon, class: "input-group-addon"
           end

data/lib/iruby/input/multiple.rb

@@ -9,7 +9,7 @@ module IRuby
 
         params[:key] = unique_key(key)
         params[:options] = args
-        
+
         params[:default] = case params[:default]
         when false, nil
           []
@@ -24,12 +24,12 @@ module IRuby
 
       def widget_css
         <<-CSS
-          .iruby-multiple { 
+          .iruby-multiple {
             display: table;
             min-width: 25%;
           }
-          .form-control.iruby-multiple-container { 
-            display: table; 
+          .form-control.iruby-multiple-container {
+            display: table;
           }
         CSS
       end
@@ -54,17 +54,17 @@ module IRuby
       end
 
       def widget_html
-        widget_label do 
-          div class: 'form-control iruby-multiple-container' do 
+        widget_label do
+          div class: 'form-control iruby-multiple-container' do
             params = {
               size: @size,
               multiple: true,
-              class: 'iruby-multiple', 
+              class: 'iruby-multiple',
               :'data-iruby-key' => @key
             }
-            
-            select **params do 
-              @options.each do |o| 
+
+            select **params do
+              @options.each do |o|
                 option o, selected: @default.include?(o)
               end
             end

data/lib/iruby/input/popup.rb

@@ -21,11 +21,11 @@ module IRuby
                 #{widget_join :widget_js, @form, *@buttons}
 
                 var popup = $(this);
-                
+
                 $('#iruby-form').submit(function() {
                   popup.modal('hide');
                 });
-                
+
                 Jupyter.notebook.keyboard_manager.disable();
               }
             });

data/lib/iruby/input/radio.rb

@@ -6,7 +6,7 @@ module IRuby
       builder :radio do |*args, **params|
         key = :radio
         key, *args = args if args.first.is_a? Symbol
-        
+
         params[:key] = unique_key(key)
         params[:options] = args
         params[:default] ||= false
@@ -24,7 +24,7 @@ module IRuby
         <<-JS
           $('.iruby-radio input').change(function(){
             var parent = $(this).closest('.iruby-radio');
-            $(parent).data('iruby-value', 
+            $(parent).data('iruby-value',
               $(parent).find(':checked').val()
             );
           });
@@ -38,13 +38,13 @@ module IRuby
           :'data-iruby-value' => @options.first,
           class: 'iruby-radio form-control'
         }
-        widget_label do 
+        widget_label do
           div **params do
             @options.each do |option|
-              label class: 'radio-inline' do 
+              label class: 'radio-inline' do
                 input(
-                  name: @key, 
-                  value: option, 
+                  name: @key,
+                  value: option,
                   type: 'radio',
                   checked: @default == option
                 )

data/lib/iruby/input/select.rb

@@ -20,7 +20,7 @@ module IRuby
 
       def widget_css
         <<-CSS
-          .iruby-select { 
+          .iruby-select {
             min-width: 25%;
             margin-left: 0 !important;
           }
@@ -30,7 +30,7 @@ module IRuby
       def widget_js
         <<-JS
           $('.iruby-select').change(function(){
-            $(this).data('iruby-value', 
+            $(this).data('iruby-value',
               $(this).find('option:selected').text()
             );
           });
@@ -38,16 +38,16 @@ module IRuby
       end
 
       def widget_html
-        widget_label do 
-          div class: 'form-control' do 
+        widget_label do
+          div class: 'form-control' do
             params = {
-              class: 'iruby-select', 
+              class: 'iruby-select',
               :'data-iruby-key' => @key,
               :'data-iruby-value' => @default
             }
-            
-            select **params do 
-              @options.each do |o| 
+
+            select **params do
+              @options.each do |o|
                 option o, selected: @default == o
               end
             end

data/lib/iruby/input/textarea.rb

@@ -9,7 +9,7 @@ module IRuby
       end
 
       def widget_html
-        widget_label do 
+        widget_label do
           textarea(
             @default,
             rows: @rows,

data/lib/iruby/input/widget.rb

@@ -9,13 +9,13 @@ module IRuby
       def content; widget_html; end
 
       def self.builder method, &block
-        Builder.instance_eval do 
+        Builder.instance_eval do
           define_method method, &block
         end
       end
 
       def widget_join method, *args
-        strings = args.map do |arg| 
+        strings = args.map do |arg|
           arg.is_a?(String) ? arg : arg.send(method)
         end
         strings.uniq.join("\n")

data/lib/iruby/jupyter.rb

@@ -31,6 +31,7 @@ module IRuby
 
       # returns %APPDATA%
       def windows_user_appdata
+        require 'fiddle/import'
         check_windows
         path = Fiddle::Pointer.malloc(2 * 300) # uint16_t[300]
         csidl_appdata = 0x001a

data/lib/iruby/kernel.rb

@@ -59,14 +59,21 @@ module IRuby
       @session.send(:reply, :kernel_info_reply,
                     protocol_version: '5.0',
                     implementation: 'iruby',
-                    banner: "IRuby #{IRuby::VERSION} (with #{@session.description})",
                     implementation_version: IRuby::VERSION,
                     language_info: {
                       name: 'ruby',
                       version: RUBY_VERSION,
                       mimetype: 'application/x-ruby',
                       file_extension: '.rb'
-                    })
+                    },
+                    banner: "IRuby #{IRuby::VERSION} (with #{@session.description})",
+                    help_links: [
+                      {
+                        text: "Ruby Documentation",
+                        url:  "https://ruby-doc.org/"
+                      }
+                    ],
+                    status: :ok)
     end
 
     def send_status(status)
@@ -94,6 +101,7 @@ module IRuby
         content = error_content(e)
         @session.send(:publish, :error, content)
         content[:status] = :error
+        content[:execution_count] = @execution_count
       end
       @session.send(:reply, :execute_reply, content)
       @session.send(:publish, :execute_result,
@@ -103,9 +111,11 @@ module IRuby
     end
 
     def error_content(e)
+      rindex = e.backtrace.rindex{|line| line.start_with?(@backend.eval_path)} || -1
+      backtrace = SyntaxError === e  && rindex == -1 ? [] : e.backtrace[0..rindex]
       { ename: e.class.to_s,
         evalue: e.message,
-        traceback: ["#{RED}#{e.class}#{RESET}: #{e.message}", *e.backtrace] }
+        traceback: ["#{RED}#{e.class}#{RESET}: #{e.message}", *backtrace] }
     end
 
     def is_complete_request(msg)
@@ -123,9 +133,10 @@ module IRuby
       end
       @session.send(:reply, :complete_reply,
                     matches: @backend.complete(code),
-                    status: :ok,
                     cursor_start: start.to_i,
-                    cursor_end: msg[:content]['cursor_pos'])
+                    cursor_end: msg[:content]['cursor_pos'],
+                    metadata: {},
+                    status: :ok)
     end
 
     def connect_request(msg)
@@ -144,14 +155,8 @@ module IRuby
     end
 
     def inspect_request(msg)
-      result = @backend.eval(msg[:content]['code'])
-      @session.send(:reply, :inspect_reply,
-                    status: :ok,
-                    data: Display.display(result),
-                    metadata: {})
-    rescue Exception => e
-      IRuby.logger.warn "Inspection error: #{e.message}\n#{e.backtrace.join("\n")}"
-      @session.send(:reply, :inspect_reply, status: :error)
+      # not yet implemented. See (#119).
+      @session.send(:reply, :inspect_reply, status: :ok, found: false, data: {}, metadata: {})
     end
 
     def comm_open(msg)

data/lib/iruby/ostream.rb

@@ -25,26 +25,38 @@ module IRuby
     alias_method :next, :read
     alias_method :readline, :read
 
-    def write(s)
-      raise 'I/O operation on closed file' unless @session
-      @session.send(:publish, :stream, name: @name, text: s.to_s)
-      nil
+    def write(*obj)
+      str = build_string { |sio| sio.write(*obj) }
+      session_send(str)
     end
     alias_method :<<, :write
     alias_method :print, :write
 
-    def printf(*fmt)
-      write sprintf(*fmt)
+    def printf(format, *obj)
+      str = build_string { |sio| sio.printf(format, *obj) }
+      session_send(str)
     end
 
-    def puts(*lines)
-      lines = [''] if lines.empty?
-      lines.each { |s| write("#{s}\n")}
-      nil
+    def puts(*obj)
+      str = build_string { |sio| sio.puts(*obj) }
+      session_send(str)
     end
 
     def writelines(lines)
       lines.each { |s| write(s) }
     end
+
+    private
+
+    def build_string
+      StringIO.open { |sio| yield(sio); sio.string }
+    end
+
+    def session_send(str)
+      raise 'I/O operation on closed file' unless @session
+
+      @session.send(:publish, :stream, name: @name, text: str)
+      nil
+    end
   end
 end

data/lib/iruby/session_adapter.rb

@@ -36,15 +36,13 @@ module IRuby
 
     require_relative 'session_adapter/ffirzmq_adapter'
     require_relative 'session_adapter/cztop_adapter'
-    require_relative 'session_adapter/rbczmq_adapter'
     require_relative 'session_adapter/pyzmq_adapter'
 
     def self.select_adapter_class(name=nil)
       classes = {
         'ffi-rzmq' => SessionAdapter::FfirzmqAdapter,
         'cztop' => SessionAdapter::CztopAdapter,
-        'rbczmq' => SessionAdapter::RbczmqAdapter,
-        'pyzmq' => SessionAdapter::PyzmqAdapter
+        # 'pyzmq' => SessionAdapter::PyzmqAdapter
       }
       if (name ||= ENV.fetch('IRUBY_SESSION_ADAPTER', nil))
         cls = classes[name]

data/lib/iruby/session_adapter/pyzmq_adapter.rb

@@ -1,14 +1,19 @@
 module IRuby
   module SessionAdapter
     class PyzmqAdapter < BaseAdapter
-      def self.load_requirements
-        require 'pycall'
-        @zmq = PyCall.import_module('zmq')
-      rescue PyCall::PyError => error
-        raise LoadError, error.message
-      end
 
       class << self
+        def load_requirements
+          require 'pycall'
+          import_pyzmq
+        end
+
+        def import_pyzmq
+          @zmq = PyCall.import_module('zmq')
+        rescue PyCall::PyError => error
+          raise LoadError, error.message
+        end
+
         attr_reader :zmq
       end
 
@@ -20,10 +25,6 @@ module IRuby
         make_socket(:PUB, protocol, host, port)
       end
 
-      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')

data/lib/iruby/utils.rb

@@ -10,6 +10,10 @@ module IRuby
                                    metadata: {}) unless obj.nil?
     end
 
+    def clear_output(wait=false)
+      Display.clear_output(wait)
+    end
+
     def table(s, **options)
       html(HTML.table(s, options))
     end

data/lib/iruby/version.rb

@@ -1,3 +1,3 @@
 module IRuby
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/run-test.sh

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

data/test/helper.rb

@@ -0,0 +1,90 @@
+require "iruby"
+require "test/unit"
+require "test/unit/rr"
+require "tmpdir"
+
+module IRubyTest
+  class TestBase < Test::Unit::TestCase
+    def assert_output(stdout=nil, stderr=nil)
+      flunk "assert_output requires a block to capture output." unless block_given?
+
+      out, err = capture_io do
+        yield
+      end
+
+      y = check_assert_output_result(stderr, err, "stderr")
+      x = check_assert_output_result(stdout, out, "stdout")
+
+      (!stdout || x) && (!stderr || y)
+    end
+
+    private
+
+    def capture_io
+      captured_stdout = StringIO.new
+      captured_stderr = StringIO.new
+
+      orig_stdout, $stdout = $stdout, captured_stdout
+      orig_stderr, $stderr = $stderr, captured_stderr
+
+      yield
+
+      return captured_stdout.string, captured_stderr.string
+    ensure
+      $stdout = orig_stdout
+      $stderr = orig_stderr
+    end
+
+    def check_assert_output_result(expected, actual, name)
+      if expected
+        message = "In #{name}"
+        case expected
+        when Regexp
+          assert_match(expected, actual, message)
+        else
+          assert_equal(expected, actual, message)
+        end
+      end
+    end
+
+    def ignore_warning
+      saved, $VERBOSE = $VERBOSE , nil
+      yield
+    ensure
+      $VERBOSE = saved
+    end
+
+    def with_env(env)
+      keys = env.keys
+      saved_values = ENV.values_at(*keys)
+      ENV.update(env)
+      yield
+    ensure
+      if keys && saved_values
+        keys.zip(saved_values) do |k, v|
+          ENV[k] = v
+        end
+      end
+    end
+
+    def windows_only
+      omit('windows only test') unless windows?
+    end
+
+    def apple_only
+      omit('apple only test') unless windows?
+    end
+
+    def unix_only
+      omit('unix only test') if windows? || apple?
+    end
+
+    def windows?
+      /mingw|mswin/ =~ RUBY_PLATFORM
+    end
+
+    def apple?
+      /darwin/ =~ RUBY_PLATFORM
+    end
+  end
+end