rubysl-irb 1.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 201469d3b84442d02b22e1e9c9ca01f73ba419a3
-  data.tar.gz: 93235143e723b589f75dd8c4dc051756d380cf5e
+  metadata.gz: 1cc1caf272f42cf9753a854bfb67e228ba92fb34
+  data.tar.gz: dfc3cb9d5b6fdb2646931ad5eb34d772f1cd51e1
 SHA512:
-  metadata.gz: 351477db4bb573e53dc2bdf1c680667eb3e356f155163657c6a715a26ed7f2ee031ad74113be2b8664797fad9efb1ee2e83054796e7ac5b1115fa9d0223ea8da
-  data.tar.gz: e64921f7471b9babc7e4dc285b859a07146bec72af25f5f70f1391d4aa2254d49fff002c6321c3cd284b736babae451ee7c32f1690fdc79ce673342da5db3d7b
+  metadata.gz: cb75aa61c78a8e7c60f57799901589ed62a1902286a21472fc2cca4add5aa30e317000e1f366ae63c98694b430247785425de66bf912130155bf1b46fc9465aa
+  data.tar.gz: ba69200e216aa59c3955ba9f1956d3eddb0d0bfd6531d2fb2522eb215e61e1ad4be02cafc8d8bbc3edb9b0497658bfa80207331e1781076beecf3c832652104b

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 before_install:
+  - rvm use $RVM --install --binary --fuzzy
   - gem update --system
   - gem --version
   - gem install rubysl-bundler
+env:
+  - RVM=rbx-nightly-d21 RUBYLIB=lib
 script: bundle exec mspec spec
-rvm:
-  - rbx-nightly-18mode

data/lib/irb/cmd/chws.rb

@@ -1,18 +1,18 @@
 #
-#   change-ws.rb - 
-#   	$Release Version: 0.9.5$
-#   	$Revision: 11708 $
-#   	$Date: 2007-02-12 15:01:19 -0800 (Mon, 12 Feb 2007) $
+#   change-ws.rb -
+#   	$Release Version: 0.9.6$
+#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "irb/cmd/nop.rb"
 require "irb/ext/change-ws.rb"
 
+# :stopdoc:
 module IRB
   module ExtendCommand
 
@@ -30,4 +30,4 @@ module IRB
     end
   end
 end
-
+# :startdoc:

data/lib/irb/cmd/fork.rb

@@ -1,25 +1,24 @@
 #
-#   fork.rb - 
-#   	$Release Version: 0.9.5 $
-#   	$Revision: 11708 $
-#   	$Date: 2007-02-12 15:01:19 -0800 (Mon, 12 Feb 2007) $
+#   fork.rb -
+#   	$Release Version: 0.9.6 $
+#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
-@RCS_ID='-$Id: fork.rb 11708 2007-02-12 23:01:19Z shyouhei $-'
-
+@RCS_ID='-$Id$-'
 
+# :stopdoc:
 module IRB
   module ExtendCommand
     class Fork<Nop
-      def execute(&block)
+      def execute
 	pid = send ExtendCommand.irb_original_method_name("fork")
-	unless pid 
-	  class<<self
+	unless pid
+	  class << self
 	    alias_method :exit, ExtendCommand.irb_original_method_name('exit')
 	  end
 	  if iterator?
@@ -35,5 +34,6 @@ module IRB
     end
   end
 end
+# :startdoc:
 
 

data/lib/irb/cmd/help.rb

@@ -1,31 +1,41 @@
 #
 #   help.rb - helper using ri
-#   	$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$
 #
 # --
 #
-#   
+#
 #
 
 require 'rdoc/ri/driver'
 
+require "irb/cmd/nop.rb"
+
+# :stopdoc:
 module IRB
   module ExtendCommand
-    module Help
-      include RDoc::RI
-      def self.execute(context, *names)
-        names.each do |name|
-          begin
-            Driver.run(['-T', name.to_s])
-          rescue Driver::NotFoundError
-            puts $!.message
-          rescue SystemExit
+    class Help<Nop
+      begin
+        Ri = RDoc::RI::Driver.new
+      rescue SystemExit
+      else
+        def execute(*names)
+          if names.empty?
+            Ri.interactive
+            return
+          end
+          names.each do |name|
+            begin
+              Ri.display_name(name.to_s)
+            rescue RDoc::RI::Error
+              puts $!.message
+            end
           end
+          nil
         end
-        nil
       end
     end
   end
 end
+# :startdoc:

data/lib/irb/cmd/load.rb

@@ -1,18 +1,18 @@
 #
-#   load.rb - 
-#   	$Release Version: 0.9.5$
-#   	$Revision: 11708 $
-#   	$Date: 2007-02-12 15:01:19 -0800 (Mon, 12 Feb 2007) $
+#   load.rb -
+#   	$Release Version: 0.9.6$
+#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "irb/cmd/nop.rb"
 require "irb/ext/loader"
 
