irb 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f82a38c3bf30c31ffcac5b5dd8f7883d9edd65edfbba779d87a18eb028c88c93
-  data.tar.gz: d45c6f3671612e3186a902c9c3406df16b350ae9a91e89d85383544267bc3eed
+  metadata.gz: db51125adbe98b16228e314bff627b1cec953b92f32c774c4b9a820dc3bfc40b
+  data.tar.gz: ead3ebf30f5a4369d8cc2767691397d766bab8532031f8f505c2d0b3f251e071
 SHA512:
-  metadata.gz: 32eee54235bcc829238f55cb70d29cebce2c0024b6ebb76d9dfc6e168fd4d35fffccd228fa1b848ac4b5a3a0f35e4743533499a060ae2cf5858ffc9caee4ee8c
-  data.tar.gz: 20bc4fdda9f15c9c668ece83acf81c0b9828664d74dac042430cbbfe798e8467ddf9af0c41a63267ceee402eb92f71c9bc4413f7e91b95b5f8ba2bf64c989505
+  metadata.gz: d2f749ce66ed43433fbbc7ec8682a0c3f0180ac8fb676739e5c3cbf0eb2f8bbb89a7896af11120bdeedd730e57edddaeabf932ae22ac55ad33c99f8408ffc832
+  data.tar.gz: 55621e3a5f9926c3f1b44426c23b9b08543920075fa0d32eeda8b7db35ded09aba6c311011e7f8397a6a5089bbb63d2b2e2603c1d7e254b77a16b93ca35b76f3

data/README.md

@@ -1,5 +1,8 @@
 # IRB
 
