irt 1.1.5 → 1.1.6

data/README.markdown

@@ -36,7 +36,7 @@ to distinguish, and showing NOTHING about the test code that produced the failur
 When something fails IRT assumes that you don't want just to know that something went wrong,
 but that you actually want to fix it! IRT assumes that...
 
-- you want to know exactly what the resulting diffs are
+- you want to know exactly what are the resulting diffs
 - you want to look at the code that failed without having to search for it
 - you want to play with it IMMEDIATELY in an interactive session, right in the context of the failure
 - you want to eventually edit and possibly fix it, right in the console
@@ -366,8 +366,8 @@ the wanted line. Example:
 
 ### Contextual ri doc with autocompletion
 
-IRT offers the 'ri' command, implemented with fastri so you should have it installed.
-It uses 'qri' by default but you can change the IRT.ri_command_format if you prefer to use 'fri'.
+IRT offers the 'ri' command, (implemented with fastri for RUBY_VERSION < 1.9.2, or 'bri' for RUBY_VERSION >= 1.9.2)
+See also the IRT.ri_command_format option if you want to change it.
 
 In its basic form the 'ri' command can accept a string as the system ri command does (you can even omit the quotes).
 
@@ -425,18 +425,18 @@ You can also print it with 'status' (or 'ss') at any time.
 ### Quasi-shell
 
 Save some typing for system calls and avoid to open a shell.
-You can use the '$' as an alias of 'system' with the difference that you don't need to use quotes
-(although quotes will work anyway), and the command will not be logged. Examples:
+You can use the 'sh' as an alias of 'system' with the difference that you don't need to use quotes
+(although the quotes work anyway), and the command will not be logged. Examples:
 
-    >> $ ls -F
-    >> $ tail /some/path
-    >> $ git rebase -i HEAD~5
-    >> $ cat #{file_path}
+    >> sh ls -F
+    >> sh tail /some/path
+    >> sh git rebase -i HEAD~5
+    >> sh cat #{file_path}
 
 ### FileUtils
 
 All the FileUtils methods are included as commands: just call them in the session
-and they will ignored by the log; if they are part of your testing, use them as usual
+and they will ignored by the log; if they are part of your testing, use them as usual:
 
     >> rm_rf 'dir/to/remove'           # ignored because it's an irt command
     >> FileUtils.rm_rf 'dir/to/remove' # logged because it's a regular statement
@@ -512,7 +512,7 @@ which should work quite well without any change:
     # IRT.vi_command_format = %(vi -c "startinsert" "%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
+    # if RUBY_VERSION < 1.9.2 uses qri (from fastri) else bri
     # IRT.ri_command_format = %(qri -f #{Dye.color? ? 'ansi' : 'plain'} "%s")
     # IRT.ri_command_format = %(bri "%s")
 
@@ -521,13 +521,13 @@ which should work quite well without any change:
     # IRT.edit_command_format = "your_preferred_GUI_editor %1$s +%2$d"
 
     # any log-ignored-echo command you want to add
-    # IRT.log.ignored_echo_commands << %w[commandA commandB ...]
+    # IRT.log.ignored_echo_commands << [:commandA, :commandB ...]
 
     # any log-ignored command you want to add (includes all the log-ignored-echo commands)
-    # IRT.log.ignored_commands << %w[commandC commandD ...]
+    # IRT.log.ignored_commands << [:commandC, :commandD ...]
 
     # any command that will not set the last value (includes all the log-ignored commands)
-    # IRT.log.non_setting_commands << %w[commandE commandF ...]
+    # IRT.log.non_setting_commands << [:commandE, :commandF ...]
 
     # shows the rails log in console
     # IRT.rails_log = true
@@ -589,8 +589,8 @@ will not be loaded, so be careful to be in the right dir to make it work properl
 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.
 
-You can switch the rails log ON or OFF by using the 'rails\_log\_on' and 'rails\_log\_off' commands in any session,
-besides you can set the option true or false in the ~/.irtrc file.
+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
 
@@ -598,8 +598,8 @@ You must add the gem to your Gemfile, to make the bundler happy:
 
     gem 'irt'
 
-eventually adding it only to the group that you prefer.
-
+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 Issue
 

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/bin/irt_rails2

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-argv = ARGV.dup
-argv.pop               # remove --simple-prompt
-argv.push argv.shift   # move the irt file to the end
-exec "irt_irb #{argv.join(' ')}"
+ARGV.pop               # remove --simple-prompt
+ARGV.push ARGV.shift   # move the irt file to the end
+exec "irt_irb #{ARGV.join(' ')}"

