iruby 0.7.4 → 0.8.1

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iruby
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.1
 platform: ruby
 authors:
 - Daniel Mendler
 - The SciRuby developers
-autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2025-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_uri
@@ -53,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -167,23 +180,24 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/iruby
 - ci/Dockerfile.base.erb
 - ci/Dockerfile.main.erb
 - ci/requirements.txt
 - docker/setup.sh
 - docker/test.sh
+- exe/iruby
 - ext/Rakefile
 - iruby.gemspec
 - lib/iruby.rb
+- lib/iruby/application.rb
 - lib/iruby/assets/kernel.css
 - lib/iruby/assets/kernel.js
 - lib/iruby/assets/logo-32x32.png
 - lib/iruby/assets/logo-64x64.png
 - lib/iruby/backend.rb
 - lib/iruby/comm.rb
-- lib/iruby/command.rb
 - lib/iruby/display.rb
+- lib/iruby/error.rb
 - lib/iruby/event_manager.rb
 - lib/iruby/formatter.rb
 - lib/iruby/input.rb
@@ -207,6 +221,7 @@ files:
 - lib/iruby/input/widget.rb
 - lib/iruby/jupyter.rb
 - lib/iruby/kernel.rb
+- lib/iruby/kernel_app.rb
 - lib/iruby/logger.rb
 - lib/iruby/ostream.rb
 - lib/iruby/session.rb
@@ -226,8 +241,13 @@ files:
 - tasks/ci.rake
 - test/helper.rb
 - test/integration_test.rb
+- test/iruby/application/application_test.rb
+- test/iruby/application/console_test.rb
+- test/iruby/application/helper.rb
+- test/iruby/application/kernel_test.rb
+- test/iruby/application/register_test.rb
+- test/iruby/application/unregister_test.rb
 - test/iruby/backend_test.rb
-- test/iruby/command_test.rb
 - test/iruby/display_test.rb
 - test/iruby/event_manager_test.rb
 - test/iruby/jupyter_test.rb
@@ -246,7 +266,6 @@ licenses:
 - MIT
 metadata:
   msys2_mingw_dependencies: zeromq
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -261,15 +280,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.23
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Ruby Kernel for Jupyter
 test_files:
 - test/helper.rb
 - test/integration_test.rb
+- test/iruby/application/application_test.rb
+- test/iruby/application/console_test.rb
+- test/iruby/application/helper.rb
+- test/iruby/application/kernel_test.rb
+- test/iruby/application/register_test.rb
+- test/iruby/application/unregister_test.rb
 - test/iruby/backend_test.rb
-- test/iruby/command_test.rb
 - test/iruby/display_test.rb
 - test/iruby/event_manager_test.rb
 - test/iruby/jupyter_test.rb

data/bin/iruby

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift File.expand_path(__dir__ + '/../lib')
-require 'iruby/command'
-IRuby::Command.new(ARGV).run

data/lib/iruby/command.rb

