irt 1.2.2 → 1.2.3

data/README.markdown

@@ -423,6 +423,13 @@ the wanted line. Example:
 
 ## General Tools
 
+### Permanent last value (_)
+
+IRT tries to keep the relevant results from running code, separated from the results of the inspecting
+and documentation commands. In practice all the IRT commands, and the inspecting commands (like 'p', 'pp', 'y' and 'ap')
+don't set the last value, so you can mix them with your code and the '_' will remain set to your last relevant result.
+That is specially useful when you want to add a test with the 'add_test' (or 'tt') command.
+
 ### Contextual ri doc with autocompletion
 
 IRT offers the 'ri' command implemented with fastri for RUBY_VERSION < 1.9.2, or 'bri' for RUBY_VERSION >= 1.9.2:
@@ -737,7 +744,30 @@ You must add the gem to your Gemfile, to make the bundler happy:
 eventually adding it only to the group that you prefer. Anyway, if the irt executable detects that you don't have it set,
 it will ask and eventually add it for you.
 
-## Known Issues
+## Known Issues (and fixes)
+
+### Readline history
+
+The ruby readline library may have a problem with the history when you use an ANSI colored prompt
+(see this [readline bug](http://www.ruby-forum.com/topic/213807)).
+If your prompt get messed up while you are navigating the history, you need to enable the 'fix\_readline\_prompt'
+configuration option (see the Configuration session). That option fixes the prompt when it get messed, but messed
+it if it doesn't, so if you switch among different ruby versions, you might need to make it conditional. For example:
+
+    if IRT::RubyVersion <= '1.8.7'
+      IRT.fix_readline_prompt = true
+    end
+
+#### MacOS X and libedit
+
+If you are on MacOS X, your ruby might use libedit instead of readline. In that case you are not affected
+by the above readline bug, but you will be bothered by a few other problems, so you might want to link your ruby
+to readline. Depending on your installation, you have a few different choices to avoid to reinstall ruby.
+
+Useful links you can start with:
+
+* [RVM-readline](http://rvm.beginrescueend.com/packages/readline/)
+* [MacPort-readline](http://henrik.nyh.se/2008/03/irb-readline)
 
 ### Yaml serialization
 

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/irt.gemspec

@@ -14,19 +14,31 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('differ', [">= 0.1.1"])
   s.add_runtime_dependency('dye', [">= 0.1.3"])
   s.add_runtime_dependency('prompter', [">= 0.1.4"])
-  s.requirements << "In order to use the IRT contextual ri command you must install the gem 'bri' (ruby >=1.9.2) or 'fastri' (ruby < 1.9.2)"
 
   s.executables = ['irt', 'irt_irb', 'irt_rails2']
   s.files = `git ls-files -z`.split("\0") - %w[irt-tutorial.pdf]
   s.post_install_message = <<EOM
+________________________________________________________________________________
 
-********************************************************************************
+                                IMPORTANT NOTES
+________________________________________________________________________________
 
-  In order to use the IRT contextual ri command you must also install the gem:
-  "bri"    if you run ruby >= 1.9.2
-  "fastri" if you run ruby  < 1.9.2
+  1. If you notice a messed prompt while navigating the history, you must
+     enable the 'fix_readline_prompt' option in the ~/.irtrc file:
 
-********************************************************************************
+        IRT.fix_readline_prompt = true
+
+     (see the README file for details)
+
+________________________________________________________________________________
+
+  2. In order to use the IRT contextual ri command, one of the following gems
+     must be installed:
+
+       "bri"    if you run ruby >= 1.9.2
+       "fastri" if you run ruby  < 1.9.2
+
+________________________________________________________________________________
 
 EOM
   s.name = name

data/lib/irt.rb

@@ -100,7 +100,7 @@ module IRT
     @vi_command_format = %(vi "%1$s" +%2$d)
     @nano_command_format = %(nano +%2$d "%1$s")
     @emacs_command_format = %(emacs +%2$d "%1$s")
-    @ri_command_format =  IRT::RubyVersion >= '1.9.2' ? %(bri "%s") : %(qri -f #{Dye.color? ? 'ansi' : 'plain'} "%s")
+    @ri_command_format =  IRT::Commands::Ri::GEM == 'bri' ? %(bri "%s") : %(qri -f #{Dye.color? ? 'ansi' : 'plain'} "%s")
     @pager_command = 'less -R'
     @debug = false
   end
@@ -136,8 +136,6 @@ module IRT
   def start
     return if initialized
     puts copyright
-    ARGV.clear
-    ARGV.push create_tmp_file
     IRB.start
   end
 

data/lib/irt/commands/help.rb

@@ -43,11 +43,11 @@ module IRT
     c<editor>               Like `copy_lines` and <editor> in just one step
 
 #{label(" Test Commands ", :interactive_color) + IRT.dye(" (only available in interactive sessions)", :interactive_color, :bold)}
-    add_desc|dd desc        Adds a description for the test in the log
-    add_test|tt             Adds a test in the log, checking the last value (_)
+    add_desc|ad|dd desc     Adds a description for the test in the log
+    add_test|at|tt          Adds a test in the log, checking the last value (_)
                             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'
+    add_test|at|tt desc     Like add_test but adds a 'desc' directive first'
     save_as|sa path         Saves the current irt file as path
 
 #{label " FileUtils Commands ", :interactive_color}
@@ -117,8 +117,8 @@ module IRT
                             the evaluated yaml file
                             e.g.: {:a => 2}.vi  #=> {:an_edited => 'value'}
     Method#location         When possible, it returns file and line where the
-                            method is defined. It is uitable to be passed to the
-                            in place editing commands.
+                            method is defined. It is suitable to be passed to
+                            the in place editing commands.
     Method#info             Returns useful info about the method. It is suitable
                             to be passed to the in place editing commands.
 )

data/lib/irt/commands/ri.rb

@@ -2,6 +2,7 @@ module IRT
   module Commands
     module Ri
 
+      GEM = IRT::RubyVersion >= '1.9.2' ? 'bri' : 'fastri'
       @@choices_map = {}
 
       def self.reset_choices_map
@@ -26,6 +27,9 @@ module IRT
             return
           end
 
+        when arg =~ /^[A-Z]\w+\#[^.]+/
+          to_search = arg
+
         when arg !~ /\./
           begin
             obj = eval arg, IRB.CurrentContext.workspace.binding
@@ -63,7 +67,13 @@ module IRT
     private
 
       def process_ri(to_search)
-        ri = `#{sprintf(IRT.ri_command_format, to_search)}`
+        ri = if defined?(Bundler)
+               Bundler.with_clean_env do
+                 `#{sprintf(IRT.ri_command_format, to_search)}`
+               end
+             else
+               `#{sprintf(IRT.ri_command_format, to_search)}`
+             end
         ri_problem unless $?.to_i == 0
         return if ri.match(/^(nil|No matching results found)$/)
         if m = ri.match(/^(-+.*Multiple choices:.*\n\n)(.+)/m)
@@ -82,10 +92,9 @@ module IRT
       end
 
       def ri_problem
-        ri_gem = IRT::RubyVersion >= '1.9.2' ? 'bri' : 'fastri'
-        message = system("#{required} -v") ?
-                    "Bad ri_command_format for this system." :
-                    %(You must install the "#{ri_gem}" gem to use this command with ruby #{RUBY_VERSION}.)
+        cmds = {'bri' => 'bri', 'fastri' => 'qri'}
+        message = `#{cmds[GEM]}` ? "Bad ri_command_format for this system." :
+                           %(You must install the "#{GEM}" gem to use this command with ruby #{RUBY_VERSION}.)
         raise IRT::NotImplementedError, message
       end
 

data/lib/irt/commands/test.rb

@@ -14,6 +14,7 @@ module IRT
         puts
       end
       alias_method :dd, :add_desc
+      alias_method :ad, :add_desc
 
       def add_test(description='')
         mode = context.irt_mode
@@ -43,6 +44,7 @@ module IRT
         puts
       end
       alias_method :tt, :add_test
+      alias_method :at, :add_test
 
       def save_as(file_path)
         IRT.save_as(file_path)

data/lib/irt/directives/test.rb

@@ -46,10 +46,7 @@ module IRT
       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
-         require helper_path
-       rescue LoadError
-       end
+       require helper_path if File.exist?(helper_path)
       end
     end
 

data/lib/irt/extensions/irb.rb

@@ -8,6 +8,7 @@ module IRB #:nodoc:
   class << self
     alias_method :original_init_config, :init_config
     alias_method :original_setup, :setup
+    alias_method :original_parse_opts, :parse_opts
   end
 
   def IRB.setup(ap_path=nil)
@@ -38,6 +39,13 @@ module IRB #:nodoc:
     @CONF[:RC_NAME_GENERATOR] = proc {|rc| File.expand_path '~/.irtrc' }
   end
 
+  def IRB.parse_opts
+    IRB.original_parse_opts
+    unless @CONF[:SCRIPT]
+      @CONF[:SCRIPT] = IRT.create_tmp_file
+      $0 = @CONF[:SCRIPT]
+    end
+  end
 
   module HistorySavingAbility
     def HistorySavingAbility.extended(obj)

data/lib/irt/extensions/rails.rb

@@ -72,22 +72,6 @@ private
     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 Utils
     alias_method :original_ask_run_new_file, :ask_run_new_file
     # skips asking to run the save file if it is a tmp file in a server session
@@ -109,10 +93,8 @@ private
       end
 
     end
-  end
 
 
-  module Commands
     module Rails
 
       extend self # ignored_echo_commands

data/lib/irt/session.rb

@@ -36,7 +36,7 @@ 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 }
-      begin throw(:IRB_EXIT) ; rescue ArgumentError ; end if @@exit_all
+      begin throw(:IRB_EXIT) ; rescue Exception ; end if @@exit_all
     ensure
       IRT::Session.exit unless @@exit_all
       trap 'SIGINT', old_trap if old_trap
@@ -75,6 +75,11 @@ module IRT
       IRB.conf[:AT_EXIT].push(openfile)
       @@exit_all = true
       throw(:IRB_EXIT)
+    ensure
+      unless IRT.cli?
+        IRB.irb_at_exit
+        enter :interactive
+      end
     end
 
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: irt
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.2.2
+  hash: 25
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 -04:00
+date: 2011-03-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
   type: :runtime
   version_requirements: *id001
@@ -32,6 +42,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 1
+        - 3
         version: 0.1.3
   type: :runtime
   version_requirements: *id002
@@ -43,6 +58,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
         version: 0.1.4
   type: :runtime
   version_requirements: *id003
@@ -99,9 +119,29 @@ has_rdoc: true
 homepage: http://github.com/ddnexus/irt
 licenses: []
 
-post_install_message: "\n\
-  ********************************************************************************\n\n  In order to use the IRT contextual ri command you must also install the gem:\n  \"bri\"    if you run ruby >= 1.9.2\n  \"fastri\" if you run ruby  < 1.9.2\n\n\
-  ********************************************************************************\n\n"
+post_install_message: |+
+  ________________________________________________________________________________
+  
+                                  IMPORTANT NOTES
+  ________________________________________________________________________________
+  
+    1. If you notice a messed prompt while navigating the history, you must
+       enable the 'fix_readline_prompt' option in the ~/.irtrc file:
+  
+          IRT.fix_readline_prompt = true
+  
+       (see the README file for details)
+  
+  ________________________________________________________________________________
+  
+    2. In order to use the IRT contextual ri command, one of the following gems
+       must be installed:
+  
+         "bri"    if you run ruby >= 1.9.2
+         "fastri" if you run ruby  < 1.9.2
+  
+  ________________________________________________________________________________
+  
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -111,17 +151,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: 
-- In order to use the IRT contextual ri command you must install the gem 'bri' (ruby >=1.9.2) or 'fastri' (ruby < 1.9.2)
+requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Interactive Ruby Tools - Very improved irb and Rails Console with a lot of cool features.