dietrb 0.4.7 → 0.5.0

data/LICENSE

@@ -1,10 +1,16 @@
 Copyright (c) <2010> Eloy Duran, <eloy.de.enige@gmail.com>
 
-Portions Copyright (c) 2006-2010 Ben Bleything <ben@bleything.net> (history utils)
-Portions Copyright (c) 2006-2010 Paul Duncan <pabs@pablotron.org> (Wirble)
-Portions Copyright (c) 2009-2010 Jens Wille <jens.wille@gmail.com> (Wirble)
-Portions Copyright (c) 2006-2010 Giles Bowkett (light background color scheme)
-Portions Copyright (c) 2006-2010 Revieworld Ltd. <http://github.com/floehopper/mocha> (class/address object inspect)
+Portions Copyright (c):
+* 2006-2010 Ben Bleything <ben@bleything.net> (history utils)
+* 2006-2010 Paul Duncan <pabs@pablotron.org> (Wirble)
+* 2009-2010 Jens Wille <jens.wille@gmail.com> (Wirble)
+* 2006-2010 Giles Bowkett (light background color scheme)
+* 2006-2010 Revieworld Ltd. <http://github.com/floehopper/mocha>
+            (class/address object inspect)
+* 2008-2010 Vincent Isambart <http://github.com/vincentisambart/hotconsole>
+            (output redirection on different threads)
+* 2010      James Tucker <http://github.com/raggi/ir>
+            (basis of driver code and inspiration)
 
 This software is available under the Ruby license:
 

data/Rakefile

@@ -7,12 +7,12 @@ task :default => :run
 
 desc "Run the specs (run it with a rake installed on the Ruby version you want to run the specs on)"
 task :spec do
-  sh "#{ruby_bin} -r #{FileList['./spec/**/*_spec.rb'].join(' -r ')} -e ''"
+  sh "mspec -t #{ruby_bin} spec"
 end
 
 desc "Run dietrb"
 task :run do
-  sh "#{ruby_bin} -I lib ./bin/dietrb -r irb/ext/colorize -r pp"
+  sh "#{ruby_bin} -I lib ./bin/dietrb -d -r irb/ext/colorize -r pp"
 end
 
 namespace :macruby do
@@ -33,16 +33,19 @@ namespace :macruby do
   desc "Merge source into the MacRuby repo"
   task :merge do
     if (repo = ENV['macruby_repo']) && File.exist?(repo)
-      bin = File.join(repo, 'bin/irb')
-      lib = File.join(repo, 'lib')
+      bin  = File.join(repo, 'bin/irb')
+      lib  = File.join(repo, 'lib')
+      spec = File.join(repo, 'spec/dietrb')
       
-      rm_f bin
-      rm_f File.join(lib, 'irb.rb')
+      rm_f  bin
+      rm_f  File.join(lib, 'irb.rb')
       rm_rf File.join(lib, 'irb')
+      rm_rf spec
       
-      cp 'bin/dietrb', bin
-      cp 'lib/irb.rb', lib
-      cp_r 'lib/irb', lib
+      cp   'bin/dietrb', bin
+      cp   'lib/irb.rb', lib
+      cp_r 'lib/irb',    lib
+      cp_r 'spec',       spec
     else
       puts "[!] Set the `macruby_repo' env variable to point to the MacRuby repo checkout"
       exit 1
@@ -51,6 +54,7 @@ namespace :macruby do
 end
 
 begin
+  require 'rubygems'
   require 'jeweler'
   require File.expand_path('../lib/irb/version', __FILE__)
   Jeweler::Tasks.new do |gemspec|

data/TODO

@@ -1,3 +1,4 @@
+* Make puts/print use the proper IO when used from user code
 * 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 majority of the utils in utility_belt work

data/bin/dietrb

@@ -2,41 +2,55 @@
 
 require 'irb'
 
-unless ARGV.empty?
-  require 'optparse'
-  
-  ignore_irbrc = false
-  
-  OptionParser.new do |opt|
-    bin = File.basename($0)
-    opt.banner = "Usage:  #{bin} [options] [programfile] [arguments]"
-    opt.on("-f",              "Ignore ~/.irbrc") { |ignore| ignore_irbrc = ignore  }
-    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("--noinspect",     "Don't use inspect for output") { IRB.formatter.inspect = false }
-    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 IRB::VERSION::DESCRIPTION
-      exit
-    end
-  end.parse!(ARGV)
-end
-
-unless ignore_irbrc
-  irbrc = File.expand_path("~/.irbrc")
-  load(irbrc) if File.exist?(irbrc)
-end
-
-IRB.formatter.filter_from_backtrace << /^#{__FILE__}/
+IRB_CONTEXT_TOPLEVEL_ARGS = [self, TOPLEVEL_BINDING.dup]
 
