irb 1.11.2 → 1.12.0

data/lib/irb.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 #   irb.rb - irb main module
 #       by Keiju ISHITSUKA(keiju@ruby-lang.org)
@@ -9,7 +9,7 @@ require "reline"
 
 require_relative "irb/init"
 require_relative "irb/context"
-require_relative "irb/extend-command"
+require_relative "irb/command"
 
 require_relative "irb/ruby-lex"
 require_relative "irb/statement"
@@ -811,7 +811,7 @@ require_relative "irb/pager"
 #
 # === Commands
 #
-# Please use the `show_cmds` command to see the list of available commands.
+# Please use the `help` command to see the list of available commands.
 #
 # === IRB Sessions
 #
@@ -886,7 +886,7 @@ module IRB
 
   # Quits irb
   def IRB.irb_exit(*)
-    throw :IRB_EXIT
+    throw :IRB_EXIT, false
   end
 
   # Aborts then interrupts irb.
@@ -903,8 +903,8 @@ module IRB
     # parsed as a :method_add_arg and the output won't be suppressed
 
     PROMPT_MAIN_TRUNCATE_LENGTH = 32
-    PROMPT_MAIN_TRUNCATE_OMISSION = '...'.freeze
-    CONTROL_CHARACTERS_PATTERN = "\x00-\x1F".freeze
+    PROMPT_MAIN_TRUNCATE_OMISSION = '...'
+    CONTROL_CHARACTERS_PATTERN = "\x00-\x1F"
 
     # Returns the current context of this irb session
     attr_reader :context
@@ -933,7 +933,7 @@ module IRB
 
     def debug_readline(binding)
       workspace = IRB::WorkSpace.new(binding)
-      context.workspace = workspace
+      context.replace_workspace(workspace)
       context.workspace.load_commands_to_main
       @line_no += 1
 
@@ -979,13 +979,21 @@ module IRB
       end
 
       begin
-        catch(:IRB_EXIT) do
+        if defined?(RubyVM.keep_script_lines)
+          keep_script_lines_backup = RubyVM.keep_script_lines
+          RubyVM.keep_script_lines = true
+        end
+
+        forced_exit = catch(:IRB_EXIT) do
           eval_input
         end
       ensure
+        RubyVM.keep_script_lines = keep_script_lines_backup if defined?(RubyVM.keep_script_lines)
         trap("SIGINT", prev_trap)
         conf[:AT_EXIT].each{|hook| hook.call}
+
         context.io.save_history if save_history
+        Kernel.exit if forced_exit
       end
     end
 
@@ -1048,7 +1056,7 @@ module IRB
       return read_input(prompt) if @context.io.respond_to?(:check_termination)
 
       # nomultiline
-      code = ''
+      code = +''
       line_offset = 0
       loop do
         line = read_input(prompt)
@@ -1074,16 +1082,17 @@ module IRB
       loop do
         code = readmultiline
         break unless code
-
-        if code != "\n"
-          yield build_statement(code), @line_no
-        end
+        yield build_statement(code), @line_no
         @line_no += code.count("\n")
       rescue RubyLex::TerminateLineInput
       end
     end
 
     def build_statement(code)
+      if code.match?(/\A\n*\z/)
+        return Statement::EmptyInput.new
+      end
+
       code.force_encoding(@context.io.encoding)
       command_or_alias, arg = code.split(/\s/, 2)
       # Transform a non-identifier alias (@, $) or keywords (next, break)
@@ -1129,7 +1138,6 @@ module IRB
       end
       if @context.io.respond_to?(:dynamic_prompt)
         @context.io.dynamic_prompt do |lines|
-          lines << '' if lines.empty?
           tokens = RubyLex.ripper_lex_without_warning(lines.map{ |l| l + "\n" }.join, local_variables: @context.local_variables)
           line_results = IRB::NestingParser.parse_by_line(tokens)
           tokens_until_line = []
@@ -1227,7 +1235,7 @@ module IRB
         lines.map{ |l| l + "\n" }.join
       }
       # The "<top (required)>" in "(irb)" may be the top level of IRB so imitate the main object.
-      message = message.gsub(/\(irb\):(?<num>\d+):in `<(?<frame>top \(required\))>'/) { "(irb):#{$~[:num]}:in `<main>'" }
+      message = message.gsub(/\(irb\):(?<num>\d+):in (?<open_quote>[`'])<(?<frame>top \(required\))>'/) { "(irb):#{$~[:num]}:in #{$~[:open_quote]}<main>'" }
       puts message
       puts 'Maybe IRB bug!' if irb_bug
     rescue Exception => handler_exc
@@ -1261,12 +1269,11 @@ module IRB
     # Used by the irb command +irb_load+, see IRB@IRB+Sessions for more
     # information.
     def suspend_workspace(workspace)
-      @context.workspace, back_workspace = workspace, @context.workspace
-      begin
-        yield back_workspace
-      ensure
-        @context.workspace = back_workspace
-      end
+      current_workspace = @context.workspace
+      @context.replace_workspace(workspace)
+      yield
+    ensure
+      @context.replace_workspace current_workspace
     end
 
     # Evaluates the given block using the given +input_method+ as the
@@ -1526,7 +1533,7 @@ class Binding
 
     if debugger_irb
       # If we're already in a debugger session, set the workspace and irb_path for the original IRB instance
-      debugger_irb.context.workspace = workspace
+      debugger_irb.context.replace_workspace(workspace)
       debugger_irb.context.irb_path = irb_path
       # If we've started a debugger session and hit another binding.irb, we don't want to start an IRB session
       # instead, we want to resume the irb:rdbg session.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.12.0
 platform: ruby
 authors:
 - aycabta
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-07 00:00:00.000000000 Z
+date: 2024-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reline
@@ -60,34 +60,36 @@ files:
 - exe/irb
 - irb.gemspec
 - lib/irb.rb
-- lib/irb/cmd/backtrace.rb
-- lib/irb/cmd/break.rb
-- lib/irb/cmd/catch.rb
-- lib/irb/cmd/chws.rb
-- lib/irb/cmd/continue.rb
-- lib/irb/cmd/debug.rb
-- lib/irb/cmd/delete.rb
-- lib/irb/cmd/edit.rb
-- lib/irb/cmd/exit.rb
-- lib/irb/cmd/finish.rb
-- lib/irb/cmd/help.rb
-- lib/irb/cmd/history.rb
-- lib/irb/cmd/info.rb
-- lib/irb/cmd/irb_info.rb
-- lib/irb/cmd/load.rb
-- lib/irb/cmd/ls.rb
-- lib/irb/cmd/measure.rb
-- lib/irb/cmd/next.rb
 - lib/irb/cmd/nop.rb
-- lib/irb/cmd/pushws.rb
-- lib/irb/cmd/show_cmds.rb
-- lib/irb/cmd/show_doc.rb
-- lib/irb/cmd/show_source.rb
-- lib/irb/cmd/step.rb
-- lib/irb/cmd/subirb.rb
-- lib/irb/cmd/whereami.rb
 - lib/irb/color.rb
 - lib/irb/color_printer.rb
+- lib/irb/command.rb
+- lib/irb/command/backtrace.rb
+- lib/irb/command/base.rb
+- lib/irb/command/break.rb
+- lib/irb/command/catch.rb
+- lib/irb/command/chws.rb
+- lib/irb/command/continue.rb
+- lib/irb/command/debug.rb
+- lib/irb/command/delete.rb
+- lib/irb/command/edit.rb
+- lib/irb/command/exit.rb
+- lib/irb/command/finish.rb
+- lib/irb/command/force_exit.rb
+- lib/irb/command/help.rb
+- lib/irb/command/history.rb
+- lib/irb/command/info.rb
+- lib/irb/command/irb_info.rb
+- lib/irb/command/load.rb
+- lib/irb/command/ls.rb
+- lib/irb/command/measure.rb
+- lib/irb/command/next.rb
+- lib/irb/command/pushws.rb
+- lib/irb/command/show_doc.rb
+- lib/irb/command/show_source.rb
+- lib/irb/command/step.rb
+- lib/irb/command/subirb.rb
+- lib/irb/command/whereami.rb
 - lib/irb/completion.rb
 - lib/irb/context.rb
 - lib/irb/debug.rb
@@ -100,7 +102,6 @@ files:
 - lib/irb/ext/tracer.rb
 - lib/irb/ext/use-loader.rb
 - lib/irb/ext/workspaces.rb
-- lib/irb/extend-command.rb
 - lib/irb/frame.rb
 - lib/irb/help.rb
 - lib/irb/history.rb
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.1
 signing_key:
 specification_version: 4
 summary: Interactive Ruby command-line tool for REPL (Read Eval Print Loop).

data/lib/irb/cmd/edit.rb

@@ -1,60 +0,0 @@
-require 'shellwords'
-require_relative "nop"
-require_relative "../source_finder"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Edit < Nop
-      category "Misc"
-      description 'Open a file with the editor command defined with `ENV["VISUAL"]` or `ENV["EDITOR"]`.'
-
-      class << self
-        def transform_args(args)
-          # Return a string literal as is for backward compatibility
-          if args.nil? || args.empty? || string_literal?(args)
-            args
-          else # Otherwise, consider the input as a String for convenience
-            args.strip.dump
-          end
-        end
-      end
-
-      def execute(*args)
-        path = args.first
-
-        if path.nil? && (irb_path = @irb_context.irb_path)
-          path = irb_path
-        end
-
-        if !File.exist?(path)
-          source =
-            begin
-              SourceFinder.new(@irb_context).find_source(path)
-            rescue NameError
-              # if user enters a path that doesn't exist, it'll cause NameError when passed here because find_source would try to evaluate it as well
-              # in this case, we should just ignore the error
-            end
-
-          if source
-            path = source.file
-          else
-            puts "Can not find file: #{path}"
-            return
-          end
-        end
-
-        if editor = (ENV['VISUAL'] || ENV['EDITOR'])
-          puts "command: '#{editor}'"
-          puts "   path: #{path}"
-          system(*Shellwords.split(editor), path)
-        else
-          puts "Can not find editor setting: ENV['VISUAL'] or ENV['EDITOR']"
-        end
-      end
-    end
-  end
-
-  # :startdoc:
-end

data/lib/irb/cmd/help.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "show_doc"
-
-module IRB
-  module ExtendCommand
-    class Help < ShowDoc
-      category "Context"
-      description "[DEPRECATED] Enter the mode to look up RI documents."
-
-      DEPRECATION_MESSAGE = <<~MSG
-        [Deprecation] The `help` command will be repurposed to display command help in the future.
-        For RI document lookup, please use the `show_doc` command instead.
-        For command help, please use `show_cmds` for now.
-      MSG
-
-      def execute(*names)
-        warn DEPRECATION_MESSAGE
-        super
-      end
-    end
-  end
-end

data/lib/irb/cmd/show_cmds.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require "stringio"
-require_relative "nop"
-require_relative "../pager"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class ShowCmds < Nop
-      category "IRB"
-      description "List all available commands and their description."
-
-      def execute(*args)
-        commands_info = IRB::ExtendCommandBundle.all_commands_info
-        commands_grouped_by_categories = commands_info.group_by { |cmd| cmd[:category] }
-
-        user_aliases = irb_context.instance_variable_get(:@user_aliases)
-
-        commands_grouped_by_categories["Aliases"] = user_aliases.map do |alias_name, target|
-          { display_name: alias_name, description: "Alias for `#{target}`" }
-        end
-
-        if irb_context.with_debugger
-          # Remove the original "Debugging" category
-          commands_grouped_by_categories.delete("Debugging")
-          # Remove the `help` command as it's delegated to the debugger
-          commands_grouped_by_categories["Context"].delete_if { |cmd| cmd[:display_name] == :help }
-          # Add an empty "Debugging (from debug.gem)" category at the end
-          commands_grouped_by_categories["Debugging (from debug.gem)"] = []
-        end
-
-        longest_cmd_name_length = commands_info.map { |c| c[:display_name].length }.max
-
-        output = StringIO.new
-
-        commands_grouped_by_categories.each do |category, cmds|
-          output.puts Color.colorize(category, [:BOLD])
-
-          cmds.each do |cmd|
-            output.puts "  #{cmd[:display_name].to_s.ljust(longest_cmd_name_length)}    #{cmd[:description]}"
-          end
-
-          output.puts
-        end
-
-        # Append the debugger help at the end
-        if irb_context.with_debugger
-          output.puts DEBUGGER__.help
-        end
-
-        Pager.page_content(output.string)
-      end
-    end
-  end
-
-  # :startdoc:
-end