rubysl-irb 1.0.2 → 2.0.3

data/lib/irb/help.rb

@@ -1,35 +1,36 @@
 #
 #   irb/help.rb - print usage module
-#   	$Release Version: 0.9.5$
-#   	$Revision: 16857 $
-#   	$Date: 2008-06-06 01:05:24 -0700 (Fri, 06 Jun 2008) $
+#   	$Release Version: 0.9.6$
+#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #
-#   
 #
+#
+
+require 'irb/magic-file'
 
 module IRB
+  # Outputs the irb help message, see IRB@Command+line+options.
   def IRB.print_usage
     lc = IRB.conf[:LC_MESSAGES]
-    path = lc.find("irb/help-message.rb")
+    path = lc.find("irb/help-message")
     space_line = false
-    File.foreach(path) do
-      |l|
-      if /^\s*$/ =~ l
-	lc.puts l unless space_line
-	space_line = true
-	next
+    IRB::MagicFile.open(path){|f|
+      f.each_line do |l|
+	if /^\s*$/ =~ l
+	  lc.puts l unless space_line
+	  space_line = true
+	  next
+	end
+	space_line = false
+
+	l.sub!(/#.*$/, "")
+	  next if /^\s*$/ =~ l
+	lc.puts l
       end
-      space_line = false
-      
-      l.sub!(/#.*$/, "")
-      l.sub!(/<<HELP/, "")
-      l.sub!(/HELP/, "")
-      next if /^\s*$/ =~ l
-      lc.puts l
-    end
+    }
   end
 end
 

data/lib/irb/init.rb

@@ -1,16 +1,15 @@
 #
 #   irb/init.rb - irb initialize module
-#   	$Release Version: 0.9.5$
-#   	$Revision: 11708 $
-#   	$Date: 2007-02-12 15:01:19 -0800 (Mon, 12 Feb 2007) $
+#   	$Release Version: 0.9.6$
+#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
-module IRB
+module IRB # :nodoc:
 
   # initialize config
   def IRB.setup(ap_path)
@@ -21,7 +20,7 @@ module IRB
     IRB.load_modules
 
     unless @CONF[:PROMPT][@CONF[:PROMPT_MODE]]
-      IRB.fail(UndefinedPromptMode, @CONF[:PROMPT_MODE]) 
+      IRB.fail(UndefinedPromptMode, @CONF[:PROMPT_MODE])
     end
   end
 
@@ -34,7 +33,6 @@ module IRB
     unless ap_path and @CONF[:AP_NAME]
       ap_path = File.join(File.dirname(File.dirname(__FILE__)), "irb.rb")
     end
-
     @CONF[:AP_NAME] = File::basename(ap_path, ".rb")
 
     @CONF[:IRB_NAME] = "irb"
@@ -46,7 +44,7 @@ module IRB
 
     @CONF[:MATH_MODE] = false
     @CONF[:USE_READLINE] = false unless defined?(ReadlineInputMethod)
-    @CONF[:INSPECT_MODE] = nil
+    @CONF[:INSPECT_MODE] = true
     @CONF[:USE_TRACER] = false
     @CONF[:USE_LOADER] = false
     @CONF[:IGNORE_SIGINT] = true
@@ -61,49 +59,49 @@ module IRB
 
     @CONF[:PROMPT] = {
       :NULL => {
-      :PROMPT_I => nil,
-      :PROMPT_N => nil,
-      :PROMPT_S => nil,
-      :PROMPT_C => nil,
-      :RETURN => "%s\n"
-    },
+	:PROMPT_I => nil,
+	:PROMPT_N => nil,
+	:PROMPT_S => nil,
+	:PROMPT_C => nil,
+	:RETURN => "%s\n"
+      },
       :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"
-    },
+	: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"
+      },
       :CLASSIC => {
-      :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"
-    },
+	: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"
+      },
       :SIMPLE => {
-      :PROMPT_I => ">> ",
-      :PROMPT_N => ">> ",
-      :PROMPT_S => nil,
-      :PROMPT_C => "?> ",
-      :RETURN => "=> %s\n"
-    },
+	:PROMPT_I => ">> ",
+	:PROMPT_N => ">> ",
+	:PROMPT_S => nil,
+	:PROMPT_C => "?> ",
+	:RETURN => "=> %s\n"
+      },
       :INF_RUBY => {
-      :PROMPT_I => "%N(%m):%03n:%i> ",
-      #	:PROMPT_N => "%N(%m):%03n:%i> ",
-      :PROMPT_N => nil,
-      :PROMPT_S => nil,
-      :PROMPT_C => nil,
-      :RETURN => "%s\n",
-      :AUTO_INDENT => true
-    },
+	:PROMPT_I => "%N(%m):%03n:%i> ",
+#	:PROMPT_N => "%N(%m):%03n:%i> ",
+	:PROMPT_N => nil,
+	:PROMPT_S => nil,
+	:PROMPT_C => nil,
+	:RETURN => "%s\n",
+	:AUTO_INDENT => true
+      },
       :XMP => {
-      :PROMPT_I => nil,
-      :PROMPT_N => nil,
-      :PROMPT_S => nil,
-      :PROMPT_C => nil,
-      :RETURN => "    ==>%s\n"
-    }
+	:PROMPT_I => nil,
+	:PROMPT_N => nil,
+	:PROMPT_S => nil,
+	:PROMPT_C => nil,
+	:RETURN => "    ==>%s\n"
+      }
     }
 
     @CONF[:PROMPT_MODE] = (STDIN.tty? ? :DEFAULT : :NULL)
