irb 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ea14a93083cae06cb1b6acb7df716a4b674fe0179df78133a5e9d515f814de5
-  data.tar.gz: e5c48bf9b0407c3bf8c278a999a333bcf6cc514d467292eb578f0a434992d06c
+  metadata.gz: fc28457f7b997cac6ec910290d58677ee4d21b71bb769c421840b77242dddc04
+  data.tar.gz: af7a068e8bbef2cc1aec4be90b907b959da162bc0442183cee45d4ef0e39bea5
 SHA512:
-  metadata.gz: 57da5191caf04ded2eebea073a511f721bb66c511c0821fe4055aa582333209e9293380af20680fcebee290d109e30df73d1752cc32893729e8df0a7712c1192
-  data.tar.gz: eab5b941d5db5d0582e32d7dc3fb77955024c3ca852e83816fc4bf8c4c3442910dff2a3cba7c41a9e0e357943371e371646e8c1b23721fd2e1d8e2c3cfa2fa84
+  metadata.gz: 0770a8ef428fd8f604509b67ee2e796672f243b3736e385b128e0dc9354cb6283531612ff60d46fffcb06d89b6de65d1eaf7fb0f6e8e032a9058f349285c6b3d
+  data.tar.gz: 48d11c9ddabe1639331330cc8aa5f30a5f5306b5852c404377dda2527ed86e8767d783811f20e8b02783447df9adb5315d4fa1bce4422aab7774ab8140075e44

data/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,6 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.5.1
+  - ruby-head
+before_install: gem install bundler -v 1.16.2

data/Gemfile

@@ -3,8 +3,3 @@ source "https://rubygems.org"
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 gemspec
-
-# TODO: remove this when reline with `Reline::Unicode.escape_for_print` is released.
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0')
-  gem "reline", github: "ruby/reline"
-end

data/README.md

@@ -31,9 +31,9 @@ $ irb
 irb(main):001:0> 1+2
 #=> 3
 irb(main):002:0> class Foo
-irb(main):003:1>   def foo
-irb(main):004:2>     print 1
-irb(main):005:2>   end
+irb(main):003:1>  def foo
+irb(main):004:2>    print 1
+irb(main):005:2>  end
 irb(main):006:1> end
 #=> nil
 ```

data/irb.gemspec

@@ -16,69 +16,11 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ruby/irb"
   spec.license       = "BSD-2-Clause"
 
-  spec.files         = [
-    "Gemfile",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "bin/console",
-    "bin/setup",
-    "doc/irb/irb-tools.rd.ja",
-    "doc/irb/irb.rd.ja",
-    "exe/irb",
-    "irb.gemspec",
-    "lib/irb.rb",
-    "lib/irb/cmd/chws.rb",
-    "lib/irb/cmd/fork.rb",
-    "lib/irb/cmd/help.rb",
-    "lib/irb/cmd/load.rb",
-    "lib/irb/cmd/nop.rb",
-    "lib/irb/cmd/pushws.rb",
-    "lib/irb/cmd/subirb.rb",
-    "lib/irb/color.rb",
-    "lib/irb/completion.rb",
-    "lib/irb/context.rb",
-    "lib/irb/ext/change-ws.rb",
-    "lib/irb/ext/history.rb",
-    "lib/irb/ext/loader.rb",
-    "lib/irb/ext/multi-irb.rb",
-    "lib/irb/ext/save-history.rb",
-    "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/init.rb",
-    "lib/irb/input-method.rb",
-    "lib/irb/inspector.rb",
-    "lib/irb/lc/.document",
-    "lib/irb/lc/error.rb",
-    "lib/irb/lc/help-message",
-    "lib/irb/lc/ja/encoding_aliases.rb",
-    "lib/irb/lc/ja/error.rb",
-    "lib/irb/lc/ja/help-message",
-    "lib/irb/locale.rb",
-    "lib/irb/magic-file.rb",
-    "lib/irb/notifier.rb",
-    "lib/irb/output-method.rb",
-    "lib/irb/ruby-lex.rb",
-    "lib/irb/ruby_logo.aa",
-    "lib/irb/slex.rb",
-    "lib/irb/src_encoding.rb",
-    "lib/irb/version.rb",
-    "lib/irb/workspace.rb",
-    "lib/irb/ws-for-case-2.rb",
-    "lib/irb/xmp.rb",
-    "man/irb.1",
-  ]
+  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "exe/irb", "irb.gemspec", "lib/irb.rb", "lib/irb/cmd/chws.rb", "lib/irb/cmd/fork.rb", "lib/irb/cmd/help.rb", "lib/irb/cmd/load.rb", "lib/irb/cmd/nop.rb", "lib/irb/cmd/pushws.rb", "lib/irb/cmd/subirb.rb", "lib/irb/completion.rb", "lib/irb/context.rb", "lib/irb/ext/change-ws.rb", "lib/irb/ext/history.rb", "lib/irb/ext/loader.rb", "lib/irb/ext/multi-irb.rb", "lib/irb/ext/save-history.rb", "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/init.rb", "lib/irb/input-method.rb", "lib/irb/inspector.rb", "lib/irb/lc/.document", "lib/irb/lc/error.rb", "lib/irb/lc/help-message", "lib/irb/lc/ja/encoding_aliases.rb", "lib/irb/lc/ja/error.rb", "lib/irb/lc/ja/help-message", "lib/irb/locale.rb", "lib/irb/magic-file.rb", "lib/irb/notifier.rb", "lib/irb/output-method.rb", "lib/irb/ruby-lex.rb", "lib/irb/ruby-token.rb", "lib/irb/slex.rb", "lib/irb/src_encoding.rb", "lib/irb/version.rb", "lib/irb/workspace.rb", "lib/irb/ws-for-case-2.rb", "lib/irb/xmp.rb"]
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4")
-
-  spec.add_dependency "reline", ">= 0.0.1"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 end

data/lib/irb.rb

@@ -10,7 +10,6 @@
 #
 #
 require "e2mmap"
-require "ripper"
 
 require "irb/init"
 require "irb/context"
@@ -19,7 +18,6 @@ require "irb/extend-command"
 require "irb/ruby-lex"
 require "irb/input-method"
 require "irb/locale"
-require "irb/color"
 
 require "irb/version"
 
@@ -45,8 +43,8 @@ require "irb/version"
 #     irb(main):006:1> end
 #     #=> nil
 #
-# The singleline editor module or multiline editor module can be used with irb.
-# Use of multiline editor is default if it's installed.
+# The Readline extension module can be used with irb. Use of Readline is
+# default if it's installed.
 #
 # == Command line options
 #
@@ -61,24 +59,21 @@ require "irb/version"
 #     -W[level=2]       Same as `ruby -W`
 #     --inspect         Use `inspect' for output (default except for bc mode)
 #     --noinspect       Don't use inspect for output