-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 { |line| context.input_line(line) }
+module IRB
+  # Just a namespace so not to pollute the toplevel namespace with lvars.
+  module Bin
+    unless ARGV.empty?
+      require 'optparse'
+      
+      driver = nil
+      ignore_irbrc = false
+      
+      OptionParser.new do |opt|
+        bin = File.basename($0)
+        opt.banner = "Usage:  #{bin} [options] [programfile] [arguments]"
+        opt.on("-f",              "Ignore ~/.irbrc")                                 { |i| ignore_irbrc = i }
+        opt.on("-r load-lib",     "Loads the given library (same as `ruby -r')")     { |l| require l }
+        opt.on("-d",              "Set $DEBUG to true (same as `ruby -d')")          { $DEBUG = true }
+        opt.on("-I path",         "Add path to $LOAD_PATH")                          { |p| $LOAD_PATH.unshift(p) }
+        opt.on("--driver name",   "As driver, use one of: tty, readline, or socket") { |d| driver = d }
+        opt.on("--noinspect",     "Don't use inspect for output")                    { IRB.formatter.inspect = false }
+        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
+          $stdout.puts IRB::VERSION::DESCRIPTION
+          exit
+        end
+      end.parse!(ARGV)
+    end
+    
+    unless ignore_irbrc
+      irbrc = File.expand_path("~/.irbrc")
+      load(irbrc) if File.exist?(irbrc)
+    end
+    
+    IRB.formatter.filter_from_backtrace << /^#{__FILE__}/
+    
+    if ARGV.empty?
+      driver ||= begin
+        require 'readline'
+        'readline'
+      rescue LoadError
+        'tty'
+      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