+# :stopdoc:
 module IRB
   module ExtendCommand
     class Load<Nop
@@ -26,7 +26,7 @@ module IRB
 
     class Require<Nop
       include IrbLoader
-      
+
       def execute(file_name)
 #	return ruby_require(file_name) unless IRB.conf[:USE_LOADER]
 
@@ -45,7 +45,7 @@ module IRB
 	when /\.(so|o|sl)$/
 	  return ruby_require(file_name)
 	end
-	
+
 	begin
 	  irb_load(f = file_name + ".rb")
 	  $".push f
@@ -65,3 +65,4 @@ module IRB
   end
 
 end
+# :startdoc:

data/lib/irb/cmd/nop.rb

@@ -1,19 +1,19 @@
 #
-#   nop.rb - 
-#   	$Release Version: 0.9.5$
-#   	$Revision: 11708 $
-#   	$Date: 2007-02-12 15:01:19 -0800 (Mon, 12 Feb 2007) $
+#   nop.rb -
+#   	$Release Version: 0.9.6$
+#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
 #
+#
+# :stopdoc:
 module IRB
   module ExtendCommand
     class Nop
-      
-      @RCS_ID='-$Id: nop.rb 11708 2007-02-12 23:01:19Z shyouhei $-'
+
+      @RCS_ID='-$Id$-'
 
       def self.execute(conf, *opts)
 	command = new(conf)
@@ -36,4 +36,4 @@ module IRB
     end
   end
 end
-
+# :startdoc:

data/lib/irb/cmd/pushws.rb

@@ -1,18 +1,18 @@
 #
-#   change-ws.rb - 
-#   	$Release Version: 0.9.5$
-#   	$Revision: 11708 $
-#   	$Date: 2007-02-12 15:01:19 -0800 (Mon, 12 Feb 2007) $
+#   change-ws.rb -
+#   	$Release Version: 0.9.6$
+#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "irb/cmd/nop.rb"
 require "irb/ext/workspaces.rb"
 
+# :stopdoc:
 module IRB
   module ExtendCommand
     class Workspaces<Nop
@@ -36,4 +36,5 @@ module IRB
     end
   end
 end
+# :startdoc:
 

data/lib/irb/cmd/subirb.rb

@@ -1,19 +1,17 @@
-#!/usr/local/bin/ruby
-#
-#   multi.rb - 
-#   	$Release Version: 0.9.5$
-#   	$Revision: 11708 $
-#   	$Date: 2007-02-12 15:01:19 -0800 (Mon, 12 Feb 2007) $
+#   multi.rb -
+#   	$Release Version: 0.9.6$
+#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "irb/cmd/nop.rb"
 require "irb/ext/multi-irb"
 
+# :stopdoc:
 module IRB
   module ExtendCommand
     class IrbCommand<Nop
@@ -41,3 +39,4 @@ module IRB
     end
   end
 end
+# :startdoc:

data/lib/irb/completion.rb

@@ -1,8 +1,7 @@
 #
-#   irb/completor.rb - 
+#   irb/completor.rb -
 #   	$Release Version: 0.9$
-#   	$Revision: 11708 $
-#   	$Date: 2007-02-12 15:01:19 -0800 (Mon, 12 Feb 2007) $
+#   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #       From Original Idea of shugo@ruby-lang.org
 #
@@ -10,22 +9,24 @@
 require "readline"
 
 module IRB
-  module InputCompletor
+  module InputCompletor # :nodoc:
 
-    @RCS_ID='-$Id: completion.rb 11708 2007-02-12 23:01:19Z shyouhei $-'
+    @RCS_ID='-$Id$-'
 
+    # Set of reserved words used by Ruby, you should not use these for
+    # constants or variables
     ReservedWords = [
       "BEGIN", "END",
-      "alias", "and", 
-      "begin", "break", 
+      "alias", "and",
+      "begin", "break",
       "case", "class",
       "def", "defined", "do",
       "else", "elsif", "end", "ensure",
-      "false", "for", 
-      "if", "in", 
-      "module", 
+      "false", "for",
+      "if", "in",
+      "module",
       "next", "nil", "not",
-      "or", 
+      "or",
       "redo", "rescue", "retry", "return",
       "self", "super",
       "then", "true",
@@ -33,19 +34,27 @@ module IRB
       "when", "while",
       "yield",
     ]
-      
+
     CompletionProc = proc { |input|
       bind = IRB.conf[:MAIN_CONTEXT].workspace.binding
-      
+
 #      puts "input: #{input}"
 
       case input
+      when /^((["'`]).*\2)\.([^.]*)$/
+	# String
+	receiver = $1
+	message = Regexp.quote($3)
+
+	candidates = String.instance_methods.collect{|m| m.to_s}
+	select_message(receiver, message, candidates)
+
       when /^(\/[^\/]*\/)\.([^.]*)$/
 	# Regexp
 	receiver = $1
 	message = Regexp.quote($2)
 
-	candidates = Regexp.instance_methods(true)
+	candidates = Regexp.instance_methods.collect{|m| m.to_s}
 	select_message(receiver, message, candidates)
 
       when /^([^\]]*\])\.([^.]*)$/
@@ -53,7 +62,7 @@ module IRB
 	receiver = $1
 	message = Regexp.quote($2)
 
-	candidates = Array.instance_methods(true)
+	candidates = Array.instance_methods.collect{|m| m.to_s}
 	select_message(receiver, message, candidates)
 
       when /^([^\}]*\})\.([^.]*)$/
@@ -61,15 +70,16 @@ module IRB
 	receiver = $1
 	message = Regexp.quote($2)
 
-	candidates = Proc.instance_methods(true) | Hash.instance_methods(true)
+	candidates = Proc.instance_methods.collect{|m| m.to_s}
+	candidates |= Hash.instance_methods.collect{|m| m.to_s}
 	select_message(receiver, message, candidates)
-	
+
       when /^(:[^:.]*)$/
  	# Symbol
 	if Symbol.respond_to?(:all_symbols)
 	  sym = $1
 	  candidates = Symbol.all_symbols.collect{|s| ":" + s.id2name}