@@ -1,190 +0,0 @@
-require 'iruby'
-
-module IRuby
-  class Command
-    def initialize(args)
-      @args = args
-
-      @ipython_dir = File.expand_path("~/.ipython")
-      @kernel_dir = resolve_kernelspec_dir.freeze
-      @kernel_file = File.join(@kernel_dir, 'kernel.json').freeze
-      @iruby_path = File.expand_path $0
-    end
-
-    attr_reader :ipython_dir, :kernel_dir, :kernel_file
-
-    def ipython_kernel_dir
-      File.join(File.expand_path(@ipython_dir), 'kernels', 'ruby')
-    end
-
-    def run
-      case @args.first
-      when 'version', '-v', '--version'
-        require 'iruby/version'
-        puts "IRuby #{IRuby::VERSION}, Ruby #{RUBY_VERSION}"
-      when 'help', '-h', '--help'
-        print_help
-      when 'register'
-        force_p = @args.include?('--force')
-        if registered_iruby_path && !force_p
-          STDERR.puts "#{@kernel_file} already exists!\nUse --force to force a register."
-          exit 1
-        end
-        register_kernel(force_p)
-      when 'unregister'
-        unregister_kernel
-      when 'kernel'
-        run_kernel
-      else
-        run_ipython
-      end
-    end
-
-    private
-
-    def resolve_kernelspec_dir
-      if ENV.has_key?('JUPYTER_DATA_DIR')
-        if ENV.has_key?('IPYTHONDIR')
-          warn 'both JUPYTER_DATA_DIR and IPYTHONDIR are supplied; IPYTHONDIR is ignored.'
-        end
-        if @args.find {|x| /\A--ipython-dir=/ =~ x }
-          warn 'both JUPYTER_DATA_DIR and --ipython-dir are supplied; --ipython-dir is ignored.'
-        end
-        jupyter_data_dir = ENV['JUPYTER_DATA_DIR']
-        return File.join(jupyter_data_dir, 'kernels', 'ruby')
-      end
-
-      if ENV.has_key?('IPYTHONDIR')
-        warn 'IPYTHONDIR is deprecated. Use JUPYTER_DATA_DIR instead.'
-        ipython_dir = ENV['IPYTHONDIR']
-      end
-
-      @args.each do |arg|
-        next unless /\A--ipython-dir=(.*)\Z/ =~ arg
-        ipython_dir = Regexp.last_match[1]
-        warn '--ipython-dir is deprecated. Use JUPYTER_DATA_DIR environment variable instead.'
-        break
-      end
-
-      if ipython_dir
-        @ipython_dir = ipython_dir
-        ipython_kernel_dir
-      else
-        File.join(Jupyter.kernelspec_dir, 'ruby')
-      end
-    end
-
-    def print_help
-      puts %{
-Usage:
-    iruby register        Register IRuby kernel in #{@kernel_file}.
-    iruby unregister      Unregister IRuby kernel.
-    iruby console         Launch the IRuby terminal-based console.
-    iruby notebook        Launch the IRuby HTML notebook server.
-    ...                   Same as IPython.
-
-Please note that IRuby accepts the same parameters as IPython.
-Try `ipython help` for more information.
-}
-    end
-
-    def run_kernel
-      IRuby.logger = MultiLogger.new(*Logger.new(STDOUT))
-      STDOUT.sync = true # FIXME: This can make the integration test.
-
-      @args.reject! {|arg| arg =~ /\A--log=(.*)\Z/ && IRuby.logger.loggers << Logger.new($1) }
-      IRuby.logger.level = @args.delete('--debug') ? Logger::DEBUG : Logger::INFO
-
-      raise(ArgumentError, 'Not enough arguments to the kernel') if @args.size < 2 || @args.size > 4
-      config_file, boot_file, working_dir = @args[1..-1]
-      Dir.chdir(working_dir) if working_dir
-
-      require boot_file if boot_file
-      check_bundler {|e| IRuby.logger.warn "Could not load bundler: #{e.message}" }
-
-      require 'iruby'
-      Kernel.new(config_file).run
-    rescue Exception => e
-      IRuby.logger.fatal "Kernel died: #{e.message}\n#{e.backtrace.join("\n")}"
-      raise
-    end
-
-    def check_version
-      required = '3.0.0'
-      version = `ipython --version`.chomp
-      if version < required
-        STDERR.puts "Your IPython version #{version} is too old, at least #{required} is required"
-        exit 1
-      end
-    end
-
-    def run_ipython
-      # If no command is given, we use the console to launch the whole 0MQ-client-server stack
-      @args = %w(console) + @args if @args.first.to_s !~ /\A\w/
-      @args += %w(--kernel ruby) if %w(console qtconsole).include? @args.first
-
-      check_version
-      check_registered_kernel
-      check_bundler {|e| STDERR.puts "Could not load bundler: #{e.message}" }
-
-      Process.exec('ipython', *@args)
-    end
-
-    def check_registered_kernel
-      if (kernel = registered_iruby_path)
-        STDERR.puts "#{@iruby_path} differs from registered path #{registered_iruby_path}.
-This might not work. Run 'iruby register --force' to fix it." if @iruby_path != kernel
-      else
-        register_kernel
-      end
-    end
-
-    def check_bundler
-      require 'bundler'
-      raise %q{iruby is missing from Gemfile. This might not work.
-Add `gem 'iruby'` to your Gemfile to fix it.} unless Bundler.definition.specs.any? {|s| s.name == 'iruby' }
-      Bundler.setup
-    rescue LoadError
-    rescue Exception => e
-      yield(e)
-    end
-
-    def register_kernel(force_p=false)
-      if force_p
-        unregister_kernel_in_ipython_dir
-      else
-        return unless check_existing_kernel_in_ipython_dir
-      end
-      FileUtils.mkpath(@kernel_dir)
-      unless RUBY_PLATFORM =~ /mswin(?!ce)|mingw|cygwin/
-        File.write(@kernel_file, MultiJson.dump(argv: [ @iruby_path, 'kernel', '{connection_file}' ],
-                                              display_name: "Ruby #{RUBY_VERSION}", language: 'ruby'))
-      else
-        ruby_path, iruby_path = [RbConfig.ruby, @iruby_path].map{|path| path.gsub('/', '\\\\')}
-        File.write(@kernel_file, MultiJson.dump(argv: [ ruby_path, iruby_path, 'kernel', '{connection_file}' ],
-                                                display_name: "Ruby #{RUBY_VERSION}", language: 'ruby'))
-      end
-
-      FileUtils.copy(Dir[File.join(__dir__, 'assets', '*')], @kernel_dir) rescue nil
-    end
-
-    def check_existing_kernel_in_ipython_dir
-      return true unless File.file?(File.join(ipython_kernel_dir, 'kernel.json'))
-      warn "IRuby kernel file already exists in the deprecated IPython's data directory."
-      warn "Using --force, you can replace the old kernel file with the new one in Jupyter's data directory."
-      false
-    end
-
-    def registered_iruby_path
-      File.exist?(@kernel_file) && MultiJson.load(File.read(@kernel_file))['argv'].first
-    end
-
-    def unregister_kernel
-      FileUtils.rm_rf(@kernel_dir)
-    end
-
-    def unregister_kernel_in_ipython_dir
-      FileUtils.rm_rf(ipython_kernel_dir)
-    end
-  end
-end