data/irtrc

@@ -30,7 +30,7 @@
 # IRT.vi_command_format = %(vi -c "startinsert" "%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
+# if RUBY_VERSION < 1.9.2 uses qri (from fastri) else bri
 # IRT.ri_command_format = %(qri -f #{Dye.color? ? 'ansi' : 'plain'} "%s")
 # IRT.ri_command_format = %(bri "%s")
 
@@ -39,13 +39,13 @@
 # IRT.edit_command_format = "your_preferred_GUI_editor %1$s +%2$d"
 
 # any log-ignored-echo command you want to add
-# IRT.log.ignored_echo_commands << %w[commandA commandB ...]
+# IRT.log.ignored_echo_commands << [:commandA, :commandB ...]
 
 # any log-ignored command you want to add (includes all the log-ignored-echo commands)
-# IRT.log.ignored_commands << %w[commandC commandD ...]
+# IRT.log.ignored_commands << [:commandC, :commandD ...]
 
 # any command that will not set the last value (includes all the log-ignored commands)
-# IRT.log.non_setting_commands << %w[commandE commandF ...]
+# IRT.log.non_setting_commands << [:commandE, :commandF ...]
 
 # shows the rails log in console
 # IRT.rails_log = true

data/lib/irt/commands/core.rb

@@ -20,7 +20,7 @@ module IRT
       end
       alias_method :open_session, :irt # legacy method
 
-      %w[p y pp ap].each do |m|
+      [:p, :y, :pp, :ap].each do |m|
         define_method(m) do |*args|
           args = [context.last_value] if args.empty?
           super *args
@@ -47,6 +47,10 @@ module IRT
       end
       alias_method :rr, :rerun
 
+      def sh(*args)
+        system *args
+      end
+
     end
   end
 end

data/lib/irt/commands/help.rb

@@ -71,7 +71,9 @@ module IRT
 
 #{label(" Rails Commands ", :interactive_color) + IRT.dye(" (only available for Rails Apps)", :interactive_color, :bold)}
     rails_log_on            Turn the rails log-in-console ON
+    rlon|rlo                Aliases for rails_log_on
     rails_log_off           Turn the rails log-in-console OFF
+    rloff|rlf               Aliases for rails_log_off
 
 #{label " Misc Commands ", :interactive_color}
     x|q                     Aliases for exit (from the current session)
@@ -79,7 +81,7 @@ module IRT
     status|ss               Prints the session status line
     rerun|rr                Reruns the same file
     irt_help|hh             Shows this screen
-    $ shell_command         Alias for system("shell_command") (no quotes needed)
+    sh command              Alias for system("command") (no quotes needed)
 
 #{label " Session Directives ", :file_color}
     irt                     Opens an interactive session which retains the

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

@@ -39,12 +39,12 @@ module IRB
       log_file_line(line_no) if irt_mode == :file
       begin
         # skip setting last_value for non_setting_commands
-        if line =~ /^\s*(#{quoted_option_string(IRT.log.non_setting_commands)})(?:[ \t]+|\b)(.+)*/
+        if line =~ /^\s*(#{quoted_option_string(IRT.log.non_setting_commands)})\b(.*)$/
           command, args = $1, $2
-          if command =~ /^(\$|ri)$/ && irt_mode != :file
-            cmd = command == '$' ? 'system' : command
-            args = "%(#{args})" unless args.match(/^('|").+\1$/)
-            line = "#{cmd} #{args}"
+          if command =~ /^(sh|ri)$/ && irt_mode != :file
+            args = args.strip if args
+            args = "%(#{args})" unless args.empty? || args.match(/^('|").+\1$/)
+            line = "#{command} #{args}"
           end
           IRT::Commands::Ri.reset_choices_map unless command == 'ri'
           self.echo = false
@@ -145,7 +145,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)})/
+        unless l =~ /^\s*(#{quoted_option_string(IRT.log.ignored_commands)})\b/
           IRT.log.add_line l, @last_line_no
         end
       end

data/lib/irt/extensions/rails.rb

@@ -24,11 +24,17 @@ module IRT
 
       def rails_log_on
         IRT.rails_log = true
+        "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"
       end
+      alias_method :rloff, :rails_log_off
+      alias_method :rlf, :rails_log_off
 
     end
   end

data/lib/irt/log.rb

@@ -10,7 +10,7 @@ module IRT
       @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, :'$']
+                          [ :p, :pp, :ap, :y, :puts, :print, :irt, :irb ]
       @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)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: irt
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 -04:00
+date: 2011-02-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency