iruby 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f389a45d763afc30ae093cb65b479b727bde7f1a4ecf04246329f56099ec280
-  data.tar.gz: 16dc91aaba973d5b0e8cc4c2d9444266c9c8f479704a5394103a732f2f70ba01
+  metadata.gz: 43bde0525564da42d868ec8eded9727ba0398ad0ae30e7fbcaea3eb795068a24
+  data.tar.gz: 32bc31a371dcccc92c04ee85b557754d3336f88a9aec72efd6dbe9cfe096552a
 SHA512:
-  metadata.gz: a2fcf2691c1f795abad87a5bfe174f17dd49980c11a6ffc1c3fc665e4345cf14caf3be273ff6123224864d261b9b6b730c9bd16907dcd535d2a168ce07f6763a
-  data.tar.gz: 523123ce6314e0f5e5e49dc0156dd00e6d3aac45b49af8780009df1977c7edd3306388ed2b3375a315ed5267da0c2311a6da21bbd0fffae58ef8fe19a8079ce6
+  metadata.gz: a8c7e7275de0fb026784a66286a8e3474fe54a8d60b551e2103434d3d5a1ada05ad1d5dfd2e285f19aaa4ef4bff07d181b956cef23b2da788158e9c400cae871
+  data.tar.gz: 6f66cf0aab532b765d3760287fb0e1aab4578054484d7fa7b4cd5d724222154c943c2768597f36054bdddb6da6b9c8aa23040b1f278618d9917ead1f61ce3969

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -16,6 +16,7 @@ jobs:
         os:
           - ubuntu-latest
         ruby:
+          - "4.0"
           - "3.4"
           - "3.3"
           - "3.2"
@@ -27,7 +28,7 @@ jobs:
           - debug
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 1
 
@@ -35,6 +36,15 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
+      - uses: mamba-org/setup-micromamba@v3
+        with:
+          environment-name: iruby-ci
+          create-args: >-
+            python=3.12
+            jupyter_console
+          cache-environment: true
+          cache-downloads: true
+
       - run: rake build
 
       - name: Install ffi (if Ruby 2.7)
@@ -81,23 +91,17 @@ jobs:
         run: |
           sudo apt update
           sudo apt install -y --no-install-recommends \
-                   libczmq-dev \
-                   python3 \
-                   python3-pip \
-                   python3-setuptools
-          sudo pip3 install wheel
-          sudo pip3 install -r ci/requirements.txt
+                   libczmq-dev
 
       - run: bundle install --jobs 4 --retry 3
 
       - name: Run tests
         env:
-          PYTHON: python3
           ADAPTERS: cztop ffi-rzmq
         run: |
           for adapter in $ADAPTERS; do
             export IRUBY_TEST_SESSION_ADAPTER_NAME=$adapter
-            bundle exec rake test TESTOPTS="-v"
+            micromamba run -n iruby-ci bundle exec rake test TESTOPTS="-v"
           done
 
   windows:
@@ -105,7 +109,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 1
 
@@ -126,7 +130,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 1
 

data/CHANGES.md

@@ -1,3 +1,14 @@
+# 0.8.3 (2026-06-30)
+
+* Remove MultiJson dependency and replace with JSON by @kojix2 in https://github.com/SciRuby/iruby/pull/373
+* Fix undefined var in FfirzmqAdapter by @kojix2 in https://github.com/SciRuby/iruby/pull/377
+* Avoid conflict with Ruby's numbered parameters by @zalt50 in https://github.com/SciRuby/iruby/pull/380
+* Remove legacy IRUBY_OLD_SESSION session implementations by @kojix2 in https://github.com/SciRuby/iruby/pull/384
+* Add explicit session cleanup by @kojix2 in https://github.com/SciRuby/iruby/pull/388
+* Use raw zmq_proxy for ffi-rzmq heartbeat by @kojix2 in https://github.com/SciRuby/iruby/pull/391
+* Remove obsolete PyCall dependency by @kojix2 in https://github.com/SciRuby/iruby/pull/393
+* Add Ruby 4.0 to CI workflow matrix by @kojix2 in https://github.com/SciRuby/iruby/pull/394
+
 # 0.8.2 (2025-04-10)
 
 * Update CI to refresh apt packages before installing IRuby gem by @kojix2 in https://github.com/SciRuby/iruby/pull/367
@@ -141,7 +152,7 @@
 
 * Improvements to IRuby dependency detection using `Bundler::Dependencies#specs` (@kou).
 * Use less memory forcing pry to store only the last 3 commands in memory (@kylekyle).
-* Use bigger z-index that is used accross all browsers (@kylekyle).
+* Use bigger z-index that is used across all browsers (@kylekyle).
 * Ability to input date values as DateTime objects in IRuby/Input (@kylekyle).
 * Add option to have check boxes checked by default (@kylekyle).
 * Option for multi-select in drop down menus in the prompter (@kylekyle).

data/README.md

@@ -6,15 +6,6 @@
 
 IRuby is a Ruby kernel for [Jupyter project](https://jupyter.org/).
 
-## Try IRuby
-
-You can try IRuby with a sample notebook on Binder (the same link as the banner placed above):
-
-<https://mybinder.org/v2/gh/RubyData/binder/master?filepath=ruby-data.ipynb>
-
-The following URL launches JupyterLab directly on Binder.
-
-<https://mybinder.org/v2/gh/RubyData/binder/master?filepath=../lab>
 
 ## Installation
 
@@ -35,8 +26,8 @@ The following dependencies are optional.
 
 See the official document to know how to install Jupyter Notebook and/or JupyterLab.
 
-- <https://jupyter.readthedocs.io/en/latest/install/notebook-classic.html>
-- <https://jupyter.readthedocs.io/en/latest/install.html>
+- <https://docs.jupyter.org/en/latest/install/notebook-classic.html>
+- <https://docs.jupyter.org/en/latest/install.html>
 
 ### Ubuntu
 
@@ -167,6 +158,12 @@ Take a look at the [example notebook](https://nbviewer.jupyter.org/urls/raw.gith
 and the [collection of notebooks](https://github.com/SciRuby/sciruby-notebooks/) which includes a Dockerfile to create a containerized installation of iruby
 and other scientific gems.
 
+## Try IRuby
+
+- [Try a sample notebook on Binder](https://mybinder.org/v2/gh/RubyData/binder/master?filepath=ruby-data.ipynb)
+
+- [Launch JupyterLab on Binder](https://mybinder.org/v2/gh/RubyData/binder/master?filepath=../lab)
+
 ## Contributing
 
 Contributions to IRuby are very welcome.

data/Rakefile

@@ -16,27 +16,3 @@ task :test do
 end
 
 task default: 'test'
-
-namespace :docker do
-  def root_dir
-    @root_dir ||= File.expand_path("..", __FILE__)
-  end
-
-  task :build do
-    container_name = "iruby_build"
-    image_name = "mrkn/iruby"
-    sh "docker", "run",
-       "--name", container_name,
-       "-v", "#{root_dir}:/tmp/iruby",
-       "rubylang/ruby", "/bin/bash", "/tmp/iruby/docker/setup.sh"
-    sh "docker", "commit", container_name, image_name
-    sh "docker", "rm", container_name
-  end
-
-  task :test do
-    root_dir = File.expand_path("..", __FILE__)
-    sh "docker", "run", "-it", "--rm",
-       "-v", "#{root_dir}:/tmp/iruby",
-       "mrkn/iruby", "/bin/bash", "/tmp/iruby/docker/test.sh"
-  end
-end

data/iruby.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.authors       = ['Daniel Mendler', 'The SciRuby developers']
   s.email         = ['mail@daniel-mendler.de']
   s.summary       = 'Ruby Kernel for Jupyter'
-  s.description   = 'A Ruby kernel for Jupyter environment. Try it at try.jupyter.org.'
+  s.description   = 'A Ruby kernel for Jupyter environment.'
   s.homepage      = 'https://github.com/SciRuby/iruby'
   s.license       = 'MIT'
 
@@ -23,9 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'irb'
   s.add_dependency 'logger'
   s.add_dependency 'mime-types', '>= 3.3.1'
-  s.add_dependency 'multi_json', '~> 1.11'
 
-  s.add_development_dependency 'pycall', '>= 1.2.1'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'test-unit-rr'

data/lib/iruby/backend.rb

@@ -18,7 +18,7 @@ module IRuby
       # TODO Add IRuby.cache_size which controls the size of the Out array
       # and sets the oldest entries and _<n> variables to nil.
       if store_history
-        b.local_variable_set("_#{Out.size}", out)
+        b.local_variable_set("_o#{Out.size}", out)
         b.local_variable_set("_i#{In.size}", code)
 
         Out << out

data/lib/iruby/input/README.ipynb

@@ -113,7 +113,7 @@
     "\n",
     "The enter key will submit an input or form and the escape key will cancel it. Canceled inputs are returned as `nil`. Inputs are automatically canceled if destroyed. An input can be destroyed by clearing its cell's output. The `cancel` button will cancel a form and all other buttons will submit it. \n",
     "\n",
-    "After a form destroyed, the cell's output is cleared. Be careful not to prompt for input in a block that has previous output you would like to keep. Output is cleared to prevent forms from interferring with one another and to ensure that inputs are not inadvertently saved to the notebook. "
+    "After a form destroyed, the cell's output is cleared. Be careful not to prompt for input in a block that has previous output you would like to keep. Output is cleared to prevent forms from interfering with one another and to ensure that inputs are not inadvertently saved to the notebook. "
    ]
   },
   {
@@ -184,7 +184,7 @@
    "source": [
     "## Defaults\n",
     "\n",
-    "Most inputs will accept a `default` parameter. If no default is given, the deault is `nil`. Since checkboxes can have multiple values selected, you can pass an array of values. To check everything, pass `true` as the default. "
+    "Most inputs will accept a `default` parameter. If no default is given, the default is `nil`. Since checkboxes can have multiple values selected, you can pass an array of values. To check everything, pass `true` as the default. "
    ]
   },
   {

data/lib/iruby/input/README.md

@@ -67,7 +67,7 @@ end
 
 The enter key will submit an input or form and the escape key will cancel it. Canceled inputs are returned as `nil`. Inputs are automatically canceled if destroyed. An input can be destroyed by clearing its cell's output. The `cancel` button will cancel a form and all other buttons will submit it. 
 
-After a form destroyed, the cell's output is cleared. Be careful not to prompt for input in a block that has previous output you would like to keep. Output is cleared to prevent forms from interferring with one another and to ensure that inputs are not inadvertently saved to the notebook. 
+After a form destroyed, the cell's output is cleared. Be careful not to prompt for input in a block that has previous output you would like to keep. Output is cleared to prevent forms from interfering with one another and to ensure that inputs are not inadvertently saved to the notebook. 
 
 
 ```ruby
@@ -105,7 +105,7 @@ end
 
 ## Defaults
 
-Most inputs will accept a `default` parameter. If no default is given, the deault is `nil`. Since checkboxes can have multiple values selected, you can pass an array of values. To check everything, pass `true` as the default. 
+Most inputs will accept a `default` parameter. If no default is given, the default is `nil`. Since checkboxes can have multiple values selected, you can pass an array of values. To check everything, pass `true` as the default. 
 
 
 ```ruby

data/lib/iruby/input/form.rb

@@ -63,7 +63,7 @@ module IRuby
       end
 
       def submit
-        result = MultiJson.load(Kernel.instance.session.recv_input)
+        result = JSON.parse(Kernel.instance.session.recv_input)
 
         unless result.has_key? @id
           submit
@@ -74,4 +74,4 @@ module IRuby
       end
     end
   end
-end
+end

data/lib/iruby/kernel.rb

@@ -38,7 +38,7 @@ module IRuby
     ].freeze
 
     def initialize(config_file, session_adapter_name=nil)
-      @config = MultiJson.load(File.read(config_file))
+      @config = JSON.parse(File.read(config_file))
       IRuby.logger.debug("IRuby kernel start with config #{@config}")
       Kernel.instance = self
 
@@ -126,6 +126,13 @@ module IRuby
       while @running
         dispatch
       end
+    ensure
+      close
+    end
+
+    def close
+      @session&.close
+      stop_parent_process_poller
     end
 
     # @private
@@ -314,6 +321,13 @@ module IRuby
       end
     end
 
+    def stop_parent_process_poller
+      return unless @parent_poller&.alive?
+
+      @parent_poller.kill
+      @parent_poller.join
+    end
+
     def start_parent_process_pollar_unix
       Thread.start do
         IRuby.logger.warn("parent process poller thread started.")

data/lib/iruby/session.rb

@@ -1,5 +1,5 @@
 require 'iruby/session_adapter'
-require 'iruby/session/mixin'
+require 'iruby/session_serializer'
 
 require 'securerandom'
 require 'time'
@@ -25,6 +25,26 @@ module IRuby
       "#{@adapter.name} session adapter"
     end
 
+    def close
+      return if @closed
+
+      @closed = true
+      begin
+        @adapter.shutdown_heartbeat(@hb_socket) if @hb_socket
+      ensure
+        begin
+          stop_heartbeat
+        ensure
+          begin
+            close_sockets
+          ensure
+            @adapter.close
+          end
+        end
+      end
+    end
+
+    # Optional setup hook.
     def setup
     end
 
@@ -51,10 +71,10 @@ module IRuby
       @hb_socket, @hb_port = @adapter.make_rep_socket(protocol, host, hb_port)
       @heartbeat_thread = Thread.start do
         begin
-          # NOTE: this loop is copied from CZTop's old session code
+          # Adapters should return when cleanup closes the heartbeat socket/context.
           @adapter.heartbeat_loop(@hb_socket)
         rescue Exception => e
-          IRuby.logger.fatal "Kernel heartbeat died: #{e.message}\n#{e.backtrace.join("\n")}"
+          IRuby.logger.fatal "Kernel heartbeat died: #{e.message}\n#{e.backtrace.join("\n")}" unless @closed
         end
       end
     end
@@ -102,6 +122,22 @@ module IRuby
 
     private
 
+    def close_sockets
+      @sockets&.values&.each do |socket|
+        @adapter.close_socket(socket)
+      end
+    end
+
+    def stop_heartbeat
+      return unless @heartbeat_thread&.alive?
+
+      @heartbeat_thread.join(1)
+      return unless @heartbeat_thread.alive?
+
+      @heartbeat_thread.kill
+      @heartbeat_thread.join
+    end
+
     def check_socket_type(socket_type)
       case socket_type
       when :publish, :reply, :stdin

data/lib/iruby/session_adapter/ffirzmq_adapter.rb

@@ -26,23 +26,41 @@ module IRuby
       end
 
       def heartbeat_loop(sock)
-        @heartbeat_device = ZMQ::Device.new(sock, sock)
+        # Avoid ZMQ::Device in #357; call libzmq's proxy directly.
+        rc = LibZMQ.zmq_proxy(sock.socket, sock.socket, nil)
+        errno = ZMQ::Util.errno
+        return if rc == -1 && (zmq_errno?(:ETERM, errno) || zmq_errno?(:EINTR, errno))
+
+        ZMQ::Util.error_check('zmq_proxy', rc)
+      end
+
+      def shutdown_heartbeat(sock)
+        if @zmq_context&.context && LibZMQ.respond_to?(:zmq_ctx_shutdown)
+          LibZMQ.zmq_ctx_shutdown(@zmq_context.context)
+        end
+        close_socket(sock)
+      end
+
+      def close
+        @zmq_context&.terminate
+        @zmq_context = nil
       end
 
       private
 
-      def make_socket(type, protocol, host, port)
-        case type
+      def make_socket(type_symbol, protocol, host, port)
+        case type_symbol
         when :ROUTER, :PUB, :REP
-          type = ZMQ.const_get(type)
+          type = ZMQ.const_get(type_symbol)
         else
-          if ZMQ.const_defined?(type)
+          if ZMQ.const_defined?(type_symbol)
             raise ArgumentError, "Unsupported ZMQ socket type: #{type_symbol}"
           else
             raise ArgumentError, "Invalid ZMQ socket type: #{type_symbol}"
           end
         end
         zmq_context.socket(type).tap do |sock|
+          sock.setsockopt(ZMQ::LINGER, 0) if type_symbol == :REP
           sock.bind("#{protocol}://#{host}:#{port}")
         end
       end
@@ -50,6 +68,10 @@ module IRuby
       def zmq_context
         @zmq_context ||= ZMQ::Context.new
       end
+
+      def zmq_errno?(name, errno)
+        ZMQ.const_defined?(name) && ZMQ.const_get(name) == errno
+      end
     end
   end
 end

data/lib/iruby/session_adapter/test_adapter.rb

@@ -1,4 +1,4 @@
-require 'iruby/session/mixin'
+require 'iruby/session_serializer'
 
 module IRuby
   module SessionAdapter
@@ -20,9 +20,14 @@ module IRuby
 
         @send_callback = nil
         @recv_callback = nil
+        @closed_sockets = []
+        @closed = false
+        @heartbeat_started = false
+        @heartbeat_finished = false
       end
 
       attr_accessor :send_callback, :recv_callback
+      attr_reader :closed_sockets, :closed, :heartbeat_started, :heartbeat_finished
 
       def send(sock, data)
         unless @send_callback.nil?
@@ -37,6 +42,22 @@ module IRuby
       end
 
       def heartbeat_loop(sock)
+        @heartbeat_started = true
+        sleep 0.01 until @closed
+        @heartbeat_finished = true
+      end
+
+      def close_socket(sock)
+        @closed_sockets << sock
+      end
+
+      def shutdown_heartbeat(sock)
+        @closed = true
+        close_socket(sock)
+      end
+
+      def close
+        @closed = true
       end
 
       private

data/lib/iruby/session_adapter.rb

@@ -36,6 +36,18 @@ module IRuby
         socket, port = make_socket(:REP, protocol, host, port)
         [socket, port]
       end
+
+      def close_socket(socket)
+        socket.close if socket.respond_to?(:close)
+      end
+
+      def shutdown_heartbeat(socket)
+        close_socket(socket)
+      end
+
+      # Override in adapters that need cleanup.
+      def close
+      end
     end
 
     require_relative 'session_adapter/ffirzmq_adapter'

data/lib/iruby/{session/mixin.rb → session_serializer.rb}

@@ -5,10 +5,10 @@ module IRuby
     private
 
     def serialize(idents, header, metadata = nil, content)
-      msg = [MultiJson.dump(header),
-             MultiJson.dump(@last_recvd_msg ? @last_recvd_msg[:header] : {}),
-             MultiJson.dump(metadata || {}),
-             MultiJson.dump(content || {})]
+      msg = [JSON.generate(header),
+             JSON.generate(@last_recvd_msg ? @last_recvd_msg[:header] : {}),
+             JSON.generate(metadata || {}),
+             JSON.generate(content || {})]
       frames = ([*idents].compact.map(&:to_s) << DELIM << sign(msg)) + msg
       IRuby.logger.debug "Sent #{frames.inspect}"
       frames
@@ -28,10 +28,10 @@ module IRuby
       raise 'Invalid signature' unless s == sign(msg_list[1..-1])
       {
         idents:        idents,
-        header:        MultiJson.load(header),
-        parent_header: MultiJson.load(parent_header),
-        metadata:      MultiJson.load(metadata),
-        content:       MultiJson.load(content),
+        header:        JSON.parse(header),
+        parent_header: JSON.parse(parent_header),
+        metadata:      JSON.parse(metadata),
+        content:       JSON.parse(content),
         buffers:       buffers
       }
     end

data/lib/iruby/version.rb

@@ -1,3 +1,3 @@
 module IRuby
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/lib/iruby.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'mime/types'
-require 'multi_json'
+require 'json'
 require 'securerandom'
 require 'openssl'
 require 'tempfile'
@@ -19,18 +19,4 @@ require 'iruby/formatter'
 require 'iruby/utils'
 require 'iruby/display'
 require 'iruby/comm'
-
-if ENV.fetch('IRUBY_OLD_SESSION', false)
-  require 'iruby/session/mixin'
-  begin
-    require 'iruby/session/ffi_rzmq'
-  rescue LoadError
-    begin
-      require 'iruby/session/cztop'
-    rescue LoadError
-      STDERR.puts "Please install ffi-rzmq or cztop before running iruby. See README."
-    end
-  end
-else
-  require 'iruby/session'
-end
+require 'iruby/session'

data/test/helper.rb

@@ -1,6 +1,5 @@
 require "iruby"
 require "json"
-require 'multi_json'
 require "pathname"
 require "rbconfig"
 require "test/unit"
@@ -61,10 +60,12 @@ module IRubyTest
     end
 
     def teardown
+      IRuby::Kernel.instance&.close
       self.class.restore_kernel
     end
 
     def with_session_adapter(session_adapter_name)
+      IRuby::Kernel.instance&.close
       IRuby::Kernel.new(self.class.test_config_filename, session_adapter_name)
       $stdout = STDOUT
       $stderr = STDERR
@@ -137,7 +138,7 @@ module IRubyTest
     end
 
     def apple_only
-      omit('apple only test') unless windows?
+      omit('apple only test') unless apple?
     end
 
     def unix_only

data/test/iruby/application/console_test.rb

@@ -74,7 +74,7 @@ module IRubyTest::ApplicationTests
         kernel_name = "other-kernel-#{Process.pid}"
         out, status = Open3.capture2e(*iruby_command("console", "--kernel=#{kernel_name}"))
         refute status.success?
-        assert_match(/\bNo such kernel named #{Regexp.escape(kernel_name)}\b/, out)
+        assert_match(/\b(?:No such kernel named|Could not find kernel) '?#{Regexp.escape(kernel_name)}'?(?=\W|\z)/, out)
       end
     end
 

data/test/iruby/kernel_test.rb

@@ -17,6 +17,7 @@ module IRubyTest
 
       def teardown
         IRuby::Kernel.events.unregister(:initialized, @callback)
+        super
       end
 
       def test_iruby_initialized_event

data/test/iruby/session_test.rb

@@ -15,7 +15,7 @@ module IRubyTest
       }
     end
 
-    def test_new_with_session_adapter
+    def test_selects_correct_adapter_class
       adapter_name = ENV['IRUBY_TEST_SESSION_ADAPTER_NAME']
       adapter_class = case adapter_name
                       when 'cztop'
@@ -26,8 +26,20 @@ module IRubyTest
                         flunk "Unknown session adapter: #{adapter_name.inspect}"
                       end
 
+      selected_class = IRuby::SessionAdapter.select_adapter_class(adapter_name)
+      assert_equal(adapter_class, selected_class)
+    end
+
+    def test_new_with_session_adapter_closes_heartbeat
+      adapter_name = ENV['IRUBY_TEST_SESSION_ADAPTER_NAME']
+      omit("ffi-rzmq only") unless adapter_name == 'ffi-rzmq'
+
       session = IRuby::Session.new(@session_config, adapter_name)
-      assert_kind_of(adapter_class, session.adapter)
+
+      session.close
+      refute(session.instance_variable_get(:@heartbeat_thread).alive?)
+    ensure
+      session&.close
     end
 
     def test_without_any_session_adapter
@@ -40,5 +52,26 @@ module IRubyTest
         end
       end
     end
+
+    def test_close_releases_adapter_resources
+      session = IRuby::Session.new(@session_config, "test")
+      adapter = session.adapter
+
+      session.close
+
+      assert(adapter.closed)
+      assert(adapter.heartbeat_started)
+      assert(adapter.heartbeat_finished)
+      assert_equal([
+                     :PUB,
+                     :REP,
+                     :ROUTER,
+                     :ROUTER,
+                   ],
+                   adapter.closed_sockets.map(&:type).sort_by(&:to_s))
+      refute(session.instance_variable_get(:@heartbeat_thread).alive?)
+    ensure
+      session&.close
+    end
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iruby
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Daniel Mendler
 - The SciRuby developers
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_uri
@@ -81,34 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.1
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-- !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: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Ruby kernel for Jupyter environment. Try it at try.jupyter.org.
+description: A Ruby kernel for Jupyter environment.
 email:
 - mail@daniel-mendler.de
 executables:
@@ -159,6 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - CHANGES.md
@@ -166,11 +138,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- ci/Dockerfile.base.erb
-- ci/Dockerfile.main.erb
-- ci/requirements.txt
-- docker/setup.sh
-- docker/test.sh
 - exe/iruby
 - iruby.gemspec
 - lib/iruby.rb
@@ -210,20 +177,16 @@ files:
 - 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_adapter.rb
 - lib/iruby/session_adapter/cztop_adapter.rb
 - lib/iruby/session_adapter/ffirzmq_adapter.rb
 - lib/iruby/session_adapter/test_adapter.rb
+- lib/iruby/session_serializer.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/helper.rb
 - test/integration_test.rb
 - test/iruby/application/application_test.rb
@@ -251,7 +214,6 @@ licenses:
 - MIT
 metadata:
   msys2_mingw_dependencies: zeromq
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -271,8 +233,7 @@ requirements:
 - 'system: libzmq: freebsd: libzmq4'
 - 'system: libzmq: homebrew: zmq'
 - 'system: libzmq: macports: zmq'
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Ruby Kernel for Jupyter
 test_files:

data/ci/Dockerfile.base.erb

@@ -1,41 +0,0 @@
-FROM rubylang/ruby:<%= ruby_version %>-bionic
-
-ADD ci/requirements.txt /tmp
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-               libczmq-dev \
-               python3 \
-               python3-pip \
-               python3-setuptools \
-               libpython3.6 \
-    && pip3 install wheel \
-    && pip3 install -r /tmp/requirements.txt \
-    && rm -f /tmp/requirements.txt
-
-# ZeroMQ version 4.1.6 and CZMQ version 3.0.2 for rbczmq
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-               build-essential \
-               file \
-               wget \
-    && cd /tmp \
-    && wget https://github.com/zeromq/zeromq4-1/releases/download/v4.1.6/zeromq-4.1.6.tar.gz \
-    && wget https://archive.org/download/zeromq_czmq_3.0.2/czmq-3.0.2.tar.gz \
-    && tar xf zeromq-4.1.6.tar.gz \
-    && tar xf czmq-3.0.2.tar.gz \
-    && \
-    ( \
-        cd zeromq-4.1.6 \
-        && ./configure \
-        && make install \
-    ) \
-    && \
-    ( \
-        cd czmq-3.0.2 \
-        && wget -O 1.patch https://github.com/zeromq/czmq/commit/2594d406d8ec6f54e54d7570d7febba10a6906b2.diff \
-        && wget -O 2.patch https://github.com/zeromq/czmq/commit/b651cb479235751b22b8f9a822a2fc6bc1be01ab.diff \
-        && cat *.patch | patch -p1 \
-        && ./configure \
-        && make install \
-    )

data/ci/Dockerfile.main.erb

@@ -1,7 +0,0 @@
-FROM iruby-test-base:ruby-<%= ruby_version %>
-
-RUN gem install cztop
-RUN mkdir -p /iruby
-ADD . /iruby
-WORKDIR /iruby
-RUN bundle install

data/ci/requirements.txt

@@ -1 +0,0 @@
-jupyter-console>=6.0.0

data/docker/setup.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update
-apt-get install -y --no-install-recommends \
-        libczmq-dev \
-        python3 \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel
-
-cd /tmp/iruby
-bundle install --with test --without plot
-pip3 install jupyter

data/docker/test.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cd /tmp/iruby
-bundle install --with test --without plot
-bundle exec rake test

data/lib/iruby/session/cztop.rb

@@ -1,70 +0,0 @@
-require 'cztop'
-
-module IRuby
-  class Session
-    include SessionSerialize
-
-    def initialize(config)
-      connection = "#{config['transport']}://#{config['ip']}:%d"
-
-      reply_socket = CZTop::Socket::ROUTER.new(connection % config['shell_port'])
-      pub_socket = CZTop::Socket::PUB.new(connection % config['iopub_port'])
-      stdin_socket = CZTop::Socket::ROUTER.new(connection % config['stdin_port'])
-
-      Thread.new do
-        begin
-          hb_socket = CZTop::Socket::REP.new(connection % config['hb_port'])
-          loop do
-            message = hb_socket.receive
-            hb_socket << message
-          end
-        rescue Exception => e
-          IRuby.logger.fatal "Kernel heartbeat died: #{e.message}\n#{e.backtrace.join("\n")}"
-        end
-      end
-
-      @sockets = {
-        publish: pub_socket,
-        reply: reply_socket,
-        stdin: stdin_socket,
-      }
-
-      @session = SecureRandom.uuid
-      unless config['key'].to_s.empty? || config['signature_scheme'].to_s.empty?
-        raise 'Unknown signature scheme' unless config['signature_scheme'] =~ /\Ahmac-(.*)\Z/
-        @hmac = OpenSSL::HMAC.new(config['key'], OpenSSL::Digest.new($1))
-      end
-    end
-
-    def description
-      'old-stle session using cztop'
-    end
-
-    # Build and send a message
-    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:   SecureRandom.uuid,
-        username: 'kernel',
-        session:  @session,
-        version:  '5.0'
-      }
-      @sockets[socket] << serialize(idents, header, content)
-    end
-
-    # Receive a message and decode it
-    def recv(socket)
-      @last_recvd_msg = unserialize(@sockets[socket].receive)
-    end
-
-    def recv_input
-      unserialize(@sockets[:stdin].receive)[:content]["value"]
-    end
-  end
-end

data/lib/iruby/session/ffi_rzmq.rb

@@ -1,87 +0,0 @@
-require 'ffi-rzmq'
-
-module IRuby
-  class Session
-    include SessionSerialize
-
-    def initialize(config)
-      c = ZMQ::Context.new
-
-      connection = "#{config['transport']}://#{config['ip']}:%d"
-      reply_socket = c.socket(ZMQ::XREP)
-      reply_socket.bind(connection % config['shell_port'])
-
-      pub_socket = c.socket(ZMQ::PUB)
-      pub_socket.bind(connection % config['iopub_port'])
-
-      stdin_socket = c.socket(ZMQ::XREP)
-      stdin_socket.bind(connection % config['stdin_port'])
-
-      Thread.new do
-        begin
-          hb_socket = c.socket(ZMQ::REP)
-          hb_socket.bind(connection % config['hb_port'])
-          ZMQ::Device.new(hb_socket, hb_socket)
-        rescue Exception => e
-          IRuby.logger.fatal "Kernel heartbeat died: #{e.message}\n#{e.backtrace.join("\n")}"
-        end
-      end
-
-      @sockets = { 
-        publish: pub_socket, reply: reply_socket, stdin: stdin_socket
-      }
-      
-      @session = SecureRandom.uuid
-      unless config['key'].to_s.empty? || config['signature_scheme'].to_s.empty?
-        raise 'Unknown signature scheme' unless config['signature_scheme'] =~ /\Ahmac-(.*)\Z/
-        @hmac = OpenSSL::HMAC.new(config['key'], OpenSSL::Digest.new($1))
-      end
-    end
-
-    # Build and send a message
-    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:   SecureRandom.uuid,
-        username: 'kernel',
-        session:  @session,
-        version:  '5.0'
-      }
-      socket = @sockets[socket]
-      list = serialize(idents, header, content)
-      list.each_with_index do |part, i|
-        socket.send_string(part, i == list.size - 1 ? 0 : ZMQ::SNDMORE)
-      end
-    end
-
-    # Receive a message and decode it
-    def recv(socket)
-      socket = @sockets[socket]
-      msg = []
-      while msg.empty? || socket.more_parts?
-        begin
-          frame = ''
-          rc = socket.recv_string(frame)
-          ZMQ::Util.error_check('zmq_msg_send', rc)
-          msg << frame
-        rescue
-        end
-      end
-
-      @last_recvd_msg = unserialize(msg)
-    end
-
-    def recv_input 
-      last_recvd_msg = @last_recvd_msg
-      input = recv(:stdin)[:content]["value"]
-      @last_recvd_msg = last_recvd_msg
-      input
-    end
-  end
-end

data/run-test.sh

@@ -1,12 +0,0 @@
-#! /bin/bash
-
-set -ex
-
-export PYTHON=python3
-
-ADAPTERS="cztop ffi-rzmq"
-
-for adapter in $ADAPTERS; do
-  export IRUBY_TEST_SESSION_ADAPTER_NAME=$adapter
-  bundle exec rake test TESTOPTS=-v
-done

data/tasks/ci.rake

@@ -1,65 +0,0 @@
-namespace :ci do
-  namespace :docker do
-    def ruby_version
-      @ruby_version ||= ENV['ruby_version']
-    end
-
-    def ruby_image_name
-      @ruby_image_name ||= "rubylang/ruby:#{ruby_version}-bionic"
-    end
-
-    def iruby_test_base_image_name
-      @iruby_test_base_image_name ||= "iruby-test-base:ruby-#{ruby_version}"
-    end
-
-    def iruby_test_image_name
-      @docker_image_name ||= begin
-                               "sciruby/iruby-test:ruby-#{ruby_version}"
-                             end
-    end
-
-    def docker_image_found?(image_name)
-      image_id = `docker images -q #{image_name}`.chomp
-      image_id.length > 0
-    end
-
-    directory 'tmp'
-
-    desc "Build iruby-test-base docker image"
-    task :build_test_base_image => 'tmp' do
-      unless docker_image_found?(iruby_test_base_image_name)
-        require 'erb'
-        dockerfile_content = ERB.new(File.read('ci/Dockerfile.base.erb')).result(binding)
-        File.write('tmp/Dockerfile', dockerfile_content)
-        sh 'docker', 'build', '-t', iruby_test_base_image_name, '-f', 'tmp/Dockerfile', '.'
-      end
-    end
-
-    desc "Pull docker image of ruby"
-    task :pull_ruby_image do
-      sh 'docker', 'pull', ruby_image_name
-    end
-
-    desc "Build iruby-test docker image"
-    task :build_test_image => 'tmp' do
-      require 'erb'
-      dockerfile_content = ERB.new(File.read('ci/Dockerfile.main.erb')).result(binding)
-      File.write('tmp/Dockerfile', dockerfile_content)
-      sh 'docker', 'build', '-t', iruby_test_image_name, '-f', 'tmp/Dockerfile', '.'
-    end
-
-    desc 'before_install script for CI with Docker'
-    task :before_install => :pull_ruby_image
-    task :before_install => :build_test_base_image
-
-    desc 'install script for CI with Docker'
-    task :install => :build_test_image
-
-    desc 'main script for CI with Docker'
-    task :script do
-      volumes = ['-v', "#{Dir.pwd}:/iruby"] if ENV['attach_pwd']
-      sh 'docker', 'run', '--rm', '-it', *volumes,
-         iruby_test_image_name, 'bash', 'run-test.sh'
-    end
-  end
-end