data/test/iruby/command_test.rb

@@ -1,207 +0,0 @@
-require 'iruby/command'
-
-module IRubyTest
-  class CommandTest < TestBase
-    def test_with_empty_argv
-      with_env('JUPYTER_DATA_DIR' => nil,
-               'IPYTHONDIR' => nil) do
-        assert_output(nil, /\A\z/) do
-          @command = IRuby::Command.new([])
-          kernel_dir = File.join(IRuby::Jupyter.kernelspec_dir, 'ruby')
-          assert_equal(kernel_dir, @command.kernel_dir)
-          assert_equal(File.join(kernel_dir, 'kernel.json'), @command.kernel_file)
-        end
-      end
-    end
-
-    def test_with_JUPYTER_DATA_DIR
-      Dir.mktmpdir do |tmpdir|
-        with_env('JUPYTER_DATA_DIR' => tmpdir,
-                 'IPYTHONDIR' => nil) do
-          assert_output(nil, /\A\z/) do
-            @command = IRuby::Command.new([])
-            kernel_dir = File.join(tmpdir, 'kernels', 'ruby')
-            assert_equal(kernel_dir, @command.kernel_dir)
-            assert_equal(File.join(kernel_dir, 'kernel.json'), @command.kernel_file)
-          end
-        end
-      end
-    end
-
-    def test_with_IPYTHONDIR
-      Dir.mktmpdir do |tmpdir|
-        with_env('JUPYTER_DATA_DIR' => nil,
-                 'IPYTHONDIR' => tmpdir) do
-          assert_output(nil, /IPYTHONDIR is deprecated\. Use JUPYTER_DATA_DIR instead\./) do
-            @command = IRuby::Command.new([])
-            kernel_dir = File.join(tmpdir, 'kernels', 'ruby')
-            assert_equal(kernel_dir, @command.kernel_dir)
-            assert_equal(File.join(kernel_dir, 'kernel.json'), @command.kernel_file)
-          end
-        end
-      end
-    end
-
-    def test_with_JUPYTER_DATA_DIR_and_IPYTHONDIR
-      Dir.mktmpdir do |tmpdir|
-        Dir.mktmpdir do |tmpdir2|
-          with_env('JUPYTER_DATA_DIR' => tmpdir,
-                   'IPYTHONDIR' => tmpdir2) do
-            assert_output(nil, /both JUPYTER_DATA_DIR and IPYTHONDIR are supplied; IPYTHONDIR is ignored\./) do
-              @command = IRuby::Command.new([])
-              kernel_dir = File.join(tmpdir, 'kernels', 'ruby')
-              assert_equal(kernel_dir, @command.kernel_dir)
-              assert_equal(File.join(kernel_dir, 'kernel.json'), @command.kernel_file)
-            end
-          end
-        end
-      end
-    end
-
-    def test_with_ipython_dir_option
-      Dir.mktmpdir do |tmpdir|
-        with_env('JUPYTER_DATA_DIR' => nil,
-                 'IPYTHONDIR' => nil) do
-          assert_output(nil, /--ipython-dir is deprecated\. Use JUPYTER_DATA_DIR environment variable instead\./) do
-            @command = IRuby::Command.new(%W[--ipython-dir=#{tmpdir}])
-            kernel_dir = File.join(tmpdir, 'kernels', 'ruby')
-            assert_equal(kernel_dir, @command.kernel_dir)
-            assert_equal(File.join(kernel_dir, 'kernel.json'), @command.kernel_file)
-          end
-        end
-      end
-    end
-
-    def test_with_JUPYTER_DATA_DIR_and_ipython_dir_option
-      Dir.mktmpdir do |tmpdir|
-        Dir.mktmpdir do |tmpdir2|
-          with_env('JUPYTER_DATA_DIR' => tmpdir,
-                   'IPYTHONDIR' => nil) do
-            assert_output(nil, /both JUPYTER_DATA_DIR and --ipython-dir are supplied; --ipython-dir is ignored\./) do
-              @command = IRuby::Command.new(%W[--ipython-dir=#{tmpdir2}])
-              kernel_dir = File.join(tmpdir, 'kernels', 'ruby')
-              assert_equal(kernel_dir, @command.kernel_dir)
-              assert_equal(File.join(kernel_dir, 'kernel.json'), @command.kernel_file)
-            end
-          end
-        end
-      end
-    end
-
-    def test_register_when_there_is_kernel_in_ipython_dir
-      Dir.mktmpdir do |tmpdir|
-        Dir.mktmpdir do |tmpdir2|
-          with_env('JUPYTER_DATA_DIR' => nil,
-                   'IPYTHONDIR' => nil,
-                   'HOME' => tmpdir2) do
-            ignore_warning do
-              @command = IRuby::Command.new(["register", "--ipython-dir=~/.ipython"])
-              assert_equal("#{tmpdir2}/.ipython/kernels/ruby/kernel.json", @command.kernel_file)
-              @command.run
-              assert(File.file?("#{tmpdir2}/.ipython/kernels/ruby/kernel.json"))
-            end
-          end
-
-          with_env('JUPYTER_DATA_DIR' => nil,
-                   'IPYTHONDIR' => nil,
-                   'HOME' => tmpdir2) do
-            @command = IRuby::Command.new(["register"])
-            assert_output(nil, /IRuby kernel file already exists in the deprecated IPython's data directory\.\nUsing --force, you can replace the old kernel file with the new one in Jupyter's data directory\./) do
-              @command.run
-            end
-            assert(File.file?(File.join(@command.ipython_kernel_dir, 'kernel.json')))
-            refute(File.file?(@command.kernel_file))
-
-            @command = IRuby::Command.new(["register", "--force"])
-            assert_output(nil, nil) do
-              @command.run
-            end
-            refute(File.exist?(@command.ipython_kernel_dir))
-            assert(File.file?(@command.kernel_file))
-          end
-        end
-      end
-    end
-
-    def test_register_and_unregister_with_JUPYTER_DATA_DIR
-      Dir.mktmpdir do |tmpdir|
-        Dir.mktmpdir do |tmpdir2|
-          with_env('JUPYTER_DATA_DIR' => tmpdir,
-                   'IPYTHONDIR' => nil,
-                   'HOME' => tmpdir2) do
-            assert_output(nil, nil) do
-              @command = IRuby::Command.new(['register'])
-              kernel_dir = File.join(tmpdir, 'kernels', 'ruby')
-              kernel_file = File.join(kernel_dir, 'kernel.json')
-              assert(!File.file?(kernel_file))
-
-              @command.run
-              assert(File.file?(kernel_file))
-
-              @command = IRuby::Command.new(['unregister'])
-              @command.run
-              assert(!File.file?(kernel_file))
-            end
-          end
-        end
-      end
-    end
-
-    def test_register_and_unregister_with_JUPYTER_DATA_DIR_when_there_is_kernel_in_ipython_dir
-      Dir.mktmpdir do |tmpdir|
-        Dir.mktmpdir do |tmpdir2|
-          with_env('HOME' => tmpdir2) do
-            ignore_warning do
-              @command = IRuby::Command.new(["register", "--ipython-dir=~/.ipython"])
-              assert_equal("#{tmpdir2}/.ipython/kernels/ruby/kernel.json", @command.kernel_file)
-              @command.run
-              assert(File.file?("#{tmpdir2}/.ipython/kernels/ruby/kernel.json"))
-            end
-          end
-
-          with_env('JUPYTER_DATA_DIR' => tmpdir,
-                   'IPYTHONDIR' => nil,
-                   'HOME' => tmpdir2) do
-            @command = IRuby::Command.new(["register"])
-            assert_output(nil, /IRuby kernel file already exists in the deprecated IPython's data directory\.\nUsing --force, you can replace the old kernel file with the new one in Jupyter's data directory\./) do
-              @command.run
-            end
-            assert(File.file?(File.join(@command.ipython_kernel_dir, 'kernel.json')))
-            refute(File.file?(@command.kernel_file))
-
-            @command = IRuby::Command.new(["register", "--force"])
-            assert_output(nil, nil) do
-              @command.run
-            end
-            refute(File.file?(File.join(@command.ipython_kernel_dir, 'kernel.json')))
-            assert(File.file?(@command.kernel_file))
-          end
-        end
-      end
-    end
-
-    def test_register_and_unregister_with_IPYTHONDIR
-      Dir.mktmpdir do |tmpdir|
-        Dir.mktmpdir do |tmpdir2|
-          with_env('JUPYTER_DATA_DIR' => nil,
-                   'IPYTHONDIR' => tmpdir,
-                   'HOME' => tmpdir2) do
-            ignore_warning do
-              @command = IRuby::Command.new(['register'])
-              kernel_dir = File.join(tmpdir, 'kernels', 'ruby')
-              kernel_file = File.join(kernel_dir, 'kernel.json')
-              assert(!File.file?(kernel_file))
-
-              @command.run
-              assert(File.file?(kernel_file))
-
-              @command = IRuby::Command.new(['unregister'])
-              @command.run
-              assert(!File.file?(kernel_file))
-            end
-          end
-        end
-      end
-    end
-  end
-end