irb 1.3.6 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7071322837c419efbce74bd5aa91c9b83a9a3fd31e893e72376b763b2bbf4409
-  data.tar.gz: fa4e508771f91e4da313913592a7caa713cb82069f57d4dab059426baa764fc4
+  metadata.gz: be0bdb184f8483785b83b91bc57339e994a15b2d1435720e8f17b9f04b2b924e
+  data.tar.gz: 02ca5b9f06cedc077c79f07ad33765225736f9d7ffa9bb93671cf739131a2d9c
 SHA512:
-  metadata.gz: 2b040a17c30df8f8512c176acfb1884237c050d5e4dab769f08aa75a00da23dcba1be9fab15d37671e4617abee3f6279363fed80c0980687cdcbed417bf5e3f4
-  data.tar.gz: 0a021169f28c114aeac7b7375eda932cdd4b357056b092a8499a61da6d4d1b01d019591e94eaaf134392a8b5c92cd632d0dfc7bf4b243831df93cc0514cd2eb1
+  metadata.gz: faa52653f45b98a0ce82b215110376e3cac3faefa34928a50067e101c3171a0fbc492ba3b7a23334ac81f23448526e6931fca45925a07ab914aa2634c8e1de9a
+  data.tar.gz: 4da73a1293f021bcb3a0ed996ac4f48f3c73884d34efa438987b230cda72ce3aa0c6ac67865e57655cdcc8ffd49cb6ca267c564711345247ed889857f60156c1

data/Gemfile

@@ -1,15 +1,13 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
 gemspec
 
 group :development do
-  gem "bundler"
   is_unix = RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
   is_truffleruby = RUBY_DESCRIPTION =~ /truffleruby/
-  gem 'vterm', '>= 0.0.5' if is_unix && ENV['WITH_VTERM']
-  gem 'yamatanooroti', '>= 0.0.6'
+  gem "vterm", ">= 0.0.5" if is_unix && ENV['WITH_VTERM']
+  gem "yamatanooroti", ">= 0.0.6"
   gem "rake"
   gem "stackprof" if is_unix && !is_truffleruby
+  gem "test-unit"
 end

data/Rakefile

@@ -4,14 +4,23 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test" << "test/lib"
   t.libs << "lib"
+  t.ruby_opts << "-rhelper"
   t.test_files = FileList["test/irb/test_*.rb"]
 end
 
 Rake::TestTask.new(:test_yamatanooroti) do |t|
-  t.libs << 'test'
+  t.libs << 'test' << "test/lib"
   t.libs << 'lib'
   #t.loader = :direct
+  t.ruby_opts << "-rhelper"
   t.pattern = 'test/irb/yamatanooroti/test_*.rb'
 end
 
+task :sync_tool do
+  require 'fileutils'
+  FileUtils.cp "../ruby/tool/lib/core_assertions.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/envutil.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/find_executable.rb", "./test/lib"
+end
+
 task :default => :test

data/doc/irb/irb.rd.ja

@@ -40,15 +40,24 @@ irbの使い方は, Rubyさえ知っていればいたって簡単です. 基本
   irb.rb [options] file_name opts
   options:
   -f		    ~/.irbrc を読み込まない.
-  -m		    bcモード(分数, 行列の計算ができる)
   -d                $DEBUG をtrueにする(ruby -d と同じ)
-  -Kc		    ruby -Kcと同じ
   -r load-module    ruby -r と同じ.
-  --verbose	    これから実行する行を表示する(デフォルト)
-  --noverbose	    これから実行する行を表示しない
-  --echo	    実行結果を表示する(デフォルト)
-  --noecho	    実行結果を表示しない
-  --inspect	    結果出力にinspectを用いる(bcモード以外はデフォルト).
+  -I path           $LOAD_PATH に path を追加する.
+  -U                ruby -U と同じ.
+  -E enc            ruby -E と同じ.
+  -w                ruby -w と同じ.
+  -W[level=2]       ruby -W と同じ.
+  --context-mode n  新しいワークスペースを作成した時に関連する Binding
+		    オブジェクトの作成方法を 0 から 3 のいずれかに設定する.
+  --echo	    実行結果を表示する(デフォルト).
+  --noecho	    実行結果を表示しない.
+  --echo-on-assignment
+                    代入時に実行結果を表示する.
+  --noecho-on-assignment
+                    代入時に実行結果を表示しない.
+  --truncate-echo-on-assignment
+                    代入時に省略された実行結果を表示する(デフォルト).
+  --inspect	    結果出力にinspectを用いる.
   --noinspect	    結果出力にinspectを用いない.
   --singleline      シングルラインエディタを利用する.
   --nosingleline    シングルラインエディタを利用しない. デフォルトの動
