dietrb 0.2.1 → 0.3.0

data/Rakefile

@@ -12,7 +12,7 @@ end
 
 desc "Run dietrb with ruby19"
 task :run do
-  sh "ruby19 -Ilib ./bin/dietrb"
+  sh "ruby19 -Ilib ./bin/dietrb -r irb/ext/completion"
 end
 
 begin

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/bin/dietrb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'irb'
+
 unless ARGV.empty?
   require 'optparse'
   
@@ -9,6 +11,8 @@ unless ARGV.empty?
     opt.on("-r load-lib",     "Loads the given library (same as `ruby -r')") { |lib| require lib }
     opt.on("-d",              "Set $DEBUG to true (same as `ruby -d')") { $DEBUG = true }
     opt.on("-I path",         "Add path to $LOAD_PATH") { |path| $LOAD_PATH.unshift(path) }
+    opt.on("--simple-prompt", "Simple prompt mode") { IRB.formatter.prompt = :simple }
+    opt.on("--noprompt",      "No prompt mode") { IRB.formatter.prompt = nil }
     opt.on("-v", "--version", "Print the version of #{bin}") do
       puts File.read(File.expand_path('../../VERSION', __FILE__))
       exit
@@ -16,5 +20,17 @@ unless ARGV.empty?
   end.parse!(ARGV)
 end
 
-require 'irb'
-irb(self, TOPLEVEL_BINDING)
+IRB.formatter.filter_from_backtrace << /^#{__FILE__}/
+
+if ARGV.empty?
+  irb(self, TOPLEVEL_BINDING.dup)
+else
+  path = ARGV.shift
+  context = IRB::Context.new(self, TOPLEVEL_BINDING.dup)
+  File.open(path, 'r') do |file|
+    file.each_line do |line|
+      puts IRB.formatter.prompt(context) + line
+      context.process_line(line)
+    end
+  end
+end

data/dietrb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dietrb}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Duran"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-02-24}
   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}
@@ -30,9 +30,11 @@ Gem::Specification.new do |s|
      "lib/irb/context.rb",
      "lib/irb/ext/completion.rb",
      "lib/irb/ext/macruby.rb",
+     "lib/irb/formatter.rb",
      "lib/irb/source.rb",
      "spec/completion_spec.rb",
      "spec/context_spec.rb",
+     "spec/formatter_spec.rb",
      "spec/irb_spec.rb",
      "spec/source_spec.rb",
      "spec/spec_helper.rb"
@@ -46,6 +48,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/completion_spec.rb",
      "spec/context_spec.rb",
+     "spec/formatter_spec.rb",
      "spec/irb_spec.rb",
      "spec/source_spec.rb",
      "spec/spec_helper.rb"

data/lib/irb/context.rb

@@ -1,3 +1,4 @@
+require 'irb/formatter'
 require 'readline'
 
 module IRB
@@ -22,20 +23,23 @@ module IRB
       clear_buffer
     end
     
-    def __evaluate__(source)
-      eval(source, @binding)
+    def __evaluate__(source, file = __FILE__, line = __LINE__)
+      eval(source, @binding, file, line)
     end
     
     def evaluate(source)
-      result = __evaluate__("_ = (#{source})")
-      puts format_result(result)
+      result = __evaluate__("_ = (#{source})", '(irb)', @line - @source.buffer.size + 1)
+      puts formatter.result(result)
       result
     rescue Exception => e
-      puts format_exception(e)
+      puts formatter.exception(e)
     end
     
     def readline
-      Readline.readline(prompt, true)
+      Readline.readline(formatter.prompt(self), true)
+    rescue Interrupt
+      clear_buffer
+      ""
     end
     
     def run
@@ -64,7 +68,7 @@ module IRB
       return false if @source.to_s == "quit"
       
       if @source.syntax_error?
-        puts format_syntax_error(@source.syntax_error)
+        puts formatter.syntax_error(@line, @source.syntax_error)
         @source.pop
       elsif @source.code_block?
         evaluate(@source)
@@ -75,26 +79,12 @@ module IRB
       true
     end
     
-    PROMPT = "irb(%s):%03d:%d> "
-    
-    def prompt
-      PROMPT % [@object.inspect, @line, @source.level]
-    end
-    
-    def format_result(result)
-      "=> #{result.inspect}"
-    end
-    
-    def format_exception(e)
-      "#{e.class.name}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
-    end
+    private
     
-    def format_syntax_error(e)
-      "SyntaxError: compile error\n(irb):#{@line}: #{e}"
+    def formatter
+      IRB.formatter
     end
     
-    private
-    
     def clear_buffer
       @source = Source.new
     end

data/lib/irb/ext/completion.rb

@@ -7,6 +7,29 @@ module IRB
     VALUE  = 1
     CALLEE = 3
     
+    RESERVED_UPCASE_WORDS = %w{
+      BEGIN  END
+    }
+    
+    RESERVED_DOWNCASE_WORDS = %w{
+      alias  and
+      begin  break
+      case   class
+      def    defined do
+      else   elsif   end   ensure
+      false  for
+      if     in
+      module
+      next   nil     not
+      or
+      redo   rescue  retry return
+      self   super
+      then   true
+      undef  unless  until
+      when   while
+      yield
+    }
+    
     # Returns an array of possible completion results, with the current
     # IRB::Context.
     #
@@ -33,6 +56,10 @@ module IRB
       @context.object.methods.map(&:to_s)
     end
     
+    def instance_methods_of(klass)
+      evaluate(klass).instance_methods
+    end
+    
     # TODO: test and or fix the fact that we need to get constants from the
     # singleton class.
     def constants
@@ -54,18 +81,39 @@ module IRB
         
         # [:call, [:hash, nil], :".", [:@ident, x, …]]
         if root[TYPE] == :call
-          call     = true
-          filter   = root[CALLEE][VALUE]
-          receiver = source[0..-(filter.length + 2)]
-          root     = root[VALUE]
+          call  = true
+          stack = unwind_callstack(root)
+          # [[:var_ref, [:@const, "Klass", [1, 0]]], [:call, "new"]]
+          # [[:var_ref, [:@ident, "klass", [1, 0]]], [:call, "new"], [:call, "filter"]]
+          if stack[1][VALUE] == 'new'
+            klass    = stack[0][VALUE][VALUE]
+            filter   = stack[2][VALUE] if stack[2]
+            receiver = "#{klass}.new"
+            methods  = instance_methods_of(klass)
+          else
+            filter   = root[CALLEE][VALUE]
+            filter   = stack[1][VALUE]
+            receiver = source[0..-(filter.length + 2)]
+            root     = root[VALUE]
+          end
         end
         
         if call
-          format_methods(receiver, methods_of_object(root), filter)
+          format_methods(receiver, methods || methods_of_object(root), filter)
         else
           match_methods_vars_or_consts_in_scope(root)
-        end.sort
+        end.sort.uniq
+      end
+    end
+    
+    def unwind_callstack(root, stack = [])
+      if root[TYPE] == :call
+        stack.unshift [:call, root[CALLEE][VALUE]]
+        unwind_callstack(root[VALUE], stack)
+      else
+        stack.unshift root
       end
+      stack
     end
     
     def match_methods_vars_or_consts_in_scope(symbol)
@@ -73,7 +121,7 @@ module IRB
       filter = var[VALUE]
       case var[TYPE]
       when :@ident
-        local_variables + instance_methods
+        local_variables + instance_methods + RESERVED_DOWNCASE_WORDS
       when :@gvar
         global_variables.map(&:to_s)
       when :@const
@@ -81,7 +129,7 @@ module IRB
           filter = "::#{filter}"
           Object.constants.map { |c| "::#{c}" }
         else
