iruby 0.3 → 0.4.0

data/test/iruby/jupyter_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+require 'iruby/jupyter'
+
+module IRubyTest
+  class JupyterDefaultKernelSpecDirectoryTest < TestBase
+    def setup
+      @kernel_spec = IRuby::Jupyter.kernelspec_dir
+    end
+
+    def test_default_windows
+      windows_only
+      appdata = IRuby::Jupyter.send :windows_user_appdata
+      assert_equal(File.join(appdata, 'jupyter/kernels'), @kernel_spec)
+    end
+
+    def test_default_apple
+      apple_only
+      assert_equal(File.expand_path('~/Library/Jupyter/kernels'), @kernel_spec)
+    end
+
+    def test_default_unix
+      unix_only
+      with_env('XDG_DATA_HOME' => nil) do
+        assert_equal(File.expand_path('~/.local/share/jupyter/kernels'), @kernel_spec)
+      end
+    end
+  end
+end

data/test/iruby/multi_logger_test.rb

@@ -2,7 +2,7 @@ require 'stringio'
 require 'test_helper'
 require 'iruby/logger'
 
-class MultiLoggerTest < IRubyTest
+class IRubyTest::MultiLoggerTest < IRubyTest::TestBase
   def test_multilogger
     out, err = StringIO.new, StringIO.new
     logger = IRuby::MultiLogger.new(Logger.new(out), Logger.new(err))

data/test/iruby/session_adapter/cztop_adapter_test.rb

@@ -0,0 +1,20 @@
+require_relative 'session_adapter_test_base'
+require 'iruby'
+
+module IRubyTest
+  if ENV['IRUBY_TEST_SESSION_ADAPTER_NAME'] == 'cztop'
+    class CztopAdapterTest < SessionAdapterTestBase
+      def adapter_class
+        IRuby::SessionAdapter::CztopAdapter
+      end
+
+      def test_send
+        assert(adapter_class.available?)
+      end
+
+      def test_recv
+        skip
+      end
+    end
+  end
+end

data/test/iruby/session_adapter/ffirzmq_adapter_test.rb

@@ -0,0 +1,20 @@
+require_relative 'session_adapter_test_base'
+require 'iruby'
+
+module IRubyTest
+  if ENV['IRUBY_TEST_SESSION_ADAPTER_NAME'] == 'ffi-rzmq'
+    class FfirzmqAdapterTest < SessionAdapterTestBase
+      def adapter_class
+        IRuby::SessionAdapter::FfirzmqAdapter
+      end
+
+      def test_send
+        assert(adapter_class.available?)
+      end
+
+      def test_recv
+        skip
+      end
+    end
+  end
+end

data/test/iruby/session_adapter/rbczmq_adapter_test.rb

@@ -0,0 +1,37 @@
+require_relative 'session_adapter_test_base'
+require 'iruby'
+
+module IRubyTest
+  if ENV['IRUBY_TEST_SESSION_ADAPTER_NAME'] == 'rbczmq'
+    class RbczmqAdapterTest < SessionAdapterTestBase
+      def adapter_class
+        IRuby::SessionAdapter::RbczmqAdapter
+      end
+
+      def test_send
+        dummy_message = MiniTest::Mock.new.expect(:called!, true)
+
+        dummy_socket = MiniTest::Mock.new.expect(:send_message, nil, [dummy_message])
+
+        ZMQ.stub(:Message, ->(message) { message.called!; message }) do
+          @session_adapter.send(dummy_socket, dummy_message)
+        end
+
+        assert(dummy_message.verify)
+        assert(dummy_socket.verify)
+      end
+
+      def test_recv
+        dummy_message = MiniTest::Mock.new
+        dummy_message.expect(:equal?, true, [dummy_message])
+
+        dummy_socket = MiniTest::Mock.new.expect(:recv_message, dummy_message)
+
+        assert_same(dummy_message, @session_adapter.recv(dummy_socket))
+
+        assert(dummy_message.verify)
+        assert(dummy_socket.verify)
+      end
+    end
+  end
+end

