irt 1.2.0.p01 → 1.2.0.p02

data/README.markdown

@@ -12,8 +12,9 @@ that will make your life a lot easier.
 
 - clean colored output for easy reading
 - 3 types of sessions: interactive, inspecting and binding
-- irb opening from your code (or erb templates) as binding session
-- optional colored rails log in the console
+- irb/irt opening from your code (or erb templates) as a binding session
+- irb/irt opening from inside the Rails Server window
+- optional colored Rails log in the console
 - contextual ri doc with completion
 - recording of session steps with filtering
 - easy testing based on recorded steps
@@ -225,6 +226,18 @@ If you want to edit the running file, just type 'nano' or  'vi' without any argu
 the file at the current line. Edit, save and exit from the editor, and you will continue your session
 from the point you left. You can also 'rerun' the same file (or 'rr') when you need to reload the whole code.
 
+### Rerun vs restart
+
+When you make any change in an irt file being evaluated you should perform a 'rerun' (or 'rr')
+in order to see the effect of your change.
+The 'rerun' command will exit from all the opened sessions, call the at_exit procs and rerun the same file
+without reloading any library or required file. That is the fastest behaviour when your changes are limited to any irt file.
+
+If you change some library in any required file and you wants to rerun the same file against the changes,
+you need to 'restart' (or 'rs') the whole process, so all the required files will be re-evaluated
+and your irt file will be rerun in the new context. That is notably slower in complex application, but guarantees
+a fresh loaded environment.
+
 ## Editing Tools
 
 ### In Place Editing
@@ -590,21 +603,40 @@ irt_helper.rb #1, #2 and #3. If you are running the testA.irt and testB.irt, IRT
 require the irt_helper.rb #1, #2. But if you run the same from the first_level dir, the irt_helper.rb #1
 will not be loaded, so be careful to be in the right dir to make it work properly.
 
+Notice: the irt helpers files are 'require'd (not 'load'ed). For that reason they are
+suitable for adding constants, methods, require(s) that will be loaded only once.
+If you change any irt helper you should 'restart (or 'rs') once before your changes get reloaded.
+
 ## Rails
 
 You can use irt instead of the standard Rails console, by just calling the irt executable from
 any Rails application dir. If you want to skip the autoloading of the Rails app even from that
 dir, you must pass the -n option (--no-rails).
 
+    $ cd my_rails_app
+
+    # will use the test environment in sandbox mode
+    $ irt -b--sandbox -etest
+
+    # will open a normal irt console, skipping the rails app
+    $ irt -n
+
 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.
 
+## Rerun, restart, reload!-rerun
+
+The 'rerun' (or 'rr') irt command in rails will also perform a 'reload!' first, so if you are in development mode
+your changes will be reloaded, so the command should do what you need: if it doesn't you
+should use the regular 'restart' (or 'rs') as the last resort. The 'restart' causes the Rails environment
+to be fully reloaded, so it is slower, but guaranteed.
+
 ### 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.
+launched from the irt executable, besides you have access to the server internals.
 
 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
@@ -627,7 +659,9 @@ you will be asked if you want to shutdown the server or open an IRT session.
 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)
+Note: The Server Sessions are known to work with WEBrick and Mongrel (using Rack).
+WEBrick might spit some error closing an Interactive Session, while it is ok
+with Binding Sessions. Mongrel works perfectly.
 
 ### Rails 3
 

data/VERSION

@@ -1 +1 @@
-1.2.0.p01
+1.2.0.p02

data/bin/irt

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+at_exit{ Dye.print_reset_colors }
+
 require 'rubygems'
 require 'fileutils'
 require 'optparse'
@@ -13,9 +15,12 @@ optparse = OptionParser.new do |opts|
 
   opts.banner = <<EOB
 Interactive Ruby Tools:
-    Improved irb and rails console with lots of easy and powerful tools.
+    Improved irb and Rails Console with lots of easy and powerful tools.
 Usage:
-    irt [PATH] [options]
+    irt [PATHS] [options]
+Paths:
+    List of irt files and/or dirs containing irt files.
+    If PATHS is omitted IRT will create and run a temporary empty file.
 Options:
 EOB
 
@@ -25,7 +30,7 @@ EOB
   end
 
   options[:irb_options] = nil
