irb 1.1.0 → 1.1.1

data/lib/irb/ext/history.rb

@@ -22,7 +22,7 @@ module IRB # :nodoc:
     def set_last_value(value)
       _set_last_value(value)
 
-      if defined?(@eval_history) && @eval_history
+      if @eval_history
         @eval_history_values.push @line_no, @last_value
         @workspace.evaluate self, "__ = IRB.CurrentContext.instance_eval{@eval_history_values}"
       end
@@ -30,13 +30,9 @@ module IRB # :nodoc:
       @last_value
     end
 
-    remove_method :eval_history= if method_defined?(:eval_history=)
-    # The command result history limit. This method is not available until
-    # #eval_history= was called with non-nil value (directly or via
-    # setting <code>IRB.conf[:EVAL_HISTORY]</code> in <code>.irbrc</code>).
+    # The command result history limit.
     attr_reader :eval_history
-    # Sets command result history limit. Default value is set from
-    # <code>IRB.conf[:EVAL_HISTORY]</code>.
+    # Sets command result history limit.
     #
     # +no+ is an Integer or +nil+.
     #
@@ -45,9 +41,6 @@ module IRB # :nodoc:
     # If +no+ is 0, the number of history items is unlimited.
     #
     # If +no+ is +nil+, execution result history isn't used (default).
-    #
-    # History values are available via <code>__</code> variable, see
-    # IRB::History.
     def eval_history=(no)
       if no
         if defined?(@eval_history) && @eval_history
@@ -65,51 +58,20 @@ module IRB # :nodoc:
     end
   end
 
-  # Represents history of results of previously evaluated commands.
-  #
-  # Available via <code>__</code> variable, only if <code>IRB.conf[:EVAL_HISTORY]</code>
-  # or <code>IRB::CurrentContext().eval_history</code> is non-nil integer value
-  # (by default it is +nil+).
-  #
-  # Example (in `irb`):
-  #
-  #    # Initialize history
-  #    IRB::CurrentContext().eval_history = 10
-  #    # => 10
-  #
-  #    # Perform some commands...
-  #    1 + 2
-  #    # => 3
-  #    puts 'x'
-  #    # x
-  #    # => nil
-  #    raise RuntimeError
-  #    # ...error raised
-  #
-  #    # Inspect history (format is "<item number> <evaluated value>":
-  #    __
-  #    # => 1 10
-  #    # 2 3
-  #    # 3 nil
-  #
-  #    __[1]
-  #    # => 10
-  #
-  class History
-
-    def initialize(size = 16)  # :nodoc:
+  class History # :nodoc:
+
+    def initialize(size = 16)
       @size = size
       @contents = []
     end
 
-    def size(size) # :nodoc:
+    def size(size)
       if size != 0 && size < @size
         @contents = @contents[@size - size .. @size]
       end
       @size = size
     end
 
-    # Get one item of the content (both positive and negative indexes work).
     def [](idx)
       begin
         if idx >= 0
@@ -122,14 +84,14 @@ module IRB # :nodoc:
       end
     end
 
-    def push(no, val)  # :nodoc:
+    def push(no, val)
       @contents.push [no, val]
       @contents.shift if @size != 0 && @contents.size > @size
     end
 
     alias real_inspect inspect
 
-    def inspect  # :nodoc:
+    def inspect
       if @contents.empty?
         return real_inspect
       end

data/lib/irb/ext/save-history.rb

@@ -27,7 +27,7 @@ module IRB
       IRB.conf[:SAVE_HISTORY]
     end
 
-    remove_method :save_history= if method_defined?(:save_history=)
+    remove_method :save_history= if respond_to?(:save_history=)
     # Sets <code>IRB.conf[:SAVE_HISTORY]</code> to the given +val+ and calls
     # #init_save_history with this context.
     #
@@ -58,6 +58,8 @@ module IRB
   end
 
   module HistorySavingAbility # :nodoc:
+    include Readline
+
     def HistorySavingAbility.extended(obj)
       IRB.conf[:AT_EXIT].push proc{obj.save_history}
       obj.load_history
@@ -65,30 +67,18 @@ module IRB
     end
 
     def load_history
