irt 1.1.1 → 1.1.2

data/README.markdown

@@ -506,7 +506,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
-    # IRT.ri_command_format = "qri -f #{Colorer.color? ? 'ansi' : 'plain'} %s"
+    # IRT.ri_command_format = "qri -f #{Dye.color? ? 'ansi' : 'plain'} %s"
 
     # add your command format if you want to use another editor than nano or vi
     # default 'open -t %1$s' on MacOX; 'kde-open %1$s' or 'gnome-open %1$s' un unix/linux; '%1$s' on windoze
@@ -527,25 +527,23 @@ The default color styles of IRT should be OK in most situation, anyway, if you r
 you can switch off the color completely (IRT.force_color = false) or you can also
 redefine the colors by redefining them in your .irtrc file.
 
-The following are the default Colorer styles, change them at will:
-
-    Colorer.def_custom_styles({ :bold              => :bold,
-                                :reversed          => :reversed,
-                                :null              => :clear,
-
-                                :log_color         => :blue,
-                                :file_color        => :cyan,
-                                :interactive_color => :magenta,
-                                :inspect_color     => :clear,
-                                :binding_color     => :yellow,
-                                :actual_color      => :green,
-                                :ignored_color     => :yellow,
-
-                                :error_color       => :red,
-                                :ok_color          => :green,
-                                :diff_color        => :yellow,
-                                :diff_a_color      => :cyan,
-                                :diff_b_color      => :green } , true)
+The following are the default Dye (gem) styles, change them at will:
+
+    IRT.dye_styles = { :null              => :clear,
+
+                       :log_color         => :blue,
+                       :file_color        => :cyan,
+                       :interactive_color => :magenta,
+                       :inspect_color     => :clear,
+                       :binding_color     => :yellow,
+                       :actual_color      => :green,
+                       :ignored_color     => :yellow,
+
+                       :error_color       => :red,
+                       :ok_color          => :green,
+                       :diff_color        => :yellow,
+                       :diff_a_color      => :cyan,
+                       :diff_b_color      => :green }
 
 ### Note about IRT.autoload_helper_files
 

data/Rakefile

@@ -20,7 +20,7 @@ task :install, :force do |t, args|
     File.open('VERSION', 'w') {|f| f.puts version }
     gem_name = "#{name}-#{version}.gem"
     sh %(gem build #{name}.gemspec)
-    sh %(gem install #{gem_name} --local)
+    sh %(gem install #{gem_name} --local --no-rdoc --no-ri)
     puts <<-EOS.gsub(/^ {6}/, '')
 
       *******************************************************************************

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/bin/irt

@@ -1,13 +1,16 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'irt'
 require 'fileutils'
 require 'tempfile'
 require 'optparse'
+require 'prompter'
+require 'dye'
 
 
-copy = "irt #{IRT::VERSION} (c) 2010-2011 Domizio Demichelis".log_color.bold
+version = File.read(File.expand_path('../../VERSION', __FILE__)).strip
+
+copy = Dye.dye "irt #{version} (c) 2010-2011 Domizio Demichelis", :blue, :bold
 
 options = {}
 
@@ -37,7 +40,7 @@ EOB
    end
 
   opts.on( '-v', '--version', 'Shows the version and exits' ) do
-    puts IRT::VERSION
+    puts version
     exit
   end
 
@@ -62,7 +65,7 @@ paths = if ARGV.empty?
 
 files = paths.map do |path|
           unless File.exists?(path)
-            next if IRT.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)
@@ -72,7 +75,7 @@ files = paths.map do |path|
         end.flatten
 
 if files.empty?
-  puts 'No *.irt files to run'
+  Prompter.say_notice 'No *.irt files to run'
   exit
 end
 
@@ -95,7 +98,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 Colorer.color
+    puts "\e[0m" if Dye.color?
     exit(1)
   end
 end

data/irt.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.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.'
 
   s.add_runtime_dependency('differ', [">= 0.1.1"])
-  s.add_runtime_dependency('colorer', [">= 0.7.0"])
-  s.add_runtime_dependency('prompter', [">= 0.1.1"])
+  s.add_runtime_dependency('dye', [">= 0.1.1"])
+  s.add_runtime_dependency('prompter', [">= 0.1.2"])
   s.add_runtime_dependency('fastri', [">= 0.3.1.1"])
 
   s.executables = ['irt', 'irt_irb', 'irt_rails2']

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
-# IRT.ri_command_format = "qri -f #{Colorer.color? ? 'ansi' : 'plain'} %s"
+# IRT.ri_command_format = "qri -f #{Dye.color? ? 'ansi' : 'plain'} %s"
 
 # add your command format if you want to use another editor than nano or vi
 # default 'open -t %1$s' on MacOX; 'kde-open %1$s' or 'gnome-open %1$s' un unix/linux; '%1$s' on windoze

data/lib/irt/commands/core.rb

@@ -41,7 +41,7 @@ module IRT
         IRB.irb_at_exit
         str = "Rerunning: `#{ENV['IRT_COMMAND']}`"
         puts
-        puts " #{str} ".error_color.bold.reversed.or("*** #{str} ***")
+        puts IRT.dye(" #{str} ", "*** #{str} ***", :error_color, :bold, :reversed)
         puts
         exec ENV["IRT_COMMAND"]
       end

data/lib/irt/commands/help.rb

@@ -5,25 +5,25 @@ module IRT
       def irt_help
         ensure_session
         puts %(
-#{" NOTICE ".log_color.reversed.bold}
-- The #{"Commands".interactive_color.bold} are methods generally available in any IRT session
-- The #{"Directives".file_color.bold} are methods available in any file but not in IRT sessions
-- The #{"Extensions".log_color.bold} are methods available anywhere
+#{label " NOTICE ", :log_color}
+- The #{IRT.dye "Commands", :interactive_color, :bold} are methods generally available in any IRT session
+- The #{IRT.dye "Directives", :file_color, :bold} are methods available in any file but not in IRT sessions
+- The #{IRT.dye "Extensions", :log_color, :bold} are methods available anywhere
 
-#{" Inspecting Commands ".interactive_color.reversed.bold}
+#{label " Inspecting Commands ", :interactive_color}
     irt object              Opens an inspecting session into object
     vdiff|vd obj_a, obj_b   Prints the visual diff of the yaml dump of 2 objects
     cat args                Similar to system cat
     ls args                 Similar to system ls
 
-#{" Log Commands ".interactive_color.reversed.bold}
+#{label " Log Commands ", :interactive_color}
     log|l [limit]           Prints limit or 'tail_size' lines of the virtual log
     full_log|ll             Prints all the lines in the virtual log
     print_lines|pl          Prints the last lines of the current session
                             without numbers (for easy copying)
     print_all_lines|pll     Like print_line but prints all the sessions lines
 
-#{" In Place Editing Commands ".interactive_color.reversed.bold}
+#{label " In Place Editing Commands ", :interactive_color}
     (<editor> can be 'vi', 'nano|nn', 'edit|ed')
     <editor>                Uses <editor> to open the current evalued file at
                             the current evalued line for in place edit
@@ -37,14 +37,14 @@ module IRT
     <editor> n              Uses <editor> to open the backtraced file [n] at
                             the backtraced line
 
-#{" Copy-Edit Commands ".interactive_color.reversed.bold + " (use copy_to_clipboard_command)".interactive_color.bold}
+#{label( " Copy-Edit Commands ", :interactive_color ) + IRT.dye(" (use copy_to_clipboard_command)", :interactive_color, :bold)}
     copy_lines|cl           Copy the last session lines
     copy_all_lines|cll      Copy the lines of all the sessions
     cnano|cnn               Like nano, but copy the last session lines first
     cvi                     Like vi, but copy the last session lines first
     cedit|ced               Like edit, but copy the last session lines first
 
-#{" Test Commands ".interactive_color.reversed.bold + " (only available in interactive sessions)".interactive_color.bold}
+#{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 (_)
                             by automatically choosing the :_eql?, or :_yaml_eql?
@@ -52,15 +52,15 @@ module IRT
     add_test|tt desc        Like add_test but adds a 'desc' directive first'
     save_as|sa path         Saves the current irt file as path and runs it
 
-#{" FileUtils Commands ".interactive_color.reversed.bold}
+#{label " FileUtils Commands ", :interactive_color}
     All the FileUtils methods are availabe as IRT Commands
     (e.g. pwd, touch, mkdir, mv, cp, rm, rm_rf, compare_files, ...)
 
-#{" Enhanced Commands ".interactive_color.reversed.bold}
+#{label " Enhanced Commands ", :interactive_color}
     p, pp, ap, y            When invoked with no arguments print the last_value
                             (e.g. just type 'y' instead 'y _')
 
-#{" Documentation Commands ".interactive_color.reversed.bold}
+#{label " Documentation Commands ", :interactive_color}
     ri to_search            Search the ri doc for to_search (no quotes needed)
     ri obj.any_method       Search the method.owner ri doc for of any_method
                             (no quotes needed, and completion available)
@@ -69,30 +69,30 @@ module IRT
     ri n                    Search the ri doc for the method n in a multiple
                             choices list
 
-#{" Misc Commands ".interactive_color.reversed.bold}
+#{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
 
-#{" Session Directives ".file_color.reversed.bold}
+#{label " Session Directives ", :file_color}
     irt                     Opens an interactive session which retains the
                             current variables and the last value (_)
     irt binding             Opens a binding session at the line of the call
 
-#{" Test Directives ".file_color.reversed.bold + " (auto added by the Test Commands)".file_color.bold}
+#{label(" Test Directives ", :file_color) + IRT.dye(" (auto added by the Test Commands)", :file_color, :bold)}
     desc description        Adds a description to the next test
     _eql? val               Runs a test checking _ == val
     _yaml_eql? yaml_dump    Runs a test checking y _ == yaml_dump
 
-#{" Helper Directives ".file_color.reversed.bold}
+#{label " Helper Directives ", :file_color}
     insert_file file        Evaluates file as it were inserted at that line
     eval_file               Alias for eval_file
     irt_at_exit block       Ensures execution of block at exit (useful for
                             cleanup of test env)
 
-#{" Extensions ".log_color.reversed.bold}
+#{label " Extensions ", :log_color}
     Kernel#capture block    Executes block and returns a string containing the
                             captured stdout
     Object#own_methods      Returns the methods implemented by the receiver
@@ -106,6 +106,11 @@ module IRT
       end
       alias_method :hh, :irt_help
 
+    private
+      def label(string, color)
+        IRT.dye string, color, :reversed, :bold
+      end
+
     end
   end
 end

data/lib/irt/commands/test.rb

@@ -10,7 +10,7 @@ module IRT
         desc_str = %(desc "#{description}")
         context.current_line = desc_str
         puts
-        puts desc_str.interactive_color
+        puts IRT.dye(desc_str, :interactive_color)
         puts
       end
       alias_method :dd, :add_desc
@@ -39,7 +39,7 @@ module IRT
         str = desc_str + test_str
         context.current_line = str
         puts
-        puts str.interactive_color
+        puts IRT.dye(str, :interactive_color)
         puts
       end
       alias_method :tt, :add_test

data/lib/irt/differ.rb

@@ -19,11 +19,11 @@ module IRT
 
     def output
       out = "\n"
-      out << " = same ".reversed.bold.or('***** diff ')
-      out << " #{@options[:a_marker]} #{@options[:a_label]} ".diff_a_color.reversed.bold.
-          or(" (#{@options[:a_marker]} #{@options[:a_label]}) ")
-      out << " #{@options[:b_marker]} #{@options[:b_label]} ".diff_b_color.reversed.bold.
-          or(" (#{@options[:b_marker]} #{@options[:b_label]}) ")
+      out << IRT.dye(' = same ', :reversed, :bold)
+      a = "#{@options[:a_marker]} #{@options[:a_label]}"
+      out << IRT.dye(" #{a} ", " (#{a}) ", :diff_a_color, :reversed, :bold)
+      b = "#{@options[:b_marker]} #{@options[:b_label]}"
+      out << IRT.dye(" #{b} ", " (#{b}) ", :diff_b_color, :reversed, :bold)
       out << "\n"
       diff = @diff.format_as(IRT::Differ::Format)
       out << diff.sub(/^\n/,'')
@@ -48,7 +48,7 @@ module IRT
 
       def process(string, mark='=', color=:null, bold=:null)
         string.sub(/^\n/,'').split("\n").map do |s|
-          " #{mark} ".send(color).send(bold).reversed.or(" #{mark} ") + ' ' + s.send(color)
+          IRT.dye(" #{mark} ", " #{mark} |", color, :bold, :reversed) + ' ' + IRT.dye(s, color)
         end.join("\n") + "\n"
       end
 

data/lib/irt/directives/test.rb

@@ -31,12 +31,12 @@ module IRT
         return unless @@tests > 0
         if @@tests == @@oks
           str = @@tests == 1 ? " The TEST is OK! " : " All #{@@tests} TESTs are OK! "
-          puts str.ok_color.bold
+          puts IRT.dye(str, :ok_color, :bold)
         else
-          puts "#{@@tests} TEST#{'s' unless @@tests == 1}: ".bold +
-               "#{@@oks} OK#{'s' unless @@oks == 1}, ".ok_color.bold +
-               "#{@@diffs} DIFF#{'s' unless @@diffs == 1}, ".diff_color.bold +
-               "#{@@errors} ERROR#{'s' unless @@errors == 1}.".error_color.bold
+          puts IRT.dye("#{@@tests} TEST#{'s' unless @@tests == 1}: ", :bold) +
+               IRT.dye("#{@@oks} OK#{'s' unless @@oks == 1}, ", :ok_color, :bold) +
+               IRT.dye("#{@@diffs} DIFF#{'s' unless @@diffs == 1}, ", :diff_color, :bold) +
+               IRT.dye("#{@@errors} ERROR#{'s' unless @@errors == 1}.", :error_color, :bold)
         end
     end
 
@@ -64,17 +64,17 @@ module IRT
         begin
           if saved == actual
             @@oks += 1
-            puts "#{tno}. OK!".ok_color.bold + " #{d}".ok_color
+            puts IRT.dye("#{tno}. OK!", :ok_color, :bold) + IRT.dye(" #{d}", :ok_color)
           else
             @@diffs += 1
-            puts "#{tno}. DIFFS!".diff_color.bold + %( #{d}\n     ).diff_color +
-              %( at #{context.irb_path}: #{context.last_line_no} ).file_color.reversed.bold
+            puts IRT.dye("#{tno}. DIFFS!", :diff_color, :bold) + IRT.dye(" #{d}\n     ", :diff_color) +
+                 IRT.dye(" at #{context.irb_path}: #{context.last_line_no} ", :file_color, :reversed, :bold)
             puts IRT.differ.new(saved, actual, kind).output
             IRT::Session.enter(:interactive) if IRT.irt_on_diffs
           end
         rescue Exception
           @@errors += 1
-          puts "#{tno}. ERROR! ".error_color.bold + d.error_color
+          puts IRT.dye("#{tno}. ERROR! ", :error_color, :bold) + IRT.dye(d, :error_color)
           raise
         end
       end

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

@@ -59,7 +59,7 @@ module IRB
       rescue Exception => e
         @exception_raised = true
         process_exception(e)
-        print "\e[31m" if Colorer.color?
+        print "\e[31m" if Dye.color?
         raise
       else
         log_session_line(line, line_no) unless irt_mode == :file
@@ -69,7 +69,7 @@ module IRB
     %w[prompt_i prompt_s prompt_c prompt_n].each do |m|
       define_method(m) do
         pr = instance_variable_get("@#{m}")
-        col_pr = pr.send "#{irt_mode}_color"
+        col_pr = IRT.dye pr, "#{irt_mode}_color".to_sym
         # workaround for Readline bug see http://www.ruby-forum.com/topic/213807
         if IRT.fix_readline_prompt
           col_pr.gsub(/^(.*)#{pr}(.*)$/, "\001\\1\002#{pr}\001\\2\002")
@@ -81,7 +81,7 @@ module IRB
 
     def return_format(color=:actual_color, ignored=false)
       ret = ignored ? @return_format.sub(/=/,'#') : @return_format
-      ret.send color
+      IRT.dye ret, color
     end
 
 private
@@ -95,7 +95,7 @@ private
     def map_backtrace(bktr)
       @backtrace_map = {}
       mapped_bktr = []
-      reverted_error_colors = 'xxx'.error_color.match(/^(.*)xxx(.*)$/).captures.reverse
+      reverted_error_colors = IRT.dye('xxx', :error_color).match(/^(.*)xxx(.*)$/).captures.reverse
       index_format = sprintf '%s%%s%s', *reverted_error_colors
       bktr.each_with_index do |m, i|
         unless i + 1 > back_trace_limit || m.match(/^\(.*\)/)

data/lib/irt/extensions/irb.rb

@@ -31,7 +31,7 @@ module IRB #:nodoc:
     @CONF[:AT_EXIT] ||= []
     @CONF[:AT_EXIT] << proc{ IRT::Session.enter(:interactive) if IRB.CurrentContext.irt_mode == :file } if !!ENV['IRT_INTERACTIVE_EOF']
     @CONF[:AT_EXIT] << proc{ IRT::Directives.test_summary }
-    @CONF[:AT_EXIT] << proc{ print "\e[0m" if Colorer.color? } # reset colors
+    @CONF[:AT_EXIT] << proc{ print "\e[0m" if Dye.color? } # reset colors
     @CONF[:RC_NAME_GENERATOR] = proc {|rc| File.expand_path '~/.irtrc' }
 
     IRT.init

data/lib/irt/hunks.rb

@@ -37,12 +37,12 @@ module IRT
       end
 
       def render_header
-        puts "     #{header_name}     ".send(color).bold.reversed.or("***** #{header_name} *****")
+        puts IRT.dye("     #{header_name}     ",  "***** #{header_name} *****", color, :bold, :reversed)
       end
 
       def render_line(content, line_no)
-        lcontent = content.send(color)
-        lno = ('%3d ' % line_no).send(color).reversed
+        lcontent = IRT.dye content, color
+        lno = IRT.dye(('%3d ' % line_no), color, :reversed)
         puts "#{lno} #{lcontent}"
       end
 

data/lib/irt/log.rb

@@ -1,7 +1,8 @@
 module IRT
   class Log < Array
 
-    attr_accessor :ignored_commands, :ignored_echo_commands, :non_setting_commands, :tail_size, :status
+    attr_accessor :ignored_commands, :ignored_echo_commands, :non_setting_commands, :tail_size
+    attr_reader :status
 
     def initialize
       @ignored_echo_commands = FileUtils.own_methods
@@ -24,7 +25,7 @@ module IRT
     end
 
     def self.print_border
-      print ' '.log_color.reversed.or('')
+      print IRT.dye(' ','', :log_color, :reversed)
     end
 
     def print(limit=nil) # nil prints all
@@ -66,29 +67,31 @@ module IRT
 
     def print_status
       segments = status.map {|name,mode| status_segment(name,mode)}
-      puts segments.join(">>".log_color.bold)
+      puts segments.join(IRT.dye(">>", :log_color, :bold))
     end
 
     def pop_status
       name, mode = status.pop
       return if mode == :file
-      puts "   <<".log_color.bold + status_segment(name, mode)
+      puts IRT.dye("   <<", :log_color, :bold) + status_segment(name, mode)
       puts
     end
 
     def print_running_file
-      puts " Running: #{IRT.irt_file} ".file_color.reversed.bold.or("*** Runing: #{IRT.irt_file} ***")
+      run_str = "Running: #{IRT.irt_file}"
+      puts IRT.dye(" #{run_str} ", "*** #{run_str} ***", :file_color, :bold, :reversed)
     end
 
   private
 
     def print_header(tail_str='')
       puts
-      puts "      Virtual Log#{' '+ tail_str unless tail_str.empty?}      ".log_color.bold.reversed.or('***** IRT Log *****')
+      log_head = "Virtual Log#{' '+ tail_str unless tail_str.empty?}"
+      puts IRT.dye("      #{log_head}      ", '***** #{log_head} *****', :log_color, :bold, :reversed)
     end
 
     def status_segment(name, mode)
-      " #{name} ".send("#{mode}_color".to_sym).bold.reversed.or("[#{name}]")
+      IRT.dye(" #{name} ", "[#{name}]", "#{mode}_color".to_sym, :bold, :reversed)
     end
   end
 end

data/lib/irt.rb

@@ -13,7 +13,7 @@ require 'irt/extensions/object'
 require 'irt/extensions/method'
 require 'irt/extensions/irb'
 require 'irb/completion'
-require 'colorer'
+require 'dye'
 require 'irt/log'
 require 'irt/hunks'
 require 'irt/differ'
@@ -24,6 +24,19 @@ module IRT
 
   VERSION = File.read(File.expand_path('../../VERSION', __FILE__)).strip
 
+  OS = case RbConfig::CONFIG['host_os']
+       when /mswin|msys|mingw32|windows/i
+         :windows
+       when /darwin|mac os/i
+         :macosx
+       when /linux/i
+         :linux
+       when /(solaris|bsd)/i
+         :unix
+       else
+         :unknown
+       end
+
   class IndexError < RuntimeError ; end
   class SessionModeError < RuntimeError ; end
   class ArgumentTypeError < RuntimeError ; end
@@ -32,30 +45,12 @@ module IRT
   extend self
 
   attr_accessor :irt_on_diffs, :tail_on_irt, :fix_readline_prompt, :debug,
-                :full_exit, :exception_raised, :session_no, :autoload_helper_files,
+                :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, :os
-
-  Colorer.def_custom_styles :bold              => :bold,
-                            :reversed          => :reversed,
-                            :null              => :clear,
-
-                            :log_color         => :blue,
-                            :file_color        => :cyan,
-                            :interactive_color => :magenta,
-                            :inspect_color     => :clear,
-                            :binding_color     => :yellow,
-                            :actual_color      => :green,
-                            :ignored_color     => :yellow,
-
-                            :error_color       => :red,
-                            :ok_color          => :green,
-                            :diff_color        => :yellow,
-                            :diff_a_color      => :cyan,
-                            :diff_b_color      => :green
+  attr_reader :log, :irt_file, :differ
 
   def force_color=(bool)
-    Colorer.color = bool
+    Dye.color = bool
   end
 
   def init
@@ -65,31 +60,41 @@ module IRT
     @tail_on_irt = false
     @fix_readline_prompt = false
     @autoload_helper_files = true
-    @os = get_os
-    @copy_to_clipboard_command = case @os
-                                 when :windows
-                                   'clip'
-                                 when :macosx
-                                   'pbcopy'
-                                 when :linux, :unix
-                                   'xclip -selection c'
-                                 end
-    @edit_command_format = case @os
-                           when :windows
-                             '%1$s'
-                           when :macosx
-                             'open -t %1$s'
-                           when :linux, :unix
-                             case ENV['DESKTOP_SESSION']
+    @dye_styles = { :null              => :clear,
+
+                    :log_color         => :blue,
+                    :file_color        => :cyan,
+                    :interactive_color => :magenta,
+                    :inspect_color     => :clear,
+                    :binding_color     => :yellow,
+                    :actual_color      => :green,
+                    :ignored_color     => :yellow,
+
+                    :error_color       => :red,
+                    :ok_color          => :green,
+                    :diff_color        => :yellow,
+                    :diff_a_color      => :cyan,
+                    :diff_b_color      => :green }
+    define_dye_method @dye_styles
+    case OS
+    when :windows
+      @copy_to_clipboard_command = 'clip'
+      @edit_command_format = '%1$s'
+    when :macosx
+      @copy_to_clipboard_command = 'pbcopy'
+      @edit_command_format = 'open -t %1$s'
+    when :linux, :unix
+      @copy_to_clipboard_command = 'xclip -selection c'
+      @edit_command_format = case ENV['DESKTOP_SESSION']
                              when /kde/i
                                'kde-open %1$s'
                              when /gnome/i
                                'gnome-open %1$s'
                              end
-                           end
+    end
     @vi_command_format = "vi -c 'startinsert' %1$s +%2$d"
     @nano_command_format = 'nano +%2$d %1$s'
-    @ri_command_format =  "qri -f #{Colorer.color? ? 'ansi' : 'plain'} %s"
+    @ri_command_format =  "qri -f #{Dye.color? ? 'ansi' : 'plain'} %s"
     @debug = false
   end
 
@@ -114,30 +119,13 @@ module IRT
   def prompter
     @prompter ||= begin
                     require 'prompter'
-                    pr = Prompter.new
-                    def pr.say_echo(result, opts={})
-                      opts = {:style => :ignored_color}.merge opts
-                      say '   #> ' + result.inspect, opts
+                    Prompter.new do |pr|
+                      def pr.say_echo(result, opts={})
+                        opts = {:style => IRT.dye_styles[:ignored_color]}.merge opts
+                        say '   #> ' + result.inspect, opts
+                      end
                     end
-                    pr
                   end
   end
 
-private
-
-  def get_os
-    case RbConfig::CONFIG['host_os']
-    when /mswin|msys|mingw32|windows/i
-      :windows
-    when /darwin|mac os/i
-      :macosx
-    when /linux/i
-      :linux
-    when /solaris|bsd/i
-      :unix
-    else
-      :unknown
-    end
-  end
-
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: irt
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 -04:00
+date: 2011-02-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,19 +35,19 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: colorer
+  name: dye
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
         - 0
-        - 7
-        - 0
-        version: 0.7.0
+        - 1
+        - 1
+        version: 0.1.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 31
         segments: 
         - 0
         - 1
-        - 1
-        version: 0.1.1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency