irt 1.1.6 → 1.1.7

data/README.markdown

@@ -64,7 +64,7 @@ first, then if you want more details you can read this documentation.
 
 ### Command/Directives Usage
 
-    >> irt_help
+    >> irt_help         # in an irt session
 
 ## Colored and Styled Output
 
@@ -79,7 +79,7 @@ IRT uses colors consistently, so you will have an instant feedback about what a
 - __blue__        for the Virtual Log, Rails Log and generic labels
 - __yellow__      for result echo (not setting last value), for binding sessions and for tests with diffs
 - __green__       for result echo (setting last value) (and object 'b' in a diff)
-- __red__         for erros, exceptions and rerun
+- __red__         for errors, exceptions and rerun
 
 Besides IRT is using reversed and bold styles to compose a more readable/graphical output.
 
@@ -105,7 +105,7 @@ to any existing file, irt will ask you to confirm that you want to create that f
 if you don't pass any path argument, irt will create a temporary one-empty-line file.
 
 Notice: When you pass a dir as the path, irt will recursively execute all the '.irt' files in it, so suffixing
-with '.irt' the files is not just a convention. It allows to skyp any non .irt file, like libraries or files
+with '.irt' the files is not just a convention. It allows to skip any non .irt file, like libraries or files
 used with the 'insert\_file' directive.
 
 #### Note about new files
@@ -166,8 +166,8 @@ that's not relevant for your code so the typo and the error doesn't get recorded
 When you just inspect a variable, using p, pp, ap, puts, y, ... or use any irt command...
 that are not relevant steps that you want to rerun the next time, so they don't get recorded in the log.
 
-Also , if you are in an inspecting or binding session,
-that stesps are not relevant for your tests, so they don't get recorded in the log.
+Also, if you are in an inspecting or binding session,
+that steps are not relevant for your tests, so they don't get recorded in the log.
 
 ### Log Management
 
@@ -201,7 +201,7 @@ When you type 'tt' irt serializes the current (last) value returned by the last
 and adds one test statement to your log. If you paste the log in the irt file,
 you will have it executed the next time you will run the file.
 
-Your tipical testing cycle with IRT is:
+Your typical testing cycle with IRT is:
 
 - write/change some code in your IDE
 - run it with irt and check some value from your code
@@ -216,7 +216,7 @@ a very complex object.
 Besides, when a test fails IRT can show you the tail of the running file, (use 'l' or configure
 IRT.tail_on_irt = true for automatic tail) so you have an instant feedback about where the
 failure comes from. It also opens an interactive session at that point with all
-the variables loaded, so you can imediately and interactively try and fix what went wrong.
+the variables loaded, so you can immediately and interactively try and fix what went wrong.
 
 If you want to edit the running file, just type 'nano' or  'vi' without any argument and you will open
 the file at the current line. Edit, save and exit from the editor, and you will continue your session
@@ -304,7 +304,7 @@ to play with your variables and methods during execution (see Binding Sessions)
 
 ### Object diff
 
-IRT can compare complex objects and shows the diffs. You can run 'vdiff obj_a, obj_b'
+IRT can compare complex objects and shows the diffs. You can run 'vdiff obj_a, obj_b' (or 'vd obj_a, obj_b')
 and have a nice and easy to check graphical diff report of the yaml dump of the 2 objects
 
 ### Kernel#capture
@@ -337,9 +337,9 @@ in place editing command to open the file at the line.
 
 ### Inspecting libs
 
-'pp', 'yaml' (and 'ap' if installed) are loaded, so you can use 'pp', 'ap' and 'y' commands to have
-a better looking inspection of your objects. Besides they are also enhanced a bit: when invoked
-with no arguments, they use the last value (\_) as the default (e.g. just type 'y' instead 'y \_')
+'pp' and 'yaml' are loaded, so you can use 'pp' and 'y' commands to have
+a better looking inspection of your objects. Besides 'p', 'pp', 'y' and 'ap' (if you require it in the .irtrc file)
+are also enhanced a bit: when invoked with no arguments, they use the last value (\_) as the default (e.g. just type 'y' instead 'y \_')
 
 ### In place inspecting/editing of backtraced files
 
@@ -459,7 +459,7 @@ and the prompt is '#>' instead '=>'. Example:
 
 ### File insert/eval
 
-You can split your tests and reuse them in other files as you whould do with 'partials' template files.
+You can split your tests and reuse them in other files as you would do with 'partials' template files.
 Use "insert_file 'file/path'" to insert a file into another. It will be evaluated by IRT as
 it were written right in the including file itself. Take that into account with variables and last_values.
 Besides, you should NOT suffix them with '.irt', so they will get ignored by the irt executable scanning the dirs.