-  opts.on( '-b', '--irb-options [OPTIONS]', 'Sets the irb or rails console options' ) do |opt|
+  opts.on( '-b', '--irb-options [OPTIONS]', 'Sets the irb or Rails Console options' ) do |opt|
     options[:irb_options] = opt
   end
 
@@ -58,7 +63,11 @@ puts copy
 
 paths = if ARGV.empty?
           options[:interactive_eof] = true
-          [ IRT::Utils.create_tmp_file ]
+          tmp_path = IRT::Utils.create_tmp_file do |as_file, tmp_path|
+                       ENV['IRT_COMMAND'] = ENV['IRT_COMMAND'].sub(/#{Regexp.quote(tmp_path)}/, as_file)
+                       exec ENV['IRT_COMMAND']
+                     end
+          [ tmp_path ]
         else
           ARGV.map {|p| File.expand_path(p) }
         end
@@ -103,8 +112,5 @@ ENV['IRT_INTERACTIVE_EOF'] = options[:interactive_eof].inspect if options[:inter
 
 files.each do |file|
   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)
-  end
+  exit(1) unless system ENV['IRT_COMMAND']
 end

data/lib/irt/commands/core.rb

@@ -40,7 +40,7 @@ module IRT
         puts
         exec ENV["IRT_COMMAND"]
       end
-      alias_method :r!, :restart
+      alias_method :rs, :restart
 
       def rerun
         ensure_session

data/lib/irt/commands/help.rb

@@ -5,7 +5,7 @@ module IRT
       def irt_help
         ensure_session
         puts %(
-#{label " NOTICE ", :log_color}
+#{label " Irt Help ", :log_color}
 - The #{IRT.dye "Commands", :interactive_color, :bold} are methods generally available in any IRT session
 - The #{IRT.dye "Directives", :file_color, :bold} are methods available in any file but not in IRT sessions
 - The #{IRT.dye "Extensions", :log_color, :bold} are methods available anywhere
@@ -13,8 +13,8 @@ module IRT
 #{label " Inspecting Commands ", :interactive_color}
     irt object              Opens an inspecting session into object
     vdiff|vd obj_a, obj_b   Prints the visual diff of the yaml dump of 2 objects
-    cat args                Similar to system cat
-    ls args                 Similar to system ls
+    p, pp, ap, y            When invoked with no arguments print the last_value
+                            (e.g. just type 'y' instead 'y _')
 
 #{label " Log Commands ", :interactive_color}
     log|l [limit]           Prints limit or 'tail_size' lines of the virtual log
@@ -50,16 +50,12 @@ module IRT
                             by automatically choosing the :_eql?, or :_yaml_eql?
                             method, depending on the type of the last value (_)
     add_test|tt desc        Like add_test but adds a 'desc' directive first'
-    save_as|sa path         Saves the current irt file as path and runs it
+    save_as|sa path         Saves the current irt file as path
 
 #{label " FileUtils Commands ", :interactive_color}
     All the FileUtils methods are availabe as IRT Commands
     (e.g. pwd, touch, mkdir, mv, cp, rm, rm_rf, compare_files, ...)
 
-#{label " Enhanced Commands ", :interactive_color}
-    p, pp, ap, y            When invoked with no arguments print the last_value
-                            (e.g. just type 'y' instead 'y _')
-
 #{label " Documentation Commands ", :interactive_color}
     ri to_search            Search the ri doc for to_search (no quotes needed)
     ri obj.any_method       Search the method.owner ri doc for of any_method
@@ -82,7 +78,7 @@ module IRT
     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
+    restart|rs              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,8 @@ module IRT
       alias_method :tt, :add_test
 
       def save_as(path)
-        IRT::Utils.save_as(path) do
-          IRT::Session.run_file path
+        IRT::Utils.save_as(path) do |as_file|
+          IRT::Session.run_file as_file
         end
       end
       alias_method :sa, :save_as

data/lib/irt/extensions/irb.rb

@@ -1,4 +1,5 @@
 require 'irb'
+require 'irb/ext/save-history.rb'
 require 'irt/extensions/irb/context'
 require 'irt/extensions/irb/commands'
 
@@ -16,7 +17,6 @@ module IRB #:nodoc:
 
   def IRB.init_config(ap_path)
     original_init_config(ap_path)
-
     @CONF[:AP_NAME] = 'irt'
     @CONF[:PROMPT][:IRT] = { :PROMPT_I => "%02n >> ",
                              :PROMPT_S => '   "> ',
@@ -34,8 +34,21 @@ module IRB #:nodoc:
                                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{ IRT::History.save_history }
     @CONF[:RC_NAME_GENERATOR] = proc {|rc| File.expand_path '~/.irtrc' }
+  end
+
 
+  module HistorySavingAbility
+    def HistorySavingAbility.extended(obj)
+    # save_history has to be called just one time at exit
+    # IRB.conf[:AT_EXIT].push proc{obj.save_history}
+      obj.load_history
+      obj
+    end
   end
 
 end
+
+require 'irt/history'
+

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

@@ -25,6 +25,7 @@ module IRB
     def abort
       ensure_cli
       IRT::Session.exit_all = true
+      IRT::History.save_history
       original_abort
     end
     alias_method :xx, :abort

data/lib/irt/extensions/rails.rb

@@ -87,6 +87,20 @@ private
 
   end
 
+
+  module Commands
+    module Core
+
+      alias_method :original_rerun, :rerun
+      def rerun
+        reload!
+        original_rerun
+      end
+
+    end
+  end
+
+
   module Commands
     module Rails
 

data/lib/irt/history.rb

@@ -0,0 +1,5 @@
+module IRT
+  module History
+    extend IRB::HistorySavingAbility
+  end
+end

data/lib/irt/session.rb

@@ -36,7 +36,6 @@ module IRT
       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 unless @@exit_all

data/lib/irt/utils.rb

@@ -1,6 +1,7 @@
 require 'irt/prompter'
 
 module IRT
+
   module Utils
 
     extend self
@@ -11,31 +12,38 @@ module IRT
       return if IRT.initialized
       puts IRT::Utils.copyright
       ARGV.clear
-      tmp_path = create_tmp_file run
+      tmp_path = if run
+                   create_tmp_file {|as_file| IRT::Session.run_file as_file}
+                 else
+                   create_tmp_file
+                 end
       ARGV.push tmp_path
       IRB.start
     end
 
-    def create_tmp_file(run=true)
+    def create_tmp_file(&block)
       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) }
+      # ENV used because with IRT.cli? 2 different processes need to access the same path
+      ENV['IRT_TMP_PATH'] = tmp_path = tmp_file.path
+      at_exit { check_save_tmp_file(tmp_file, &block) }
       tmp_path
     end
 
-    def save_as(as_file_local, run=true)
+    def save_as(as_file_local, source_path=IRT.irt_file, &block)
       as_file = File.expand_path(as_file_local)
       if File.exists?(as_file)
         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 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
+      FileUtils.cp source_path, as_file
+      if block && IRT::Prompter.yes?( %(Do you want to run the file "#{as_file_local}" now?) )
+        # reset the tmpfile content so the at_exit proc will not be triggered
+        File.open(source_path, 'w'){|f| f.puts "\n"} if IRT.irt_file == Pathname.new(ENV['IRT_TMP_PATH']).realpath
+        block.call as_file, source_path
       end
     end
 
@@ -49,11 +57,11 @@ module IRT
 
   private
 
-    def check_save_tmp_file(tmp_file, run)
+    def check_save_tmp_file(tmp_file, &block)
       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)