data/test/iruby/session_adapter/session_adapter_test_base.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+module IRubyTest
+  class SessionAdapterTestBase < TestBase
+    # https://jupyter-client.readthedocs.io/en/stable/kernels.html#connection-files
+    def make_connection_config
+      {
+        "control_port" => 50160,
+        "shell_port" => 57503,
+        "transport" => "tcp",
+        "signature_scheme" => "hmac-sha256",
+        "stdin_port" => 52597,
+        "hb_port" => 42540,
+        "ip" => "127.0.0.1",
+        "iopub_port" => 40885,
+        "key" => "a0436f6c-1916-498b-8eb9-e81ab9368e84"
+      }
+    end
+
+    def setup
+      @config = make_connection_config
+      @session_adapter = adapter_class.new(@config)
+
+      unless adapter_class.available?
+        skip "#{@session_adapter.name} is unavailable"
+      end
+    end
+  end
+end

data/test/iruby/session_adapter_test.rb

@@ -0,0 +1,116 @@
+require 'test_helper'
+
+module IRubyTest
+  class SessionAdapterTest < TestBase
+    def test_available_p_return_false_when_load_error
+      subclass = Class.new(IRuby::SessionAdapter::BaseAdapter)
+      class << subclass
+        def load_requirements
+          raise LoadError
+        end
+      end
+      refute subclass.available?
+    end
+
+    def test_select_adapter_class_with_rbczmq
+      IRuby::SessionAdapter::RbczmqAdapter.stub :available?, true do
+        IRuby::SessionAdapter::CztopAdapter.stub :available?, false do
+          IRuby::SessionAdapter::FfirzmqAdapter.stub :available?, false do
+            IRuby::SessionAdapter::PyzmqAdapter.stub :available?, false do
+              cls = IRuby::SessionAdapter.select_adapter_class
+              assert_equal IRuby::SessionAdapter::RbczmqAdapter, cls
+            end
+          end
+        end
+      end
+    end
+
+    def test_select_adapter_class_with_cztop
+      IRuby::SessionAdapter::CztopAdapter.stub :available?, true do
+        IRuby::SessionAdapter::RbczmqAdapter.stub :available?, false do
+          IRuby::SessionAdapter::FfirzmqAdapter.stub :available?, false do
+            IRuby::SessionAdapter::PyzmqAdapter.stub :available?, false do
+              cls = IRuby::SessionAdapter.select_adapter_class
+              assert_equal IRuby::SessionAdapter::CztopAdapter, cls
+            end
+          end
+        end
+      end
+    end
+
+    def test_select_adapter_class_with_ffirzmq
+      IRuby::SessionAdapter::FfirzmqAdapter.stub :available?, true do
+        IRuby::SessionAdapter::RbczmqAdapter.stub :available?, false do
+          IRuby::SessionAdapter::CztopAdapter.stub :available?, false do
+            IRuby::SessionAdapter::PyzmqAdapter.stub :available?, false do
+              cls = IRuby::SessionAdapter.select_adapter_class
+              assert_equal IRuby::SessionAdapter::FfirzmqAdapter, cls
+            end
+          end
+        end
+      end
+    end
+
+    def test_select_adapter_class_with_pyzmq
+      IRuby::SessionAdapter::PyzmqAdapter.stub :available?, true do
+        IRuby::SessionAdapter::RbczmqAdapter.stub :available?, false do
+          IRuby::SessionAdapter::CztopAdapter.stub :available?, false do
+            IRuby::SessionAdapter::FfirzmqAdapter.stub :available?, false do
+              cls = IRuby::SessionAdapter.select_adapter_class
+              assert_equal IRuby::SessionAdapter::PyzmqAdapter, cls
+            end
+          end
+        end
+      end
+    end
+    def test_select_adapter_class_with_env
+      with_env('IRUBY_SESSION_ADAPTER' => 'rbczmq') do
+        IRuby::SessionAdapter::RbczmqAdapter.stub :available?, true do
+          assert_equal IRuby::SessionAdapter::RbczmqAdapter, IRuby::SessionAdapter.select_adapter_class
+        end
+
+        IRuby::SessionAdapter::RbczmqAdapter.stub :available?, false do
+          assert_raises IRuby::SessionAdapterNotFound do
+            IRuby::SessionAdapter.select_adapter_class
+          end
+        end
+      end
+
+      with_env('IRUBY_SESSION_ADAPTER' => 'cztop') do
+        IRuby::SessionAdapter::CztopAdapter.stub :available?, true do
+          assert_equal IRuby::SessionAdapter::CztopAdapter, IRuby::SessionAdapter.select_adapter_class
+        end
+
+        IRuby::SessionAdapter::CztopAdapter.stub :available?, false do
+          assert_raises IRuby::SessionAdapterNotFound do
+            IRuby::SessionAdapter.select_adapter_class
+          end
+        end
+      end
+
+      with_env('IRUBY_SESSION_ADAPTER' => 'ffi-rzmq') do
+        IRuby::SessionAdapter::FfirzmqAdapter.stub :available?, true do
+          assert_equal IRuby::SessionAdapter::FfirzmqAdapter, IRuby::SessionAdapter.select_adapter_class
+        end
+
+        IRuby::SessionAdapter::FfirzmqAdapter.stub :available?, false do
+          assert_raises IRuby::SessionAdapterNotFound do
+            IRuby::SessionAdapter.select_adapter_class
+          end
+        end
+      end
+
+      with_env('IRUBY_SESSION_ADAPTER' => 'pyzmq') do
+        IRuby::SessionAdapter::PyzmqAdapter.stub :available?, true do
+          assert_equal IRuby::SessionAdapter::PyzmqAdapter, IRuby::SessionAdapter.select_adapter_class
+        end
+
+        IRuby::SessionAdapter::PyzmqAdapter.stub :available?, false do
+          assert_raises IRuby::SessionAdapterNotFound do
+            IRuby::SessionAdapter.select_adapter_class
+          end
+        end
+      end
+    end
+  end
+end