-          constants
+          constants + RESERVED_UPCASE_WORDS
         end
       end.grep(/^#{Regexp.quote(filter)}/)
     end

data/lib/irb/formatter.rb

@@ -0,0 +1,49 @@
+module IRB
+  def self.formatter
+    @formatter ||= Formatter.new
+  end
+  
+  class Formatter
+    DEFAULT_PROMPT = "irb(%s):%03d:%d> "
+    SIMPLE_PROMPT  = ">> "
+    NO_PROMPT      = ""
+    SYNTAX_ERROR   = "SyntaxError: compile error\n(irb):%d: %s"
+    SOURCE_ROOT    = /^#{File.expand_path('../../../', __FILE__)}/
+    
+    attr_writer :prompt
+    attr_reader :filter_from_backtrace
+    
+    def initialize
+      @prompt = :default
+      @filter_from_backtrace = [SOURCE_ROOT]
+    end
+    
+    def prompt(context)
+      case @prompt
+      when :default then DEFAULT_PROMPT % [context.object.inspect, context.line, context.source.level]
+      when :simple  then SIMPLE_PROMPT
+      else
+        NO_PROMPT
+      end
+    end
+    
+    def result(object)
+      "=> #{object.inspect}"
+    end
+    
+    def syntax_error(line, message)
+      SYNTAX_ERROR % [line, message]
+    end
+    
+    def exception(exception)
+      backtrace = $DEBUG ? exception.backtrace : filter_backtrace(exception.backtrace)
+      "#{exception.class.name}: #{exception.message}\n\t#{backtrace.join("\n\t")}"
+    end
+    
+    def filter_backtrace(backtrace)
+      backtrace.reject do |line|
+        @filter_from_backtrace.any? { |pattern| pattern.match(line) }
+      end
+    end
+  end
+end

data/lib/irb/source.rb

@@ -10,8 +10,11 @@ module IRB
     
     # Adds a source line to the buffer and flushes the cached reflection.
     def <<(source)
-      @reflection = nil
-      @buffer << source.chomp
+      source = source.strip
+      unless source.empty?
+        @reflection = nil
+        @buffer << source
+      end
     end
     
     # Removes the last line from the buffer and flushes the cached reflection.
@@ -54,11 +57,11 @@ module IRB
       @reflection ||= Reflector.new(source)
     end
     
-    class Reflector < Ripper
+    class Reflector < Ripper::SexpBuilder
       def initialize(source)
         super
         @level = 0
-        parse
+        @code_block = !parse.nil?
       end
       
       # Returns the code block indentation level.
@@ -85,7 +88,7 @@ module IRB
       #
       #   def foo; p :ok; end
       def code_block?
-        @level == 0
+        @code_block
       end
       
       # Returns whether or not the source contains a syntax error. However, it
@@ -132,6 +135,11 @@ module IRB
         super
       end
       
+      def on_embexpr_beg(token) #:nodoc:
+        @level += 1
+        super
+      end
+      
       def on_lbrace(token) #:nodoc:
         @level += 1
         super

data/spec/completion_spec.rb

@@ -171,6 +171,15 @@ describe "IRB::Completion" do
           complete('-100_000_000_000_000_000_000.0.').should == imethods(Float, '-100_000_000_000_000_000_000.0')
         end
       end
+      
+      it "returns *all* public instance methods of the class (the receiver) that ::new is called on" do
+        complete("Playground.new.").should == imethods(Playground, 'Playground.new')
+        complete("Playground.new.a_local_m").should == %w{ Playground.new.a_local_method }
+        
+        @context.__evaluate__("klass = Playground")
+        complete("klass.new.").should == imethods(Playground, 'klass.new')
+        complete("klass.new.a_local_m").should == %w{ klass.new.a_local_method }
+      end
     end
     
     describe "and the source does *not* end with a period," do
@@ -218,4 +227,11 @@ describe "IRB::Completion" do
       complete("::CompletionSt").should == %w{ ::CompletionStub }
     end
   end
+  
+  it "completes reserved words as variables or constants" do
+    (IRB::Completion::RESERVED_DOWNCASE_WORDS +
+      IRB::Completion::RESERVED_UPCASE_WORDS).each do |word|
+      complete(word[0..-2]).should.include word
+    end
+  end
 end

data/spec/context_spec.rb

@@ -1,18 +1,21 @@
 require File.expand_path('../spec_helper', __FILE__)
 require 'tempfile'
 
-class << Readline
-  attr_reader :received
-  
-  def stub_input(*input)
-    @input = input
-  end
-  
-  def readline(prompt, history)
-    @received = [prompt, history]
-    @input.shift
+def stub_Readline
+  class << Readline
+    attr_reader :received
+    
+    def stub_input(*input)
+      @input = input
+    end
+    
+    def readline(prompt, history)
+      @received = [prompt, history]
+      @input.shift
+    end
   end
 end
+stub_Readline
 
 main = self
 
@@ -45,26 +48,6 @@ describe "IRB::Context" do
     lambda { eval("x", @context.binding) }.should.raise NameError
   end
   
-  it "returns a prompt string, displaying line number and code indentation level" do
-    @context.prompt.should == "irb(main):001:0> "
-    @context.instance_variable_set(:@line, 23)
-    @context.prompt.should == "irb(main):023:0> "
-    @context.source << "def foo"
-    @context.prompt.should == "irb(main):023:1> "
-  end
-  
-  it "describes the context's object in the prompt" do
-    @context.prompt.should == "irb(main):001:0> "
-    o = Object.new
-    IRB::Context.new(o).prompt.should == "irb(#{o.inspect}):001:0> "
-  end
-  
-  it "returns a formatted exception message" do
-    begin; DoesNotExist; rescue NameError => e; exception = e; end
-    @context.format_exception(exception).should ==
-      "NameError: uninitialized constant Bacon::Context::DoesNotExist\n\t#{exception.backtrace.join("\n\t")}"
-  end
-  
   it "makes itself the current running context during the runloop and resigns once it's done" do
     IRB::Context.current.should == nil
     
@@ -80,6 +63,7 @@ describe "IRB::Context, when evaluating source" do
   before do
     @context = IRB::Context.new(main)
     def @context.puts(string); @printed = string; end
+    def @context.printed;      @printed;          end
   end
   
   it "evaluates code with the object's binding" do
@@ -113,8 +97,16 @@ describe "IRB::Context, when evaluating source" do
   
   it "prints the exception that occurs" do
     @context.evaluate("DoesNotExist")
-    printed = @context.instance_variable_get(:@printed)
-    printed.should.match /^NameError:.+DoesNotExist/
+    @context.printed.should.match /^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.match /\(irb\):1:in/
+    @context.process_line("class A")
+    @context.process_line("DoesNotExist")
+    @context.process_line("end")
+    @context.printed.should.match /\(irb\):3:in.+\(irb\):2:in/m
   end
 end
 
@@ -142,6 +134,24 @@ describe "IRB::Context, when receiving input" do
     @context.source.to_s.should == "def foo\np :ok"
   end
   
+  it "clears the source buffer when an Interrupt signal is received" do
+    begin
+      @context.process_line("def foo")
+      
+      def Readline.readline(*args)
+        unless @raised
+          @raised = true
+          raise Interrupt
+        end
+      end
+      
+      lambda { @context.run }.should.not.raise Interrupt
+      @context.source.to_s.should == ""
+    ensure
+      stub_Readline
+    end
+  end
+  
   it "increases the current line number" do
     @context.line.should == 1
     @context.process_line("def foo")

data/spec/formatter_spec.rb

@@ -0,0 +1,61 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+main = self
+
+describe "IRB::Formatter" do
+  before do
+    @formatter = IRB::Formatter.new
+    @context = IRB::Context.new(main)
+  end
+  
+  it "returns a prompt string, displaying line number and code indentation level" do
+    @formatter.prompt(@context).should == "irb(main):001:0> "
+    @context.instance_variable_set(:@line, 23)
+    @formatter.prompt(@context).should == "irb(main):023:0> "
+    @context.source << "def foo"
+    @formatter.prompt(@context).should == "irb(main):023:1> "
+  end
+  
+  it "describes the context's object in the prompt" do
+    o = Object.new
+    @formatter.prompt(IRB::Context.new(o)).should == "irb(#{o.inspect}):001:0> "
+  end
+  
+  it "returns a very simple prompt if specified" do
+    @formatter.prompt = :simple
+    @formatter.prompt(@context).should == ">> "
+  end
+  
+  it "returns no prompt if specified" do
+    @formatter.prompt = nil
+    @formatter.prompt(@context).should == ""
+  end
+  
+  it "returns a formatted exception message, with the lines, regarding dietrb, filtered out of the backtrace" do
+    begin; @context.__evaluate__('DoesNotExist'); rescue NameError => e; exception = e; end
+    backtrace = exception.backtrace.reject { |f| f =~ /#{ROOT}/ }
+    @formatter.exception(exception).should ==
+      "NameError: uninitialized constant IRB::Context::DoesNotExist\n\t#{backtrace.join("\n\t")}"
+  end
+  
+  it "does not filter the backtrace if $DEBUG is true" do
+    begin
+      before, $DEBUG = $DEBUG, true
+      
+      begin; @context.__evaluate__('DoesNotExist'); rescue NameError => e; exception = e; end
+      @formatter.exception(exception).should ==
+        "NameError: uninitialized constant IRB::Context::DoesNotExist\n\t#{exception.backtrace.join("\n\t")}"
+    ensure
+      $DEBUG = before
+    end
+  end
+  
+  it "prints the result" do
+    @formatter.result(:foo => :foo).should == "=> {:foo=>:foo}"
+  end
+  
+  it "prints that a syntax error occurred on the last line and reset the buffer to the previous line" do
+    @formatter.syntax_error(2, "syntax error, unexpected '}'").should ==
+      "SyntaxError: compile error\n(irb):2: syntax error, unexpected '}'"
+  end
+end

data/spec/source_spec.rb

@@ -19,6 +19,12 @@ describe "IRB::Source" do
     @source.buffer.should == %w{ foo bar }
   end
   
+  it "ignores empty strings" do
+    @source << ""
+    @source << " \n"
+    @source.buffer.should == []
+  end
+  
   it "removes the last line from the buffer" do
     @source << "foo\n"
     @source << "bar\r\n"
@@ -120,6 +126,9 @@ describe "IRB::Source::Reflector" do
     reflect("def foo").should.not.be.code_block
     reflect("def foo; p :ok").should.not.be.code_block
     reflect("def foo; p :ok; end").should.be.code_block
+    
+    reflect("if true").should.not.be.code_block
+    reflect("p :ok if true").should.be.code_block
   end
   
   it "returns whether or not the source contains a syntax error, except a code block not ending" do
@@ -171,6 +180,7 @@ describe "IRB::Source::Reflector" do
     [
       ["lambda { |x|", "}"],
       ["{", "}"],
+      ['"#{', '}"'],
       ["[", "]"]
     ].each do |open, close|
       reflect(open).level.should == 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dietrb
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Eloy Duran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 +01:00
+date: 2010-02-24 00:00:00 +01:00
 default_executable: dietrb
 dependencies: []
 
@@ -34,9 +34,11 @@ files:
 - lib/irb/context.rb
 - lib/irb/ext/completion.rb
 - lib/irb/ext/macruby.rb
+- lib/irb/formatter.rb
 - lib/irb/source.rb
 - spec/completion_spec.rb
 - spec/context_spec.rb
+- spec/formatter_spec.rb
 - spec/irb_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb
@@ -71,6 +73,7 @@ summary: IRB on a diet, for MacRuby / Ruby 1.9
 test_files: 
 - spec/completion_spec.rb
 - spec/context_spec.rb
+- spec/formatter_spec.rb
 - spec/irb_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb