irb 0.9.6 → 1.4.1

data/lib/irb/ruby_logo.aa

@@ -0,0 +1,37 @@
+
+                                             -+smJYYN?mm-
+                                   HB"BBYT            TQg  NggT
+                              9Q+g       Nm,T      8g          NJW
+                          YS+              N2NJ"Sg               N?
+                       BQg                  #(  gT Nggggk          J
+                     5j                     NJ    NJ            NNge
+                  #Q                        #JJ     NgT            N(
+                @j                          bj         mT           J
+              Bj                           @/d           NJ         (
+            #q                            #((              NgT     #J
+           5d                            #(t                  mT   $d
+         #q                             @(@J                    NJB;
+        @(                             5d ? HHH H HQmgggggggmN    qD
+       5d                            #uN  2QdH                   E O
+      5                             5JSd  Nd  NJH               @d j
+     Fd                           @J4d     s     NQH           #d  (
+    #(                          #o6d       Nd       NgH       #d  #d
+    4                         B&Od          v          NgT   #d   F
+   #(                       9JGd            NH            NgUd    F
+   #d                    #GJQ                d             NP     $
+   #J                 #U+#Q                  N            Q #     j
+  j /W             BQ+ BQ                     d             NJ   NJ
+  - NjJH      HBIjTQggPJQgW                   N        W     k   #J
+ #J  b  HYWgggN       j s    Nag               d     NN      b   #d
+ #J  5-              D   s         Ngg         N    d        Nd  F
+ Fd BKH2            #+    s             NNgg    J Q           J  ]
+ F H @  J           N      y                   K(d            P  I
+ F4  E  N?         #d       y                #Q   NJ          E  j
+ F   W   Nd        q         m             Bg       NxW       N(H-
+ F   d    b       @           m          Hd            gW      vKJ
+ NJ  d     K      d            s      Bg                 aT    FDd
+  b #       d    N              m  BQ                      mV  N>
+   e5       Nd  #d              NggggggQWH HHHH              NJ -
+    m7       NW H            N                        HSVO1z=?11-
+      NgTH    bB        kH   WBHWWHBHWmQgg&gggggNNN
+           NNggggggNN

data/lib/irb/version.rb

@@ -11,7 +11,7 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "0.9.6"
+  VERSION = "1.4.1"
   @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2009-06-30"
+  @LAST_UPDATE_DATE = "2021-12-25"
 end

data/lib/irb/workspace.rb

@@ -9,6 +9,10 @@
 #
 #
 #
+
+require "delegate"
+
+IRB::TOPLEVEL_BINDING = binding
 module IRB # :nodoc:
   class WorkSpace
     # Creates a new workspace.
@@ -48,18 +52,26 @@ EOF
           end
           @binding = BINDING_QUEUE.pop
 
-        when 3	# binding in function on TOPLEVEL_BINDING(default)
-          @binding = eval("def irb_binding; private; binding; end; irb_binding",
+        when 3	# binding in function on TOPLEVEL_BINDING
+          @binding = eval("self.class.remove_method(:irb_binding) if defined?(irb_binding); private; def irb_binding; binding; end; irb_binding",
                           TOPLEVEL_BINDING,
                           __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
+
       if main.empty?
         @main = eval("self", @binding)
       else
         @main = main[0]
-        IRB.conf[:__MAIN__] = @main
+      end
+      IRB.conf[:__MAIN__] = @main
+
+      unless main.empty?
         case @main
         when Module
           @binding = eval("IRB.conf[:__MAIN__].module_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
@@ -67,10 +79,32 @@ EOF
           begin
             @binding = eval("IRB.conf[:__MAIN__].instance_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
           rescue TypeError
-            IRB.fail CantChangeBinding, @main.inspect
+            fail CantChangeBinding, @main.inspect
+          end
+        end
+      end
+
+      case @main
+      when Object
+        use_delegator = @main.frozen?
+      else
+        use_delegator = true
+      end
+
+      if use_delegator
+        @main = SimpleDelegator.new(@main)
+        IRB.conf[:__MAIN__] = @main
+        @main.singleton_class.class_eval do
+          private
+          define_method(:exit) do |*a, &b|
+            # Do nothing, will be overridden
           end
+          define_method(:binding, Kernel.instance_method(:binding))
+          define_method(:local_variables, Kernel.instance_method(:local_variables))
         end
+        @binding = eval("IRB.conf[:__MAIN__].instance_eval('binding', __FILE__, __LINE__)", @binding, *@binding.source_location)
       end
+
       @binding.local_variable_set(:_, nil)
     end
 
@@ -95,46 +129,56 @@ EOF
 
     # error message manipulator
     def filter_backtrace(bt)
+      return nil if bt =~ /\/irb\/.*\.rb/
+      return nil if bt =~ /\/irb\.rb/
+      return nil if bt =~ /tool\/lib\/.*\.rb|runner\.rb/ # for tests in Ruby repository
       case IRB.conf[:CONTEXT_MODE]
-      when 0
-        return nil if bt =~ /\(irb_local_binding\)/
       when 1
-        if(bt =~ %r!/tmp/irb-binding! or
-            bt =~ %r!irb/.*\.rb! or
-            bt =~ /irb\.rb/)
-          return nil
-        end
-      when 2
-        return nil if bt =~ /irb\/.*\.rb/
-        return nil if bt =~ /irb\.rb/
+        return nil if bt =~ %r!/tmp/irb-binding!
       when 3
-        return nil if bt =~ /irb\/.*\.rb/
-        return nil if bt =~ /irb\.rb/
         bt = bt.sub(/:\s*in `irb_binding'/, '')
       end
       bt
     end
 
     def code_around_binding
-      file, pos = @binding.source_location
+      if @binding.respond_to?(:source_location)
+        file, pos = @binding.source_location
+      else
+        file, pos = @binding.eval('[__FILE__, __LINE__]')
+      end
 
-      unless defined?(::SCRIPT_LINES__[file]) && lines = ::SCRIPT_LINES__[file]
+      if defined?(::SCRIPT_LINES__[file]) && lines = ::SCRIPT_LINES__[file]
+        code = ::SCRIPT_LINES__[file].join('')
+      else
         begin
-          lines = File.readlines(file)
+          code = File.read(file)
         rescue SystemCallError
           return
         end
       end
+
+      # NOT using #use_colorize? of IRB.conf[:MAIN_CONTEXT] because this method may be called before IRB::Irb#run
+      use_colorize = IRB.conf.fetch(:USE_COLORIZE, true)
+      if use_colorize
+        lines = Color.colorize_code(code).lines
+      else
+        lines = code.lines
+      end
       pos -= 1
 
       start_pos = [pos - 5, 0].max
       end_pos   = [pos + 5, lines.size - 1].min
 
-      fmt = " %2s %#{end_pos.to_s.length}d: %s"
+      if use_colorize
+        fmt = " %2s #{Color.colorize("%#{end_pos.to_s.length}d", [:BLUE, :BOLD])}: %s"
+      else
+        fmt = " %2s %#{end_pos.to_s.length}d: %s"
+      end
       body = (start_pos..end_pos).map do |current_pos|
         sprintf(fmt, pos == current_pos ? '=>' : '', current_pos + 1, lines[current_pos])
       end.join("")
-      "\nFrom: #{file} @ line #{pos + 1} :\n\n#{body}\n"
+      "\nFrom: #{file} @ line #{pos + 1} :\n\n#{body}#{Color.clear if use_colorize}\n"
     end
 
     def IRB.delete_caller

data/lib/irb/xmp.rb

@@ -10,7 +10,7 @@
 #
 #
 
-require "irb"
+require_relative "../irb"
 require_relative "frame"
 
 # An example printer for irb.