-      return unless self.class.const_defined?(:HISTORY)
-      history = self.class::HISTORY
       if history_file = IRB.conf[:HISTORY_FILE]
         history_file = File.expand_path(history_file)
       end
       history_file = IRB.rc_file("_history") unless history_file
       if File.exist?(history_file)
         open(history_file) do |f|
-          f.each { |l|
-            l = l.chomp
-            if self.class == ReidlineInputMethod and history.last&.end_with?("\\")
-              history.last.delete_suffix!("\\")
-              history.last << "\n" << l
-            else
-              history << l
-            end
-          }
+          f.each {|l| HISTORY << l.chomp}
         end
       end
     end
 
     def save_history
-      return unless self.class.const_defined?(:HISTORY)
-      history = self.class::HISTORY
       if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
         if history_file = IRB.conf[:HISTORY_FILE]
           history_file = File.expand_path(history_file)
@@ -101,14 +91,12 @@ module IRB
             File.chmod(0600, history_file)
           end
         rescue Errno::ENOENT
-        rescue Errno::EPERM
-          return
         rescue
           raise
         end
 
         open(history_file, 'w', 0600 ) do |f|
-          hist = history.map{ |l| l.split("\n").join("\\\n") }
+          hist = HISTORY.to_a
           f.puts(hist[-num..-1] || hist)
         end
       end

data/lib/irb/ext/use-loader.rb

@@ -20,12 +20,10 @@ end
 
 module IRB
   module ExtendCommandBundle
-    remove_method :irb_load if method_defined?(:irb_load)
     # Loads the given file similarly to Kernel#load, see IrbLoader#irb_load
     def irb_load(*opts, &b)
       ExtendCommand::Load.execute(irb_context, *opts, &b)
     end
-    remove_method :irb_require if method_defined?(:irb_require)
     # Loads the given file similarly to Kernel#require
     def irb_require(*opts, &b)
       ExtendCommand::Require.execute(irb_context, *opts, &b)
@@ -46,7 +44,6 @@ module IRB
 
     alias use_loader? use_loader
 
-    remove_method :use_loader= if method_defined?(:use_loader=)
     # Sets IRB.conf[:USE_LOADER]
     #
     # See #use_loader for more information.

data/lib/irb/extend-command.rb