-#     --multiline       Use multiline editor module
-#     --nomultiline     Don't use multiline editor module
-#     --singleline      Use singleline editor module
-#     --nosingleline    Don't use singleline editor module
-#     --colorize        Use colorization
-#     --nocolorize      Don't use colorization
+#     --readline        Use Readline extension module
+#     --noreadline      Don't use Readline extension module
 #     --prompt prompt-mode
 #     --prompt-mode prompt-mode
 #                       Switch prompt mode. Pre-defined prompt modes are
 #                       `default', `simple', `xmp' and `inf-ruby'
 #     --inf-ruby-mode   Use prompt appropriate for inf-ruby-mode on emacs.
-#                       Suppresses --multiline and --singleline.
+#                       Suppresses --readline.
 #     --simple-prompt   Simple prompt mode
 #     --noprompt        No prompt mode
 #     --tracer          Display trace for each execution of commands.
 #     --back-trace-limit n
 #                       Display backtrace top n and tail n. The default
 #                       value is 16.
+#     --irb_debug n     Set internal debug level to n (not for popular use)
 #     -v, --version     Print the version of irb
 #
 # == Configuration
@@ -100,20 +95,19 @@ require "irb/version"
 #     IRB.conf[:IRB_RC] = nil
 #     IRB.conf[:BACK_TRACE_LIMIT]=16
 #     IRB.conf[:USE_LOADER] = false
-#     IRB.conf[:USE_MULTILINE] = nil
-#     IRB.conf[:USE_SINGLELINE] = nil
-#     IRB.conf[:USE_COLORIZE] = true
+#     IRB.conf[:USE_READLINE] = nil
 #     IRB.conf[:USE_TRACER] = false
 #     IRB.conf[:IGNORE_SIGINT] = true
 #     IRB.conf[:IGNORE_EOF] = false
 #     IRB.conf[:PROMPT_MODE] = :DEFAULT
 #     IRB.conf[:PROMPT] = {...}
+#     IRB.conf[:DEBUG_LEVEL]=0
 #
 # === Auto indentation
 #
-# To disable auto-indent mode in irb, add the following to your +.irbrc+:
+# To enable auto-indent mode in irb, add the following to your +.irbrc+:
 #
-#     IRB.conf[:AUTO_INDENT] = false
+#     IRB.conf[:AUTO_INDENT] = true
 #
 # === Autocompletion
 #