-	  candidates.grep(/^#{sym}/)
+	  candidates.grep(/^#{Regexp.quote(sym)}/)
 	else
 	  []
 	end
@@ -77,72 +87,88 @@ module IRB
       when /^::([A-Z][^:\.\(]*)$/
 	# Absolute Constant or class methods
 	receiver = $1
-	candidates = Object.constants
+	candidates = Object.constants.collect{|m| m.to_s}
 	candidates.grep(/^#{receiver}/).collect{|e| "::" + e}
 
-      when /^(((::)?[A-Z][^:.\(]*)+)::?([^:.]*)$/
+#      when /^(((::)?[A-Z][^:.\(]*)+)::?([^:.]*)$/
+      when /^([A-Z].*)::([^:.]*)$/
 	# Constant or class methods
 	receiver = $1
-	message = Regexp.quote($4)
+	message = Regexp.quote($2)
 	begin
-	  candidates = eval("#{receiver}.constants | #{receiver}.methods", bind)
+	  candidates = eval("#{receiver}.constants.collect{|m| m.to_s}", bind)
+	  candidates |= eval("#{receiver}.methods.collect{|m| m.to_s}", bind)
 	rescue Exception
 	  candidates = []
 	end
-	candidates.grep(/^#{message}/).collect{|e| receiver + "::" + e}
+	select_message(receiver, message, candidates, "::")
 
-      when /^(:[^:.]+)\.([^.]*)$/
+      when /^(:[^:.]+)(\.|::)([^.]*)$/
 	# Symbol
 	receiver = $1
-	message = Regexp.quote($2)
+	sep = $2
+	message = Regexp.quote($3)
 
-	candidates = Symbol.instance_methods(true)
-	select_message(receiver, message, candidates)
+	candidates = Symbol.instance_methods.collect{|m| m.to_s}
+	select_message(receiver, message, candidates, sep)
 
-      when /^(-?(0[dbo])?[0-9_]+(\.[0-9_]+)?([eE]-?[0-9]+)?)\.([^.]*)$/
+      when /^(-?(0[dbo])?[0-9_]+(\.[0-9_]+)?([eE]-?[0-9]+)?)(\.|::)([^.]*)$/
 	# Numeric
 	receiver = $1
-	message = Regexp.quote($5)
+	sep = $5
+	message = Regexp.quote($6)
 
 	begin
-	  candidates = eval(receiver, bind).methods
+	  candidates = eval(receiver, bind).methods.collect{|m| m.to_s}
 	rescue Exception
 	  candidates = []
 	end
-	select_message(receiver, message, candidates)
+	select_message(receiver, message, candidates, sep)
 
-      when /^(-?0x[0-9a-fA-F_]+)\.([^.]*)$/
+      when /^(-?0x[0-9a-fA-F_]+)(\.|::)([^.]*)$/
 	# Numeric(0xFFFF)
 	receiver = $1
-	message = Regexp.quote($2)
+	sep = $2
+	message = Regexp.quote($3)
 
 	begin
-	  candidates = eval(receiver, bind).methods
+	  candidates = eval(receiver, bind).methods.collect{|m| m.to_s}
 	rescue Exception
 	  candidates = []
 	end
-	select_message(receiver, message, candidates)
+	select_message(receiver, message, candidates, sep)
 
       when /^(\$[^.]*)$/
-	candidates = global_variables.grep(Regexp.new(Regexp.quote($1)))
+	# global var
+	regmessage = Regexp.new(Regexp.quote($1))
+	candidates = global_variables.collect{|m| m.to_s}.grep(regmessage)
 
 #      when /^(\$?(\.?[^.]+)+)\.([^.]*)$/
-      when /^((\.?[^.]+)+)\.([^.]*)$/
-	# variable
+#      when /^((\.?[^.]+)+)\.([^.]*)$/
+#      when /^([^."].*)\.([^.]*)$/
+      when /^([^."].*)(\.|::)([^.]*)$/
+	# variable.func or func.func
 	receiver = $1
+	sep = $2
 	message = Regexp.quote($3)
 
-	gv = eval("global_variables", bind)
-	lv = eval("local_variables", bind)
-	cv = eval("self.class.constants", bind)
-	
-	if (gv | lv | cv).include?(receiver)
-	  # foo.func and foo is local var.
-	  candidates = eval("#{receiver}.methods", bind)
-	elsif /^[A-Z]/ =~ receiver and /\./ !~ receiver
+	gv = eval("global_variables", bind).collect{|m| m.to_s}
+	lv = eval("local_variables", bind).collect{|m| m.to_s}
+	iv = eval("instance_variables", bind).collect{|m| m.to_s}
+	cv = eval("self.class.constants", bind).collect{|m| m.to_s}
+
+	if (gv | lv | iv | cv).include?(receiver) or /^[A-Z]/ =~ receiver && /\./ !~ receiver
+	  # foo.func and foo is var. OR
+	  # foo::func and foo is var. OR
+	  # foo::Const and foo is var. OR
 	  # Foo::Bar.func
 	  begin
-	    candidates = eval("#{receiver}.methods", bind)
+	    candidates = []
+	    rec = eval(receiver, bind)
+	    if sep == "::" and rec.kind_of?(Module)
+	      candidates = rec.constants.collect{|m| m.to_s}
+	    end
+	    candidates |= rec.methods.collect{|m| m.to_s}
 	  rescue Exception
 	    candidates = []
 	  end
@@ -155,14 +181,18 @@ module IRB
 	    rescue Exception
 	      name = ""
 	    end
-	    next if name != "IRB::Context" and 
-	      /^(IRB|SLex|RubyLex|RubyToken)/ =~ name
-	    candidates.concat m.instance_methods(false)
+            begin
+              next if name != "IRB::Context" and
+                /^(IRB|SLex|RubyLex|RubyToken)/ =~ name
+            rescue Exception
+              next
+            end
+	    candidates.concat m.instance_methods(false).collect{|x| x.to_s}
 	  }
 	  candidates.sort!
 	  candidates.uniq!
 	end
-	select_message(receiver, message, candidates)
+	select_message(receiver, message, candidates, sep)
 
       when /^\.([^.]*)$/
 	# unknown(maybe String)
@@ -170,25 +200,26 @@ module IRB
 	receiver = ""
 	message = Regexp.quote($1)
 
-	candidates = String.instance_methods(true)
+	candidates = String.instance_methods(true).collect{|m| m.to_s}
 	select_message(receiver, message, candidates)
 
       else
-	candidates = eval("methods | private_methods | local_variables | self.class.constants", bind)
-			  
+	candidates = eval("methods | private_methods | local_variables | instance_variables | self.class.constants", bind).collect{|m| m.to_s}
+
 	(candidates|ReservedWords).grep(/^#{Regexp.quote(input)}/)
       end
     }
 
+    # Set of available operators in Ruby
     Operators = ["%", "&", "*", "**", "+",  "-",  "/",
       "<", "<<", "<=", "<=>", "==", "===", "=~", ">", ">=", ">>",
-      "[]", "[]=", "^",]
+      "[]", "[]=", "^", "!", "!=", "!~"]
 
-    def self.select_message(receiver, message, candidates)
+    def self.select_message(receiver, message, candidates, sep = ".")
       candidates.grep(/^#{message}/).collect do |e|
 	case e
 	when /^[a-zA-Z_]/
-	  receiver + "." + e
+	  receiver + sep + e
 	when /^[0-9]/
 	when *Operators
 	  #receiver + " " + e
@@ -199,7 +230,8 @@ module IRB
 end
 
 if Readline.respond_to?("basic_word_break_characters=")
-  Readline.basic_word_break_characters= " \t\n\"\\'`><=;|&{("
+#  Readline.basic_word_break_characters= " \t\n\"\\'`><=;|&{("
+  Readline.basic_word_break_characters= " \t\n`><=;|&{("
 end
 Readline.completion_append_character = nil
 Readline.completion_proc = IRB::InputCompletor::CompletionProc