dietrb 0.5.1 → 0.5.2

data/README.rdoc

@@ -49,16 +49,8 @@ The original IRB will still work when you uninstall the DietRB gem, though.
   
   * Kernel#clear_history! will clear the history and the history file.
 
-* irb/ext/macruby.rb, adds support for Cocoa development by starting an
-  NSRunloop. Loaded by default on MacRuby.
-
 == Differences
 
-* This IRB version specifically targets MacRuby, for now, and allows Cocoa
-  development to be done from the command-line. Dietrb will automatically
-  override the normal runloop to be ran in a thread and start a NSRunLoop on
-  the main thread.
-
 * Dietrb will try to warn about syntax errors as soon as a line is entered and
   only reset the buffer to the previous line. This means that you don't need to
   loose any previous work:
@@ -112,29 +104,3 @@ Normal usage:
   irb(#<#<Class:…>::A:…>):002:0> quit
   => nil
   irb(main):007:0> quit
-
-Or on MacRuby, try:
-
-  irb(main):001:0> win = NSWindow.alloc.initWithContentRect([200, 300, 250, 100],
-  irb(main):002:0>                                styleMask: NSTitledWindowMask|NSResizableWindowMask,
-  irb(main):003:0>                                  backing: NSBackingStoreBuffered,
-  irb(main):004:0>                                    defer: false)
-  => #<NSWindow:0x20023eb00>
-  irb(main):005:0> win.orderFrontRegardless
-  => #<NSWindow:0x20023eb00>
-  irb(main):006:0> win.title = 'Hello World'
-  => "Hello World"
-  irb(main):007:0> bye = NSButton.alloc.initWithFrame([10, 10, 80, 80])
-  => #<NSButton:0x20027f820>
-  irb(main):008:0> win.contentView.addSubview(bye)
-  => #<NSView:0x200210320>
-  irb(main):009:0> bye.bezelStyle = NSThickerSquareBezelStyle
-  => 4
-  irb(main):010:0> bye.title = 'Goodbye!'
-  => "Goodbye!"
-  irb(main):011:0> bye.target = NSApp
-  => #<NSApplication:0x200257fe0>
-  irb(main):012:0> bye.action = 'terminate:'
-  => "terminate:"
-  irb(main):013:0> bye.sound = NSSound.soundNamed('Basso')
-  => #<NSSound:0x200248b20>

data/Rakefile

@@ -53,20 +53,20 @@ namespace :macruby do
   end
 end
 
-begin
-  require 'rubygems'
-  require 'jeweler'
-  require File.expand_path('../lib/irb/version', __FILE__)
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "dietrb"
-    gemspec.version = IRB::VERSION::STRING
-    gemspec.summary = gemspec.description = "IRB on a diet, for MacRuby / Ruby 1.9"
-    gemspec.email = "eloy.de.enige@gmail.com"
-    gemspec.homepage = "http://github.com/alloy/dietrb"
-    gemspec.authors = ["Eloy Duran"]
-    
-    gemspec.required_ruby_version = ::Gem::Requirement.new("~> 1.9")
-    gemspec.files.reject! { |file| file =~ /^(extensions|\.gitignore)/ }
-  end
-rescue LoadError
-end
+# begin
+#   require 'rubygems'
+#   require 'jeweler'
+#   require File.expand_path('../lib/irb/version', __FILE__)
+#   Jeweler::Tasks.new do |gemspec|
+#     gemspec.name = "dietrb"
+#     gemspec.version = IRB::VERSION::STRING
+#     gemspec.summary = gemspec.description = "IRB on a diet, for MacRuby / Ruby 1.9"
+#     gemspec.email = "eloy.de.enige@gmail.com"
+#     gemspec.homepage = "http://github.com/alloy/dietrb"
+#     gemspec.authors = ["Eloy Duran"]
+#     
+#     gemspec.required_ruby_version = ::Gem::Requirement.new("~> 1.9")
+#     gemspec.files.reject! { |file| file =~ /^(extensions|\.gitignore)/ }
+#   end
+# rescue LoadError
+# end

data/TODO

@@ -1,6 +1,8 @@
-* Add specs for irb/driver/socket, and possibly for bin/dietrb
+* Complete file paths in strings (for require etc).
+* Write docs for using a as library. Probably right after creating a Cocoa client.
+* Write a not useless README.
+* Add specs for irb/driver/socket, and possibly for bin/dietrb.
 * Configurable history file? (:HISTORY_FILE) Configurable number of saved history lines? (:SAVE_HISTORY)
-* Make sure the following formatters work: hirb, awesome_print, and looksee
+* Make sure the following formatters work: hirb, and looksee
 * Make sure the majority of the utils in utility_belt work
 * Possibly add copy-paste support as an ext
-* Decide whether or not we need more control for colorizing which could be done with Ripper::SexpBuilder

data/bin/dietrb

@@ -39,18 +39,25 @@ module IRB
     IRB.formatter.filter_from_backtrace << /^#{__FILE__}/
     
     if ARGV.empty?
-      driver ||= begin
-        require 'readline'
-        'readline'
-      rescue LoadError
-        'tty'
+      if driver == 'socket'
+        require "irb/driver/socket"
+        IRB::Driver.redirect_output! do
+          irb(*IRB_CONTEXT_TOPLEVEL_ARGS)
+        end
+      else
+        driver ||= begin
+          require 'readline'
+          'readline'
+        rescue LoadError
+          'tty'
+        end
+        require "irb/driver/#{driver}"
+        irb(*IRB_CONTEXT_TOPLEVEL_ARGS)
       end
-      require "irb/driver/#{driver}"
-      irb(*IRB_CONTEXT_TOPLEVEL_ARGS)
     else
       path = ARGV.shift
       context = IRB::Context.new(*IRB_CONTEXT_TOPLEVEL_ARGS)
       File.open(path, 'r') { |f| f.each_line { |line| context.input_line(line) } }
     end
   end
-end
+end

data/dietrb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dietrb}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Duran"]
-  s.date = %q{2010-07-24}
+  s.date = %q{2010-10-28}
   s.default_executable = %q{dietrb}
   s.description = %q{IRB on a diet, for MacRuby / Ruby 1.9}
   s.email = %q{eloy.de.enige@gmail.com}
@@ -37,7 +37,6 @@ Gem::Specification.new do |s|
      "lib/irb/ext/colorize.rb",
      "lib/irb/ext/completion.rb",
      "lib/irb/ext/history.rb",
-     "lib/irb/ext/macruby.rb",
      "lib/irb/formatter.rb",
      "lib/irb/source.rb",
      "lib/irb/version.rb",
@@ -57,7 +56,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new("~> 1.9")
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{IRB on a diet, for MacRuby / Ruby 1.9}
   s.test_files = [
     "spec/context_spec.rb",
@@ -77,7 +76,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/irb.rb

@@ -5,15 +5,12 @@
 # Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
 
 require 'irb/context'
+require 'irb/driver'
 require 'irb/source'
 require 'irb/version'
 
 require 'irb/deprecated'
 
-# if !ENV['SPECCING'] && defined?(RUBY_ENGINE) && RUBY_ENGINE == "macruby"
-#   require 'irb/ext/macruby'
-# end
-
 module IRB
   class << self
     # This is just here for so the ruby 1.9 IRB will seemingly work, but actually
@@ -26,4 +23,4 @@ module IRB
     end
     alias_method :setup, :start
   end
-end
+end

data/lib/irb/context.rb

@@ -5,6 +5,7 @@
 # Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
 
 require 'irb/formatter'
+require 'irb/source'
 
 module IRB
   class Context
@@ -26,17 +27,24 @@ module IRB
     def __evaluate__(source, file = __FILE__, line = __LINE__)
       eval(source, @binding, file, line)
     end
+
+    def to_s
+      object_description = "`#{object.inspect}'"
+      object_description = "of class `#{object.class.name}'" if object_description.length > 32
+      "#<IRB::Context for object #{object_description}>"
+    end
+    alias_method :inspect, :to_s
     
     def evaluate(source)
       result = __evaluate__(source.to_s, '(irb)', @line - @source.buffer.size + 1)
       unless result == IGNORE_RESULT
         store_result(result)
-        puts(formatter.result(result))
+        output(formatter.result(result))
         result
       end
     rescue Exception => e
       store_exception(e)
-      puts(formatter.exception(e))
+      output(formatter.exception(e))
     end
     
     # Returns whether or not the user wants to continue the current runloop.
@@ -56,7 +64,7 @@ module IRB
       return false if @source.terminate?
       
       if @source.syntax_error?
-        puts(formatter.syntax_error(@line, @source.syntax_error))
+        output(formatter.syntax_error(@line, @source.syntax_error))
         @source.pop
       elsif @source.code_block?
         evaluate(@source)
@@ -67,12 +75,22 @@ module IRB
       true
     end
     
+    # Output is directed to the IRB::Driver.current driver’s output if a
+    # current driver is available. Otherwise it’s simply printed to $stdout.
+    def output(string)
+      if driver = IRB::Driver.current
+        driver.output.puts(string)
+      else
+        puts(string)
+      end
+    end
+    
     def prompt
       formatter.prompt(self)
     end
     
     def input_line(line)
-      puts(formatter.prompt(self) + line)
+      output(formatter.prompt(self) + line)
       process_line(line)
     end
     
@@ -92,4 +110,4 @@ module IRB
       @exception_assigner.call(exception)
     end
   end
-end
+end

data/lib/irb/driver.rb

@@ -18,6 +18,13 @@ module IRB
           end
         end
       end
+
+      def redirect_output!(redirector = OutputRedirector.new)
+        before, $stdout = $stdout, redirector unless $stdout.is_a?(redirector.class)
+        yield
+      ensure
+        $stdout = before if before
+      end
     end
     
     class OutputRedirector
@@ -58,4 +65,4 @@ module IRB
       end
     end
   end
-end
+end

data/lib/irb/driver/tty.rb

@@ -34,13 +34,11 @@ module IRB
       # subclass thereof.
       def run(context)
         @context_stack << context
-        before, $stdout = $stdout, OutputRedirector.new unless $stdout.is_a?(OutputRedirector)
         while line = consume
           break unless context.process_line(line)
         end
       ensure
         @context_stack.pop
-        $stdout = before if before
       end
     end
   end

data/lib/irb/ext/completion.rb

@@ -59,6 +59,14 @@ module IRB
       evaluate('local_variables').map(&:to_s)
     end
     
+    def instance_variables
+      context.object.instance_variables.map(&:to_s)
+    end
+    
+    def global_variables
+      super.map(&:to_s)
+    end
+    
     def instance_methods
       context.object.methods.map(&:to_s)
     end
@@ -81,11 +89,10 @@ module IRB
       call = (source[-1,1] == '.')
       receiver = source = source[0..-2] if call
       
-      if sexp = Ripper::SexpBuilder.new(source).parse
-        # [:program, [:stmts_add, [:stmts_new], [x, …]]]
-        #                                        ^
-        root = sexp[1][2]
-        
+      # root node:
+      # [:program, [:stmts_add, [:stmts_new], [x, …]]]
+      #                                        ^
+      if (sexp = Ripper::SexpBuilder.new(source).parse) && root = sexp[1][2]
         # [:call, [:hash, nil], :".", [:@ident, x, …]]
         if root[TYPE] == :call
           call  = true
@@ -105,11 +112,14 @@ module IRB
           end
         end
         
-        if call
-          format_methods(receiver, methods || methods_of_object(root), filter)
-        else
-          match_methods_vars_or_consts_in_scope(root)
-        end.sort.uniq
+        result = if call
+                   if m = (methods || methods_of_object(root))
+                     format_methods(receiver, m, filter)
+                   end
+                 else
+                   match_methods_vars_or_consts_in_scope(root)
+                 end
+        result.sort.uniq if result
       end
     end
     
@@ -126,11 +136,13 @@ module IRB
     def match_methods_vars_or_consts_in_scope(symbol)
       var    = symbol[VALUE]
       filter = var[VALUE]
-      case var[TYPE]
+      result = case var[TYPE]
       when :@ident
         local_variables + instance_methods + RESERVED_DOWNCASE_WORDS
+      when :@ivar
+        instance_variables
       when :@gvar
-        global_variables.map(&:to_s)
+        global_variables
       when :@const
         if symbol[TYPE] == :top_const_ref
           filter = "::#{filter}"
@@ -138,7 +150,8 @@ module IRB
         else
           constants + RESERVED_UPCASE_WORDS
         end
-      end.grep(/^#{Regexp.quote(filter)}/)
+      end
+      (result && filter) ? result.grep(/^#{Regexp.quote(filter)}/) : result
     end
     
     def format_methods(receiver, methods, filter)
@@ -174,8 +187,10 @@ module IRB
         case type
         when :@ident
           evaluate(name).methods if local_variables.include?(name)
+        when :@ivar
+          evaluate(name).methods if instance_variables.include?(name)
         when :@gvar
-          eval(name).methods if global_variables.include?(name.to_sym)
+          eval(name).methods if global_variables.include?(name)
         when :@const
           evaluate(name).methods if constants.include?(name)
         end

data/lib/irb/ext/history.rb

@@ -89,4 +89,4 @@ end
 
 IRB::History.file = File.expand_path("~/.irb_history")
 IRB::History.max_entries_in_overview = 50
-IRB::History.setup
+IRB::History.setup if defined?(Readline)

data/lib/irb/source.rb

@@ -72,7 +72,7 @@ module IRB
       def initialize(source)
         super
         @level = 0
-        @code_block = !parse.nil?
+        @code_block = !parse.nil? && !@in_string && !@in_regexp && !@in_array
       end
       
       # Returns the code block indentation level.
@@ -183,6 +183,66 @@ module IRB
         @level -= 1
         super
       end
+
+      def on_tstring_beg(token)
+        @in_string = token
+        @level += 1
+        super
+      end
+
+      def on_tstring_end(token)
+        if @in_string && tokens_match?(@in_string, token)
+          @in_string = nil
+          @level -= 1
+        end
+        super
+      end
+
+      def on_qwords_beg(token)
+        @in_array = token.strip
+        @level += 1
+        super
+      end
+      alias_method :on_words_beg, :on_qwords_beg
+
+      def on_words_sep(token)
+        if tokens_match?(@in_array, token)
+          @in_array = false
+          @level -= 1
+        end
+        super
+      end
+
+      def on_regexp_beg(token)
+        @in_regexp = token
+        @level += 1
+        super
+      end
+
+      def on_regexp_end(token)
+        token_without_regexp_options = token[0,1]
+        if tokens_match?(@in_regexp, token_without_regexp_options)
+          @in_regexp = false
+          @level -= 1
+        end
+        super
+      end
+
+      def tokens_match?(open_token, close_token)
+        last_char_open_token = open_token[-1, 1]
+        last_char_close_token = close_token[-1, 1]
+        if last_char_open_token == last_char_close_token
+          true
+        else
+          case last_char_open_token
+          when '{' then last_char_close_token == '}'
+          when '(' then last_char_close_token == ')'
+          when '[' then last_char_close_token == ']'
+          else
+            false
+          end
+        end
+      end
     end
   end
 end

data/lib/irb/version.rb

@@ -9,7 +9,7 @@ module IRB
     NAME  = 'DietRB'
     MAJOR = 0
     MINOR = 5
-    TINY  = 1
+    TINY  = 2
     
     STRING = [MAJOR, MINOR, TINY].join('.')
     DESCRIPTION = "#{NAME} (#{STRING})"

data/spec/context_spec.rb

@@ -1,16 +1,11 @@
 require File.expand_path('../spec_helper', __FILE__)
 require 'tempfile'
 
-class TestProcessor
-  def input(s)
-    s * 2
-  end
-end
-
 main = self
 
 describe "IRB::Context" do
   before do
+    @output = setup_current_driver.output
     @context = IRB::Context.new(main)
     @context.extend(OutputStubMixin)
   end
@@ -38,12 +33,25 @@ describe "IRB::Context" do
   it "does not use the same binding copy of the top level object" do
     lambda { eval("x", @context.binding) }.should raise_error(NameError)
   end
+  
+  it "prints to the output object of the current driver" do
+    @context.output("croque monsieur")
+    @output.printed.should == "croque monsieur\n"
+    @context.printed.should == ""
+  end
+
+  it "prints as normal when no current driver is available" do
+    IRB::Driver.current = nil
+    @context.output("croque monsieur")
+    @output.printed.should == ""
+    @context.printed.should == "croque monsieur\n"
+  end
 end
 
 describe "IRB::Context, when evaluating source" do
   before do
+    @output = setup_current_driver.output
     @context = IRB::Context.new(main)
-    @context.extend(OutputStubMixin)
     IRB.formatter = IRB::Formatter.new
   end
   
@@ -53,7 +61,7 @@ describe "IRB::Context, when evaluating source" do
   
   it "prints the result" do
     @context.evaluate("Hash[:foo, :foo]")
-    @context.printed.should == "=> {:foo=>:foo}\n"
+    @output.printed.should == "=> {:foo=>:foo}\n"
   end
   
   it "assigns the result to the local variable `_'" do
@@ -84,31 +92,31 @@ describe "IRB::Context, when evaluating source" do
   
   it "prints the exception that occurs" do
     @context.evaluate("DoesNotExist")
-    @context.printed.should =~ /^NameError:.+DoesNotExist/
+    @output.printed.should =~ /^NameError:.+DoesNotExist/
   end
   
   it "uses the line number of the *first* line in the buffer, for the line parameter of eval" do
     @context.process_line("DoesNotExist")
-    @context.printed.should =~ /\(irb\):1:in/
+    @output.printed.should =~ /\(irb\):1:in/
     @context.process_line("class A")
     @context.process_line("DoesNotExist")
     @context.process_line("end")
-    @context.printed.should =~ /\(irb\):3:in.+\(irb\):2:in/m
+    @output.printed.should =~ /\(irb\):3:in.+\(irb\):2:in/m
   end
   
   it "ignores the result if it's IRB::Context::IGNORE_RESULT" do
     @context.evaluate(":bananas")
     @context.evaluate("IRB::Context::IGNORE_RESULT").should == nil
-    @context.printed.should == "=> :bananas\n"
+    @output.printed.should == "=> :bananas\n"
     @context.evaluate("_").should == :bananas
   end
 end
 
 describe "IRB::Context, when receiving input" do
   before do
+    @output = setup_current_driver.output
     @context = IRB::Context.new(main)
     @context.extend(InputStubMixin)
-    @context.extend(OutputStubMixin)
   end
   
   it "adds the received code to the source buffer" do
@@ -147,7 +155,7 @@ describe "IRB::Context, when receiving input" do
     @context.process_line("  };")
     
     @context.source.to_s.should == "def foo"
-    @context.printed.should == "SyntaxError: compile error\n(irb):2: syntax error, unexpected '}'\n"
+    @output.printed.should == "SyntaxError: compile error\n(irb):2: syntax error, unexpected '}'\n"
   end
   
   it "returns whether or not the runloop should continue, but only if the level is 0" do
@@ -161,6 +169,6 @@ describe "IRB::Context, when receiving input" do
   it "inputs a line to be processed" do
     expected = "#{@context.formatter.prompt(@context)}2 * 21\n=> 42\n"
     @context.input_line("2 * 21")
-    @context.printed.should == expected
+    @output.printed.should == expected
   end
 end

data/spec/ext/completion_spec.rb

@@ -58,6 +58,11 @@ describe "IRB::Completion" do
           complete('foo.').should include('foo.singleton_method')
         end
         
+        it "matches as an instance variable" do
+          @context.__evaluate__('@an_instance_variable = ::CompletionStub.new')
+          complete('@an_instance_variable.').should == imethods(::CompletionStub, '@an_instance_variable')
+        end
+        
         it "matches as a global variable" do
           complete('$a_completion_stub.').should == imethods(::CompletionStub, '$a_completion_stub')
         end
@@ -193,9 +198,10 @@ describe "IRB::Completion" do
       end
       
       it "filters the methods, of the variable receiver, by the given method name" do
-        @context.__evaluate__('foo = ::CompletionStub.new')
+        @context.__evaluate__('foo = @an_instance_variable = ::CompletionStub.new')
         complete('foo.an_im').should == %w{ foo.an_imethod }
         complete('$a_completion_stub.an_im').should == %w{ $a_completion_stub.an_imethod }
+        complete('@an_instance_variable.an_im').should == %w{ @an_instance_variable.an_imethod }
         # TODO: fix
         # complete('CompletionStub.a_sing').should == %w{ CompletionStub.a_singleton_method }
       end
@@ -204,7 +210,7 @@ describe "IRB::Completion" do
   
   describe "when *not* doing a method call on an explicit receiver" do
     before do
-      @context.__evaluate__("a_local_variable = :ok")
+      @context.__evaluate__("a_local_variable = @an_instance_variable = :ok")
     end
     
     it "matches local variables" do
@@ -219,6 +225,10 @@ describe "IRB::Completion" do
       complete("a_loc").should == %w{ a_local_method a_local_variable }
     end
     
+    it "matches instance variables" do
+      complete("@an_inst").should == %w{ @an_instance_variable }
+    end
+    
     it "matches global variables" do
       complete("$a_completion_s").should == %w{ $a_completion_stub }
     end
@@ -238,4 +248,9 @@ describe "IRB::Completion" do
       complete(word[0..-2]).should include(word)
     end
   end
-end
+
+  it "does not crash when trying to complete garbage" do
+    complete("/").should == nil
+    complete("./Rake").should == nil
+  end
+end

data/spec/formatter_spec.rb

@@ -69,7 +69,7 @@ describe "IRB::Formatter" do
     def object.inspect; @inspected = true; "Never called!"; end
     def object.__id__; 2158110700; end
     
-    @formatter.result(object).should == "=> #<Object:0x101444fd8>"
+    @formatter.result(object).should == "=> #<#{object.class.name}:0x101444fd8>"
     object.instance_variable_get(:@inspected).should_not == true
   end
   

data/spec/source_spec.rb

@@ -140,11 +140,14 @@ describe "IRB::Source::Reflector" do
   it "returns whether or not the source contains a syntax error, except a code block not ending" do
     reflect("def;").syntax_error?.should == true
     reflect("def;").syntax_error?.should == true
+    reflect("{ [ } ]").syntax_error?.should == true
     reflect("def foo").syntax_error?.should == false
     reflect("class A; }").syntax_error?.should == true
     reflect("class A; {" ).syntax_error?.should == false
+    reflect("class A; def {").syntax_error?.should == true
     reflect("class A def foo").syntax_error?.should == true
     reflect("class A; def foo" ).syntax_error?.should == false
+    reflect("def foo; {; end; }").syntax_error?.should == true
   end
   
   it "returns the actual syntax error message if one occurs" do
@@ -185,12 +188,72 @@ describe "IRB::Source::Reflector" do
   it "correctly increases and decreases the code block indentation level for literals" do
     [
       ["lambda { |x|", "}"],
-      ["{", "}"],
-      ['"#{', '}"'],
-      ["[", "]"]
+      ["{ :foo => ", " :bar }"],
+      ["[ 1", ", 2 ]"],
+
+      ["'", "'"],
+      ["' ", " '"],
+      ["'foo ", " bar'"],
+      ["' foo ", " bar '"],
+
+      ['"', '"'],
+      ['" ', ' "'],
+      ['"foo ', ' bar"'],
+      ['" foo ', ' bar "'],
+
+      ["%{", "}"],
+      ["%{ ", " }"],
+      ["%{foo ", " bar}"],
+      ["%{ foo ", " bar }"],
+      ["%(foo ", " bar)"],
+      ["%( foo ", " bar )"],
+      ["%[ foo ", " bar ]"],
+      ["%[foo ", " bar]"],
+
+      #["%w{ ", " }"], fails on 1.9
+      ["%w{foo ", " bar}"],
+      ["%w{ foo ", " bar }"],
+      ["%w(foo ", " bar)"],
+      ["%w( foo ", " bar )"],
+      ["%w[foo ", " bar]"],
+      ["%w[ foo ", " bar ]"],
+
+      ["%W{foo ", " bar}"],
+      ["%W{ foo ", " bar }"],
+      ["%W(foo ", " bar)"],
+      ["%W( foo ", " bar )"],
+      ["%W[foo ", " bar]"],
+      ["%W[ foo ", " bar ]"],
+
+      ["%r{foo ", " bar}"],
+      ["%r{ foo ", " bar }"],
+      ["%r{ foo ", " bar}i"],
+      ["%r(foo ", " bar)"],
+      ["%r( foo ", " bar )"],
+      ["%r( foo ", " bar)i"],
+      ["%r[foo ", " bar]"],
+      ["%r[ foo ", " bar ]"],
+      ["%r[ foo ", " bar]i"],
+
+      ["/foo ", " bar/"],
+      ["/ foo ", " bar /"],
+      ["/ foo ", " bar/iu"], # macruby ticket 965
     ].each do |open, close|
       reflect(open).level.should == 1
+      reflect(open).code_block?.should == false
       reflect("#{open}\n#{close}").level.should == 0
+      reflect("#{open}\n#{close}").code_block?.should == true
+    end
+  end
+
+  it "handles cases that contain backspaces" do
+    [
+      ["%{", "\b"],
+      ["%w{", "\b"],
+      ["%r{", "\b"],
+    ].each do |open, close|
+      reflect("#{open}\n#{close}").level.should == 1
+      reflect("#{open}\n#{close}").code_block?.should == false
     end
   end
 end

data/spec/spec_helper.rb

@@ -72,4 +72,14 @@ class StubDriver
   def output
     @output || $stdout
   end
+
+  def printed
+    @output.printed
+  end
+end
+
+def setup_current_driver
+  driver = StubDriver.new
+  driver.output = OutputStub.new
+  IRB::Driver.current = driver
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dietrb
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Eloy Duran
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-24 00:00:00 +02:00
+date: 2010-10-28 00:00:00 +02:00
 default_executable: dietrb
 dependencies: []
 
@@ -41,7 +47,6 @@ files:
 - lib/irb/ext/colorize.rb
 - lib/irb/ext/completion.rb
 - lib/irb/ext/history.rb
-- lib/irb/ext/macruby.rb
 - lib/irb/formatter.rb
 - lib/irb/source.rb
 - lib/irb/version.rb
@@ -66,21 +71,28 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ~>
     - !ruby/object:Gem::Version 
+      hash: 29
+      segments: 
+      - 1
+      - 9
       version: "1.9"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: IRB on a diet, for MacRuby / Ruby 1.9

data/lib/irb/ext/macruby.rb

@@ -1,25 +0,0 @@
-# MacRuby implementation of IRB.
-#
-# This file is covered by the Ruby license. See COPYING for more details.
-# 
-# Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
-
-framework 'AppKit'
-
-module IRB
-  class Context
-    alias_method :_run, :run
-    
-    def run
-      if NSApplication.sharedApplication.running?
-        _run
-      else
-        Thread.new do
-          _run
-          NSApplication.sharedApplication.terminate(self)
-        end
-        NSApplication.sharedApplication.run
-      end
-    end
-  end
-end