irt 1.1.7 → 1.2.0.p01

data/README.markdown

@@ -140,7 +140,10 @@ When you close the session with 'exit' (or 'x' or 'q'), IRT will not pass back a
 
 ### Binding Sessions (yellow)
 
-You can open a binding session from any file being evaluated with the directive 'irt binding'.
+You can open a binding session from any file with the directive 'irt binding': you don't even need to use the IRT executable.
+It works also from the rails code, while the server is running. (See Rails)
+
+
 The 'self' of the new session will be the 'self' at the line you called it, so you can play with local variables
 and methods as you would do it at that line.
 
@@ -597,6 +600,35 @@ By default IRT will output the rails log (colored in blue) right in the console.
 You can switch the rails log ON or OFF by using the 'rails\_log\_on' (or 'rlo') and 'rails\_log\_off' (or 'rlf')
 commands in any session, besides you can set the option IRT.rails_log to true or false in the ~/.irtrc file.
 
+### Rails Server Sessions
+
+The server sessions are a quick way to interact with your application while your server is running,
+without the need to launch a the irt executable: you can do almost everything you can from a regular IRT session
+launched from the irt executable.
+
+If you want to open a session from your Rails code or from a template while the server is running,
+you don't have to use the IRT executable: you can just add an 'irt binding' statement where you want
+(even in a erb template), load the page in the browser and IRT will open a Binding Session right in the server's console.
+
+    # will open an IRT Binding Session in the server window
+    irt binding
+
+Besides, if you want to open an Interactive Session, you have just to type Ctrl-C in the server console and
+you will be asked if you want to shutdown the server or open an IRT session.
+
+    => Booting Mongrel
+    => Rails 3.0.4 application starting in development on http://0.0.0.0:3000
+    => Call with -d to detach
+    => Ctrl-C to shutdown server
+    ^C
+       #> Server suspended
+       ?>  [s]hutdown, [i]rt or [c]ancel? [<enter>=s|i|c]
+
+Notice that the execution of the web response is halted until you exit from the session.
+When you exit, the response process will be resumed, and the server will return to its normal behaviour.
+
+Note: The Server Sessions are known to work with WEBrick and Mongrel (using Rack)
+
 ### Rails 3
 
 You must add the gem to your Gemfile, to make the bundler happy:

data/VERSION

@@ -1 +1 @@
-1.1.7
+1.2.0.p01

data/bin/irt

@@ -2,21 +2,10 @@
 
 require 'rubygems'
 require 'fileutils'
-require 'tempfile'
 require 'optparse'
-require 'prompter'
-require 'dye'
+require 'irt/utils'
 
-prompter = Prompter.new do |pr|
-             def pr.say_echo(result, opts={})
-               out = sprintf "   #> %s", result
-               say out, :style => :yellow
-             end
-           end
-
-version = File.read(File.expand_path('../../VERSION', __FILE__)).strip
-
-copy = Dye.dye "irt #{version} (c) 2010-2011 Domizio Demichelis", :blue, :bold
+copy = IRT::Utils.copyright
 
 options = {}
 
@@ -36,7 +25,7 @@ EOB
   end
 
   options[:irb_options] = nil
-  opts.on( '-b', '--irb-options [OPTIONS]', 'Sets the irb Options' ) do |opt|
+  opts.on( '-b', '--irb-options [OPTIONS]', 'Sets the irb or rails console options' ) do |opt|
     options[:irb_options] = opt
   end
 
@@ -51,7 +40,7 @@ EOB
    end
 
   opts.on( '-v', '--version', 'Shows the version and exits' ) do
-    puts version
+    puts IRT::Utils.version
     exit
   end
 
@@ -69,47 +58,34 @@ puts copy
 
 paths = if ARGV.empty?
           options[:interactive_eof] = true