@@ -46,80 +46,58 @@ module IRB # :nodoc:
     ]
 
     @EXTEND_COMMANDS = [
-      [
-        :irb_current_working_workspace, :CurrentWorkingWorkspace, "irb/cmd/chws",
-        [:irb_print_working_workspace, OVERRIDE_ALL],
-        [:irb_cwws, OVERRIDE_ALL],
-        [:irb_pwws, OVERRIDE_ALL],
-        [:cwws, NO_OVERRIDE],
-        [:pwws, NO_OVERRIDE],
-        [:irb_current_working_binding, OVERRIDE_ALL],
-        [:irb_print_working_binding, OVERRIDE_ALL],
-        [:irb_cwb, OVERRIDE_ALL],
-        [:irb_pwb, OVERRIDE_ALL],
-      ],
-      [
-        :irb_change_workspace, :ChangeWorkspace, "irb/cmd/chws",
-        [:irb_chws, OVERRIDE_ALL],
-        [:irb_cws, OVERRIDE_ALL],
-        [:chws, NO_OVERRIDE],
-        [:cws, NO_OVERRIDE],
-        [:irb_change_binding, OVERRIDE_ALL],
-        [:irb_cb, OVERRIDE_ALL],
-        [:cb, NO_OVERRIDE],
-      ],
+      [:irb_current_working_workspace, :CurrentWorkingWorkspace, "irb/cmd/chws",
+       [:irb_print_working_workspace, OVERRIDE_ALL],
+       [:irb_cwws, OVERRIDE_ALL],
+       [:irb_pwws, OVERRIDE_ALL],
+       [:cwws, NO_OVERRIDE],
+       [:pwws, NO_OVERRIDE],
+       [:irb_current_working_binding, OVERRIDE_ALL],
+       [:irb_print_working_binding, OVERRIDE_ALL],
+       [:irb_cwb, OVERRIDE_ALL],
+       [:irb_pwb, OVERRIDE_ALL],
+    ],
+    [:irb_change_workspace, :ChangeWorkspace, "irb/cmd/chws",
+     [:irb_chws, OVERRIDE_ALL],
+     [:irb_cws, OVERRIDE_ALL],
+     [:chws, NO_OVERRIDE],
+     [:cws, NO_OVERRIDE],
+     [:irb_change_binding, OVERRIDE_ALL],
+     [:irb_cb, OVERRIDE_ALL],
+     [:cb, NO_OVERRIDE]],
 
-      [
-        :irb_workspaces, :Workspaces, "irb/cmd/pushws",
-        [:workspaces, NO_OVERRIDE],
-        [:irb_bindings, OVERRIDE_ALL],
-        [:bindings, NO_OVERRIDE],
-      ],
-      [
-        :irb_push_workspace, :PushWorkspace, "irb/cmd/pushws",
-        [:irb_pushws, OVERRIDE_ALL],
-        [:pushws, NO_OVERRIDE],
-        [:irb_push_binding, OVERRIDE_ALL],
-        [:irb_pushb, OVERRIDE_ALL],
-        [:pushb, NO_OVERRIDE],
-      ],
-      [
-        :irb_pop_workspace, :PopWorkspace, "irb/cmd/pushws",
-        [:irb_popws, OVERRIDE_ALL],
-        [:popws, NO_OVERRIDE],
-        [:irb_pop_binding, OVERRIDE_ALL],
-        [:irb_popb, OVERRIDE_ALL],
-        [:popb, NO_OVERRIDE],
-      ],
+    [:irb_workspaces, :Workspaces, "irb/cmd/pushws",
+     [:workspaces, NO_OVERRIDE],
+     [:irb_bindings, OVERRIDE_ALL],
+     [:bindings, NO_OVERRIDE]],
+    [:irb_push_workspace, :PushWorkspace, "irb/cmd/pushws",
+     [:irb_pushws, OVERRIDE_ALL],
+     [:pushws, NO_OVERRIDE],
+     [:irb_push_binding, OVERRIDE_ALL],
+     [:irb_pushb, OVERRIDE_ALL],
+     [:pushb, NO_OVERRIDE]],
+    [:irb_pop_workspace, :PopWorkspace, "irb/cmd/pushws",
+     [:irb_popws, OVERRIDE_ALL],
+     [:popws, NO_OVERRIDE],
+     [:irb_pop_binding, OVERRIDE_ALL],
+     [:irb_popb, OVERRIDE_ALL],
+     [:popb, NO_OVERRIDE]],
 
-      [
-        :irb_load, :Load, "irb/cmd/load"],
-      [
-        :irb_require, :Require, "irb/cmd/load"],
-      [
-        :irb_source, :Source, "irb/cmd/load",
-        [:source, NO_OVERRIDE],
-      ],
+    [:irb_load, :Load, "irb/cmd/load"],
+    [:irb_require, :Require, "irb/cmd/load"],
+    [:irb_source, :Source, "irb/cmd/load",
+     [:source, NO_OVERRIDE]],
 
-      [
-        :irb, :IrbCommand, "irb/cmd/subirb"],
-      [
-        :irb_jobs, :Jobs, "irb/cmd/subirb",
-        [:jobs, NO_OVERRIDE],
-      ],
-      [
-        :irb_fg, :Foreground, "irb/cmd/subirb",
-        [:fg, NO_OVERRIDE],
-      ],
-      [
-        :irb_kill, :Kill, "irb/cmd/subirb",
-        [:kill, OVERRIDE_PRIVATE_ONLY],
-      ],
+    [:irb, :IrbCommand, "irb/cmd/subirb"],
+    [:irb_jobs, :Jobs, "irb/cmd/subirb",
+     [:jobs, NO_OVERRIDE]],
+    [:irb_fg, :Foreground, "irb/cmd/subirb",
+     [:fg, NO_OVERRIDE]],
+    [:irb_kill, :Kill, "irb/cmd/subirb",
+     [:kill, OVERRIDE_PRIVATE_ONLY]],
 
-      [
-        :irb_help, :Help, "irb/cmd/help",
-        [:help, NO_OVERRIDE],
-      ],
+    [:irb_help, :Help, "irb/cmd/help",
+     [:help, NO_OVERRIDE]],
 
     ]
 

data/lib/irb/init.rb

@@ -43,19 +43,17 @@ module IRB # :nodoc:
     @CONF[:LOAD_MODULES] = []
     @CONF[:IRB_RC] = nil
 