data/test/iruby/session_test.rb

@@ -0,0 +1,53 @@
+require 'test_helper'
+
+module IRubyTest
+  class SessionAdapterSelectionTest < TestBase
+    def setup
+      # https://jupyter-client.readthedocs.io/en/stable/kernels.html#connection-files
+      @session_config = {
+        "control_port" => 0,
+        "shell_port" => 0,
+        "transport" => "tcp",
+        "signature_scheme" => "hmac-sha256",
+        "stdin_port" => 0,
+        "hb_port" => 0,
+        "ip" => "127.0.0.1",
+        "iopub_port" => 0,
+        "key" => "a0436f6c-1916-498b-8eb9-e81ab9368e84"
+      }
+    end
+
+    def test_new_with_session_adapter
+      adapter_name = ENV['IRUBY_TEST_SESSION_ADAPTER_NAME']
+      adapter_class = case adapter_name
+                      when 'cztop'
+                        IRuby::SessionAdapter::CztopAdapter
+                      when 'rbczmq'
+                        IRuby::SessionAdapter::RbczmqAdapter
+                      when 'ffi-rzmq'
+                        IRuby::SessionAdapter::FfirzmqAdapter
+                      when 'pyzmq'
+                        IRuby::SessionAdapter::PyzmqAdapter
+                      else
+                        flunk "Unknown session adapter: #{adapter_name}"
+                      end
+
+      session = IRuby::Session.new(@session_config, adapter_name)
+      assert_kind_of(adapter_class, session.adapter)
+    end
+
+    def test_without_any_session_adapter
+      IRuby::SessionAdapter::CztopAdapter.stub :available?, false do
+        IRuby::SessionAdapter::RbczmqAdapter.stub :available?, false do
+          IRuby::SessionAdapter::FfirzmqAdapter.stub :available?, false do
+            IRuby::SessionAdapter::PyzmqAdapter.stub :available?, false do
+              assert_raises IRuby::SessionAdapterNotFound do
+                IRuby::Session.new(@session_config)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,48 @@
 require 'iruby'
