irb 1.3.8.pre.5 → 1.3.8.pre.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d29a3a6c94d71c5b11b5f946244793454141aaefd087bc2c8a9f45ad099e081a
-  data.tar.gz: d0a9f1094a170721582e33fab6c9d2b3ee26e4c169d0355da606d76d1efaa9a7
+  metadata.gz: dc37bc2cdd7bf77d09704fb22c31aec464fc7aa391f2bc6a6619d8549bd0cd5d
+  data.tar.gz: 20b8157c7167ccf5b30fef3d4b8340c3d1a316a59c742c968d0e62e0bd5010d7
 SHA512:
-  metadata.gz: 350ea1c51a7674cac7421a4b23a8e4614c76a5f40bad5a72170ac51b5f78ca98c1414730d885bc2f55cd94d9b5244d154d7258f9c64bd87a522ed2eb36ff38ea
-  data.tar.gz: 5a345350ec713e070693266317fe97d79f2fea3497ff7085f1c3cac9ce791827eab920081d7f48f5223da0fdd82b521c9ea1a1d3a6ba4e4c4ead631c16796cda
+  metadata.gz: 9783aa13399d0eddb2e67cf3aa51760cfde1cc76f7b59d78158e83746359511e46824034d29f07181ffc91a51901bb6202562b8eab950649c0082f58295809d0
+  data.tar.gz: f2a27869c90d81a93497515c38da52c0e19c113a308c95c264b863fb8edc9e1f96f558343bbe4bfe47b6a527ce4eaa98757380b700626d9f445f12b994b296d2

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.8.pre.5"
+  spec.add_dependency "reline", ">= 0.2.8.pre.9"
 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/completion.rb

@@ -38,16 +38,44 @@ 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
+        if File.absolute_path(p) == p
+          true
+        else
+          false
+        end
+      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
+      (gem_paths + $LOAD_PATH).uniq.sort
+    end
+
     def self.retrieve_files_to_require_from_load_path