@@ -112,10 +110,12 @@ module IRB
     @CONF[:CONTEXT_MODE] = 3 # use binding in function on TOPLEVEL_BINDING
     @CONF[:SINGLE_IRB] = false
 
-    #    @CONF[:LC_MESSAGES] = "en"
+#    @CONF[:LC_MESSAGES] = "en"
     @CONF[:LC_MESSAGES] = Locale.new
 
-    @CONF[:DEBUG_LEVEL] = 1
+    @CONF[:AT_EXIT] = []
+
+    @CONF[:DEBUG_LEVEL] = 0
   end
 
   def IRB.init_error
@@ -130,87 +130,117 @@ module IRB
     while opt = ARGV.shift
       case opt
       when "-f"
-        @CONF[:RC] = false
+	@CONF[:RC] = false
       when "-m"
-        @CONF[:MATH_MODE] = true
+	@CONF[:MATH_MODE] = true
       when "-d"
-        $DEBUG = true
+	$DEBUG = true
+	$VERBOSE = true
+      when "-w"
+	$VERBOSE = true
+      when /^-W(.+)?/
+	opt = $1 || ARGV.shift
+	case opt
+	when "0"
+	  $VERBOSE = nil
+	when "1"
+	  $VERBOSE = false
+	else
+	  $VERBOSE = true
+	end
       when /^-r(.+)?/
-        opt = $1 || ARGV.shift
-        @CONF[:LOAD_MODULES].push opt if opt
+	opt = $1 || ARGV.shift
+	@CONF[:LOAD_MODULES].push opt if opt
       when /^-I(.+)?/
         opt = $1 || ARGV.shift
-        load_path.concat(opt.split(File::PATH_SEPARATOR)) if opt
-      when /^-K(.)/
-        $KCODE = $1
+	load_path.concat(opt.split(File::PATH_SEPARATOR)) if opt
+      when '-U'
+	set_encoding("UTF-8", "UTF-8")
+      when /^-E(.+)?/, /^--encoding(?:=(.+))?/
+	opt = $1 || ARGV.shift
+	set_encoding(*opt.split(':', 2))
       when "--inspect"
-        @CONF[:INSPECT_MODE] = true
+	if /^-/ !~ ARGV.first
+	  @CONF[:INSPECT_MODE] = ARGV.shift
+	else
+	  @CONF[:INSPECT_MODE] = true
+	end
       when "--noinspect"
-        @CONF[:INSPECT_MODE] = false
+	@CONF[:INSPECT_MODE] = false
       when "--readline"
-        @CONF[:USE_READLINE] = true
+	@CONF[:USE_READLINE] = true
       when "--noreadline"
-        @CONF[:USE_READLINE] = false
+	@CONF[:USE_READLINE] = false
       when "--echo"
-        @CONF[:ECHO] = true
+	@CONF[:ECHO] = true
       when "--noecho"
-        @CONF[:ECHO] = false
+	@CONF[:ECHO] = false
       when "--verbose"
-        @CONF[:VERBOSE] = true
+	@CONF[:VERBOSE] = true
       when "--noverbose"
-        @CONF[:VERBOSE] = false
-      when "--prompt-mode", "--prompt"
-        prompt_mode = ARGV.shift.upcase.tr("-", "_").intern
-        @CONF[:PROMPT_MODE] = prompt_mode
+	@CONF[:VERBOSE] = false
+      when /^--prompt-mode(?:=(.+))?/, /^--prompt(?:=(.+))?/
+	opt = $1 || ARGV.shift
+	prompt_mode = opt.upcase.tr("-", "_").intern
+	@CONF[:PROMPT_MODE] = prompt_mode
       when "--noprompt"