-          tmp_file = Tempfile.new(['', '.irt'])
-          tmp_file << "\n" # one empty line makes irb of 1.9.2 happy
-          tmp_file.flush
-          tmp_path = tmp_file.path
-          at_exit do
-            require 'irt/utils'
-            if File.read(tmp_path).length > 1
-              prompter.yes? %(The template file has been modified, do you want to save it?) do
-                prompter.choose %(Enter the file path to save:), /[\w0-9_]/ do |as_file|
-                  IRT::Utils.save_as(tmp_path, as_file, prompter){ system(ENV['IRT_COMMAND']) }
-                end
-              end
-            end
-          end
-          [ tmp_path ]
+          [ IRT::Utils.create_tmp_file ]
         else
           ARGV.map {|p| File.expand_path(p) }
         end
 
 files = paths.map do |path|
           unless File.exists?(path)
-            next if prompter.no? %(Do you want to create the file "#{path}"?), :hint => '[<enter=y|n]', :default => 'y'
+            next if IRT::Prompter.no? %(Do you want to create the file "#{path}"?), :hint => '[<enter=y|n]', :default => 'y'
             options[:interactive_eof] = true
             dirname = File.dirname(path)
             FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
             File.open(path, 'w') {|f| f.puts "\n" } # one empty line makes irb of 1.9.2 happy
           end
           File.directory?(path) ? Dir.glob(File.join(path, '**/*.irt')) : path
-        end.flatten
+        end.flatten.compact
 
 if files.empty?
-  prompter.say_notice 'No *.irt files to run'
+  IRT::Prompter.say_notice 'No *.irt files to run'
   exit
 end
 
 cmd_format = if File.exists?('./config/environment.rb') && !options[:no_rails]
+               ENV['RAILS_ENV'] = options[:rails_env]
                if File.exists?('./script/rails')
                  gemfile = File.read('Gemfile')
                  unless gemfile.match(/\bgem\b.+\birt\b/)
