irt 1.1.4 → 1.1.5

data/README.markdown

@@ -1,4 +1,4 @@
-# irt
+# IRT
 
 Interactive Ruby Tools - Improved irb and rails console with a lot of easy and powerful tools.
 
@@ -76,7 +76,7 @@ IRT uses colors consistently, so you will have an instant feedback about what a
 - __cyan__        for files, saved values (and object 'a' in a diff)
 - __magenta__     for interactive sessions
 - __black/white__ for generic stdin/stdout and inspecting sessions (e.g. 'irt my_obj')
-- __blue__        for the Virtual Log and generic labels
+- __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
@@ -102,23 +102,21 @@ There are 4 irt modes / session types: file, interactive, inspect, binding.
 IRT always start in file mode, which simply means that it will execute the code in a file.
 Indeed you launch irt passing a path argument of one or more existing files or dirs. If any path does not refer
 to any existing file, irt will ask you to confirm that you want to create that file. Eventually
-if you don't pass any path argument, irt will create a temporary empty file.
-
-A new or temporary created file contains just one statement: 'irt' which will open an interactive session.
+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
-used with the 'insert_file' directive.
+used with the 'insert\_file' directive.
 
 #### Note about new files
 
 The new created files are implicitly run with the -i (--interative-eol) flag by default.
 That flag instruct irt to open an interactive session at the end of the file, so you will have the possibilty
 to add your statements. As long as you rerun the file (with the 'rr' command) IRT will remember the flag,
-anyway, if the session ends and you have to re-launch it from the command line, you must pass the -e flag
+anyway, if the session ends and you have to re-launch it from the command line, you must pass the -i flag
 explicitly or no interactive session will be opened automatically.
 
-You can save any running file as another file with the 'save_as' command.
+You can save any running file as another file with the 'save\_as' command.
 
 ### Interactive Sessions (magenta)
 
@@ -397,7 +395,7 @@ Besides it offers a very useful contextual search, that will find the ri doc of
 Example:
 
     # autocompletion
-    >> ri "any string".eq[TAB]
+    >> ri "any string".eq[TAB][TAB]
     .eql?    .equal?
 
     >> ri "a string".eql?
@@ -424,9 +422,16 @@ The status line shows the nesting status of your sessions: each time you open a
 session or exit from the current session it is automatically printed.
 You can also print it with 'status' (or 'ss') at any time.
 
-### System Shortcuts
+### 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:
 
-Save some typing for common system calls like ls, cat, vi, nano
+    >> $ ls -F
+    >> $ tail /some/path
+    >> $ git rebase -i HEAD~5
+    >> $ cat #{file_path}
 
 ### FileUtils
 

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/bin/irt

@@ -84,6 +84,15 @@ end
 
 cmd_format = if File.exists?('./config/environment.rb')
                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
+                     File.open('Gemfile', 'a') do |f|
+                       f.puts %(gem "irt")
+                     end
+                   end
+                 end
                  'rails c %s %s %s'
                elsif File.exists?('./script/console')
                  'ruby script/console --irb="irt_rails2 %s"'
@@ -101,7 +110,7 @@ ENV['IRT_INTERACTIVE_EOF'] = options[:interactive_eof].inspect if options[:inter
 files.each do |file|
   ENV['IRT_COMMAND'] = sprintf cmd_format, file, options[:irb_options], options[:rails_env]
   unless system(ENV['IRT_COMMAND'])
-    puts "\e[0m" if Dye.color?
+    puts Dye.sgr(:clear) if Dye.color?
     exit(1)
   end
 end

data/lib/irt.rb

@@ -99,9 +99,9 @@ module IRT
 
   def init_files
     @irt_file = IRB.conf[:SCRIPT]
+    require 'irt/extensions/rails' if defined?(ActiveSupport::BufferedLogger)
     @log = Log.new
     @log.print_running_file
-    require 'irt/extensions/rails' if defined?(ActiveSupport::BufferedLogger)
     IRT::Directives.load_helper_files
   end
 

data/lib/irt/commands/{system.rb → edit.rb}

@@ -1,18 +1,6 @@
 module IRT
   module Commands
-    module System
-
-      def cat(*args)
-        ensure_session
-        return system "cat #{context.file_line_pointers.first}" if args.empty?
-        system "cat #{args * ' '}"
-      end
-
-      def ls(*args)
-        ensure_session
-        args = %w[.] if args.empty?
-        system "ls #{args * ' '}"
-      end
+    module Edit
 
       def copy_lines
         ensure_session

data/lib/irt/commands/help.rb

@@ -69,12 +69,17 @@ module IRT
     ri n                    Search the ri doc for the method n in a multiple
                             choices list
 
+#{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
+    rails_log_off           Turn the rails log-in-console OFF
+
 #{label " Misc Commands ", :interactive_color}
     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
     irt_help|hh             Shows this screen
+    $ shell_command         Alias for system("shell_command") (no quotes needed)
 
 #{label " Session Directives ", :file_color}
     irt                     Opens an interactive session which retains the

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

@@ -1,6 +1,6 @@
 require 'irt/commands/log'
 require 'irt/commands/test'
-require 'irt/commands/system'
+require 'irt/commands/edit'
 require 'irt/commands/core'
 require 'irt/commands/help'
 require 'irt/commands/ri'
@@ -11,7 +11,7 @@ module IRB
 
     include IRT::Commands::Log
     include IRT::Commands::Test
-    include IRT::Commands::System
+    include IRT::Commands::Edit
     include IRT::Commands::Core
     include IRT::Commands::Help
     include IRT::Commands::Ri

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

@@ -38,18 +38,18 @@ module IRB
       end
       log_file_line(line_no) if irt_mode == :file
       begin
-        # ri arg to string
-        if m = line.match(/^(\s*ri[ \t]+)(.+)$/)
-          pre, to_search = m.captures
-          line = "#{pre}#{to_search.inspect}" unless to_search.match(/^('|").+\1$/)
-        else
-          IRT::Commands::Ri.reset_choices_map
-        end
         # skip setting last_value for non_setting_commands
-        if line =~ /^\s*(#{IRT.log.non_setting_commands * '|'})\b/
+        if line =~ /^\s*(#{quoted_option_string(IRT.log.non_setting_commands)})(?:[ \t]+|\b)(.+)*/
+          command, args = $1, $2
+          if command =~ /^(\$|ri)$/ && irt_mode != :file
+            cmd = command == '$' ? 'system' : command
+            args = "%(#{args})" unless args.match(/^('|").+\1$/)
+            line = "#{cmd} #{args}"
+          end
+          IRT::Commands::Ri.reset_choices_map unless command == 'ri'
           self.echo = false
           res = @workspace.evaluate(self, line, irb_path, line_no)
-          if line =~ /^\s*(#{IRT.log.ignored_echo_commands * '|'})\b/
+          if command =~ /^(#{IRT.log.ignored_echo_commands * '|'})$/
             output_ignored_echo_value(res)
           end
         else
@@ -59,14 +59,14 @@ module IRB
       rescue Exception => e
         @exception_raised = true
         process_exception(e)
-        print "\e[31m" if Dye.color?
+        print Dye.sgr(IRT.dye_styles[:error_color]) if Dye.color?
         raise
       else
         log_session_line(line, line_no) unless irt_mode == :file
       end
     end
 
-    %w[prompt_i prompt_s prompt_c prompt_n].each do |m|
+    [:prompt_i, :prompt_s, :prompt_c, :prompt_n].each do |m|
       define_method(m) do
         pr = instance_variable_get("@#{m}")
         col_pr = IRT.dye pr, "#{irt_mode}_color".to_sym
@@ -95,6 +95,10 @@ module IRB
 
 private
 
+    def quoted_option_string(arr)
+      arr.map{|c|Regexp.quote(c.to_s)} * '|'
+    end
+
     def process_exception(e)
       bktr = e.backtrace.reject do |m|
                workspace.filter_backtrace(m).nil? || !IRT.debug && File.expand_path(m).match(/^#{IRT.lib_path}/)
@@ -141,7 +145,9 @@ private
       i = -1
       str.each_line do |l|
         @last_line_no = line_no + i+=1
-        IRT.log.add_line l, @last_line_no
+        unless l =~ /^\s*(#{quoted_option_string(IRT.log.ignored_commands)})/
+          IRT.log.add_line l, @last_line_no
+        end
       end
     end
 

data/lib/irt/extensions/rails.rb

@@ -16,16 +16,22 @@ class ActiveSupport::BufferedLogger
 
 end
 
-module IRB
-  module ExtendCommandBundle #:nodoc:
+module IRT
+  module Commands
+    module Rails
 
-    def rails_log_on
-      IRT.rails_log = true
-    end
+      extend self
 
-    def rails_log_off
-      IRT.rails_log = false
-    end
+      def rails_log_on
+        IRT.rails_log = true
+      end
 
+      def rails_log_off
+        IRT.rails_log = false
+      end
+
+    end
   end
 end
+
+IRB::ExtendCommandBundle.send :include, IRT::Commands::Rails

data/lib/irt/hunks.rb

@@ -74,12 +74,6 @@ module IRT
         @header = IRB.CurrentContext.irb_name
       end
 
-      def add_line(content, line_no)
-        ignored = IRT.log.ignored_commands + %w[_]
-        return if content.match(/^\s*(#{ignored * '|'})\b/)
-        super
-      end
-
     end
 
 

data/lib/irt/log.rb

@@ -5,11 +5,15 @@ module IRT
     attr_reader :status
 
     def initialize
-      @ignored_echo_commands = FileUtils.own_methods
+      @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 +
-                          %w[ 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)
       @tail_size = tail_size || 10
       self << FileHunk.new(IRT.irt_file)
       @status = [[File.basename(IRT.irt_file), :file]]

data/lib/irt/ruby_version.rb

@@ -1,20 +1,20 @@
 module IRT
   module RubyVersion
 
-    extend self
-
     class Version < Array
       include Comparable
 
-       def initialize(version=RUBY_VERSION)
-         replace version.split('.').map(&:to_i)
-       end
+      def initialize(version)
+        replace version.split('.').map(&:to_i)
+      end
     end
 
+    extend self
+
     [:>, :>=, :<, :<=, :==, :between?].each do |m|
       define_method(m) do |*args|
         vers = args.map{|a| Version.new(a)}
-        Version.new.send m, *vers
+        Version.new(RUBY_VERSION).send m, *vers
       end
     end
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: irt
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.4
+  hash: 25
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 -04:00
+date: 2011-02-06 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: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
   type: :runtime
   version_requirements: *id002
@@ -43,18 +58,29 @@ 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: 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.
@@ -83,10 +109,10 @@ files:
 - irtrc
 - lib/irt.rb
 - lib/irt/commands/core.rb
+- lib/irt/commands/edit.rb
 - lib/irt/commands/help.rb
 - lib/irt/commands/log.rb
 - lib/irt/commands/ri.rb
-- lib/irt/commands/system.rb
 - lib/irt/commands/test.rb
 - lib/irt/differ.rb
 - lib/irt/directives.rb
@@ -117,17 +143,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.