iruby 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d874a72b0b879122f83a0a31cd86d387bf9ead180e4f1954a42d2ec82b5de6be
-  data.tar.gz: 8cbe956be221da36f99cc8c550857fcc7dee567f4a4cbcf43a167ec8ce0b5a41
+  metadata.gz: 43bde0525564da42d868ec8eded9727ba0398ad0ae30e7fbcaea3eb795068a24
+  data.tar.gz: 32bc31a371dcccc92c04ee85b557754d3336f88a9aec72efd6dbe9cfe096552a
 SHA512:
-  metadata.gz: 6cc1fdaf13bf195ad4d18206c8663f693a77a1c0bcf29446c3d1c91a8e6e88fc80d8612868caa47794752dae9bcf6edc07165374fbb3637e4af1e49d8e8efa96
-  data.tar.gz: 9d092e97d5adc8b615f7d1f02a8fa5b52428e5c167e24e8997770a2d808e10d327a4df86fbaba8f986640110109785cd796cd5751a50ff45b298ca85037f8976
+  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)
@@ -68,7 +78,10 @@ jobs:
           GEMFILE
           BUNDLE_GEMFILE=Gemfile.irb bundle install --jobs 4 --retry 3
 
-      - run: gem install pkg/*.gem
+      - name: Install IRuby gem
+        run: |
+          gem install rubygems-requirements-system
+          gem install pkg/*.gem
 
       - run: ruby -r iruby -e "p IRuby::SessionAdapter.select_adapter_class"
         env:
@@ -78,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:
@@ -102,7 +109,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 1
 
@@ -123,7 +130,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 1
 
@@ -133,7 +140,7 @@ jobs:
 
       - run: rake build
 
-      - run: gem install pkg/*.gem
+      - run: gem install rubygems-requirements-system pkg/*.gem
 
       - run: ruby -r iruby -e "p IRuby::SessionAdapter.select_adapter_class"
         env:

data/CHANGES.md

@@ -1,3 +1,22 @@
+# 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
+* Fix missing `OStream#closed?` method by @RobinDaugherty in https://github.com/SciRuby/iruby/pull/368
+* Use rubygems-requirements-system to install system dependencies automatically by @kou in https://github.com/SciRuby/iruby/pull/369
+* Various typo corrections by @kojix2 in https://github.com/SciRuby/iruby/pull/370
+* Minor changes to README by @kojix2 in https://github.com/SciRuby/iruby/pull/371
+
 # 0.8.1 (2025-02-16)
 
 * Add support for jupyter widgets by @matt-do-it in https://github.com/SciRuby/iruby/pull/350
@@ -133,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/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
+
+plugin 'rubygems-requirements-system'
+
 gemspec
 
 group :pry do

data/README.md

@@ -4,70 +4,51 @@
 [![Build Status](https://github.com/SciRuby/iruby/workflows/CI/badge.svg)](https://github.com/SciRuby/iruby/actions)
 [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/RubyData/binder/master?filepath=ruby-data.ipynb)
 
-IRuby is a Ruby kernel for [Jupyter project](http://try.jupyter.org/).
+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
 
 ### Requirements
 
-* [Jupyter](https://jupyter.org)
+- [Jupyter](https://jupyter.org)
 
 The following requirements are automatically installed.
 
-* [ffi-rzmq](https://github.com/chuckremes/ffi-rzmq)
-* [libzmq](https://github.com/zeromq/libzmq)
+- [ffi-rzmq](https://github.com/chuckremes/ffi-rzmq)
+- [libzmq](https://github.com/zeromq/libzmq)
 
 The following dependencies are optional.
 
-* [Pry][Pry], if you want to use [Pry][Pry] instead of IRB for the code execution backend
+- [Pry][Pry], if you want to use [Pry][Pry] instead of IRB for the code execution backend
 
 ### Installing Jupyter Notebook and/or JupyterLab
 
 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
 
-#### Ubuntu 17+
+#### Ubuntu 22.04+
 
 ```shell
 sudo apt install libtool libffi-dev ruby ruby-dev make
 
-gem install --user-install iruby
-iruby register --force
-```
-
-#### Ubuntu 16
-
-The latest IRuby requires Ruby >= 2.4 while Ubuntu's official Ruby package is version 2.3.
-So you need to install Ruby >= 2.4 by yourself before preparing IRuby.
-We recommend to use rbenv.
-
-```shell
-sudo apt install libtool libffi-dev ruby ruby-dev make
+gem install --user-install rubygems-requirements-system
 gem install --user-install iruby
 iruby register --force
 ```
 
 ### Fedora
 
-#### Fedora 36
+#### Fedora 40+
 
 ```shell
 sudo dnf install ruby ruby-dev make zeromq-devel
 
+gem install --user-install rubygems-requirements-system
 gem install --user-install iruby
 iruby register --force
 ```
@@ -89,6 +70,7 @@ Install Jupyter.
 #### Homebrew
 
 ```shell
+gem install rubygems-requirements-system
 gem install iruby
 iruby register --force
 ```
@@ -99,6 +81,7 @@ If you are using macports, run the following commands.
 
 ```shell
 port install libtool autoconf automake autogen
+gem install rubygems-requirements-system
 gem install iruby
 iruby register --force
 ```
@@ -116,8 +99,8 @@ docker run --rm -it -p 8888:8888 rubydata/datascience-notebook
 
 You can use Java classes in your IRuby notebook.
 
-* JRuby version >= 9.0.4.0
-* iruby gem
+- JRuby version >= 9.0.4.0
+- iruby gem
 
 After installation, make sure that your `env` is set up to use jruby.
 
@@ -160,8 +143,8 @@ export IRUBY_SESSION_ADAPTER="cztop"
 
 There are two backends: PlainBackend and PryBackend.
 
-* PlainBackend is the default backend.  It uses [IRB](https://github.com/ruby/irb).
-* PryBackend uses [Pry][Pry].
+- PlainBackend is the default backend. It uses [IRB](https://github.com/ruby/irb).
+- PryBackend uses [Pry][Pry].
 
 You can switch the backend to PryBackend by running the code below.
 
@@ -171,9 +154,15 @@ IRuby::Kernel.instance.switch_backend!(:pry)
 
 ## Notebooks
 
-Take a look at the [example notebook](http://nbviewer.ipython.org/urls/raw.github.com/SciRuby/sciruby-notebooks/master/getting_started.ipynb)
+Take a look at the [example notebook](https://nbviewer.jupyter.org/urls/raw.github.com/SciRuby/sciruby-notebooks/master/getting_started.ipynb)
 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. You can find the prebuild image at [dockerhub](https://registry.hub.docker.com/u/minad/sciruby-notebooks/).
+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
 

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'
 
@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.executables   = %w[iruby]
   s.test_files    = s.files.grep(%r{^test/})
   s.require_paths = %w[lib]
-  s.extensions    = %w[ext/Rakefile]
 
   s.required_ruby_version = '>= 2.3.0'
 
@@ -24,13 +23,20 @@ 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_dependency 'native-package-installer'
 
-  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'
 
+  [
+    ['arch_linux', 'zeromq'],
+    ['debian', 'libzmq3-dev'],
+    ['freebsd', 'libzmq4'],
+    ['homebrew', 'zmq'],
+    ['macports', 'zmq'],
+  ].each do |platform, package|
+    s.requirements << "system: libzmq: #{platform}: #{package}"
+  end
+
   s.metadata['msys2_mingw_dependencies'] = 'zeromq'
 end

data/lib/iruby/application.rb

@@ -225,7 +225,7 @@ module IRuby
       end
 
       if ipython_dir
-        File.join(ipython_dir, 'kerenels')
+        File.join(ipython_dir, 'kernels')
       else
         Jupyter.kernelspec_dir
       end

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/display.rb

@@ -7,7 +7,7 @@ module IRuby
       "text/markdown" => :to_markdown,
       "image/svg+xml" => :to_svg,
       "image/png" => :to_png,
-      "appliation/pdf" => :to_pdf,
+      "application/pdf" => :to_pdf,
       "image/jpeg" => :to_jpeg,
       "text/latex" => [:to_latex, :to_tex],
       # NOTE: Do not include the entry of "application/json" because

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/ostream.rb

@@ -11,6 +11,10 @@ module IRuby
       @session = nil
     end
 
+    def closed?
+      @session.nil?
+    end
+
     def flush
     end
 

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