ripl-color_result 0.1.1 → 0.1.2

data/CHANGELOG.rdoc

@@ -1,2 +1,9 @@
+== 0.1.2
+* customize default colorization colors with Ripl.config[:color_result_scheme]
+
+== 0.1.1
+* disable coloring with nil
+* updated to ripl
+
 == 0.1.0
 * Initial release.

data/README.rdoc

@@ -4,13 +4,13 @@ This {ripl}[http://github.com/cldwalker/ripl] plugin colorizes your results.
 == Install
 Install the gem with:
 
-    sudo gem install ripl-color_result
+  sudo gem install ripl-color_result
 
 == Usage
 
 Add to your ~/.riplrc
 
-    require 'ripl/color_result'
+  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:
 
@@ -19,10 +19,14 @@ You can choose a <tt>:color_result_engine</tt>. By default, the bundled +Wirble+
 
 Example (in your ~/.riplrc)
 
-     Ripl.config[:color_result_engine] = :coderay
+  Ripl.config[:color_result_engine] = :coderay
 
 Set it to +nil+ to deactivate result colorization.
 
+You can change the colors used by the default colorization by editing the <tt>:color_result_scheme</tt> hash:
+
+  Ripl.config[:color_result_scheme][:comma] = :green
+
 == Credits
 
 The default colorization uses code from Wirble

data/lib/ripl/color_result/{default.rb → default_colorizer.rb}

@@ -1,7 +1,7 @@
 # Default colorization module:
 #  Code taken from the (blackwinter) wirble gem, adjusted api. See COPYING for credits.
 
-class << Ripl::ColorResult::Default = Module.new
+class << Ripl::ColorResult::DefaultColorizer = Module.new
   def tokenize(str)
     raise 'missing block' unless block_given?
     chars = str.split(//)
@@ -161,108 +161,11 @@ class << Ripl::ColorResult::Default = Module.new
     end
   end
 
-  #
-  # Terminal escape codes for colors.
-  #
-  COLORS = {
-    :nothing => '0;0',
-    :black => '0;30',
-    :red => '0;31',
-    :green => '0;32',
-    :brown => '0;33',
-    :blue => '0;34',
-    :cyan => '0;36',
-    :purple => '0;35',
-    :light_gray => '0;37',
-    :dark_gray => '1;30',
-    :light_red => '1;31',
-    :light_green => '1;32',
-    :yellow => '1;33',
-    :light_blue => '1;34',
-    :light_cyan => '1;36',
-    :light_purple => '1;35',
-    :white => '1;37',
-  }
-
   #
   # Return the escape code for a given color.
   #
   def get_color(key)
-    COLORS.key?(key) && "\033[#{COLORS[key]}m"
-  end
-
-  #
-  # Default Wirble color scheme.
-  #
-  DEFAULT_SCHEME = {
-    # delimiter colors
-    :comma => :blue,
-    :refers => :blue,
-
-    # container colors (hash and array)
-    :open_hash => :green,
-    :close_hash => :green,
-    :open_array => :green,
-    :close_array => :green,
-
-    # object colors
-    :open_object => :light_red,
-    :object_class => :white,
-    :object_addr_prefix => :blue,
-    :object_line_prefix => :blue,
-    :close_object => :light_red,
-
-    # symbol colors
-    :symbol => :yellow,
-    :symbol_prefix => :yellow,
-
-    # string colors
-    :open_string => :red,
-    :string => :cyan,
-    :close_string => :red,
-
-    # misc colors
-    :number => :cyan,
-    :keyword => :green,
-    :class => :light_green,
-    :range => :red,
-  }
-
-  #
-  # Fruity testing colors.
-  #
-  TESTING_SCHEME = {
-    :comma => :red,
-    :refers => :red,
-    :open_hash => :blue,
-    :close_hash => :blue,
-    :open_array => :green,
-    :close_array => :green,
-    :open_object => :light_red,
-    :object_class => :light_green,
-    :object_addr => :purple,
-    :object_line => :light_purple,
-    :close_object => :light_red,
-    :symbol => :yellow,
-    :symbol_prefix => :yellow,
-    :number => :cyan,
-    :string => :cyan,
-    :keyword => :white,
-    :range => :light_blue,
-  }
-
-  #
-  # Set color map to hash
-  #
-  def scheme=(hash)
-    @scheme = hash
-  end
-
-  #
-  # Get current color map
-  #
-  def scheme
-    @scheme ||= {}.update(DEFAULT_SCHEME)
+    Ripl::ColorResult::COLORS.key?(key) && "\033[#{Ripl::ColorResult::COLORS[key]}m"
   end
 
   #
@@ -279,7 +182,7 @@ class << Ripl::ColorResult::Default = Module.new
   def colorize_code(str)
     ret, nocol = '', get_color(:nothing)
     tokenize(str) do |tok, val|
-      ret << colorize_string(val, scheme[tok])
+      ret << colorize_string(val, Ripl.config[:color_result_scheme][tok])
     end
     ret
   rescue # catch any errors from the tokenizer (just in case)

data/lib/ripl/color_result.rb

@@ -2,7 +2,26 @@ require 'ripl'
 
 module Ripl
   module ColorResult
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
+    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',
+    }
 
     # def inspect_result(result)
     #   result.inspect
@@ -28,8 +47,8 @@ module Ripl
         require 'ap'
         result.awesome_inspect
       else # :default
-        require 'ripl/color_result/default'
-        Default.colorize_code( result.inspect )
+        require 'ripl/color_result/default_colorizer'
+        DefaultColorizer.colorize_code( result.inspect )
       end
 
     end
@@ -37,6 +56,40 @@ module Ripl
 end
 
 Ripl::Shell.send :include, Ripl::ColorResult if defined? Ripl::Shell
+
 Ripl.config[:color_result_engine] ||= :default
+Ripl.config[:color_result_scheme] ||= { # color scheme for default colorization, original from wirble
+  # delimiter colors
+  :comma => :blue,
+  :refers => :blue,
+
+  # container colors (hash and array)
+  :open_hash => :green,
+  :close_hash => :green,
+  :open_array => :green,
+  :close_array => :green,
+
+  # object colors
+  :open_object => :light_red,
+  :object_class => :white,
+  :object_addr_prefix => :blue,
+  :object_line_prefix => :blue,
+  :close_object => :light_red,
+
+  # symbol colors
+  :symbol => :yellow,
+  :symbol_prefix => :yellow,
+
+  # string colors
+  :open_string => :red,
+  :string => :cyan,
+  :close_string => :red,
+
+  # misc colors
+  :number => :cyan,
+  :keyword => :green,
+  :class => :light_green,
+  :range => :red,
+}
 
 # J-_-L

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ripl-color_result
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jan Lelis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 +01:00
+date: 2010-11-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,7 @@ extra_rdoc_files:
 - README.rdoc
 - COPYING
 files: 
-- lib/ripl/color_result/default.rb
+- lib/ripl/color_result/default_colorizer.rb
 - lib/ripl/color_result.rb
 - README.rdoc
 - CHANGELOG.rdoc