-    @CONF[:USE_SINGLELINE] = false unless defined?(ReadlineInputMethod)
-    @CONF[:USE_COLORIZE] = true
+    @CONF[:USE_READLINE] = false unless defined?(ReadlineInputMethod)
     @CONF[:INSPECT_MODE] = true
     @CONF[:USE_TRACER] = false
     @CONF[:USE_LOADER] = false
     @CONF[:IGNORE_SIGINT] = true
     @CONF[:IGNORE_EOF] = false
     @CONF[:ECHO] = nil
-    @CONF[:ECHO_ON_ASSIGNMENT] = nil
     @CONF[:VERBOSE] = nil
 
     @CONF[:EVAL_HISTORY] = nil
-    @CONF[:SAVE_HISTORY] = 1000
+    @CONF[:SAVE_HISTORY] = nil
 
     @CONF[:BACK_TRACE_LIMIT] = 16
 
@@ -84,7 +82,7 @@ module IRB # :nodoc:
       :SIMPLE => {
         :PROMPT_I => ">> ",
         :PROMPT_N => ">> ",
-        :PROMPT_S => "%l> ",
+        :PROMPT_S => nil,
         :PROMPT_C => "?> ",
         :RETURN => "=> %s\n"
       },
@@ -106,7 +104,7 @@ module IRB # :nodoc:
     }
 
     @CONF[:PROMPT_MODE] = (STDIN.tty? ? :DEFAULT : :NULL)
-    @CONF[:AUTO_INDENT] = true
+    @CONF[:AUTO_INDENT] = false
 
     @CONF[:CONTEXT_MODE] = 3 # use binding in function on TOPLEVEL_BINDING
     @CONF[:SINGLE_IRB] = false
@@ -114,6 +112,8 @@ module IRB # :nodoc:
     @CONF[:LC_MESSAGES] = Locale.new
 
     @CONF[:AT_EXIT] = []
+
+    @CONF[:DEBUG_LEVEL] = 0
   end
 
   def IRB.init_error
@@ -161,30 +161,18 @@ module IRB # :nodoc:
         end
       when "--noinspect"
         @CONF[:INSPECT_MODE] = false
-      when "--singleline", "--readline", "--legacy"
-        @CONF[:USE_SINGLELINE] = true
-      when "--nosingleline", "--noreadline"
-        @CONF[:USE_SINGLELINE] = false
-      when "--multiline", "--reidline"
-        @CONF[:USE_MULTILINE] = true
-      when "--nomultiline", "--noreidline"
-        @CONF[:USE_MULTILINE] = false
+      when "--readline"
+        @CONF[:USE_READLINE] = true
+      when "--noreadline"
+        @CONF[:USE_READLINE] = false
       when "--echo"
         @CONF[:ECHO] = true
       when "--noecho"
         @CONF[:ECHO] = false
-      when "--echo-on-assignment"
-        @CONF[:ECHO_ON_ASSIGNMENT] = true
-      when "--noecho-on-assignment"
-        @CONF[:ECHO_ON_ASSIGNMENT] = false
       when "--verbose"
         @CONF[:VERBOSE] = true
       when "--noverbose"
         @CONF[:VERBOSE] = false
-      when "--colorize"
-        @CONF[:USE_COLORIZE] = true
-      when "--nocolorize"
-        @CONF[:USE_COLORIZE] = false
       when /^--prompt-mode(?:=(.+))?/, /^--prompt(?:=(.+))?/
         opt = $1 || argv.shift
         prompt_mode = opt.upcase.tr("-", "_").intern
@@ -203,6 +191,8 @@ module IRB # :nodoc:
         @CONF[:CONTEXT_MODE] = ($1 || argv.shift).to_i
       when "--single-irb"
         @CONF[:SINGLE_IRB] = true
+      when /^--irb_debug(?:=(.+))?/
+        @CONF[:DEBUG_LEVEL] = ($1 || argv.shift).to_i
       when "-v", "--version"
         print IRB.version, "\n"
         exit 0
@@ -274,11 +264,11 @@ module IRB # :nodoc:
     if home = ENV["HOME"]
       yield proc{|rc| home+"/.irb#{rc}"}
     end
-    current_dir = Dir.pwd
-    yield proc{|rc| current_dir+"/.irb#{rc}"}
-    yield proc{|rc| current_dir+"/irb#{rc.sub(/\A_?/, '.')}"}
-    yield proc{|rc| current_dir+"/_irb#{rc}"}
-    yield proc{|rc| current_dir+"/$irb#{rc}"}
+    home = Dir.pwd
+    yield proc{|rc| home+"/.irb#{rc}"}
+    yield proc{|rc| home+"/irb#{rc.sub(/\A_?/, '.')}"}
+    yield proc{|rc| home+"/_irb#{rc}"}
+    yield proc{|rc| home+"/$irb#{rc}"}
   end
 
   # loading modules

data/lib/irb/input-method.rb

@@ -11,8 +11,6 @@
 #
 require_relative 'src_encoding'
 require_relative 'magic-file'
-require_relative 'completion'
-require 'reline'
 
 module IRB
   STDIN_FILE_NAME = "(line)" # :nodoc:
@@ -142,12 +140,6 @@ module IRB
 
         @stdin = IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
         @stdout = IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
-
-        if Readline.respond_to?("basic_word_break_characters=")
-          Readline.basic_word_break_characters = IRB::InputCompletor::BASIC_WORD_BREAK_CHARACTERS
-        end
-        Readline.completion_append_character = nil
-        Readline.completion_proc = IRB::InputCompletor::CompletionProc
       end
 
       # Reads the next line from this input method.
@@ -194,105 +186,7 @@ module IRB
       def encoding
         @stdin.external_encoding
       end
-
-      if Readline.respond_to?("basic_word_break_characters=")
-        Readline.basic_word_break_characters = IRB::InputCompletor::BASIC_WORD_BREAK_CHARACTERS
-      end
-      Readline.completion_append_character = nil
-      Readline.completion_proc = IRB::InputCompletor::CompletionProc
     end
   rescue LoadError
   end
-
-  class ReidlineInputMethod < InputMethod
-    include Reline
-    # Creates a new input method object using Readline
-    def initialize
-      super
-
-      @line_no = 0
-      @line = []
-      @eof = false
-
-      @stdin = ::IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
-      @stdout = ::IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
-
-      if Reline.respond_to?("basic_word_break_characters=")
-        Reline.basic_word_break_characters = IRB::InputCompletor::BASIC_WORD_BREAK_CHARACTERS
-      end
-      Reline.completion_append_character = nil
-      Reline.completion_proc = IRB::InputCompletor::CompletionProc
-      Reline.output_modifier_proc =
-        if IRB.conf[:USE_COLORIZE]
-          proc do |output, complete:|
-            next unless IRB::Color.colorable?
-            IRB::Color.colorize_code(output, complete: complete)
-          end
-        else
-          proc do |output|
-            Reline::Unicode.escape_for_print(output)
-          end
-        end
-      Reline.dig_perfect_match_proc = IRB::InputCompletor::PerfectMatchedProc
-    end
-
-    def check_termination(&block)
-      @check_termination_proc = block
-    end
-
-    def dynamic_prompt(&block)
-      @prompt_proc = block
-    end
-
-    def auto_indent(&block)
-      @auto_indent_proc = block
-    end
-
-    # Reads the next line from this input method.
-    #
-    # See IO#gets for more information.
-    def gets
-      Reline.input = @stdin
-      Reline.output = @stdout
-      Reline.prompt_proc = @prompt_proc
-      Reline.auto_indent_proc = @auto_indent_proc if @auto_indent_proc
-      if l = readmultiline(@prompt, false, &@check_termination_proc)
-        HISTORY.push(l) if !l.empty?
-        @line[@line_no += 1] = l + "\n"
-      else
-        @eof = true
-        l
-      end
-    end
-
-    # Whether the end of this input method has been reached, returns +true+
-    # if there is no more data to read.
-    #
-    # See IO#eof? for more information.
-    def eof?
-      super
-    end
-
-    # Whether this input method is still readable when there is no more data to
-    # read.
-    #
-    # See IO#eof for more information.
-    def readable_after_eof?
-      true
-    end
-
-    # Returns the current line number for #io.
-    #
-    # #line counts the number of times #gets is called.
-    #
-    # See IO#lineno for more information.
-    def line(line_no)
-      @line[line_no]
-    end
-
-    # The external encoding for standard input.
-    def encoding
-      @stdin.external_encoding
-    end
-  end
 end