irb 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be0bdb184f8483785b83b91bc57339e994a15b2d1435720e8f17b9f04b2b924e
-  data.tar.gz: 02ca5b9f06cedc077c79f07ad33765225736f9d7ffa9bb93671cf739131a2d9c
+  metadata.gz: 025d4dccc426fe09dc77b79d7efb8157abc559b89a7455249e5d7e9b2ff1562c
+  data.tar.gz: fd2cffe5c013c56a5d454ce81331ac1c24b6826c81db6ae6f2240e6e2d5f8c06
 SHA512:
-  metadata.gz: faa52653f45b98a0ce82b215110376e3cac3faefa34928a50067e101c3171a0fbc492ba3b7a23334ac81f23448526e6931fca45925a07ab914aa2634c8e1de9a
-  data.tar.gz: 4da73a1293f021bcb3a0ed996ac4f48f3c73884d34efa438987b230cda72ce3aa0c6ac67865e57655cdcc8ffd49cb6ca267c564711345247ed889857f60156c1
+  metadata.gz: 582d9176beb3f3b9a016f6d44b90b9d781066230f4c64dec93ba5d645ae54df8f7f6f1a5dcaab20899390cd048050eaed6db9b45fdcf44c55a57098013855aa9
+  data.tar.gz: ab9b30b770c677778cc4871b249a0967177805e543bd8576077099be7d3a5d93e2ef33c35362326cd7f889cd1f855d956c2cb9bd992560029e152c6293720a94

data/Gemfile

@@ -10,4 +10,5 @@ group :development do
   gem "rake"
   gem "stackprof" if is_unix && !is_truffleruby
   gem "test-unit"
+  gem "reline", github: "ruby/reline" if ENV["WITH_LATEST_RELINE"] == "true"
 end

data/README.md

@@ -40,6 +40,10 @@ irb(main):006:1> end
 
 The Readline extension module can be used with irb. Use of Readline is default if it's installed.
 
+## Documentation
+
+https://docs.ruby-lang.org/en/master/IRB.html
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/Rakefile

@@ -8,6 +8,31 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/irb/test_*.rb"]
 end
 
+# To make sure they have been correctly setup for Ruby CI.
+desc "Run each irb test file in isolation."
+task :test_in_isolation do
+  failed = false
+
+  FileList["test/irb/test_*.rb"].each do |test_file|
+    ENV["TEST"] = test_file
+    begin
+      Rake::Task["test"].execute
+    rescue => e
+      failed = true
+      msg = "Test '#{test_file}' failed when being executed in isolation. Please make sure 'rake test TEST=#{test_file}' passes."
+      separation_line = '=' * msg.length
+
+      puts <<~MSG
+        #{separation_line}
+        #{msg}
+        #{separation_line}
+      MSG
+    end
+  end
+
+  fail "Some tests failed when being executed in isolation" if failed
+end
+
 Rake::TestTask.new(:test_yamatanooroti) do |t|
   t.libs << 'test' << "test/lib"
   t.libs << 'lib'

data/irb.gemspec

@@ -8,8 +8,8 @@ end
 Gem::Specification.new do |spec|
   spec.name          = "irb"
   spec.version       = IRB::VERSION
-  spec.authors       = ["Keiju ISHITSUKA"]
-  spec.email         = ["keiju@ruby-lang.org"]
+  spec.authors       = ["aycabta", "Keiju ISHITSUKA"]
+  spec.email         = ["aycabta@gmail.com", "keiju@ruby-lang.org"]
 
   spec.summary       = %q{Interactive Ruby command-line tool for REPL (Read Eval Print Loop).}
   spec.description   = %q{Interactive Ruby command-line tool for REPL (Read Eval Print Loop).}
@@ -34,7 +34,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.5")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6")
 
   spec.add_dependency "reline", ">= 0.3.0"
 end

data/lib/irb/cmd/chws.rb

@@ -13,8 +13,9 @@
 require_relative "nop"
 require_relative "../ext/change-ws"
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   module ExtendCommand
 
     class CurrentWorkingWorkspace < Nop
@@ -30,5 +31,6 @@ module IRB
       end
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/cmd/fork.rb

@@ -10,9 +10,11 @@
 #
 #
 
+require_relative "nop"
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   module ExtendCommand
     class Fork < Nop
       def execute
@@ -33,5 +35,6 @@ module IRB
       end
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/cmd/help.rb