+            save_as(as_file, tmp_file.path, &block)
           end
         end
       end

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: irt
 version: !ruby/object:Gem::Version 
-  hash: 957451098
-  prerelease: true
-  segments: 
-  - 1
-  - 2
-  - 0
-  - p01
-  version: 1.2.0.p01
+  prerelease: 6
+  version: 1.2.0.p02
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -16,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -04:00
+date: 2011-02-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
         version: 0.1.1
   type: :runtime
   version_requirements: *id001
@@ -43,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 1
-        - 3
         version: 0.1.3
   type: :runtime
   version_requirements: *id002
@@ -59,29 +43,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
         version: 0.1.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: fastri
+  name: bri
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 81
-        segments: 
-        - 0
-        - 3
-        - 1
-        - 1
-        version: 0.3.1.1
+        version: 0.1.5
   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.
@@ -125,6 +98,7 @@ files:
 - lib/irt/extensions/method.rb
 - lib/irt/extensions/object.rb
 - lib/irt/extensions/rails.rb
+- lib/irt/history.rb
 - lib/irt/hunks.rb
 - lib/irt/init.rb
 - lib/irt/log.rb
@@ -146,25 +120,17 @@ 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.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Interactive Ruby Tools - Improved irb and rails console with a lot of easy and powerful tools.