-                   prompter.say_warning %(The Gemfile doesn't look to include any 'gem "irt"' statement.\nIRT will probably not work until you add it!)
-                   prompter.yes?("Do you want to add irt to your Gemfile?", :hint => '[enter=y|n]', :default => 'y') do
+                   IRT::Prompter.say_warning %(The Gemfile doesn't look to include any 'gem "irt"' statement.\nIRT will probably not work until you add it!)
+                   IRT::Prompter.yes?("Do you want to add irt to your Gemfile?", :hint => '[enter=y|n]', :default => 'y') do
                      File.open('Gemfile', 'a') do |f|
                        f.puts %(gem "irt")
                      end
@@ -117,20 +93,16 @@ cmd_format = if File.exists?('./config/environment.rb') && !options[:no_rails]
                  end
                  'rails c %s %s %s'
                elsif File.exists?('./script/console')
-                 'ruby script/console --irb="irt_rails2 %s"'
+                 'ruby script/console --irb="irt_rails2 %2$s" %1$s %3$s'
                end
              else
                'irt_irb %s %s'
              end
 
-if cmd_format.match(/^ruby script\/console/)
-  ENV['RAILS_ENV'] ||= options[:rails_env]
-end
-
 ENV['IRT_INTERACTIVE_EOF'] = options[:interactive_eof].inspect if options[:interactive_eof]
 
 files.each do |file|
-  ENV['IRT_COMMAND'] = sprintf cmd_format, file, options[:irb_options], options[:rails_env]
+  ENV['IRT_COMMAND'] = sprintf cmd_format, options[:irb_options], file, options[:rails_env]
   unless system(ENV['IRT_COMMAND'])
     puts Dye.sgr(:clear) if Dye.color?
     exit(1)

data/irt.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.description = 'If you use IRT in place of irb or rails console, you will have more tools that will make your life a lot easier.'
 
   s.add_runtime_dependency('differ', [">= 0.1.1"])
-  s.add_runtime_dependency('dye', [">= 0.1.1"])
-  s.add_runtime_dependency('prompter', [">= 0.1.2"])
+  s.add_runtime_dependency('dye', [">= 0.1.3"])
+  s.add_runtime_dependency('prompter', [">= 0.1.4"])
   if IRT::RubyVersion >= '1.9.2'
     s.add_runtime_dependency('bri', [">= 0.1.5"])
   else

data/lib/irt/commands/core.rb

@@ -21,6 +21,7 @@ module IRT
       alias_method :open_session, :irt # legacy method
 
       def vdiff(a,b)
+        ensure_session
         puts IRT::Differ.new(a,b, :value, {:a_marker => 'a',
                                            :b_marker => 'b',
                                            :a_label => '',
@@ -29,17 +30,29 @@ module IRT
       alias_method :vd, :vdiff
 
       # rerun the same shell command
-      def rerun
+      def restart
         ensure_session
+        ensure_cli
         IRB.irb_at_exit
-        str = "Rerunning: `#{ENV['IRT_COMMAND']}`"
+        str = "Restarting: `#{ENV['IRT_COMMAND']}`"
         puts
         puts IRT.dye(" #{str} ", "*** #{str} ***", :error_color, :bold, :reversed)
         puts
         exec ENV["IRT_COMMAND"]
       end
+      alias_method :r!, :restart
+
+      def rerun
+        ensure_session
+        IRT::Session.run_file
+      end
       alias_method :rr, :rerun
 
+      def run(file_path)
+        ensure_session
+        IRT::Session.run_file file_path
+      end
+
       def sh(*args)
         system *args
       end

data/lib/irt/commands/edit.rb

@@ -14,20 +14,19 @@ module IRT
       end
       alias_method :cll, :copy_all_lines
 
-      %w[vi nano edit].each do |n|
-        eval <<-EOE, binding, __FILE__, __LINE__+1
-          def #{n}(*args)
-            ensure_session
-            run_editor(:#{n}, *args)
-          end
-        EOE
-        eval <<-EOE, binding, __FILE__, __LINE__+1
-          def c#{n}(*args)
-            ensure_session
-            copy_lines
-            #{n} *args
-          end
-        EOE
+      [:vi, :nano, :edit].each do |n|
+
+        define_method(n) do |*args|
+          ensure_session
+          run_editor(n, *args)
+        end
+
+        define_method(:"c#{n}") do |*args|
+          ensure_session
+          copy_lines
+          send n, *args
+        end
+
       end
       alias_method :nn, :nano
       alias_method :ed, :edit

data/lib/irt/commands/help.rb

@@ -79,7 +79,11 @@ module IRT
     x|q                     Aliases for exit (from the current session)
     xx|qq                   Aliases for abort (abort the irt process)
     status|ss               Prints the session status line
-    rerun|rr                Reruns the same file
+    run file                Run an irt file (exiting from the current sessions)
+    rerun|rr                Reruns the current irt file (exiting from the
+                            current sessions)
+    restart|r!              Restart the executable, reload IRT (and Rails) and
+                            rerun the current file
     irt_help|hh             Shows this screen
     sh command              Alias for system("command") (no quotes needed)
 

data/lib/irt/commands/test.rb

@@ -45,8 +45,9 @@ module IRT
       alias_method :tt, :add_test
 
       def save_as(path)
-        require 'irt/utils'
-        IRT::Utils.save_as(IRT.irt_file, path, IRT.prompter){ rerun }
+        IRT::Utils.save_as(path) do
+          IRT::Session.run_file path
+        end
       end
       alias_method :sa, :save_as
 

data/lib/irt/directives/test.rb

@@ -42,9 +42,8 @@ module IRT
 
     def load_helper_files
       return unless IRT.autoload_helper_files
-      irt_file_path = Pathname.new($0).realpath
       container_path = Pathname.getwd.parent
-      down_path = irt_file_path.relative_path_from container_path
+      down_path = IRT.irt_file.relative_path_from container_path
       down_path.dirname.descend do |p|
        helper_path = container_path.join(p, 'irt_helper.rb')
        begin
@@ -69,7 +68,7 @@ module IRT
             @@diffs += 1
             puts IRT.dye("#{tno}. DIFFS!", :diff_color, :bold) + IRT.dye(" #{d}\n     ", :diff_color) +
                  IRT.dye(" at #{context.irb_path}: #{context.last_line_no} ", :file_color, :reversed, :bold)
-            puts IRT.differ.new(saved, actual, kind).output
+            puts IRT::Differ.new(saved, actual, kind).output
             IRT::Session.enter(:interactive) if IRT.irt_on_diffs
           end
         rescue Exception

data/lib/irt/extensions/irb/commands.rb

@@ -19,9 +19,16 @@ module IRB
 
     alias_method :x, :irb_exit
     alias_method :q, :irb_exit
+    alias_method :irb, :irt
+
+    alias_method :original_abort, :abort
+    def abort
+      ensure_cli
+      IRT::Session.exit_all = true
+      original_abort
+    end
     alias_method :xx, :abort
     alias_method :qq, :abort
-    alias_method :irb, :irt
 
     def method_missing(method, *args, &block)
       IRB.conf[:MAIN_CONTEXT] && IRB.conf[:MAIN_CONTEXT].irt_mode == :file && IRT::Directives.respond_to?(method) ?
@@ -38,5 +45,12 @@ module IRB
       end
     end
 
+    def ensure_cli
+      unless IRT.cli?
+        m = caller[0].match(/`(\w*)'$/).captures[0]
+        raise IRT::SessionModeError, ":#{m} command not available. IRT didn't start with the CLI"
+      end
+    end
+
   end
 end

data/lib/irt/extensions/irb/context.rb

@@ -103,7 +103,7 @@ private
       bktr = e.backtrace.reject do |m|
                workspace.filter_backtrace(m).nil? || !IRT.debug && File.expand_path(m).match(/^#{IRT.lib_path}/)
              end
-      e.set_backtrace( e.class.name.match(/^IRT::/) ? bktr : map_backtrace(bktr) )
+      e.set_backtrace map_backtrace(bktr)
     end
 
     def map_backtrace(bktr)
@@ -117,7 +117,9 @@ private
           index = sprintf index_format, " [#{i}]"
         end
         mapped_bktr << "#{m}#{index}"
+        break if m.match /^\(irt\#\d+\)/
       end
+      # mapped_bktr.last << "\n" if mapped_bktr.last && !mapped_bktr.last.match(/\n$/)
       mapped_bktr
     end
 
@@ -145,7 +147,7 @@ private
       i = -1
       str.each_line do |l|
         @last_line_no = line_no + i+=1
-        unless l =~ /^\s*(#{quoted_option_string(IRT.log.ignored_commands)})\b/
+        if irt_mode == :file || l !~ /^\s*(#{quoted_option_string(IRT.log.ignored_commands)})\b/
           IRT.log.add_line l, @last_line_no
         end
       end

data/lib/irt/extensions/irb.rb

@@ -5,22 +5,22 @@ require 'irt/extensions/irb/commands'
 module IRB #:nodoc:
 
   class << self
-    alias_method :irb_init_config, :init_config
-    alias_method :irb_setup, :setup
+    alias_method :original_init_config, :init_config
+    alias_method :original_setup, :setup
   end
 
   def IRB.setup(ap_path=nil)
-    irb_setup(ap_path)
-    IRT.before_run
+    original_setup(ap_path)
+    IRT.setup
   end
 
   def IRB.init_config(ap_path)
-    irb_init_config(ap_path)
+    original_init_config(ap_path)
 
     @CONF[:AP_NAME] = 'irt'
     @CONF[:PROMPT][:IRT] = { :PROMPT_I => "%02n >> ",
                              :PROMPT_S => '   "> ',
-                             :PROMPT_C => "%02n ?> ",
+                             :PROMPT_C => "%02n .> ",
                              :PROMPT_N => "%02n -> ",
                              :RETURN   => "   => %s\n",
                              :RETURN_I => "   #> %s\n" }
@@ -30,12 +30,12 @@ module IRB #:nodoc:
     @CONF[:SAVE_HISTORY] = 100
     @CONF[:HISTORY_FILE] = File.expand_path '~/.irt-history'
     @CONF[:AT_EXIT] ||= []
-    @CONF[:AT_EXIT] << proc{ IRT::Session.enter(:interactive) if IRB.CurrentContext.irt_mode == :file } if !!ENV['IRT_INTERACTIVE_EOF']
+    @CONF[:AT_EXIT] << proc{ IRT::Session.enter(:interactive) \
+                               if IRB.CurrentContext.irt_mode == :file && !IRT::Session.exit_all?} \
+                                 if !!ENV['IRT_INTERACTIVE_EOF']
     @CONF[:AT_EXIT] << proc{ IRT::Directives.test_summary }
-    @CONF[:AT_EXIT] << proc{ print "\e[0m" if Dye.color? } # reset colors
     @CONF[:RC_NAME_GENERATOR] = proc {|rc| File.expand_path '~/.irtrc' }
 
-    IRT.init_config
   end
 
 end

data/lib/irt/extensions/kernel.rb

@@ -12,6 +12,7 @@ module Kernel
 
   def irt(bind)
     raise IRT::ArgumentTypeError, "You must pass binding instead of #{bind.class.name} object" unless bind.is_a?(Binding)
+    IRT::Utils.load_irt
     IRT::Session.enter :binding, bind
   end
 

data/lib/irt/extensions/method.rb

@@ -12,16 +12,22 @@ class Method
         end
     arr = Array.new(n)
     set_trace_func proc{ |event, file, line, meth_name, binding, classname|
-      if event.eql?('call') && name.to_s.match(meth_name.to_s)
-        f = file
-        l = line
-        set_trace_func nil
-        throw :method_located
+      if name == meth_name
+        case event
+        when 'call'
+          f = file
+          l = line
+          throw :method_located
+       when 'c-call'
+          f = "(c-func)"
+          throw :method_located
+        end
       end
     }
     catch(:method_located) { call *arr }
-    set_trace_func nil
     [f,l]
+  ensure
+    set_trace_func nil
   end
 
   def info

data/lib/irt/extensions/rails.rb

@@ -4,6 +4,8 @@ class ActiveSupport::BufferedLogger
 
   def add(*args)
     message = original_add(*args)
+    # no inline log when in rails server and not interactive mode
+    return message if IRB.CurrentContext.nil? || IRT.rails_server && IRB.CurrentContext.irt_mode != :interactive
     if IRT.rails_log
       if IRT.dye_rails_log
         plain_message = Dye.strip_ansi(message).chomp
@@ -16,22 +18,90 @@ class ActiveSupport::BufferedLogger
 
 end
 
+module Kernel
+
+  alias_method :original_irt, :irt
+  def irt(bind)
+    raise IRT::ArgumentTypeError, "You must pass binding instead of #{bind.class.name} object" unless bind.is_a?(Binding)
+    IRT.send(:rails_server_notice_wrap) do
+      IRT::Utils.load_irt
+      IRT::Session.enter :binding, bind
+    end
+  end
+
+end
+
+require 'rack/server'
+module Rack
+  class Server
+    alias_method :original_server, :server
+    def server
+      # override the SIGINT trap in the Rack::Server.start method allowing multiple choices
+      # since #server is also called after the Rack::Server.start trap
+      IRT::Utils.load_irt(false)
+      IRT.rails_server_sigint_trap = trap('SIGINT') { IRT.rails_signal_handle }
+      IRT.rails_server = original_server
+    end
+  end
+end
+
 module IRT
+
+  def rails_signal_handle
+    puts
+    rails_server_notice_wrap do
+      trap('SIGINT'){}
+      input = IRT::Prompter.choose " [s]hutdown, [i]rt or [c]ancel?", /^(s|i|c)$/i,
+                              :hint => '[<enter>=s|i|c]', :default => 's'
+      trap('SIGINT') { rails_signal_handle  }
+      case input
+      when 's'
+        IRT.rails_server_sigint_trap.call
+      when 'i'
+        Session.enter :interactive
+      end
+    end
+  end
+
+private
+
+  def rails_server_notice_wrap
+    return yield unless rails_server
+    IRT::Prompter.say_notice "Server suspended"
+    yield
+    IRT::Prompter.say_notice "Server resumed"
+  end
+
+
+  module Session
+
+    alias_method :original_run_file, :run_file
+    def run_file(*args)
+      original_run_file *args
+    ensure
+      if IRT.rails_server
+        IRB.irb_at_exit
+        enter :interactive
+      end
+    end
+
+  end
+
   module Commands
     module Rails
 
-      extend self
+      extend self # ignored_echo_commands
 
       def rails_log_on
         IRT.rails_log = true
-        "Rails Log ON"
+        IRT::Prompter.say_notice "Rails Log ON"
       end
       alias_method :rlon, :rails_log_on
       alias_method :rlo, :rails_log_on
 
       def rails_log_off
         IRT.rails_log = false
-        "Rails Log OFF"
+        IRT::Prompter.say_notice "Rails Log OFF"
       end
       alias_method :rloff, :rails_log_off
       alias_method :rlf, :rails_log_off

data/lib/irt/log.rb

@@ -6,17 +6,17 @@ module IRT
 
     def initialize
       @ignored_echo_commands = FileUtils.own_methods + [:_]
-      @ignored_echo_commands += IRT::Commands::Rails.own_methods if defined?(IRT::Commands::Rails)
       @ignored_echo_commands = @ignored_echo_commands.map(&:to_sym)
       @ignored_commands = @ignored_echo_commands +
                           IRB::ExtendCommandBundle.instance_methods +
                           [ :p, :pp, :ap, :y, :puts, :print, :irt, :irb ]
+      @ignored_commands += IRT::Commands::Rails.own_methods if defined?(IRT::Commands::Rails)
       @ignored_commands = @ignored_commands.map(&:to_sym)
       @non_setting_commands = @ignored_commands + IRT::Directives.own_methods
       @non_setting_commands = @non_setting_commands.map(&:to_sym)
       @tail_size = tail_size || 10
       self << FileHunk.new(IRT.irt_file)
-      @status = [[File.basename(IRT.irt_file), :file]]
+      @status = [[IRT.irt_file.basename, :file]]
     end
 
     def add_hunk

data/lib/irt/prompter.rb

@@ -0,0 +1,32 @@
+require 'prompter'
+
+module IRT
+  class Prompter
+
+    extend ::Prompter::Methods
+
+    if IRT.respond_to?(:dye_styles)
+      ::Prompter.dye_styles[:say_notice_style] = IRT.dye_styles[:ignored_color]
+      ::Prompter.dye_styles[:ask_style]        = IRT.dye_styles[:interactive_color]
+    end
+
+    def self.say_echo(result, opts={})
+      if defined?(IRB)
+        IRB.CurrentContext.send :output_ignored_echo_value, result
+      else
+        say_notice result
+      end
+    end
+
+    def self.say_notice(message="", opts={})
+      opts = { :prefix => '   #> ' }.merge opts
+      super message, opts
+    end
+
+    def self.ask(prompt, opts={})
+      opts = { :prefix => '   ?> ' }.merge opts
+      super prompt, opts
+    end
+
+  end
+end

data/lib/irt/session.rb

@@ -2,6 +2,14 @@ module IRT
   module Session
     extend self
 
+    @@exit_all = false
+    def exit_all?
+      @@exit_all
+    end
+    def exit_all=(bool)
+      @@exit_all = bool
+    end
+
     def enter(mode, obj=nil)
       IRT.log.print if IRT.tail_on_irt
       ws = obj ? IRB::WorkSpace.new(obj) : IRB.CurrentContext.workspace
@@ -26,23 +34,51 @@ module IRT
       IRT.log.add_hunk
       IRT.log.status << [new_context.irb_name, mode]
       IRT.log.print_status unless mode == :file
+      old_trap = trap('SIGINT'){new_context.irb.signal_handle}
       catch(:IRB_EXIT) { new_context.irb.eval_input }
+      # rethrow if there is a parent context, and it is a reading file
+      begin throw(:IRB_EXIT) ; rescue ArgumentError ; end if @@exit_all
     ensure
-      IRT::Session.exit
+      IRT::Session.exit unless @@exit_all
+      trap 'SIGINT', old_trap if old_trap
     end
 
     def exit
       exiting_context = IRB.conf[:MAIN_CONTEXT]
       resuming_context = exiting_context.parent_context
+      return unless resuming_context
       exiting_mode = exiting_context.irt_mode
       resuming_context.set_last_value( exiting_context.last_value ) \
         unless (exiting_mode == :inspect || exiting_mode == :binding)
+      IRB.conf[:MAIN_CONTEXT] = resuming_context
       IRT.log.pop_status
       IRT.log.print_status unless resuming_context.irt_mode == :file
-      IRB.conf[:MAIN_CONTEXT] = resuming_context
       IRT.log.add_hunk
     end
 
+    def run_file(file_path=IRT.irt_file)
+      raise Errno::ENOENT, "No such file or directory - #{file_path}" unless File.exist?(file_path)
+      openfile = proc do
+        @@exit_all = false
+        IRB.conf[:AT_EXIT].pop
+        IRT.init_file(file_path)
+        irb = IRB::Irb.new(nil, IRT.irt_file.to_s)
+        irb.context.irt_mode = :file
+        irb.context.irb_path = IRT.irt_file.to_s
+        irb.context.irb_name = IRT.irt_file.basename
+        IRB.conf[:MAIN_CONTEXT] = irb.context
+        begin
+          catch(:IRB_EXIT) { irb.eval_input }
+        ensure
+          IRB.irb_at_exit
+        end
+      end
+      IRB.conf[:AT_EXIT].push(openfile)
+      @@exit_all = true
+      throw(:IRB_EXIT)
+    end
+
+
   private
 
     # used for open the last file for editing

data/lib/irt/utils.rb

@@ -1,21 +1,62 @@
+require 'irt/prompter'
+
 module IRT
   module Utils
 
     extend self
 
-    def save_as(file, as_file_local, prompter)
+    # this will create a tmp file and start IRB
+    # but it will be left in file mode at EOF (sort of irt-standby)
+    def load_irt(run=true)
+      return if IRT.initialized
+      puts IRT::Utils.copyright
+      ARGV.clear
+      tmp_path = create_tmp_file run
+      ARGV.push tmp_path
+      IRB.start
+    end
+
+    def create_tmp_file(run=true)
+      require 'tempfile'
+      tmp_file = Tempfile.new(['', '.irt'])
+      tmp_file << "\n" # one empty line makes irb of 1.9.2 happy
+      tmp_file.flush
+      tmp_path = tmp_file.path
+      at_exit { check_save_tmp_file(tmp_file, run) }
+      tmp_path
+    end
+
+    def save_as(as_file_local, run=true)
       as_file = File.expand_path(as_file_local)
       if File.exists?(as_file)
-        return false if prompter.no? %(Do you want to overwrite "#{as_file}"?), :hint => '[y|<enter=n]', :default => 'n'
+        return false if IRT::Prompter.no? %(Do you want to overwrite "#{as_file}"?), :hint => '[y|<enter=n]', :default => 'n'
       end
       dirname = File.dirname(as_file)
       FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-      FileUtils.cp file, as_file
-      if prompter.yes? %(Do you want to run the file "#{as_file_local}" now?)
-        ENV['IRT_COMMAND'] = ENV['IRT_COMMAND'].sub(/#{Regexp.quote(file)}/, as_file)
-        yield
+      FileUtils.cp IRT.irt_file, as_file
+      if run && IRT::Prompter.yes?( %(Do you want to run the file "#{as_file_local}" now?) )
+        IRT::Session.run_file as_file
+      end
+    end
+
+    def version
+      @version ||= File.read(File.expand_path('../../../VERSION', __FILE__)).strip
+    end
+
+    def copyright
+      @copyrignt ||= Dye.dye "irt #{version} (c) 2010-2011 Domizio Demichelis", :blue, :bold
+    end
+
+  private
+
+    def check_save_tmp_file(tmp_file, run)
+      if tmp_file.size > 1
+        IRT::Prompter.yes? %(The template file has been modified, do you want to save it?) do
+          IRT::Prompter.choose %(Enter the file path to save:), /[\w0-9_]/ do |as_file|
+            save_as(as_file, run)
+          end
+        end
       end
-      true
     end
 
   end

data/lib/irt.rb

@@ -1,3 +1,5 @@
+at_exit{ Dye.print_reset_colors }
+
 require 'rubygems'
 
 require 'pp'
@@ -16,6 +18,7 @@ require 'irt/differ'
 require 'irt/directives'
 require 'irt/session'
 require 'irt/ruby_version'
+require 'irt/utils'
 
 module IRT
 
@@ -41,18 +44,21 @@ module IRT
 
   extend self
 
-  attr_accessor :irt_on_diffs, :tail_on_irt, :fix_readline_prompt, :debug, :rails_log, :dye_rails_log,
-                :full_exit, :exception_raised, :session_no, :autoload_helper_files, :dye_styles,
+  attr_accessor :irt_on_diffs, :tail_on_irt, :fix_readline_prompt, :debug,
+                :rails_log, :dye_rails_log, :rails_server, :rails_server_sigint_trap,
+                :full_exit, :session_no, :autoload_helper_files, :dye_styles,
                 :copy_to_clipboard_command, :nano_command_format, :vi_command_format, :edit_command_format, :ri_command_format
-  attr_reader :log, :irt_file, :differ
+  attr_reader :log, :irt_file, :initialized
+
+  def cli?
+    !!ENV['IRT_COMMAND']
+  end
 
   def force_color=(bool)
     Dye.color = bool
   end
 
   def init_config
-    @session_no = 0
-    @differ = IRT::Differ
     @irt_on_diffs = true
     @tail_on_irt = false
     @fix_readline_prompt = false
@@ -97,12 +103,7 @@ module IRT
     @debug = false
   end
 
-  def before_run
-    @irt_file = IRB.conf[:SCRIPT]
-    require 'irt/extensions/rails' if defined?(ActiveSupport::BufferedLogger)
-    @log = Log.new
-    @log.print_running_file
-    IRT::Directives.load_helper_files
+  def setup
     IRB::ExtendCommandBundle.class_eval do
       [:p, :y, :pp, :ap].each do |m|
         next unless begin
@@ -115,6 +116,17 @@ module IRT
         end
       end
     end
+    @initialized = true
+    init_file
+  end
+
+  def init_file(file = nil)
+    @session_no = 0
+    irt_file = file.nil? ? IRB.conf[:SCRIPT] : (IRB.conf[:SCRIPT] = file)
+    @irt_file = Pathname.new(irt_file).realpath
+    @log = Log.new
+    IRT::Directives.load_helper_files
+    @log.print_running_file
   end
 
   def lib_path
@@ -128,15 +140,8 @@ module IRT
     yml.gsub(/ +\n/, "\n")
   end
 
-  def prompter
-    @prompter ||= begin
-                    require 'prompter'
-                    Prompter.new do |pr|
-                      def pr.say_echo(result, opts={})
-                        IRB.CurrentContext.send :output_ignored_echo_value, result
-                      end
-                    end
-                  end
-  end
-
 end
+
+IRT.init_config
+require 'irt/prompter'
+require 'irt/extensions/rails' if defined?(ActiveSupport::BufferedLogger)

metadata

@@ -1,8 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: irt
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.7
+  hash: 957451098
+  prerelease: true
+  segments: 
+  - 1
+  - 2
+  - 0
+  - p01
+  version: 1.2.0.p01
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -10,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 -04:00
+date: 2011-02-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +27,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
   type: :runtime
   version_requirements: *id001
@@ -32,7 +43,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        hash: 29
+        segments: 
+        - 0
+        - 1
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,18 +59,29 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.2
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
+        version: 0.1.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bri
+  name: fastri
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.5
+        hash: 81
+        segments: 
+        - 0
+        - 3
+        - 1
+        - 1
+        version: 0.3.1.1
   type: :runtime
   version_requirements: *id004
 description: If you use IRT in place of irb or rails console, you will have more tools that will make your life a lot easier.
@@ -101,6 +128,7 @@ files:
 - lib/irt/hunks.rb
 - lib/irt/init.rb
 - lib/irt/log.rb
+- lib/irt/prompter.rb
 - lib/irt/ruby_version.rb
 - lib/irt/session.rb
 - lib/irt/utils.rb
@@ -118,17 +146,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Interactive Ruby Tools - Improved irb and rails console with a lot of easy and powerful tools.