@@ -483,6 +483,9 @@ play well with IRT, then copy and paste just part of it.
 You can also change the configuration options in the ~/.irtrc file. The following are the defaults
 which should work quite well without any change:
 
+    # uncomment if you want to use the awesome_print gem
+    # require 'ap'
+
     # set this to true if your prompt get messed up when you use the history
     # IRT.fix_readline_prompt = false
 
@@ -509,7 +512,7 @@ which should work quite well without any change:
     # IRT.nano_command_format = %(nano +%2$d "%1$s")
 
     # the format to build the command to launch vi
-    # IRT.vi_command_format = %(vi -c "startinsert" "%1$s" +%2$d)
+    # IRT.vi_command_format = %(vi "%1$s" +%2$d)
 
     # the format to build the command to launch the ri tool
     # if RUBY_VERSION < 1.9.2 uses qri (from fastri) else bri
@@ -568,13 +571,13 @@ worring about requiring them from your test files.
 
 For example:
 
-    working_dir
+    working_dir/
       irt_helper.rb #1
-      first_level
+      first_level/
         irt_helper.rb #2
         testA.irt
         testB.irt
-        second_level
+        second_level/
           irt_helper.rb #3
           test1.irt
           test2.irt
@@ -584,15 +587,17 @@ 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.
 
-### Rails
+## Rails
 
 You can use irt instead of the standard Rails console, by just calling the irt executable from
-any Rails application dir. By default IRT will output the rails log (colored in blue) right in the console.
+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).
 
+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 3
+### Rails 3
 
 You must add the gem to your Gemfile, to make the bundler happy:
 
@@ -603,7 +608,7 @@ it will ask and eventually add it for you.
 
 ## Known Issue
 
-IRT use yaml serialization, and inherits its limits (e.g.: Yaml cannot dump anonymous classes, MatchData, oject that contains binding, etc.)
+IRT uses yaml serialization, and inherits its limits (e.g.: Yaml cannot dump anonymous classes, MatchData, object that contains binding, etc.)
 so if you stumble upon on one of them, you have just to test the subparts of the object that you cannot dump. For example, instead of testing one whole anonymous
 class, (which is however a bad idea) you can add tests for the values returned by its methods or variables.
 

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

data/bin/irt

@@ -7,6 +7,12 @@ require 'optparse'
 require 'prompter'
 require 'dye'
 
+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
 
@@ -24,7 +30,7 @@ Usage:
 Options:
 EOB
 
-  options[:interactive_eof]
+  options[:interactive_eof] = false
   opts.on( '-i', '--interactive-eof', 'Opens an interactive session at EOF') do
     options[:interactive_eof] = true
   end
@@ -35,10 +41,15 @@ EOB
   end
 
   options[:rails_env] = 'development'
-  opts.on( '-r', '--rails-env [ENVIRONMENT]', 'Sets the Rails Environment' ) do |env|
+  opts.on( '-e', '--rails-env [ENVIRONMENT]', 'Sets the Rails Environment' ) do |env|
      options[:rails_env] = env
    end
 
+  options[:no_rails] = false
+  opts.on( '-n', '--no-rails', 'Does not autoload the Rails Environment' ) do
+     options[:no_rails] = true
+   end
+
   opts.on( '-v', '--version', 'Shows the version and exits' ) do
     puts version
     exit
@@ -61,14 +72,25 @@ paths = if ARGV.empty?
           tmp_file = Tempfile.new(['', '.irt'])
           tmp_file << "\n" # one empty line makes irb of 1.9.2 happy
           tmp_file.flush
-          [ tmp_file.path ]
+          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 ]
         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 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)
@@ -78,16 +100,16 @@ files = paths.map do |path|
         end.flatten
 
 if files.empty?
-  Prompter.say_notice 'No *.irt files to run'
+  prompter.say_notice 'No *.irt files to run'
   exit
 end
 
-cmd_format = if File.exists?('./config/environment.rb')
+cmd_format = if File.exists?('./config/environment.rb') && !options[:no_rails]
                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
+                   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
                      File.open('Gemfile', 'a') do |f|
                        f.puts %(gem "irt")
                      end

data/irtrc

@@ -1,3 +1,6 @@
+# uncomment if you want to use the awesome_print gem
+# require 'ap'
+
 # IRT RC file
 # ITR conf options
 
@@ -27,7 +30,7 @@
 # IRT.nano_command_format = %(nano +%2$d "%1$s")
 
 # the format to build the command to launch vi
-# IRT.vi_command_format = %(vi -c "startinsert" "%1$s" +%2$d)
+# IRT.vi_command_format = %(vi "%1$s" +%2$d)
 
 # the format to build the command to launch the ri tool
 # if RUBY_VERSION < 1.9.2 uses qri (from fastri) else bri

data/lib/irt.rb