@@ -11,8 +11,9 @@
 
 require_relative "nop"
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   module ExtendCommand
     class Help < Nop
       def execute(*names)
@@ -43,5 +44,6 @@ module IRB
       end
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/cmd/info.rb

@@ -2,8 +2,9 @@
 
 require_relative "nop"
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   module ExtendCommand
     class Info < Nop
       def execute
@@ -28,5 +29,6 @@ module IRB
       end
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/cmd/load.rb

@@ -13,8 +13,9 @@
 require_relative "nop"
 require_relative "../ext/loader"
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   module ExtendCommand
     class Load < Nop
       include IrbLoader
@@ -63,5 +64,5 @@ module IRB
     end
   end
 
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/cmd/ls.rb

@@ -4,10 +4,20 @@ require "reline"
 require_relative "nop"
 require_relative "../color"
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   module ExtendCommand
     class Ls < Nop
+      def self.transform_args(args)
+        if match = args&.match(/\A(?<args>.+\s|)(-g|-G)\s+(?<grep>[^\s]+)\s*\n\z/)
+          args = match[:args]
+          "#{args}#{',' unless args.chomp.empty?} grep: /#{match[:grep]}/"
+        else
+          args
+        end
+      end
+
       def execute(*arg, grep: nil)
         o = Output.new(grep: grep)
 
@@ -97,5 +107,6 @@ module IRB
       private_constant :Output
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/cmd/measure.rb

@@ -1,7 +1,8 @@
 require_relative "nop"
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   module ExtendCommand
     class Measure < Nop
       def initialize(*args)
@@ -39,5 +40,6 @@ module IRB
       end
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/cmd/nop.rb

@@ -9,8 +9,9 @@
 #
 #
 #
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   module ExtendCommand
     class Nop
 
@@ -41,5 +42,6 @@ module IRB
       end
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/cmd/pushws.rb

@@ -13,8 +13,9 @@
 require_relative "nop"
 require_relative "../ext/workspaces"
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   module ExtendCommand
     class Workspaces < Nop
       def execute(*obj)
@@ -36,5 +37,6 @@ module IRB
       end
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/cmd/show_source.rb

@@ -4,10 +4,29 @@ require_relative "nop"
 require_relative "../color"
 require_relative "../ruby-lex"
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   module ExtendCommand
     class ShowSource < Nop
+      class << self
+        def transform_args(args)
+          # Return a string literal as is for backward compatibility
+          if args.empty? || string_literal?(args)
+            args
+          else # Otherwise, consider the input as a String for convenience
+            args.strip.dump
+          end
+        end
+
+        private
+
+        def string_literal?(args)
+          sexp = Ripper.sexp(args)
+          sexp && sexp.size == 2 && sexp.last&.first&.first == :string_literal
+        end
+      end
+
       def execute(str = nil)
         unless str.is_a?(String)
           puts "Error: Expected a string but got #{str.inspect}"
@@ -89,5 +108,6 @@ module IRB
       private_constant :Source
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/cmd/subirb.rb

@@ -12,8 +12,9 @@
 require_relative "nop"
 require_relative "../ext/multi-irb"
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   module ExtendCommand
     class IrbCommand < Nop
       def execute(*obj)
@@ -39,5 +40,6 @@ module IRB
       end
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/cmd/whereami.rb

@@ -2,8 +2,9 @@
 
 require_relative "nop"
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   module ExtendCommand
     class Whereami < Nop
       def execute(*)
@@ -16,5 +17,6 @@ module IRB
       end
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/color.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'reline'
 require 'ripper'
-require 'irb/ruby-lex'
+require_relative 'ruby-lex'
 
 module IRB # :nodoc:
   module Color
@@ -77,7 +77,15 @@ module IRB # :nodoc:
 
     class << self
       def colorable?
-        $stdout.tty? && (/mswin|mingw/ =~ RUBY_PLATFORM || (ENV.key?('TERM') && ENV['TERM'] != 'dumb'))
+        supported = $stdout.tty? && (/mswin|mingw/ =~ RUBY_PLATFORM || (ENV.key?('TERM') && ENV['TERM'] != 'dumb'))
+
+        # because ruby/debug also uses irb's color module selectively,
+        # irb won't be activated in that case.
+        if IRB.respond_to?(:conf)
+          supported && IRB.conf.fetch(:USE_COLORIZE, true)
+        else
+          supported
+        end
       end
 
       def inspect_colorable?(obj, seen: {}.compare_by_identity)