+require 'tmpdir'
 require 'minitest/autorun'
 
-class IRubyTest < Minitest::Test
+module IRubyTest
+  class TestBase < Minitest::Test
+    private
+
+    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
+      skip('windows only test') unless windows?
+    end
+
+    def apple_only
+      skip('apple only test') unless windows?
+    end
+
+    def unix_only
+      skip('unix only test') if windows? || apple?
+    end
+
+    def windows?
+      /mingw|mswin/ =~ RUBY_PLATFORM
+    end
+
+    def apple?
+      /darwin/ =~ RUBY_PLATFORM
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iruby
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Mendler
@@ -9,36 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2019-07-31 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'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi-rzmq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pycall
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: bond
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +141,11 @@ files:
 - README.md
 - Rakefile
 - bin/iruby
+- ci/Dockerfile.base.erb
+- ci/Dockerfile.main.erb
+- ci/requirements.txt
+- docker/setup.sh
+- docker/test.sh
 - iruby.gemspec
 - lib/iruby.rb
 - lib/iruby/assets/kernel.css
@@ -126,6 +159,7 @@ files:
 - lib/iruby/formatter.rb
 - lib/iruby/input.rb
 - lib/iruby/input/README.ipynb
+- lib/iruby/input/README.md
 - lib/iruby/input/autoload.rb
 - lib/iruby/input/builder.rb
 - lib/iruby/input/button.rb
@@ -142,20 +176,37 @@ files:
 - lib/iruby/input/select.rb
 - lib/iruby/input/textarea.rb
 - lib/iruby/input/widget.rb
+- lib/iruby/jupyter.rb
 - lib/iruby/kernel.rb
 - lib/iruby/logger.rb
 - lib/iruby/ostream.rb
+- lib/iruby/session.rb
 - lib/iruby/session/cztop.rb
 - lib/iruby/session/ffi_rzmq.rb
 - lib/iruby/session/mixin.rb
 - lib/iruby/session/rbczmq.rb
+- lib/iruby/session_adapter.rb
+- lib/iruby/session_adapter/cztop_adapter.rb
+- lib/iruby/session_adapter/ffirzmq_adapter.rb
+- lib/iruby/session_adapter/pyzmq_adapter.rb
+- lib/iruby/session_adapter/rbczmq_adapter.rb
 - lib/iruby/utils.rb
 - lib/iruby/version.rb
 - logo/logo-32x32.png
 - logo/logo-64x64.png
 - logo/ruby.svg
+- run-test.sh
+- tasks/ci.rake
 - test/integration_test.rb
+- test/iruby/command_test.rb
+- test/iruby/jupyter_test.rb
 - test/iruby/multi_logger_test.rb
+- test/iruby/session_adapter/cztop_adapter_test.rb
+- test/iruby/session_adapter/ffirzmq_adapter_test.rb
+- test/iruby/session_adapter/rbczmq_adapter_test.rb
+- test/iruby/session_adapter/session_adapter_test_base.rb
+- test/iruby/session_adapter_test.rb
+- test/iruby/session_test.rb
 - test/test_helper.rb
 homepage: https://github.com/SciRuby/iruby
 licenses:
@@ -169,6 +220,8 @@ post_install_message: |+
     * gnuplot
     * rubyvis
     * nyaplot
+    * cztop
+    * rbczmq
 
 rdoc_options: []
 require_paths:
@@ -184,12 +237,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Ruby Kernel for Jupyter/IPython
 test_files:
 - test/integration_test.rb
+- test/iruby/command_test.rb
+- test/iruby/jupyter_test.rb
 - test/iruby/multi_logger_test.rb
+- test/iruby/session_adapter/cztop_adapter_test.rb
+- test/iruby/session_adapter/ffirzmq_adapter_test.rb
+- test/iruby/session_adapter/rbczmq_adapter_test.rb
+- test/iruby/session_adapter/session_adapter_test_base.rb
+- test/iruby/session_adapter_test.rb
+- test/iruby/session_test.rb
 - test/test_helper.rb