-      @@files_from_load_path ||= $LOAD_PATH.flat_map { |path|
+      @@files_from_load_path ||= retrieve_gem_and_system_load_path.map { |path|
         begin
           Dir.glob("**/*.{rb,#{RbConfig::CONFIG['DLEXT']}}", base: path)
         rescue Errno::ENOENT
           []
         end
-      }.uniq.map { |path|
-        path.sub(/\.(rb|#{RbConfig::CONFIG['DLEXT']})\z/, '')
-      }
+      }.inject([]) { |result, names|
+        shortest, *rest = names.map{ |n| n.sub(/\.(rb|#{RbConfig::CONFIG['DLEXT']})\z/, '') }.sort
+        result.unshift(shortest) if shortest
+        result.concat(rest)
+        result
+      }.uniq
     end
 
     def self.retrieve_files_to_require_relative_from_current_dir
@@ -296,7 +324,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 +344,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/input-method.rb

@@ -314,11 +314,17 @@ module IRB
     end
 
     SHOW_DOC_DIALOG = ->() {
+      dialog.trap_key = nil
+      alt_d = [
+        [Reline::Key.new(nil, 0xE4, true)], # Normal Alt+d.
+        [195, 164] # The "ä" that appears when Alt+d is pressed on xterm.
+      ]
       begin
         require 'rdoc'
       rescue LoadError
         return nil
       end
+
       if just_cursor_moving and completion_journey_data.nil?
         return nil
       end
@@ -328,6 +334,14 @@ module IRB
       name = IRB::InputCompletor.retrieve_completion_data(name, doc_namespace: true)
 
       driver = RDoc::RI::Driver.new
+
+      if key.match?(dialog.name)
+        begin
+          driver.display_names([name])
+        rescue RDoc::RI::Driver::NotFoundError
+        end
+      end
+
       begin
         name = driver.expand_name(name)
       rescue RDoc::RI::Driver::NotFoundError
@@ -358,11 +372,13 @@ module IRB
       width = 40
       formatter = RDoc::Markup::ToAnsi.new
       formatter.width = width
-      contents = doc.accept(formatter).split("\n")
+      dialog.trap_key = alt_d
+      message = 'Press Alt+d to read the full document'
+      contents = [message] + doc.accept(formatter).split("\n")
 
       x = cursor_pos_to_render.x + autocomplete_dialog.width
-      x = cursor_pos_to_render.x - width if x + width >= screen_width
-      y = cursor_pos_to_render.y + pointer - autocomplete_dialog.scroll_top
+      x = autocomplete_dialog.column - width if x + width >= screen_width
+      y = cursor_pos_to_render.y
       DialogRenderInfo.new(pos: Reline::CursorPos.new(x, y), contents: contents, width: width, bg_color: '49')
     }
 

data/lib/irb/ruby-lex.rb

@@ -708,6 +708,9 @@ class RubyLex
     while i < tokens.size
       t = tokens[i]
       case t[1]
+      when *end_type.last
+        start_token.pop
+        end_type.pop
       when :on_tstring_beg
         start_token << t
         end_type << [:on_tstring_end, :on_label_end]
@@ -715,10 +718,14 @@ class RubyLex
         start_token << t
         end_type << :on_regexp_end
       when :on_symbeg
-        acceptable_single_tokens = %i{on_ident on_const on_op on_cvar on_ivar on_gvar on_kw on_int}
-        if (i + 1) < tokens.size and acceptable_single_tokens.all?{ |st| tokens[i + 1][1] != st }
-          start_token << t
-          end_type << :on_tstring_end
+        acceptable_single_tokens = %i{on_ident on_const on_op on_cvar on_ivar on_gvar on_kw on_int on_backtick}
+        if (i + 1) < tokens.size
+          if acceptable_single_tokens.all?{ |st| tokens[i + 1][1] != st }
+            start_token << t
+            end_type << :on_tstring_end
+          else
+            i += 1
+          end
         end
       when :on_backtick
         start_token << t
@@ -729,9 +736,6 @@ class RubyLex
       when :on_heredoc_beg
         start_token << t
         end_type << :on_heredoc_end
-      when *end_type.last
-        start_token.pop
-        end_type.pop
       end
       i += 1
     end

data/lib/irb/version.rb

@@ -11,7 +11,7 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "1.3.8.pre.5"
+  VERSION = "1.3.8.pre.9"
   @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2021-08-31"
+  @LAST_UPDATE_DATE = "2021-09-10"
 end

data/lib/irb/workspace.rb

@@ -12,6 +12,7 @@
 
 require "delegate"
 
+IRB::TOPLEVEL_BINDING = binding
 module IRB # :nodoc:
   class WorkSpace
     # Creates a new workspace.
@@ -57,6 +58,8 @@ EOF
                           __FILE__,
                           __LINE__ - 3)
         when 4  # binding is a copy of TOPLEVEL_BINDING (default)
+          # Note that this will typically be IRB::TOPLEVEL_BINDING
+          # This is to avoid RubyGems' local variables (see issue #17623)
           @binding = TOPLEVEL_BINDING.dup
         end
       end

data/lib/irb.rb

@@ -669,6 +669,8 @@ module IRB
           lines = lines.reverse if order == :bottom
           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>'" }
         puts message
       end
       print "Maybe IRB bug!\n" if irb_bug

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.3.8.pre.5
+  version: 1.3.8.pre.9
 platform: ruby
 authors:
 - Keiju ISHITSUKA
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reline
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8.pre.5
+        version: 0.2.8.pre.9
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8.pre.5
+        version: 0.2.8.pre.9
 description: Interactive Ruby command-line tool for REPL (Read Eval Print Loop).
 email:
 - keiju@ruby-lang.org
@@ -97,7 +97,7 @@ licenses:
 - Ruby
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -112,8 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Interactive Ruby command-line tool for REPL (Read Eval Print Loop).
 test_files: []