@@ -50,7 +50,7 @@ module IRT
     Dye.color = bool
   end
 
-  def init
+  def init_config
     @session_no = 0
     @differ = IRT::Differ
     @irt_on_diffs = true
@@ -91,18 +91,30 @@ module IRT
                                'gnome-open %1$s'
                              end
     end
-    @vi_command_format = %(vi -c "startinsert" "%1$s" +%2$d)
+    @vi_command_format = %(vi "%1$s" +%2$d)
     @nano_command_format = %(nano +%2$d "%1$s")
     @ri_command_format =  IRT::RubyVersion >= '1.9.2' ? %(bri "%s") : %(qri -f #{Dye.color? ? 'ansi' : 'plain'} "%s")
     @debug = false
   end
 
-  def init_files
+  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
+    IRB::ExtendCommandBundle.class_eval do
+      [:p, :y, :pp, :ap].each do |m|
+        next unless begin
+                      method(m)
+                    rescue NameError
+                    end
+        define_method(m) do |*args|
+          args = [context.last_value] if args.empty?
+          super *args
+        end
+      end
+    end
   end
 
   def lib_path

data/lib/irt/commands/core.rb

@@ -20,13 +20,6 @@ module IRT
       end
       alias_method :open_session, :irt # legacy method
 
-      [:p, :y, :pp, :ap].each do |m|
-        define_method(m) do |*args|
-          args = [context.last_value] if args.empty?
-          super *args
-        end
-      end
-
       def vdiff(a,b)
         puts IRT::Differ.new(a,b, :value, {:a_marker => 'a',
                                            :b_marker => 'b',

data/lib/irt/commands/test.rb

@@ -45,13 +45,8 @@ module IRT
       alias_method :tt, :add_test
 
       def save_as(path)
-        path = File.expand_path(path)
-        if File.exists?(path)
-          return if IRT.prompter.no? %(Do you want to overwrite "#{path}"?), :hint => '[y|<enter=n]', :default => 'n'
-        end
-        cp IRT.irt_file, path
-        ENV['IRT_COMMAND'] = ENV['IRT_COMMAND'].sub(/#{Regexp.quote(IRT.irt_file)}/, path)
-        rerun
+        require 'irt/utils'
+        IRT::Utils.save_as(IRT.irt_file, path, IRT.prompter){ rerun }
       end
       alias_method :sa, :save_as
 

data/lib/irt/extensions/irb.rb

@@ -11,7 +11,7 @@ module IRB #:nodoc:
 
   def IRB.setup(ap_path=nil)
     irb_setup(ap_path)
-    IRT.init_files
+    IRT.before_run
   end
 
   def IRB.init_config(ap_path)
@@ -35,12 +35,7 @@ module IRB #:nodoc:
     @CONF[:AT_EXIT] << proc{ print "\e[0m" if Dye.color? } # reset colors
     @CONF[:RC_NAME_GENERATOR] = proc {|rc| File.expand_path '~/.irtrc' }
 
-    IRT.init
-  end
-
-  def IRB.irb_exit(irb, ret)
-    IRT::Session.exit
-    throw :IRB_EXIT, ret
+    IRT.init_config
   end
 
 end

data/lib/irt/extensions/method.rb

@@ -12,7 +12,7 @@ class Method
         end
     arr = Array.new(n)
     set_trace_func proc{ |event, file, line, meth_name, binding, classname|
-      if event.eql?('call') && name.match(meth_name.to_s)
+      if event.eql?('call') && name.to_s.match(meth_name.to_s)
         f = file
         l = line
         set_trace_func nil

data/lib/irt/session.rb

@@ -27,6 +27,8 @@ module IRT
       IRT.log.status << [new_context.irb_name, mode]
       IRT.log.print_status unless mode == :file
       catch(:IRB_EXIT) { new_context.irb.eval_input }
+    ensure
+      IRT::Session.exit
     end
 
     def exit

data/lib/irt/utils.rb

@@ -0,0 +1,22 @@
+module IRT
+  module Utils
+
+    extend self
+
+    def save_as(file, as_file_local, prompter)
+      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'
+      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
+      end
+      true
+    end
+
+  end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: irt
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 6
-  version: 1.1.6
+  prerelease: 
+  version: 1.1.7
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -04:00
+date: 2011-02-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
         version: 0.1.1
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
         version: 0.1.1
   type: :runtime
   version_requirements: *id002
@@ -58,29 +43,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
         version: 0.1.2
   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.
@@ -129,6 +103,7 @@ files:
 - lib/irt/log.rb
 - lib/irt/ruby_version.rb
 - lib/irt/session.rb
+- lib/irt/utils.rb
 has_rdoc: true
 homepage: http://github.com/ddnexus/irt
 licenses: []
@@ -143,25 +118,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.