+[![Gem Version](https://badge.fury.io/rb/irb.svg)](https://badge.fury.io/rb/irb) 
+[![build](https://github.com/ruby/irb/actions/workflows/test.yml/badge.svg)](https://github.com/ruby/irb/actions/workflows/test.yml)
+
 IRB stands for "interactive Ruby" and is a tool to interactively execute Ruby expressions read from the standard input.
 
 The `irb` command from your shell will start the interpreter.

data/irb.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7")
 
   spec.add_dependency "reline", ">= 0.3.0"
 end

data/lib/irb/cmd/nop.rb

@@ -30,20 +30,11 @@ module IRB
         end
       end
 
-      if RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.7.0"
-        def self.execute(conf, *opts, **kwargs, &block)
-          command = new(conf)
-          command.execute(*opts, **kwargs, &block)
-        rescue CommandArgumentError => e
-          puts e.message
-        end
-      else
-        def self.execute(conf, *opts, &block)
-          command = new(conf)
-          command.execute(*opts, &block)
-        rescue CommandArgumentError => e
-          puts e.message
-        end
+      def self.execute(conf, *opts, **kwargs, &block)
+        command = new(conf)
+        command.execute(*opts, **kwargs, &block)
+      rescue CommandArgumentError => e
+        puts e.message
       end
 
       def initialize(conf)

data/lib/irb/cmd/show_source.rb

@@ -27,7 +27,7 @@ module IRB
           when /\A[A-Z]\w*(::[A-Z]\w*)*\z/ # Const::Name
             eval(str, irb_context.workspace.binding) # trigger autoload
             base = irb_context.workspace.binding.receiver.yield_self { |r| r.is_a?(Module) ? r : Object }
-            file, line = base.const_source_location(str) if base.respond_to?(:const_source_location) # Ruby 2.7+
+            file, line = base.const_source_location(str)
           when /\A(?<owner>[A-Z]\w*(::[A-Z]\w*)*)#(?<method>[^ :.]+)\z/ # Class#method
             owner = eval(Regexp.last_match[:owner], irb_context.workspace.binding)
             method = Regexp.last_match[:method]

data/lib/irb/color.rb

@@ -197,15 +197,9 @@ module IRB # :nodoc:
             end
           end
 
-          if lexer.respond_to?(:scan) # Ruby 2.7+
-            lexer.scan.each do |elem|
-              next if allow_last_error and /meets end of file|unexpected end-of-input/ =~ elem.message
-              on_scan.call(elem)
-            end
-          else
-            lexer.parse.sort_by(&:pos).each do |elem|
-              on_scan.call(elem)
-            end
+          lexer.scan.each do |elem|
+            next if allow_last_error and /meets end of file|unexpected end-of-input/ =~ elem.message
+            on_scan.call(elem)
           end
           # yield uncolorable DATA section
           yield(nil, inner_code.byteslice(byte_pos...inner_code.bytesize), nil) if byte_pos < inner_code.bytesize

data/lib/irb/color_printer.rb

@@ -4,6 +4,9 @@ require_relative 'color'
 
 module IRB
   class ColorPrinter < ::PP
+    METHOD_RESPOND_TO = Object.instance_method(:respond_to?)
+    METHOD_INSPECT = Object.instance_method(:inspect)
+
     class << self
       def pp(obj, out = $>, width = screen_width)
         q = ColorPrinter.new(out, width)
@@ -22,9 +25,11 @@ module IRB
     end
 
     def pp(obj)
-      if obj.is_a?(String)
+      if String === obj
         # Avoid calling Ruby 2.4+ String#pretty_print that splits a string by "\n"
         text(obj.inspect)
+      elsif !METHOD_RESPOND_TO.bind(obj).call(:inspect)
+        text(METHOD_INSPECT.bind(obj).call)
       else
         super
       end

data/lib/irb/completion.rb

@@ -58,19 +58,11 @@ module IRB
 
     BASIC_WORD_BREAK_CHARACTERS = " \t\n`><=;|&{("
 
-    def self.absolute_path?(p) # TODO Remove this method after 2.6 EOL.
-      if File.respond_to?(:absolute_path?)
-        File.absolute_path?(p)
-      else
-        File.absolute_path(p) == p
-      end
-    end
-
     GEM_PATHS =
       if defined?(Gem::Specification)
         Gem::Specification.latest_specs(true).map { |s|
           s.require_paths.map { |p|
-            if absolute_path?(p)
+            if File.absolute_path?(p)
               p
             else
               File.join(s.full_gem_path, p)
@@ -450,30 +442,5 @@ module IRB
         end
       end
     end
-
-    def self.ignored_modules
-      # We could cache the result, but this is very fast already.
-      # By using this approach, we avoid Module#name calls, which are
-      # relatively slow when there are a lot of anonymous modules defined.
-      s = {}
-
-      scanner = lambda do |m|
-        next if s.include?(m) # IRB::ExtendCommandBundle::EXCB recurses.
-        s[m] = true
-        m.constants(false).each do |c|
-          value = m.const_get(c)
-          scanner.call(value) if value.is_a?(Module)
-        end
-      end
-
-      %i(IRB RubyLex).each do |sym|
-        next unless Object.const_defined?(sym)
-        scanner.call(Object.const_get(sym))
-      end
-
-      s.delete(IRB::Context) if defined?(IRB::Context)
-
-      s
-    end
   end
 end

data/lib/irb/ext/loader.rb

@@ -24,31 +24,8 @@ module IRB # :nodoc:
       load_file(path, priv)
     end
 
-    if File.respond_to?(:absolute_path?)
-      def absolute_path?(path)
-        File.absolute_path?(path)
-      end
-    else
-      separator =
-        if File::ALT_SEPARATOR
-          "[#{Regexp.quote(File::SEPARATOR + File::ALT_SEPARATOR)}]"
-        else
-          File::SEPARATOR
-        end
-      ABSOLUTE_PATH_PATTERN = # :nodoc:
-        case Dir.pwd
-        when /\A\w:/, /\A#{separator}{2}/
-          /\A(?:\w:|#{separator})#{separator}/
-        else
-          /\A#{separator}/
-        end
-      def absolute_path?(path)
-        ABSOLUTE_PATH_PATTERN =~ path
-      end
-    end
-
     def search_file_from_ruby_path(fn) # :nodoc:
-      if absolute_path?(fn)
+      if File.absolute_path?(fn)
         return fn if File.exist?(fn)
         return nil
       end

data/lib/irb/ext/tracer.rb

@@ -9,7 +9,6 @@ begin
 rescue LoadError
   $stderr.puts "Tracer extension of IRB is enabled but tracer gem doesn't found."
   module IRB
-    TracerLoadError = true
     class Context
       def use_tracer=(opt)
         # do nothing

data/lib/irb/extend-command.rb

@@ -246,7 +246,7 @@ module IRB # :nodoc:
     #
     # The optional +load_file+ parameter will be required within the method
     # definition.
-    def self.def_extend_command(cmd_name, cmd_class, load_file = nil, *aliases)
+    def self.def_extend_command(cmd_name, cmd_class, load_file, *aliases)
       case cmd_class
       when Symbol
         cmd_class = cmd_class.id2name
@@ -255,34 +255,12 @@ module IRB # :nodoc:
         cmd_class = cmd_class.name
       end
 
-      if load_file
-        kwargs = ", **kwargs" if RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.7.0"
-        line = __LINE__; eval %[
-          def #{cmd_name}(*opts#{kwargs}, &b)
-            Kernel.require_relative "#{load_file}"
-            arity = ::IRB::ExtendCommand::#{cmd_class}.instance_method(:execute).arity
-            args = (1..(arity < 0 ? ~arity : arity)).map {|i| "arg" + i.to_s }
-            args << "*opts#{kwargs}" if arity < 0
-            args << "&block"
-            args = args.join(", ")
-            line = __LINE__; eval %[
-              unless singleton_class.class_variable_defined?(:@@#{cmd_name}_)
-                singleton_class.class_variable_set(:@@#{cmd_name}_, true)
-                def self.#{cmd_name}_(\#{args})
-                  ::IRB::ExtendCommand::#{cmd_class}.execute(irb_context, \#{args})
-                end
-              end
-            ], nil, __FILE__, line
-            __send__ :#{cmd_name}_, *opts#{kwargs}, &b
-          end
-        ], nil, __FILE__, line
-      else
-        line = __LINE__; eval %[
-          def #{cmd_name}(*opts, &b)
-            ::IRB::ExtendCommand::#{cmd_class}.execute(irb_context, *opts, &b)
-          end
-        ], nil, __FILE__, line
-      end
+      line = __LINE__; eval %[
+        def #{cmd_name}(*opts, **kwargs, &b)
+          Kernel.require_relative "#{load_file}"
+          ::IRB::ExtendCommand::#{cmd_class}.execute(irb_context, *opts, **kwargs, &b)
+        end
+      ], nil, __FILE__, line
 
       for ali, flag in aliases
         @ALIASES.push [ali, cmd_name, flag]
@@ -371,58 +349,4 @@ module IRB # :nodoc:
 
     CE.install_extend_commands
   end
-
-  # A convenience module for extending Ruby methods.
-  module MethodExtender
-    # Extends the given +base_method+ with a prefix call to the given
-    # +extend_method+.
-    def def_pre_proc(base_method, extend_method)
-      base_method = base_method.to_s
-      extend_method = extend_method.to_s
-
-      alias_name = new_alias_name(base_method)
-      module_eval %[
-        alias_method alias_name, base_method
-        def #{base_method}(*opts)
-          __send__ :#{extend_method}, *opts
-          __send__ :#{alias_name}, *opts
-        end
-      ]
-    end
-
-    # Extends the given +base_method+ with a postfix call to the given
-    # +extend_method+.
-    def def_post_proc(base_method, extend_method)
-      base_method = base_method.to_s
-      extend_method = extend_method.to_s
-
-      alias_name = new_alias_name(base_method)
-      module_eval %[
-        alias_method alias_name, base_method
-        def #{base_method}(*opts)
-          __send__ :#{alias_name}, *opts
-          __send__ :#{extend_method}, *opts
-        end
-      ]
-    end
-
-    # Returns a unique method name to use as an alias for the given +name+.
-    #
-    # Usually returns <code>#{prefix}#{name}#{postfix}<num></code>, example:
-    #
-    #     new_alias_name('foo') #=> __alias_of__foo__
-    #     def bar; end
-    #     new_alias_name('bar') #=> __alias_of__bar__2
-    def new_alias_name(name, prefix = "__alias_of__", postfix = "__")
-      base_name = "#{prefix}#{name}#{postfix}"
-      all_methods = instance_methods(true) + private_instance_methods(true)
-      same_methods = all_methods.grep(/^#{Regexp.quote(base_name)}[0-9]*$/)
-      return base_name if same_methods.empty?
-      no = same_methods.size
-      while !same_methods.include?(alias_name = base_name + no)
-        no += 1
-      end
-      alias_name
-    end
-  end
 end

data/lib/irb/inspector.rb

@@ -98,8 +98,7 @@ module IRB # :nodoc:
       puts "An error occurred when inspecting the object: #{e.inspect}"
 
       begin
-        # TODO: change this to bind_call when we drop support for Ruby 2.6
-        puts "Result of Kernel#inspect: #{KERNEL_INSPECT.bind(v).call}"
+        puts "Result of Kernel#inspect: #{KERNEL_INSPECT.bind_call(v)}"
         ''
       rescue => e
         puts "An error occurred when running Kernel#inspect: #{e.inspect}"

data/lib/irb/ruby-lex.rb

@@ -148,19 +148,15 @@ class RubyLex
 
     compile_with_errors_suppressed(code, line_no: line_no) do |inner_code, line_no|
       lexer = Ripper::Lexer.new(inner_code, '-', line_no)
-      if lexer.respond_to?(:scan) # Ruby 2.7+
-        lexer.scan.each_with_object([]) do |t, tokens|
-          next if t.pos.first == 0
-          prev_tk = tokens.last
-          position_overlapped = prev_tk && t.pos[0] == prev_tk.pos[0] && t.pos[1] < prev_tk.pos[1] + prev_tk.tok.bytesize
-          if position_overlapped
-            tokens[-1] = t if ERROR_TOKENS.include?(prev_tk.event) && !ERROR_TOKENS.include?(t.event)
-          else
-            tokens << t
-          end
+      lexer.scan.each_with_object([]) do |t, tokens|
+        next if t.pos.first == 0
+        prev_tk = tokens.last
+        position_overlapped = prev_tk && t.pos[0] == prev_tk.pos[0] && t.pos[1] < prev_tk.pos[1] + prev_tk.tok.bytesize
+        if position_overlapped
+          tokens[-1] = t if ERROR_TOKENS.include?(prev_tk.event) && !ERROR_TOKENS.include?(t.event)
+        else
+          tokens << t
         end
-      else
-        lexer.parse.reject { |it| it.pos.first == 0 }.sort_by(&:pos)
       end
     end
   ensure

data/lib/irb/version.rb

@@ -5,7 +5,7 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
   @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2023-03-06"
+  @LAST_UPDATE_DATE = "2023-04-07"
 end

data/lib/irb.rb

@@ -416,11 +416,6 @@ module IRB
     irb.run(@CONF)
   end
 
-  # Calls each event hook of <code>IRB.conf[:AT_EXIT]</code> when the current session quits.
-  def IRB.irb_at_exit
-    @CONF[:AT_EXIT].each{|hook| hook.call}
-  end
-
   # Quits irb
   def IRB.irb_exit(irb, ret)
     throw :IRB_EXIT, ret
@@ -565,7 +560,6 @@ module IRB
       @scanner.each_top_level_statement do |line, line_no|
         signal_status(:IN_EVAL) do
           begin
-            line.untaint if RUBY_VERSION < '2.7'
             if IRB.conf[:MEASURE] && IRB.conf[:MEASURE_CALLBACKS].empty?
               IRB.set_measure_callback
             end
@@ -897,11 +891,6 @@ module IRB
     ensure
       $VERBOSE = verbose
     end
-
-    ATTR_TTY = "\e[%sm"
-    def ATTR_TTY.[](*a) self % a.join(";"); end
-    ATTR_PLAIN = ""
-    def ATTR_PLAIN.[](*) self; end
   end
 
   def @CONF.inspect

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - aycabta
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reline
@@ -123,14 +123,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Interactive Ruby command-line tool for REPL (Read Eval Print Loop).