-        @CONF[:PROMPT_MODE] = :NULL
+	@CONF[:PROMPT_MODE] = :NULL
       when "--inf-ruby-mode"
-        @CONF[:PROMPT_MODE] = :INF_RUBY
+	@CONF[:PROMPT_MODE] = :INF_RUBY
       when "--sample-book-mode", "--simple-prompt"
-        @CONF[:PROMPT_MODE] = :SIMPLE
+	@CONF[:PROMPT_MODE] = :SIMPLE
       when "--tracer"
-        @CONF[:USE_TRACER] = true
-      when "--back-trace-limit"
-        @CONF[:BACK_TRACE_LIMIT] = ARGV.shift.to_i
-      when "--context-mode"
-        @CONF[:CONTEXT_MODE] = ARGV.shift.to_i
+	@CONF[:USE_TRACER] = true
+      when /^--back-trace-limit(?:=(.+))?/
+	@CONF[:BACK_TRACE_LIMIT] = ($1 || ARGV.shift).to_i
+      when /^--context-mode(?:=(.+))?/
+	@CONF[:CONTEXT_MODE] = ($1 || ARGV.shift).to_i
       when "--single-irb"
-        @CONF[:SINGLE_IRB] = true
-      when "--irb_debug"
-        @CONF[:DEBUG_LEVEL] = ARGV.shift.to_i
+	@CONF[:SINGLE_IRB] = true
+      when /^--irb_debug(?:=(.+))?/
+	@CONF[:DEBUG_LEVEL] = ($1 || ARGV.shift).to_i
       when "-v", "--version"
-        print IRB.version, "\n"
-        exit 0
+	print IRB.version, "\n"
+	exit 0
       when "-h", "--help"
-        require "irb/help"
-        IRB.print_usage
-        exit 0
+	require "irb/help"
+	IRB.print_usage
+	exit 0
+      when "--"
+	if opt = ARGV.shift
+	  @CONF[:SCRIPT] = opt
+	  $0 = opt
+	end
+        break
       when /^-/
-        IRB.fail UnrecognizedSwitch, opt
+	IRB.fail UnrecognizedSwitch, opt
       else
-        @CONF[:SCRIPT] = opt
-        $0 = opt
-        break
+	@CONF[:SCRIPT] = opt
+	$0 = opt
+	break
       end
     end
-
     if RUBY_VERSION >= FEATURE_IOPT_CHANGE_VERSION
       load_path.collect! do |path|
-        /\A\.\// =~ path ? path : File.expand_path(path)
+	/\A\.\// =~ path ? path : File.expand_path(path)
       end
     end
     $LOAD_PATH.unshift(*load_path)
+
   end
 
   # running config
   def IRB.run_config
     if @CONF[:RC]
       begin
-        load rc_file
+	load rc_file
       rescue LoadError, Errno::ENOENT
-      rescue => e
-        print "load error: #{rc_file}\n"
-        raise e
+      rescue # StandardError, ScriptError
+	print "load error: #{rc_file}\n"
+	print $!.class, ": ", $!, "\n"
+	for err in $@[0, $@.size - 2]
+	  print "\t", err, "\n"
+	end
       end
     end
   end
@@ -219,23 +249,28 @@ module IRB
   def IRB.rc_file(ext = IRBRC_EXT)
     if !@CONF[:RC_NAME_GENERATOR]
       rc_file_generators do |rcgen|
-        @CONF[:RC_NAME_GENERATOR] ||= rcgen
-        if File.exist?(rcgen.call(IRBRC_EXT))
-          @CONF[:RC_NAME_GENERATOR] = rcgen
-          break
-        end
+	@CONF[:RC_NAME_GENERATOR] ||= rcgen
+	if File.exist?(rcgen.call(IRBRC_EXT))
+	  @CONF[:RC_NAME_GENERATOR] = rcgen
+	  break
+	end
       end
     end
-    @CONF[:RC_NAME_GENERATOR].call ext
+    case rc_file = @CONF[:RC_NAME_GENERATOR].call(ext)
+    when String
+      return rc_file
+    else
+      IRB.fail IllegalRCNameGenerator
+    end
   end
 
   # enumerate possible rc-file base name generators
   def IRB.rc_file_generators
     if irbrc = ENV["IRBRC"]
-      yield proc{|rc|  rc == "rc" ? irbrc : irbrc+rc}
+      yield proc{|rc| rc == "rc" ? irbrc : irbrc+rc}
     end
     if home = ENV["HOME"]
-      yield proc{|rc| home+"/.irb#{rc}"} 
+      yield proc{|rc| home+"/.irb#{rc}"}
     end
     home = Dir.pwd
     yield proc{|rc| home+"/.irb#{rc}"}
@@ -248,11 +283,28 @@ module IRB
   def IRB.load_modules
     for m in @CONF[:LOAD_MODULES]
       begin
-        require m
-      rescue
-        print $@[0], ":", $!.class, ": ", $!, "\n"
+	require m
+      rescue LoadError => err
+	warn err.backtrace[0] << ":#{err.class}: #{err}"
       end
     end
   end
 
+
+  DefaultEncodings = Struct.new(:external, :internal)
+  class << IRB
+    private
+    def set_encoding(extern, intern = nil)
+      verbose, $VERBOSE = $VERBOSE, nil
+      Encoding.default_external = extern unless extern.nil? || extern.empty?
+      Encoding.default_internal = intern unless intern.nil? || intern.empty?
+      @CONF[:ENCODINGS] = IRB::DefaultEncodings.new(extern, intern)
+      [$stdin, $stdout, $stderr].each do |io|
+	io.set_encoding(extern, intern)
+      end
+      @CONF[:LC_MESSAGES].instance_variable_set(:@encoding, extern)
+    ensure
+      $VERBOSE = verbose
+    end
+  end
 end

data/lib/irb/input-method.rb

@@ -1,101 +1,156 @@
 #
 #   irb/input-method.rb - input methods used irb
-#   	$Release Version: 0.9.5$
-#   	$Revision: 11708 $
-#   	$Date: 2007-02-12 15:01:19 -0800 (Mon, 12 Feb 2007) $
+#   	$Release Version: 0.9.6$
+#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
 #
+#
+require 'irb/src_encoding'
+require 'irb/magic-file'
+
 module IRB
-  # 
-  # InputMethod
-  #	StdioInputMethod
-  #	FileInputMethod
-  #	(ReadlineInputMethod)
-  #
-  STDIN_FILE_NAME = "(line)"
+  STDIN_FILE_NAME = "(line)" # :nodoc:
   class InputMethod
-    @RCS_ID='-$Id: input-method.rb 11708 2007-02-12 23:01:19Z shyouhei $-'
+    @RCS_ID='-$Id$-'
 
+    # Creates a new input method object
     def initialize(file = STDIN_FILE_NAME)
       @file_name = file
     end
+    # The file name of this input method, usually given during initialization.
     attr_reader :file_name
 
+    # The irb prompt associated with this input method
     attr_accessor :prompt
-    
+
+    # Reads the next line from this input method.
+    #
+    # See IO#gets for more information.
     def gets
       IRB.fail NotImplementedError, "gets"
     end
     public :gets
 
-    def readable_atfer_eof?
+    # 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?
       false
     end
   end
-  
+
   class StdioInputMethod < InputMethod
+    # Creates a new input method object
     def initialize
       super
       @line_no = 0
       @line = []
+      @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 => "-")
     end
 
+    # Reads the next line from this input method.
+    #
+    # See IO#gets for more information.
     def gets
       print @prompt
-      @line[@line_no += 1] = $stdin.gets
+      line = @stdin.gets
+      @line[@line_no += 1] = line
     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?
-      $stdin.eof?
+      @stdin.eof?
     end
 
-    def readable_atfer_eof?
+    # 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
-  
+
+  # Use a File for IO with irb, see InputMethod
   class FileInputMethod < InputMethod
+    # Creates a new input method object
     def initialize(file)
       super
-      @io = open(file)
+      @io = IRB::MagicFile.open(file)
     end
+    # The file name of this input method, usually given during initialization.
     attr_reader :file_name
 
+    # 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?
       @io.eof?
     end
 
+    # Reads the next line from this input method.
+    #
+    # See IO#gets for more information.
     def gets
       print @prompt
       l = @io.gets
 #      print @prompt, l
       l
     end
+
+    # The external encoding for standard input.
+    def encoding
+      @io.external_encoding
+    end
   end
 
   begin
     require "readline"
     class ReadlineInputMethod < InputMethod
-      include Readline 
+      include Readline
+      # 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 => "-")
       end
 
+      # Reads the next line from this input method.
+      #
+      # See IO#gets for more information.
       def gets
+        Readline.input = @stdin
+        Readline.output = @stdout
 	if l = readline(@prompt, false)
-          HISTORY.push(l) if !l.empty?
+	  HISTORY.push(l) if !l.empty?
 	  @line[@line_no += 1] = l + "\n"
 	else
 	  @eof = true
@@ -103,17 +158,35 @@ module IRB
 	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?
 	@eof
       end
 
-      def readable_atfer_eof?
+      # 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
   rescue LoadError
   end