@@ -56,23 +65,30 @@ irbの使い方は, Rubyさえ知っていればいたって簡単です. 基本
                     用しようとする.
   --colorize	    色付けを利用する.
   --nocolorize	    色付けを利用しない.
+  --autocomplete    オートコンプリートを利用する.
+  --noautocomplete  オートコンプリートを利用しない.
   --prompt prompt-mode
   --prompt-mode prompt-mode
 		    プロンプトモードを切替えます. 現在定義されているプ
 		    ロンプトモードは, default, simple, xmp, inf-rubyが
-		    用意されています. デフォルトはdefaultプロンプトモー
-		    ドになっています.
-
+		    用意されています.
   --inf-ruby-mode   emacsのinf-ruby-mode用のプロンプト表示を行なう. 特
 		    に指定がない限り, ラインエディタは使わなくなる.
   --simple-prompt
 		    非常にシンプルなプロンプトを用いるモードです.
   --noprompt	    プロンプト表示を行なわない.
+  --single-irb	    irb 中で self を実行して得られるオブジェクトをサ
+		    ブ irb と共有する.
   --tracer	    コマンド実行時にトレースを行なう.
   --back-trace-limit n
 		    バックトレース表示をバックトレースの頭から n, 後ろ
 		    からnだけ行なう. デフォルトは16
-  -v, --version	    irbのバージョンを表示する
+
+  --verbose	    詳細なメッセージを出力する.
+  --noverbose	    詳細なメッセージを出力しない(デフォルト).
+  -v, --version	    irbのバージョンを表示する.
+  -h, --help	    irb のヘルプを表示する.
+  --		    以降のコマンドライン引数をオプションとして扱わない.
 
 = コンフィギュレーション
 
@@ -137,12 +153,12 @@ PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_Cは, フォーマットを指定します.
 
 例えば, デフォルトのプロンプトモードは:
 