data/dietrb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dietrb}
-  s.version = "0.4.7"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Duran"]
-  s.date = %q{2010-07-02}
+  s.date = %q{2010-07-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,6 +30,10 @@ Gem::Specification.new do |s|
      "lib/irb/completion.rb",
      "lib/irb/context.rb",
      "lib/irb/deprecated.rb",
+     "lib/irb/driver.rb",
+     "lib/irb/driver/readline.rb",
+     "lib/irb/driver/socket.rb",
+     "lib/irb/driver/tty.rb",
      "lib/irb/ext/colorize.rb",
      "lib/irb/ext/completion.rb",
      "lib/irb/ext/history.rb",
@@ -37,11 +41,14 @@ Gem::Specification.new do |s|
      "lib/irb/formatter.rb",
      "lib/irb/source.rb",
      "lib/irb/version.rb",
-     "spec/colorize_spec.rb",
-     "spec/completion_spec.rb",
      "spec/context_spec.rb",
+     "spec/driver/readline_spec.rb",
+     "spec/driver/tty_spec.rb",
+     "spec/driver_spec.rb",
+     "spec/ext/colorize_spec.rb",
+     "spec/ext/completion_spec.rb",
+     "spec/ext/history_spec.rb",
      "spec/formatter_spec.rb",
-     "spec/history_spec.rb",
      "spec/regression/context_spec.rb",
      "spec/source_spec.rb",
      "spec/spec_helper.rb"
@@ -50,14 +57,17 @@ 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.7}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{IRB on a diet, for MacRuby / Ruby 1.9}
   s.test_files = [
-    "spec/colorize_spec.rb",
-     "spec/completion_spec.rb",
-     "spec/context_spec.rb",
+    "spec/context_spec.rb",
+     "spec/driver/readline_spec.rb",
+     "spec/driver/tty_spec.rb",
+     "spec/driver_spec.rb",
+     "spec/ext/colorize_spec.rb",
+     "spec/ext/completion_spec.rb",
+     "spec/ext/history_spec.rb",
      "spec/formatter_spec.rb",
-     "spec/history_spec.rb",
      "spec/regression/context_spec.rb",
      "spec/source_spec.rb",
      "spec/spec_helper.rb"
@@ -67,7 +77,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/irb.rb

@@ -10,9 +10,6 @@ require 'irb/version'
 
 require 'irb/deprecated'
 
-require 'irb/ext/history'
-require 'irb/ext/completion'
-
 # if !ENV['SPECCING'] && defined?(RUBY_ENGINE) && RUBY_ENGINE == "macruby"
 #   require 'irb/ext/macruby'
 # end

data/lib/irb/completion.rb

@@ -1 +1 @@
-IRB.deprecated "The file `irb/completion' has moved to `irb/ext/ecompletion' and is loaded by default.", caller
+IRB.deprecated "The file `irb/completion' has moved to `irb/ext/completion' and is loaded by default.", caller

data/lib/irb/context.rb

@@ -5,28 +5,13 @@
 # Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
 
 require 'irb/formatter'
-require 'readline'
 
 module IRB
   class Context
-    class << self
-      attr_accessor :current
-      
-      def make_current(context)
-        # Messing with a current context is gonna bite me in the ass when we
-        # get to multi-threading, but we'll it when we get there.
-        before, @current = @current, context
-        yield
-      ensure
-        @current = before
-      end
-      
-      def processors
-        @processors ||= []
-      end
-    end
+    IGNORE_RESULT = :irb_ignore_result
     
-    attr_reader :object, :binding, :line, :source, :processors
+    attr_reader :object, :binding, :line, :source
+    attr_accessor :formatter
     
     def initialize(object, explicit_binding = nil)
       @object  = object
@@ -34,8 +19,8 @@ module IRB
       @line    = 1
       clear_buffer
       
-      @underscore_assigner = __evaluate__("_ = nil; proc { |val| _ = val }")
-      @processors = self.class.processors.map { |processor| processor.new(self) }
+      @last_result_assigner = __evaluate__("_ = nil; proc { |val| _ = val }")
+      @exception_assigner   = __evaluate__("e = exception = nil; proc { |ex| e = exception = ex }")
     end
     
     def __evaluate__(source, file = __FILE__, line = __LINE__)
@@ -44,31 +29,14 @@ module IRB
     
     def evaluate(source)
       result = __evaluate__(source.to_s, '(irb)', @line - @source.buffer.size + 1)
-      store_result(result)
-      puts formatter.result(result)
-      result
+      unless result == IGNORE_RESULT
+        store_result(result)
+        puts(formatter.result(result))
+        result
+      end
     rescue Exception => e
       store_exception(e)
-      puts formatter.exception(e)
-    end
-    
-    # Reads input and passes it to all processors.
-    def readline
-      input = Readline.readline(formatter.prompt(self), true)
-      @processors.each { |processor| input = processor.input(input) }
-      input
-    rescue Interrupt
-      clear_buffer
-      ""
-    end
-    
-    def run
-      self.class.make_current(self) do
-        while line = readline
-          continue = process_line(line)
-          break unless continue
-        end
-      end
+      puts(formatter.exception(e))
     end
     
     # Returns whether or not the user wants to continue the current runloop.
@@ -88,7 +56,7 @@ module IRB
       return false if @source.terminate?
       
       if @source.syntax_error?
-        puts formatter.syntax_error(@line, @source.syntax_error)
+        puts(formatter.syntax_error(@line, @source.syntax_error))
         @source.pop
       elsif @source.code_block?
         evaluate(@source)
@@ -99,13 +67,17 @@ module IRB
       true
     end
     
+    def prompt
+      formatter.prompt(self)
+    end
+    
     def input_line(line)
-      puts formatter.prompt(self) + line
+      puts(formatter.prompt(self) + line)
       process_line(line)
     end
     
     def formatter
-      IRB.formatter
+      @formatter ||= IRB.formatter
     end
     
     def clear_buffer
@@ -113,20 +85,11 @@ module IRB
     end
     
     def store_result(result)
-      @underscore_assigner.call(result)
+      @last_result_assigner.call(result)
     end
     
     def store_exception(exception)
-      $e = $EXCEPTION = exception
+      @exception_assigner.call(exception)
     end
   end
-end
-
-module Kernel
-  # Creates a new IRB::Context with the given +object+ and runs it.
-  def irb(object, binding = nil)
-    IRB::Context.new(object, binding).run
-  end
-  
-  private :irb
-end
+end

data/lib/irb/driver.rb

@@ -0,0 +1,61 @@
+module IRB
+  module Driver
+    class << self
+      def current=(driver)
+        ThreadGroup.new.add(Thread.current)
+        Thread.current[:irb_driver] = driver
+      end
+      
+      def current
+        current_thread = Thread.current
+        current_thread[:irb_driver] ||= begin
+          if group = current_thread.group
+            driver = nil
+            group.list.each do |thread|
+              break if driver = thread[:irb_driver]
+            end
+            driver
+          end
+        end
+      end
+    end
+    
+    class OutputRedirector
+      def self.target
+        if driver = IRB::Driver.current
+          driver.output
+        else
+          $stderr
+        end
+      end
+      
+      # A standard output object has only one mandatory method: write.
+      # It returns the number of characters written
+      def write(object)
+        string = object.respond_to?(:to_str) ? object : object.to_s
+        send_to_target :write, string
+        string.length
+      end
+      
+      # if puts is not there, Ruby will automatically use the write
+      # method when calling Kernel#puts, but defining it has 2 advantages:
+      # - if puts is not defined, you cannot of course use $stdout.puts directly
+      # - (objc) when Ruby emulates puts, it calls write twice
+      #   (once for the string and once for the carriage return)
+      #   but here we send the calls to another thread so it's nice
+      #   to be able to save up one (slow) interthread call
+      def puts(*args)
+        send_to_target :puts, *args
+        nil
+      end
+      
+      # Override this if for your situation you need to dispatch from a thread
+      # in a special manner.
+      #
+      # TODO: for macruby send to main thread
+      def send_to_target(method, *args)
+        self.class.target.__send__(method, *args)
+      end
+    end
+  end
+end