irt 1.1.3 → 1.1.4

data/README.markdown

@@ -12,7 +12,8 @@ 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 as binding session
+- irb opening from your code (or erb templates) as binding session
+- optional colored rails log in the console
 - contextual ri doc with completion
 - recording of session steps with filtering
 - easy testing based on recorded steps
@@ -474,7 +475,7 @@ IRT tries to load a ~/.irtrc file at startup, so you can customize a few options
 If you want to add your custom '~/.irbrc' file, try to load it at the top: if it doesn't
 play well with IRT, then copy and paste just part of it.
 
-You can also change a few configuration options in the ~/.irtrc file. The following are the defaults
+You can also change the configuration options in the ~/.irtrc file. The following are the defaults
 which should work quite well without any change:
 
     # set this to true if your prompt get messed up when you use the history
@@ -523,6 +524,12 @@ which should work quite well without any change:
     # any command that will not set the last value (includes all the log-ignored commands)
     # IRT.log.non_setting_commands << %w[commandE commandF ...]
 
+    # shows the rails log in console
+    # IRT.rails_log = true
+
+    # colors with :log_color (default blue) the rails log for easy reading
+    # IRT.dye_rails_log = true
+
 ### Colors
 
 The default color styles of IRT should be OK in most situation, anyway, if you really don't like the colors,
@@ -572,11 +579,22 @@ 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 3
+### 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.
+
+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.
+
+#### Rails 3
 
 You must add the gem to your Gemfile, to make the bundler happy:
 
-    gem 'irt', :group => :console
+    gem 'irt'
+
+eventually adding it only to the group that you prefer.
+
 
 ## Known Issue
 

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/bin/irt

@@ -58,7 +58,7 @@ puts copy
 
 paths = if ARGV.empty?
           options[:interactive_eof] = true
-          tmp_file = Tempfile.new(%w[tmp- .irt])
+          tmp_file = Tempfile.new(['', '.irt'])
           tmp_file << "\n" # one empty line makes irb of 1.9.2 happy
           tmp_file.flush
           [ tmp_file.path ]
@@ -86,7 +86,7 @@ cmd_format = if File.exists?('./config/environment.rb')
                if File.exists?('./script/rails')
                  'rails c %s %s %s'
                elsif File.exists?('./script/console')
-                 'ruby script/console --irb="irt_rails2"'
+                 'ruby script/console --irb="irt_rails2 %s"'
                end
              else
                'irt_irb %s %s'

data/bin/irt_rails2

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

data/irt.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('dye', [">= 0.1.1"])
   s.add_runtime_dependency('prompter', [">= 0.1.2"])
   if IRT::RubyVersion >= '1.9.2'
-    s.add_runtime_dependency('bri', [">= 0.1.4"])
+    s.add_runtime_dependency('bri', [">= 0.1.5"])
   else
     s.add_runtime_dependency('fastri', [">= 0.3.1.1"])
   end

data/irtrc

@@ -47,4 +47,8 @@
 # any command that will not set the last value (includes all the log-ignored commands)
 # IRT.log.non_setting_commands << %w[commandE commandF ...]
 
-# add your stuff here
+# shows the rails log in console
+# IRT.rails_log = true
+
+# colors with :log_color (default blue) the rails log for easy reading
+# IRT.dye_rails_log = true

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

@@ -5,7 +5,7 @@ module IRB
 
     attr_accessor :parent_context, :current_line, :binding_file, :binding_line_no, :backtrace_map
     attr_reader :current_line_no, :last_line_no
-    attr_writer :irt_mode
+    attr_writer :irt_mode, :return_ignored_echo_format
 
     def file_line_pointers
       file = line = nil
@@ -79,9 +79,18 @@ module IRB
       end
     end
 
-    def return_format(color=:actual_color, ignored=false)
-      ret = ignored ? @return_format.sub(/=/,'#') : @return_format
-      IRT.dye ret, color
+    def return_format
+      IRT.dye @return_format, :actual_color
+    end
+
+    def return_ignored_echo_format
+      IRT.dye @return_ignored_echo_format, :ignored_color
+    end
+
+    alias_method :original_prompt_mode, :prompt_mode=
+    def prompt_mode=(mode)
+      original_prompt_mode(mode)
+      @return_ignored_echo_format = IRB.conf[:PROMPT][mode][:RETURN_I] || "   #> %s\n"
     end
 
 private
@@ -138,9 +147,9 @@ private
 
     def output_ignored_echo_value(value)
       if inspect?
-        printf return_format(:ignored_color,false), value.inspect
+        printf return_ignored_echo_format, value.inspect
       else
-        printf return_format(:ignored_color,false), value
+        printf return_ignored_echo_format, value
       end
     end
 

data/lib/irt/extensions/irb.rb

@@ -22,7 +22,8 @@ module IRB #:nodoc:
                              :PROMPT_S => '   "> ',
                              :PROMPT_C => "%02n ?> ",
                              :PROMPT_N => "%02n -> ",
-                             :RETURN   => "   => %s\n" }
+                             :RETURN   => "   => %s\n",
+                             :RETURN_I => "   #> %s\n" }
     @CONF[:PROMPT_MODE] = :IRT
     @CONF[:ECHO] = false
     @CONF[:VERBOSE] = false

data/lib/irt/extensions/method.rb

@@ -26,11 +26,11 @@ class Method
 
   def info
     file, line = location
-    { :name       => name,
-      :class_name => owner.name,
-      :file       => file,
-      :line       => line,
-      :arity      => arity }
+    { :name  => name,
+      :owner => owner.name,
+      :file  => file,
+      :line  => line,
+      :arity => arity }
   end
 
 end

data/lib/irt/extensions/rails.rb

@@ -0,0 +1,31 @@
+class ActiveSupport::BufferedLogger
+
+  alias_method :original_add, :add
+
+  def add(*args)
+    message = original_add(*args)
+    if IRT.rails_log
+      if IRT.dye_rails_log
+        plain_message = Dye.strip_ansi(message).chomp
+        irt_message = IRT.dye(plain_message, :log_color) + "\n"
+      end
+      puts irt_message || message
+    end
+    message
+  end
+
+end
+
+module IRB
+  module ExtendCommandBundle #:nodoc:
+
+    def rails_log_on
+      IRT.rails_log = true
+    end
+
+    def rails_log_off
+      IRT.rails_log = false
+    end
+
+  end
+end

data/lib/irt.rb

@@ -1,8 +1,4 @@
 require 'rubygems'
-begin
-  require 'ap'
-rescue LoadError
-end
 
 require 'pp'
 require 'yaml'
@@ -45,7 +41,7 @@ module IRT
 
   extend self
 
-  attr_accessor :irt_on_diffs, :tail_on_irt, :fix_readline_prompt, :debug,
+  attr_accessor :irt_on_diffs, :tail_on_irt, :fix_readline_prompt, :debug, :rails_log, :dye_rails_log,
                 :full_exit, :exception_raised, :session_no, :autoload_helper_files, :dye_styles,
                 :copy_to_clipboard_command, :nano_command_format, :vi_command_format, :edit_command_format, :ri_command_format
   attr_reader :log, :irt_file, :differ
@@ -60,6 +56,8 @@ module IRT
     @irt_on_diffs = true
     @tail_on_irt = false
     @fix_readline_prompt = false
+    @rails_log = true
+    @dye_rails_log = true
     @autoload_helper_files = true
     @dye_styles = { :null              => :clear,
 
@@ -103,6 +101,7 @@ module IRT
     @irt_file = IRB.conf[:SCRIPT]
     @log = Log.new
     @log.print_running_file
+    require 'irt/extensions/rails' if defined?(ActiveSupport::BufferedLogger)
     IRT::Directives.load_helper_files
   end
 
@@ -122,8 +121,7 @@ module IRT
                     require 'prompter'
                     Prompter.new do |pr|
                       def pr.say_echo(result, opts={})
-                        opts = {:style => IRT.dye_styles[:ignored_color]}.merge opts
-                        say '   #> ' + result.inspect, opts
+                        IRB.CurrentContext.send :output_ignored_echo_value, result
                       end
                     end
                   end

metadata

@@ -2,7 +2,7 @@
 name: irt
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 -04:00
+date: 2011-02-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.4
+        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.
@@ -97,6 +97,7 @@ files:
 - lib/irt/extensions/kernel.rb
 - lib/irt/extensions/method.rb
 - lib/irt/extensions/object.rb
+- lib/irt/extensions/rails.rb
 - lib/irt/hunks.rb
 - lib/irt/init.rb
 - lib/irt/log.rb