@@ -123,22 +117,15 @@ require "irb/version"
 #
 # === History
 #
-# By default, irb will store the last 1000 commands you used in
-# <code>IRB.conf[:HISTORY_FILE]</code> (<code>~/.irb_history</code> by default).
+# By default, irb disables history and will not store any commands you used.
 #
-# If you want to disable history, add the following to your +.irbrc+:
+# If you want to enable history, add the following to your +.irbrc+:
 #
-#     IRB.conf[:SAVE_HISTORY] = nil
+#     IRB.conf[:SAVE_HISTORY] = 1000
 #
-# See IRB::Context#save_history= for more information.
-#
-# The history of _resuls_ of commands evaluated is not stored by default,
-# but can be turned on to be stored with this +.irbrc+ setting:
+# This will now store the last 1000 commands in <code>~/.irb_history</code>.
 #
-#     IRB.conf[:EVAL_HISTORY] = <number>
-#
-# See IRB::Context#eval_history= and History class. The history of command
-# results is not permanently saved in any file.
+# See IRB::Context#save_history= for more information.
 #
 # == Customizing the IRB Prompt
 #
@@ -149,7 +136,7 @@ require "irb/version"
 # This example can be used in your +.irbrc+
 #
 #     IRB.conf[:PROMPT][:MY_PROMPT] = { # name of prompt mode
-#       :AUTO_INDENT => false,          # disables auto-indent mode
+#       :AUTO_INDENT => true,           # enables auto-indent mode
 #       :PROMPT_I =>  ">> ",		# simple prompt
 #       :PROMPT_S => nil,		# prompt for continuated strings
 #       :PROMPT_C => nil,		# prompt for continuated statement
@@ -178,7 +165,6 @@ require "irb/version"
 #
 #     IRB.conf[:PROMPT_MODE][: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" # used to printf
@@ -282,9 +268,7 @@ require "irb/version"
 # <code>_</code>::
 #   The value command executed, as a local variable
 # <code>__</code>::
-#   The history of evaluated commands. Available only if
-#   <code>IRB.conf[:EVAL_HISTORY]</code> is not +nil+ (which is the default).
-#   See also IRB::Context#eval_history= and IRB::History.
+#   The history of evaluated commands
 # <code>__[line_no]</code>::
 #   Returns the evaluation value at the given line number, +line_no+.
 #   If +line_no+ is a negative, the return value +line_no+ many lines before
@@ -421,41 +405,14 @@ module IRB
   end
 
   class Irb
-    ASSIGNMENT_NODE_TYPES = [
-      # Local, instance, global, class, constant, instance, and index assignment:
-      #   "foo = bar",
-      #   "@foo = bar",
-      #   "$foo = bar",
-      #   "@@foo = bar",
-      #   "::Foo = bar",
-      #   "a::Foo = bar",
-      #   "Foo = bar"
-      #   "foo.bar = 1"
-      #   "foo[1] = bar"
-      :assign,
-
-      # Operation assignment:
-      #   "foo += bar"
-      #   "foo -= bar"
-      #   "foo ||= bar"
-      #   "foo &&= bar"
-      :opassign,
-
-      # Multiple assignment:
-      #   "foo, bar = 1, 2
-      :massign,
-    ]
-    # Note: instance and index assignment expressions could also be written like:
-    # "foo.bar=(1)" and "foo.[]=(1, bar)", when expressed that way, the former
-    # be parsed as :assign and echo will be suppressed, but the latter is
-    # parsed as a :method_add_arg and the output won't be suppressed
-
     # Creates a new irb session
-    def initialize(workspace = nil, input_method = nil)
-      @context = Context.new(self, workspace, input_method)
+    def initialize(workspace = nil, input_method = nil, output_method = nil)
+      @context = Context.new(self, workspace, input_method, output_method)
       @context.main.extend ExtendCommandBundle
       @signal_status = :IN_IRB
+
       @scanner = RubyLex.new
+      @scanner.exception_on_syntax_error = false
     end
 
     def run(conf = IRB.conf)
@@ -501,16 +458,14 @@ module IRB
         else
           @context.io.prompt = p = ""
         end
-        if @context.auto_indent_mode and !@context.io.respond_to?(:auto_indent)
+        if @context.auto_indent_mode
           unless ltype
-            prompt_i = @context.prompt_i.nil? ? "" : @context.prompt_i
-            ind = prompt(prompt_i, ltype, indent, line_no)[/.*\z/].size +
+            ind = prompt(@context.prompt_i, ltype, indent, line_no)[/.*\z/].size +
               indent * 2 - p.size
             ind += 2 if continue
             @context.io.prompt = p + " " * ind if ind > 0
           end
         end
-        @context.io.prompt
       end
 
       @scanner.set_input(@context.io) do
@@ -531,14 +486,12 @@ module IRB
         end
       end
 
-      @scanner.set_auto_indent(@context) if @context.auto_indent_mode
-
       @scanner.each_top_level_statement do |line, line_no|
         signal_status(:IN_EVAL) do
           begin
-            line.untaint if RUBY_VERSION < '2.7'
+            line.untaint
             @context.evaluate(line, line_no, exception: exc)
-            output_value if @context.echo? && (@context.echo_on_assignment? || !assignment_expression?(line))
+            output_value if @context.echo?
           rescue Interrupt => exc
           rescue SystemExit, SignalException
             raise
@@ -710,18 +663,10 @@ module IRB
         when "l"
           ltype
         when "i"
-          if indent < 0
-            if $1
-              "-".rjust($1.to_i)
-            else
-              "-"
-            end
+          if $1
+            format("%" + $1 + "d", indent)
           else
-            if $1
-              format("%" + $1 + "d", indent)
-            else
-              indent.to_s
-            end
+            indent.to_s
           end
         when "n"
           if $1
@@ -757,21 +702,6 @@ module IRB
       format("#<%s: %s>", self.class, ary.join(", "))
     end
 
-    def assignment_expression?(line)
-      # Try to parse the line and check if the last of possibly multiple
-      # expressions is an assignment type.
-
-      # If the expression is invalid, Ripper.sexp should return nil which will
-      # result in false being returned. Any valid expression should return an
-      # s-expression where the second selement of the top level array is an
-      # array of parsed expressions. The first element of each expression is the
-      # expression's type.
-      verbose, $VERBOSE = $VERBOSE, nil
-      result = ASSIGNMENT_NODE_TYPES.include?(Ripper.sexp(line)&.dig(1,-1,0))
-      $VERBOSE = verbose
-      result
-    end
-
     ATTR_TTY = "\e[%sm"
     def ATTR_TTY.[](*a) self % a.join(";"); end
     ATTR_PLAIN = ""
@@ -819,8 +749,8 @@ class Binding
   #
   #     Potato.new
   #
-  # Running <code>ruby potato.rb</code> will open an IRB session where
-  # +binding.irb+ is called, and you will see the following:
+  # Running +ruby potato.rb+ will open an IRB session where +binding.irb+ is
+  # called, and you will see the following:
   #
   #     $ ruby potato.rb
   #
@@ -850,7 +780,7 @@ class Binding
   #     irb(#<Potato:0x00007feea1916670>):004:0> @cooked = true
   #     => true
   #
-  # You can exit the IRB session with the +exit+ command. Note that exiting will
+  # You can exit the IRB session with the `exit` command. Note that exiting will
   # resume execution where +binding.irb+ had paused it, as you can see from the
   # output printed to standard output in this example:
   #
@@ -860,11 +790,9 @@ class Binding
   #
   # See IRB@IRB+Usage for more information.
   def irb
-    IRB.setup(source_location[0], argv: [])
+    IRB.setup(eval("__FILE__"), argv: [])
     workspace = IRB::WorkSpace.new(self)
     STDOUT.print(workspace.code_around_binding)
-    binding_irb = IRB::Irb.new(workspace)
-    binding_irb.context.irb_path = File.expand_path(source_location[0])
-    binding_irb.run(IRB.conf)
+    IRB::Irb.new(workspace).run(IRB.conf)
   end
 end

data/lib/irb/cmd/fork.rb

@@ -21,7 +21,7 @@ module IRB
           class << self
             alias_method :exit, ExtendCommand.irb_original_method_name('exit')
           end
-          if block_given?
+          if iterator?
             begin
               yield
             ensure

data/lib/irb/cmd/help.rb

@@ -9,18 +9,17 @@
 #
 #
 
+require 'rdoc/ri/driver'
+
 require_relative "nop"
 
 # :stopdoc:
 module IRB
   module ExtendCommand
     class Help < Nop
-      def execute(*names)
-        require 'rdoc/ri/driver'
-        IRB::ExtendCommand::Help.const_set(:Ri, RDoc::RI::Driver.new)
-      rescue LoadError, SystemExit
-        IRB::ExtendCommand::Help.remove_method(:execute)
-        # raise NoMethodError in ensure
+      begin
+        Ri = RDoc::RI::Driver.new
+      rescue SystemExit
       else
         def execute(*names)
           if names.empty?
@@ -36,9 +35,6 @@ module IRB
           end
           nil
         end
-        nil
-      ensure
-        execute(*names)
       end
     end
   end