-  IRB.conf[:PROMPT_MODE][:DEFAULT] = {
+  IRB.conf[:PROMPT][:DEFAULT] = {
       :PROMPT_I => "%N(%m):%03n:%i> ",
       :PROMPT_N => "%N(%m):%03n:%i> ",
       :PROMPT_S => "%N(%m):%03n:%i%l ",
       :PROMPT_C => "%N(%m):%03n:%i* ",
-      :RETURN => "%s\n"
+      :RETURN => "=> %s\n"
   }
 
 となっています.
@@ -374,7 +390,7 @@ rubyでは, 以下のプログラムはエラーになります.
 パイルしてローカル変数を決定するからです. それに対し, irbは実行可能に
 なる(式が閉じる)と自動的に評価しているからです. 上記の例では,
 
-  evel "foo = 0"
+  eval "foo = 0"
 
 を行なった時点で評価を行ない, その時点で変数が定義されるため, 次式で
 変数fooは定義されているからです.

data/irb.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5")
 
-  spec.add_dependency "reline", ">= 0.2.5"
+  spec.add_dependency "reline", ">= 0.3.0"
 end

data/lib/irb/cmd/help.rb

@@ -17,7 +17,8 @@ module IRB
     class Help < Nop
       def execute(*names)
         require 'rdoc/ri/driver'
-        IRB::ExtendCommand::Help.const_set(:Ri, RDoc::RI::Driver.new)
+        opts = RDoc::RI::Driver.process_args([])
+        IRB::ExtendCommand::Help.const_set(:Ri, RDoc::RI::Driver.new(opts))
       rescue LoadError, SystemExit
         IRB::ExtendCommand::Help.remove_method(:execute)
         # raise NoMethodError in ensure

data/lib/irb/cmd/info.rb

@@ -14,6 +14,13 @@ module IRB
             str += "InputMethod: #{IRB.CurrentContext.io.inspect}\n"
             str += ".irbrc path: #{IRB.rc_file}\n" if File.exist?(IRB.rc_file)
             str += "RUBY_PLATFORM: #{RUBY_PLATFORM}\n"
+            str += "LANG env: #{ENV["LANG"]}\n" if ENV["LANG"] && !ENV["LANG"].empty?
+            str += "LC_ALL env: #{ENV["LC_ALL"]}\n" if ENV["LC_ALL"] && !ENV["LC_ALL"].empty?
+            str += "East Asian Ambiguous Width: #{Reline.ambiguous_width.inspect}\n"
+            if RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+              codepage = `chcp`.b.sub(/.*: (\d+)\n/, '\1')
+              str += "Code page: #{codepage}\n"
+            end
             str
           end
           alias_method :to_s, :inspect

data/lib/irb/cmd/ls.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "reline"
-require 'set'
 require_relative "nop"
 require_relative "../color"
 
@@ -17,32 +16,27 @@ module IRB
         klass  = (obj.class == Class || obj.class == Module ? obj : obj.class)
 
         o.dump("constants", obj.constants) if obj.respond_to?(:constants)
-        dump_singleton_methods(o, klass, obj)
-        dump_instance_methods(o, klass)
+        dump_methods(o, klass, obj)
         o.dump("instance variables", obj.instance_variables)
         o.dump("class variables", klass.class_variables)
         o.dump("locals", locals)
       end
 
-      def dump_singleton_methods(o, klass, obj)
-        maps = class_method_map(obj.singleton_class.ancestors.take_while { |c| c != klass })
+      def dump_methods(o, klass, obj)
+        singleton_class = begin obj.singleton_class; rescue TypeError; nil end
+        maps = class_method_map((singleton_class || klass).ancestors)
         maps.each do |mod, methods|
-          name = mod == obj.singleton_class ? "#{klass}.methods" : "#{mod}#methods"
+          name = mod == singleton_class ? "#{klass}.methods" : "#{mod}#methods"
           o.dump(name, methods)
         end
       end
 
-      def dump_instance_methods(o, klass)
-        maps = class_method_map(klass.ancestors)
-        maps.each do |mod, methods|
-          o.dump("#{mod}#methods", methods)
-        end
-      end
-
       def class_method_map(classes)
-        dumped = Set.new
+        dumped = Array.new
         classes.reject { |mod| mod >= Object }.map do |mod|
-          methods = mod.public_instance_methods(false).select { |m| dumped.add?(m) }
+          methods = mod.public_instance_methods(false).select do |m|
+            dumped.push(m) unless dumped.include?(m)
+          end
           [mod, methods]
         end.reverse
       end

data/lib/irb/cmd/measure.rb

@@ -9,6 +9,9 @@ module IRB
       end
 
       def execute(type = nil, arg = nil, &block)
+        # Please check IRB.init_config in lib/irb/init.rb that sets
+        # IRB.conf[:MEASURE_PROC] to register default "measure" methods,
+        # "measure :time" (abbreviated as "measure") and "measure :stackprof".
         case type
         when :off
           IRB.conf[:MEASURE] = nil

data/lib/irb/cmd/show_source.rb

@@ -59,11 +59,18 @@ module IRB
       def find_end(file, first_line)
         return first_line unless File.exist?(file)
         lex = RubyLex.new
-        code = +""
-        File.read(file).lines[(first_line - 1)..-1].each_with_index do |line, i|
-          _ltype, _indent, continue, code_block_open = lex.check_state(code << line)
+        lines = File.read(file).lines[(first_line - 1)..-1]
+        tokens = RubyLex.ripper_lex_without_warning(lines.join)
+        prev_tokens = []
+
+        # chunk with line number
+        tokens.chunk { |tok| tok.pos[0] }.each do |lnum, chunk|
+          code = lines[0..lnum].join
+          prev_tokens.concat chunk
+          continue = lex.process_continue(prev_tokens)
+          code_block_open = lex.check_code_block(code, prev_tokens)
           if !continue && !code_block_open
-            return first_line + i
+            return first_line + lnum
           end
         end
         first_line

data/lib/irb/completion.rb

@@ -38,16 +38,48 @@ module IRB
 
     BASIC_WORD_BREAK_CHARACTERS = " \t\n`><=;|&{("
 
-    def self.retrieve_files_to_require_from_load_path
-      @@files_from_load_path ||= $LOAD_PATH.flat_map { |path|
-        begin
-          Dir.glob("**/*.{rb,#{RbConfig::CONFIG['DLEXT']}}", base: path)
-        rescue Errno::ENOENT
-          []
+    def self.absolute_path?(p) # TODO Remove this method after 2.6 EOL.
+      if File.respond_to?(:absolute_path?)
+        File.absolute_path?(p)
+      else
+        if File.absolute_path(p) == p
+          true
+        else
+          false
         end
-      }.uniq.map { |path|
-        path.sub(/\.(rb|#{RbConfig::CONFIG['DLEXT']})\z/, '')
-      }
+      end
+    end
+
+    def self.retrieve_gem_and_system_load_path
+      gem_paths = Gem::Specification.latest_specs(true).map { |s|
+        s.require_paths.map { |p|
+          if absolute_path?(p)
+            p
+          else
+            File.join(s.full_gem_path, p)
+          end
+        }
+      }.flatten if defined?(Gem::Specification)
+      (gem_paths.to_a | $LOAD_PATH).sort
+    end
+
+    def self.retrieve_files_to_require_from_load_path
+      @@files_from_load_path ||=
+        (
+          shortest = []
+          rest = retrieve_gem_and_system_load_path.each_with_object([]) { |path, result|
+            begin
+              names = Dir.glob("**/*.{rb,#{RbConfig::CONFIG['DLEXT']}}", base: path)
+            rescue Errno::ENOENT
+              nil
+            end
+            next if names.empty?
+            names.map! { |n| n.sub(/\.(rb|#{RbConfig::CONFIG['DLEXT']})\z/, '') }.sort!
+            shortest << names.shift
+            result.concat(names)
+          }
+          shortest.sort! | rest
+        )
     end
 
     def self.retrieve_files_to_require_relative_from_current_dir
@@ -160,12 +192,12 @@ module IRB
         sym = $1
         candidates = Symbol.all_symbols.collect do |s|
           ":" + s.id2name.encode(Encoding.default_external)
-        rescue Encoding::UndefinedConversionError
+        rescue EncodingError
           # ignore
         end
         candidates.grep(/^#{Regexp.quote(sym)}/)
 
-      when /^::([A-Z][^:\.\(]*)$/
+      when /^::([A-Z][^:\.\(\)]*)$/
         # Absolute Constant or class methods
         receiver = $1
         candidates = Object.constants.collect{|m| m.to_s}
@@ -258,7 +290,7 @@ module IRB
           all_gvars.grep(Regexp.new(Regexp.quote(gvar)))
         end
 
-      when /^([^."].*)(\.|::)([^.]*)$/
+      when /^([^.:"].*)(\.|::)([^.]*)$/
         # variable.func or func.func
         receiver = $1
         sep = $2
@@ -296,7 +328,8 @@ module IRB
           candidates.uniq!
         end
         if doc_namespace
-          "#{rec.class.name}#{sep}#{candidates.find{ |i| i == message }}"
+          rec_class = rec.is_a?(Module) ? rec : rec.class
+          "#{rec_class.name}#{sep}#{candidates.find{ |i| i == message }}"
         else
           select_message(receiver, message, candidates, sep)
         end
@@ -315,12 +348,19 @@ module IRB
         end
 
       else
-        candidates = eval("methods | private_methods | local_variables | instance_variables | self.class.constants", bind).collect{|m| m.to_s}
-        candidates |= ReservedWords
-
         if doc_namespace
-          candidates.find{ |i| i == input }
+          vars = eval("local_variables | instance_variables", bind).collect{|m| m.to_s}
+          perfect_match_var = vars.find{|m| m.to_s == input}
+          if perfect_match_var
+            eval("#{perfect_match_var}.class.name", bind)
+          else
+            candidates = eval("methods | private_methods | local_variables | instance_variables | self.class.constants", bind).collect{|m| m.to_s}
+            candidates |= ReservedWords
+            candidates.find{ |i| i == input }
+          end
         else
+          candidates = eval("methods | private_methods | local_variables | instance_variables | self.class.constants", bind).collect{|m| m.to_s}
+          candidates |= ReservedWords
           candidates.grep(/^#{Regexp.quote(input)}/)
         end
       end

data/lib/irb/context.rb

@@ -54,6 +54,7 @@ module IRB
         @use_multiline = nil
       end
       @use_colorize = IRB.conf[:USE_COLORIZE]
+      @use_autocomplete = IRB.conf[:USE_AUTOCOMPLETE]
       @verbose = IRB.conf[:VERBOSE]
       @io = nil
 
@@ -124,6 +125,8 @@ module IRB
       end
       self.save_history = IRB.conf[:SAVE_HISTORY] if IRB.conf[:SAVE_HISTORY]
 
+      @extra_doc_dirs = IRB.conf[:EXTRA_DOC_DIRS]
+
       @echo = IRB.conf[:ECHO]
       if @echo.nil?
         @echo = true
@@ -147,18 +150,18 @@ module IRB
 
     # The toplevel workspace, see #home_workspace
     attr_reader :workspace_home
-    # WorkSpace in the current context
+    # WorkSpace in the current context.
     attr_accessor :workspace
-    # The current thread in this context
+    # The current thread in this context.
     attr_reader :thread
-    # The current input method
+    # The current input method.
     #
     # Can be either StdioInputMethod, ReadlineInputMethod,
     # ReidlineInputMethod, FileInputMethod or other specified when the
     # context is created. See ::new for more # information on +input_method+.
     attr_accessor :io
 
-    # Current irb session
+    # Current irb session.
     attr_accessor :irb
     # A copy of the default <code>IRB.conf[:AP_NAME]</code>
     attr_accessor :ap_name
@@ -185,20 +188,22 @@ module IRB
     #
     # A copy of the default <code>IRB.conf[:USE_COLORIZE]</code>
     attr_reader :use_colorize
+    # A copy of the default <code>IRB.conf[:USE_AUTOCOMPLETE]</code>
+    attr_reader :use_autocomplete
     # A copy of the default <code>IRB.conf[:INSPECT_MODE]</code>
     attr_reader :inspect_mode
 
     # A copy of the default <code>IRB.conf[:PROMPT_MODE]</code>
     attr_reader :prompt_mode
-    # Standard IRB prompt
+    # Standard IRB prompt.
     #
     # See IRB@Customizing+the+IRB+Prompt for more information.
     attr_accessor :prompt_i
-    # IRB prompt for continuated strings
+    # IRB prompt for continuated strings.
     #
     # See IRB@Customizing+the+IRB+Prompt for more information.
     attr_accessor :prompt_s
-    # IRB prompt for continuated statement (e.g. immediately after an +if+)
+    # IRB prompt for continuated statement. (e.g. immediately after an +if+)
     #
     # See IRB@Customizing+the+IRB+Prompt for more information.
     attr_accessor :prompt_c
@@ -238,6 +243,9 @@ module IRB
     #
     # If set to +false+, <code>^D</code> will quit irb.
     attr_accessor :ignore_eof
+    # Specify the installation locations of the ri file to be displayed in the
+    # document dialog.
+    attr_accessor :extra_doc_dirs
     # Whether to echo the return value to output or not.
     #
     # Uses <code>IRB.conf[:ECHO]</code> if available, or defaults to +true+.
@@ -249,7 +257,7 @@ module IRB
     #     puts "omg"
     #     # omg
     attr_accessor :echo
-    # Whether to echo for assignment expressions
+    # Whether to echo for assignment expressions.
     #
     # If set to +false+, the value of assignment will not be shown.
     #
@@ -261,13 +269,28 @@ module IRB
     #
     #     a = "omg"
     #     #=> omg
+    #
     #     a = "omg" * 10
     #     #=> omgomgomgomgomgomgomg...
+    #
     #     IRB.CurrentContext.echo_on_assignment = false
     #     a = "omg"
+    #
     #     IRB.CurrentContext.echo_on_assignment = true
-    #     a = "omg"
+    #     a = "omg" * 10
     #     #=> omgomgomgomgomgomgomgomgomgomg
+    #
+    # To set the behaviour of showing on assignment in irb:
+    #
+    #     IRB.conf[:ECHO_ON_ASSIGNMENT] = :truncate or true or false
+    #
+    # or
+    #
+    #     irb_context.echo_on_assignment = :truncate or true or false
+    #
+    # or
+    #
+    #     IRB.CurrentContext.echo_on_assignment = :truncate or true or false
     attr_accessor :echo_on_assignment
     # Whether a newline is put before multiline output.
     #
@@ -311,6 +334,8 @@ module IRB
     alias use_readline? use_singleline
     # Alias for #use_colorize
     alias use_colorize? use_colorize
+    # Alias for #use_autocomplete
+    alias use_autocomplete? use_autocomplete
     # Alias for #rc
     alias rc? rc
     alias ignore_sigint? ignore_sigint
@@ -366,6 +391,7 @@ module IRB
       @prompt_c = pconf[:PROMPT_C]
       @prompt_n = pconf[:PROMPT_N]
       @return_format = pconf[:RETURN]
+      @return_format = "%s\n" if @return_format == nil
       if ai = pconf.include?(:AUTO_INDENT)
         @auto_indent_mode = ai
       else
@@ -458,6 +484,8 @@ module IRB
     # Exits the current session, see IRB.irb_exit
     def exit(ret = 0)
       IRB.irb_exit(@irb, ret)
+    rescue UncaughtThrowError
+      super
     end
 
     NOPRINTING_IVARS = ["@last_value"] # :nodoc:

data/lib/irb/init.rb

@@ -45,11 +45,13 @@ module IRB # :nodoc:
 
     @CONF[:USE_SINGLELINE] = false unless defined?(ReadlineInputMethod)
     @CONF[:USE_COLORIZE] = !ENV['NO_COLOR']
+    @CONF[:USE_AUTOCOMPLETE] = true
     @CONF[:INSPECT_MODE] = true
     @CONF[:USE_TRACER] = false
     @CONF[:USE_LOADER] = false
     @CONF[:IGNORE_SIGINT] = true
     @CONF[:IGNORE_EOF] = false
+    @CONF[:EXTRA_DOC_DIRS] = []
     @CONF[:ECHO] = nil
     @CONF[:ECHO_ON_ASSIGNMENT] = nil
     @CONF[:VERBOSE] = nil
@@ -256,6 +258,9 @@ module IRB # :nodoc:
         @CONF[:USE_MULTILINE] = true
       when "--nomultiline", "--noreidline"
         @CONF[:USE_MULTILINE] = false
+      when /^--extra-doc-dir(?:=(.+))?/
+        opt = $1 || argv.shift
+        @CONF[:EXTRA_DOC_DIRS] << opt
       when "--echo"
         @CONF[:ECHO] = true
       when "--noecho"
@@ -274,6 +279,10 @@ module IRB # :nodoc:
         @CONF[:USE_COLORIZE] = true
       when "--nocolorize"
         @CONF[:USE_COLORIZE] = false
+      when "--autocomplete"
+        @CONF[:USE_AUTOCOMPLETE] = true
+      when "--noautocomplete"
+        @CONF[:USE_AUTOCOMPLETE] = false
       when /^--prompt-mode(?:=(.+))?/, /^--prompt(?:=(.+))?/
         opt = $1 || argv.shift
         prompt_mode = opt.upcase.tr("-", "_").intern