@@ -115,15 +123,21 @@ module IRB # :nodoc:
       # If `complete` is false (code is incomplete), this does not warn compile_error.
       # This option is needed to avoid warning a user when the compile_error is happening
       # because the input is not wrong but just incomplete.
-      def colorize_code(code, complete: true, ignore_error: false, colorable: colorable?)
+      def colorize_code(code, complete: true, ignore_error: false, colorable: colorable?, local_variables: [])
         return code unless colorable
 
         symbol_state = SymbolState.new
         colored = +''
-        length = 0
-        end_seen = false
+        lvars_code = RubyLex.generate_local_variables_assign_code(local_variables)
+        code_with_lvars = lvars_code ? "#{lvars_code}\n#{code}" : code
+
+        scan(code_with_lvars, allow_last_error: !complete) do |token, str, expr|
+          # handle uncolorable code
+          if token.nil?
+            colored << Reline::Unicode.escape_for_print(str)
+            next
+          end
 
-        scan(code, allow_last_error: !complete) do |token, str, expr|
           # IRB::ColorPrinter skips colorizing fragments with any invalid token
           if ignore_error && ERROR_TOKENS.include?(token)
             return Reline::Unicode.escape_for_print(code)
@@ -139,15 +153,12 @@ module IRB # :nodoc:
               colored << line
             end
           end
-          length += str.bytesize
-          end_seen = true if token == :on___end__
         end
 
-        # give up colorizing incomplete Ripper tokens
-        unless end_seen or length == code.bytesize
-          return Reline::Unicode.escape_for_print(code)
+        if lvars_code
+          raise "#{lvars_code.dump} should have no \\n" if lvars_code.include?("\n")
+          colored.sub!(/\A.+\n/, '') # delete_prefix lvars_code with colors
         end
-
         colored
       end
 
@@ -162,33 +173,42 @@ module IRB # :nodoc:
       end
 
       def scan(code, allow_last_error:)
-        pos = [1, 0]
-
         verbose, $VERBOSE = $VERBOSE, nil
         RubyLex.compile_with_errors_suppressed(code) do |inner_code, line_no|
           lexer = Ripper::Lexer.new(inner_code, '(ripper)', line_no)
-          if lexer.respond_to?(:scan) # Ruby 2.7+
-            lexer.scan.each do |elem|
-              str = elem.tok
-              next if allow_last_error and /meets end of file|unexpected end-of-input/ =~ elem.message
-              next if ([elem.pos[0], elem.pos[1] + str.bytesize] <=> pos) <= 0
+          byte_pos = 0
+          line_positions = [0]
+          inner_code.lines.each do |line|
+            line_positions << line_positions.last + line.bytesize
+          end
+
+          on_scan = proc do |elem|
+            start_pos = line_positions[elem.pos[0] - 1] + elem.pos[1]
 
-              str.each_line do |line|
-                if line.end_with?("\n")
-                  pos[0] += 1
-                  pos[1] = 0
-                else
-                  pos[1] += line.bytesize
-                end
-              end
+            # yield uncolorable code
+            if byte_pos < start_pos
+              yield(nil, inner_code.byteslice(byte_pos...start_pos), nil)
+            end
 
+            if byte_pos <= start_pos
+              str = elem.tok
               yield(elem.event, str, elem.state)
+              byte_pos = start_pos + str.bytesize
+            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.each do |elem|
-              yield(elem.event, elem.tok, elem.state)
+            lexer.parse.sort_by(&:pos).each do |elem|
+              on_scan.call(elem)
             end
           end
+          # yield uncolorable DATA section
+          yield(nil, inner_code.byteslice(byte_pos...inner_code.bytesize), nil) if byte_pos < inner_code.bytesize
         end
       ensure
         $VERBOSE = verbose

data/lib/irb/color_printer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'pp'
-require 'irb/color'
+require_relative 'color'
 
 module IRB
   class ColorPrinter < ::PP
@@ -37,6 +37,9 @@ module IRB
       width ||= str.length
 
       case str
+      when ''
+      when ',', '=>', '[', ']', '{', '}', '..', '...', /\A@\w+\z/
+        super(str, width)
       when /\A#</, '=', '>'
         super(Color.colorize(str, [:GREEN]), width)
       else