ripl-color_result 0.2.0 → 0.3.0

data/.gemspec

@@ -11,7 +11,8 @@ Gem::Specification.new do |s|
   s.summary = "A ripl plugin to colorize result."
   s.description =  "This ripl plugin colorizes your result."
   s.required_rubygems_version = ">= 1.3.6"
-  s.add_dependency 'ripl', '>= 0.2.8'
+  s.add_dependency 'ripl', '>= 0.3.1'
+  s.add_dependency 'wirb', '>= 0.2.0'
   s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
   s.extra_rdoc_files = ["README.rdoc", "COPYING"]
   s.license = 'MIT'

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.3.0
+* Now using Wirb as default colorizer
+
 == 0.2.0
 * Added ap_options to pass a options hash to awesome_inspect (thanks to DirtYiCE)
   * Renamed color_result_schema option to color_result_default_schema (better logical nesting)

data/COPYING

@@ -1,6 +1,4 @@
-Copyright (C) 2006-2009 Paul Duncan <pabs@pablotron.org>
-Copyright (C) 2009 Jens Wille <jens.wille@gmail.com>
-Copyright (C) 2010 Jan Lelis <mail@janlelis.de>
+Copyright (C) 2010-2011 Jan Lelis <mail@janlelis.de>
  
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,5 +1,5 @@
 == Description
-This {ripl}[http://github.com/cldwalker/ripl] plugin colorizes your results.
+This {ripl}[https://github.com/cldwalker/ripl] plugin colorizes your results.
 
 == Install
 Install the gem with:
@@ -12,10 +12,10 @@ Add to your ~/.riplrc
 
   require 'ripl/color_result'
 
-You can choose a <tt>:color_result_engine</tt>. By default, the bundled +Wirble+-like colorization is used. Possible other values are:
+You can choose a <tt>:color_result_engine</tt>. By default, Wirb[https://github.com/janlelis/wirb]] is used. Possible other values are:
 
-* <tt>:ap</tt> - using the _awesome_print_ gem
-* <tt>:coderay</tt> - using the _coderay_ gem
+* <tt>:ap</tt> - use {awesome_print}[https://github.com/michaeldv/awesome_print]
+* <tt>:coderay</tt> - use {coderay}[http://coderay.rubychan.de/]
 
 Example (in your ~/.riplrc)
 
@@ -24,18 +24,14 @@ Example (in your ~/.riplrc)
 Set it to +nil+ to deactivate result colorization.
 
 You can change the colors used by the default colorization by editing the <tt>:color_result_default_schema</tt> hash:
-  Ripl.config[:color_result_default_schema][:comma] = :green
+  Ripl.config[:color_result_default_schema][:comma] = :blue
 
 If you use <tt>awesome_print</tt>, you can override default options using <tt>:color_result_ap_options</tt> hash:
   Ripl.config[:color_result_ap_options] = { :multiline => false }
 
 == Credits
 
-The default colorization uses code from Wirble
-* Copyright (C) 2006-2009 Paul Duncan <pabs@pablotron.org>
-* Copyright (C) 2009 Jens Wille <jens.wille@gmail.com>
-
-Copyright (c) 2010 Jan Lelis <http://code-needs-smileys.com>, see COPYING for details.
+Copyright (c) 2010 Jan Lelis <http://rbjl.net>, see COPYING for details.
 
 Plus contributions by cldwalker and DirtYiCE.
 

data/deps.rip

@@ -1 +1,2 @@
-ripl >=0.2.8
+ripl >=0.3.1
+wirb >=0.2.0

data/lib/ripl/color_result.rb

@@ -2,26 +2,7 @@ require 'ripl'
 
 module Ripl
   module ColorResult
-    VERSION = '0.2.0'
-    COLORS = {
-      :nothing      => '0;0',
-      :black        => '0;30',
-      :red          => '0;31',
-      :green        => '0;32',
-      :brown        => '0;33',
-      :blue         => '0;34',
-      :purple       => '0;35',
-      :cyan         => '0;36',
-      :light_gray   => '0;37',
-      :dark_gray    => '1;30',
-      :light_red    => '1;31',
-      :light_green  => '1;32',
-      :yellow       => '1;33',
-      :light_blue   => '1;34',
-      :light_purple => '1;35',
-      :light_cyan   => '1;36',
-      :white        => '1;37',
-    }
+    VERSION = '0.3.0'
 
     def format_result(result)
       return super if !config[:color_result_engine]
@@ -34,51 +15,78 @@ module Ripl
         require 'ap'
         result.awesome_inspect( config[:color_result_ap_options] || {} )
       else # :default
-        require File.dirname(__FILE__) + "/color_result/default_colorizer"
-        DefaultColorizer.colorize_code( result.inspect )
+        require 'wirb'
+        Wirb.colorize_result result.inspect, Ripl.config[:color_result_default_schema]
       end
-
     end
   end
 end
 
-Ripl::Shell.send :include, Ripl::ColorResult
-
+Ripl::Shell.include Ripl::ColorResult
 
 Ripl.config[:color_result_engine] ||= :default
-# color scheme for default colorization, original from wirble
-Ripl.config[:color_result_default_schema] ||= { 
-  # delimiter colors
-  :comma => :blue,
-  :refers => :blue,
+Ripl.config[:color_result_default_schema] ||= { # see Wirb::COLORS for a color list
+    # container
+    :open_hash        => :light_green,
+    :close_hash       => :light_green,
+    :open_array       => :light_green,
+    :close_array      => :light_green,
+
+    :open_set         => :green,
+    :close_set        => :green,
+    :open_enumerator  => :green,
+    :close_enumerator => :green,
+
+    # delimiter colors
+    :comma            => :green,
+    :refers           => :green,
+
+    # class
+    :class            => :light_green,
+    :class_separator  => :green,
+    :object_class     => :light_green,
+
+    # object
+    :open_object               => :green,
+    :object_description_prefix => :green,
+    :object_description        => :brown,
+    :object_addr_prefix        => :brown_underline,
+    :object_addr               => :brown_underline,
+    :object_line_prefix        => :brown_underline,
+    :object_line               => :brown_underline,
+    :object_line_number        => :brown_underline,
+    :close_object              => :green,
 
-  # container colors (hash and array)
-  :open_hash => :green,
-  :close_hash => :green,
-  :open_array => :green,
-  :close_array => :green,
+    # symbol
+    :symbol_prefix       => :yellow,
+    :symbol              => :yellow,
+    :open_symbol_string  => :brown,
+    :symbol_string       => :yellow,
+    :close_symbol_string => :brown,
 
-  # object colors
-  :open_object => :light_red,
-  :object_class => :white,
-  :object_addr_prefix => :blue,
-  :object_line_prefix => :blue,
-  :close_object => :light_red,
+    # string
+    :open_string  => :light_gray,
+    :string       => :dark_gray,
+    :close_string => :light_gray,
 
-  # symbol colors
-  :symbol => :yellow,
-  :symbol_prefix => :yellow,
+    # regexp
+    :open_regexp  => :light_blue,
+    :regexp       => :dark_gray,
+    :close_regexp => :light_blue,
+    :regexp_flags => :light_red,
 
-  # string colors
-  :open_string => :red,
-  :string => :cyan,
-  :close_string => :red,
+    # number
+    :number => :cyan,
+    :range  => :red,
+    :open_rational      => :light_cyan,
+    :rational_separator => :light_cyan,
+    :close_rational     => :light_cyan,
 
-  # misc colors
-  :number => :cyan,
-  :keyword => :green,
-  :class => :light_green,
-  :range => :red,
+    # misc
+    :keyword => nil,
+    :nil     => :light_red,
+    :false   => :red,
+    :true    => :green,
 }
 
 # J-_-L

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 +01:00
+date: 2011-01-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,11 +27,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        - 8
-        version: 0.2.8
+        - 3
+        - 1
+        version: 0.3.1
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: wirb
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id002
 description: This ripl plugin colorizes your result.
 email: mail@janlelis.de
 executables: []
@@ -42,7 +57,6 @@ extra_rdoc_files:
 - README.rdoc
 - COPYING
 files: 
-- lib/ripl/color_result/default_colorizer.rb
 - lib/ripl/color_result.rb
 - README.rdoc
 - CHANGELOG.rdoc

data/lib/ripl/color_result/default_colorizer.rb

@@ -1,193 +0,0 @@
-# Default colorization module:
-#  Code taken from the (blackwinter) wirble gem, adjusted api. See COPYING for credits.
-
-class << Ripl::ColorResult::DefaultColorizer = Module.new
-  def tokenize(str)
-    raise 'missing block' unless block_given?
-    chars = str.split(//)
-
-    # $stderr.puts "DEBUG: chars = #{chars.join(',')}"
-
-    state, val, i, lc = [], '', 0, nil
-    while i <= chars.size
-      repeat = false
-      c = chars[i]
-
-      # $stderr.puts "DEBUG: state = #{state}"
-
-      case state[-1]
-      when nil
-        case c
-        when ':'
-          state << :symbol
-        when '"'
-          state << :string
-        when '#'
-          state << :object
-        when /[a-z]/i
-          state << :keyword
-          repeat = true
-        when /[0-9-]/
-          state << :number
-          repeat = true
-        when '{'
-          yield :open_hash, '{'
-        when '['
-          yield :open_array, '['
-        when ']'
-          yield :close_array, ']'
-        when '}'
-          yield :close_hash, '}'
-        when /\s/
-          yield :whitespace, c
-        when ','
-          yield :comma, ','
-        when '>'
-          yield :refers, '=>' if lc == '='
-        when '.'
-          yield :range, '..' if lc == '.'
-        when '='
-          # ignore these, they're used elsewhere
-          nil
-        else
-          # $stderr.puts "DEBUG: ignoring char #{c}"
-        end
-      when :symbol
-        case c
-        # XXX: should have =, but that messes up foo=>bar
-        when /[a-z0-9_!?]/
-          val << c
-        else
-          yield :symbol_prefix, ':'
-          yield state[-1], val
-          state.pop; val = ''
-          repeat = true
-        end
-      when :string
-        case c
-        when '"'
-          if lc == "\\"
-            val[-1] = ?"
-          else
-            yield :open_string, '"'
-            yield state[-1], val
-            state.pop; val = ''
-            yield :close_string, '"'
-          end
-        else
-          val << c
-        end
-      when :keyword
-        case c
-        when /[a-z0-9_]/i
-          val << c
-        else
-          # is this a class?
-          st = val =~ /^[A-Z]/ ? :class : state[-1]
-
-          yield st, val
-          state.pop; val = ''
-          repeat = true
-        end
-      when :number
-        case c
-        when /[0-9e-]/
-          val << c
-        when '.'
-          if lc == '.'
-            val[/\.$/] = ''
-            yield state[-1], val
-            state.pop; val = ''
-            yield :range, '..'
-          else
-            val << c
-          end
-        else
-          yield state[-1], val
-          state.pop; val = ''
-          repeat = true
-        end
-      when :object
-        case c
-        when '<'
-          yield :open_object, '#<'
-          state << :object_class
-        when ':'
-          state << :object_addr
-        when '@'
-          state << :object_line
-        when '>'
-          yield :close_object, '>'
-          state.pop; val = ''
-        end
-      when :object_class
-        case c
-        when ':'
-          yield state[-1], val
-          state.pop; val = ''
-          repeat = true
-        else
-          val << c
-        end
-      when :object_addr
-        case c
-        when '>'
-        when '@'
-          yield :object_addr_prefix, ':'
-          yield state[-1], val
-          state.pop; val = ''
-          repeat = true
-        else
-          val << c
-        end
-      when :object_line
-        case c
-        when '>'
-          yield :object_line_prefix, '@'
-          yield state[-1], val
-          state.pop; val = ''
-          repeat = true
-        else
-          val << c
-        end
-      else
-        raise "unknown state #{state}"
-      end
-
-      unless repeat
-        i += 1
-        lc = c
-      end
-    end
-  end
-
-  #
-  # Return the escape code for a given color.
-  #
-  def get_color(key)
-    Ripl::ColorResult::COLORS.key?(key) && "\033[#{Ripl::ColorResult::COLORS[key]}m"
-  end
-
-  #
-  # Return a string with the given color.
-  #
-  def colorize_string(str, color)
-    col, nocol = [color, :nothing].map { |key| get_color(key) }
-    col ? "#{col}#{str}#{nocol}" : str
-  end
-
-  #
-  # Colorize the results of inspect
-  #
-  def colorize_code(str)
-    ret, nocol = '', get_color(:nothing)
-    tokenize(str) do |tok, val|
-      ret << colorize_string(val, Ripl.config[:color_result_default_schema][tok])
-    end
-    ret
-  rescue # catch any errors from the tokenizer (just in case)
-    str
-  end
-end
-
-# J-_-L