riel 1.1.15 → 1.1.16

data/README.md

@@ -25,20 +25,44 @@ arguments.
 
 ### ANSIHighlighter
 
-This class processes strings, wrapping them in ANSI colors. For example:
+This class wraps strings in ANSI colors. For example:
 
     "foo".blue
     "bar".bold.blue.on_white
 
+It also handles RGB values (on a 0-5 scale, not 0-255):
+
+    "foo".rgb(3, 1, 5)
+    "bar".on_rgb(1, 0, 4)
+
+Colors and attributes can be chained:
+
+    "hey!".rgb(0, 3, 5).on_rgb(5, 2, 1).bold.underline
+ 
+Aliases (names) for colors can be defined:
+
+    Text::ANSIHighlighter.instance.add_alias :teal, 1, 4, 4
+    puts "hello, word".teal
+ 
+Background aliases are supported:
+
+    Text::ANSIHighlighter.instance.add_alias :on_slate, 0, 1, 1
+    puts "hello, word".teal
+ 
 ### SetDiff
 
 This class compares enumerables as sets, A fully including B, B fully including
 A, or A and B having common elements.
 
-### AnsiPalette
+### ANSIPalette
 
 This class prints the set of ANSI colors as foregrounds and backgrounds.
 
+### RGBPalette
+
+This class prints the set of RGB (extended ANSI) colors as foregrounds,
+backgrounds and combinations.
+
 ### ANSIITable
 
 This class prints a spreadsheet-like table of data.

data/lib/riel.rb

@@ -4,14 +4,5 @@ $:.unshift(riellibdir) unless
   $:.include?(riellibdir) || $:.include?(File.expand_path(riellibdir))
 
 module RIEL
-  VERSION = '1.1.15'
-end
-
-rbfiles = Dir[riellibdir + "/riel/**/*.rb"]
-
-rieldir = riellibdir + '/riel'
-
-rbfiles.sort.each do |rbfile|
-  rootname = rbfile.sub(Regexp.new('^' + rieldir + '/([\/\w]+)\.rb'), '\1')
-  require "riel/" + rootname
+  VERSION = '1.1.16'
 end

data/lib/riel/asciitable/row.rb

@@ -2,6 +2,7 @@
 # -*- ruby -*-
 
 require 'riel/log'
+require 'riel/enumerable'
 
 module RIEL
   module ASCIITable

data/lib/riel/optproc.rb

@@ -231,10 +231,10 @@ module OptProc
     end
 
     COMBINED_OPTS_RES = [
-      #               -number     non-num, then anything
-      Regexp.new('^ ( - \d+   )  ( \D+.* ) $ ', Regexp::EXTENDED),
-      #               -letter     anything
-      Regexp.new('^ ( - [a-z] )  ( .+    ) $ ', Regexp::EXTENDED)
+      #               -number       non-num
+      Regexp.new('^ ( - \d+   )     ( \D+.* ) $ ', Regexp::EXTENDED),
+      #               -letter       anything
+      Regexp.new('^ ( - [a-zA-Z] )  ( .+    ) $ ', Regexp::EXTENDED)
     ]
 
     def process_option args

data/lib/riel/text/ansi/ansi_highlight.rb

@@ -9,46 +9,34 @@ require 'riel/text/ansi/foregrounds'
 require 'riel/text/ansi/backgrounds'
 require 'riel/text/ansi/grey'
 require 'riel/text/ansi/rgb_color'
+require 'riel/text/ansi/rgb_highlighter'
 require 'singleton'
 
 module Text
   # Highlights using ANSI escape sequences.
   class ANSIHighlighter < Highlighter
-    include Singleton
-    
-    DEFAULT_COLORS = [
-                      "black on yellow",
-                      "black on green",
-                      "black on magenta",
-                      "yellow on black",
-                      "magenta on black",
-                      "green on black",
-                      "cyan on black",
-                      "blue on yellow",
-                      "blue on magenta",
-                      "blue on green",
-                      "blue on cyan",
-                      "yellow on blue",
-                      "magenta on blue",
-                      "green on blue",
-                      "cyan on blue",
-                     ]
+    include Singleton, RGBHighlighter
     
     ATTRIBUTES = Hash.new
     [ Attributes, Foregrounds, Backgrounds ].each { |cls| ATTRIBUTES.merge! cls.new.colors }
 
+    RGB_RE = Regexp.new '(on_?)?(\d)(\d)(\d)'
+
     def initialize 
-      @aliases = Hash.new
+      super
       @default_codes = nil
     end
 
     def default_codes limit = -1
-      @default_codes ||= Text::Highlighter::DEFAULT_COLORS.collect { |color| to_codes color }
+      @default_codes ||= DEFAULT_COLORS.collect { |color| to_codes color }
       @default_codes[0 .. limit]
     end
     
     def to_codes str
       names = parse_colors str
+      if names.empty?
+        return to_rgb_codes str
+      end
       names_to_code names
     end
     
@@ -61,20 +49,7 @@ module Text
       names = [ names ] unless names.kind_of? Array
       names.collect { |name| ATTRIBUTES[name].to_s }.join ''
     end
-
-    def to_rgb str, red, green, blue, meth
-      color = RGBColor.new red, green, blue
-      color.send(meth) + str + color.reset
-    end
-
-    def rgb str, red, green, blue
-      to_rgb str, red, green, blue, :fg
-    end
-
-    def on_rgb str, red, green, blue
-      to_rgb str, red, green, blue, :bg
-    end
-
+    
     def to_grey str, value, meth
       color = Grey.new 232 + value
       color.send(meth) + str + color.reset
@@ -90,33 +65,5 @@ module Text
 
     alias_method :gray, :grey
     alias_method :on_gray, :on_grey
-
-    def add_alias name, red, green, blue
-      type = name.to_s[0 .. 2] == 'on_' ? :bg : :fg
-      color = RGBColor.new red, green, blue, type
-      @aliases[name] = color
-    end
-
-    def has_alias? name
-      @aliases.include? name
-    end
-
-    def respond_to? meth
-      has_alias? meth
-    end
-
-    def method_missing(meth, *args, &blk)
-      if has_alias? meth
-        methdecl = Array.new
-        methdecl << "def #{meth}(str, &blk);"
-        methdecl << "  color = @aliases[:#{meth}];"
-        methdecl << "  color.to_s + str + color.reset;"
-        methdecl << "end"
-        self.class.class_eval methdecl.join("\n")
-        send meth, *args, &blk
-      else
-        super
-      end
-    end
   end
 end

data/lib/riel/text/ansi/ansi_palette.rb

@@ -6,7 +6,7 @@ require 'riel/text/ansi/palette'
 require 'singleton'
 
 module Text
-  class AnsiPalette < Palette
+  class ANSIPalette < Palette
     include Singleton
 
     ANSI_RG = (0 .. 7)

data/lib/riel/text/ansi/rgb_highlighter.rb

@@ -0,0 +1,73 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'riel/text/ansi/rgb_color'
+require 'singleton'
+
+module Text
+  # Highlights using extended (RGB) ANSI escape sequences.
+  module RGBHighlighter
+    RGB_RE = Regexp.new '(on_?)?(\d)(\d)(\d)'
+
+    def initialize 
+      @aliases = Hash.new
+    end
+    
+    def to_rgb_codes str
+      codes = str.scan(RGB_RE).collect do |bg, r, g, b| 
+        to_rgb_code r.to_i, g.to_i, b.to_i, bg ? :bg : :fg
+        end
+      codes.join ''
+    end
+
+    def to_rgb_code red, green, blue, fgbg = :fg
+      color = RGBColor.new red, green, blue
+      color.send fgbg
+    end
+
+    def to_rgb str, red, green, blue, meth
+      color = RGBColor.new red, green, blue
+      color.send(meth) + str + color.reset
+    end
+
+    def rgb str, red, green, blue
+      to_rgb str, red, green, blue, :fg
+    end
+
+    def on_rgb str, red, green, blue
+      to_rgb str, red, green, blue, :bg
+    end
+    
+    def rrggbb red, green, blue
+      [ red, green, blue ].collect { |x| (x * 6 / 255.0).to_i }
+    end
+
+    def add_alias name, red, green, blue
+      type = name.to_s[0 .. 2] == 'on_' ? :bg : :fg
+      color = RGBColor.new red, green, blue, type
+      @aliases[name] = color
+    end
+
+    def has_alias? name
+      @aliases.include? name
+    end
+
+    def respond_to? meth
+      has_alias?(meth) || super
+    end
+
+    def method_missing(meth, *args, &blk)
+      if has_alias? meth
+        methdecl = Array.new
+        methdecl << "def #{meth}(str, &blk);"
+        methdecl << "  color = @aliases[:#{meth}];"
+        methdecl << "  color.to_s + str + color.reset;"
+        methdecl << "end"
+        self.class.class_eval methdecl.join("\n")
+        send meth, *args, &blk
+      else
+        super
+      end
+    end
+  end
+end

data/lib/riel/text/highlight.rb

@@ -22,7 +22,7 @@ module Text
 
     BACKGROUND_COLORS = COLORS.collect { |color| "on_#{color}" }
     FOREGROUND_COLORS = COLORS
-
+    
     COLORS_RE = Regexp.new('(?: ' + 
                                 # background will be in capture 0
                                 'on(?:\s+|_) ( ' + COLORS.join(' | ') + ' ) | ' +

data/lib/riel/text/highlightable.rb

@@ -21,7 +21,7 @@ module Text
         methdecl << "end"
         self.class.class_eval methdecl.join("\n")
         send meth, *args, &blk
-      elsif ANSIHighlighter.instance.has_alias? meth
+      elsif @@highlighter.has_alias? meth
         methdecl = Array.new
         methdecl << "def #{meth}(&blk);"
         methdecl << "  @@highlighter.#{meth}(self, &blk);"

data/test/riel/asciitable/table_test.rb

@@ -2,7 +2,6 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'riel'
 require 'test/unit'
 require 'riel/asciitable/table'
 require 'stringio'

data/test/riel/text/ansi/ansi_highlight_test.rb

@@ -2,6 +2,7 @@
 # -*- ruby -*-
 
 require 'test/unit'
+require 'riel/text/highlightable'
 require 'riel/text/ansi/ansi_highlight'
 require 'riel/text/string'
 
@@ -62,16 +63,6 @@ class AnsiHighlightTestCase < Test::Unit::TestCase
     assert_equal "...\e[34m\e[42mthis\e[0m... is blue", hl.gsub("...this... is blue", %r{this}, "blue on green")
   end
 
-  def test_rgb
-    str = "123".rgb(1, 2, 3)
-    assert_equal "\x1b[38;5;67m123\e[0m", str
-  end
-
-  def test_on_rgb
-    str = "123".on_rgb(1, 2, 3)
-    assert_equal "\x1b[48;5;67m123\e[0m", str
-  end
-
   def test_grey
     str = "123".grey(14)
     assert_equal "\x1b[38;5;246m123\e[0m", str
@@ -105,39 +96,21 @@ class AnsiHighlightTestCase < Test::Unit::TestCase
     assert_equal "\e[34mABC\e[0m\e[31m123\e[0m", str + int
   end
 
-  def test_rgb_fg_alias
-    hl = Text::ANSIHighlighter.instance 
-    hl.add_alias :teal, 1, 4, 4
-    
-    str = "ABC".teal
-    # puts str
-    assert_equal "\x1b[38;5;80mABC\e[0m", str
-  end
-
-  def test_rgb_bg_alias
+  def assert_to_codes expected, rgbstr
     hl = Text::ANSIHighlighter.instance 
-    hl.add_alias :on_maroon, 1, 0, 2
-    
-    str = "ABC".on_maroon
-    # puts str
-    assert_equal "\x1b[48;5;54mABC\e[0m", str
+    codes = hl.to_codes rgbstr
+    assert_equal expected, codes
   end
 
   def test_to_codes_one_color
-    hl = Text::ANSIHighlighter.instance 
-    code = hl.to_codes 'blue'
-    assert_equal "\e[34m", code
+    assert_to_codes "\e[34m", 'blue'
   end
 
   def test_to_codes_decoration_color
-    hl = Text::ANSIHighlighter.instance 
-    code = hl.to_codes 'bold blue'
-    assert_equal "\e[1m\e[34m", code
+    assert_to_codes "\e[1m\e[34m", 'bold blue'
   end
 
   def test_to_codes_background_color
-    hl = Text::ANSIHighlighter.instance 
-    code = hl.to_codes 'on_blue'
-    assert_equal "\e[44m", code
+    assert_to_codes "\e[44m", 'on_blue'
   end
 end

data/test/riel/text/ansi/ansi_palette_test.rb

@@ -5,9 +5,9 @@ require 'riel/text/ansi/ansi_palette'
 require 'riel/text/ansi/palette_tc'
 
 module Text
-  class AnsiPaletteTest < PaletteTest
+  class ANSIPaletteTest < PaletteTest
     def cls
-      AnsiPalette
+      ANSIPalette
     end
 
     def test_ansi_foregrounds

data/test/riel/text/ansi/rgb_highlighter_test.rb

@@ -0,0 +1,99 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'test/unit'
+require 'riel/text/highlightable'
+require 'riel/text/ansi/rgb_highlighter'
+require 'riel/text/string'
+
+class RGBHighlighterTest < Test::Unit::TestCase
+  def setup
+    String.highlight
+    @hl = Text::ANSIHighlighter.instance 
+  end
+  
+  def test_rgb
+    str = "123".rgb(1, 2, 3)
+    assert_equal "\x1b[38;5;67m123\e[0m", str
+  end
+
+  def test_on_rgb
+    str = "123".on_rgb(1, 2, 3)
+    assert_equal "\x1b[48;5;67m123\e[0m", str
+  end
+
+  def test_rgb_chained
+    str = "gaudy".rgb(4, 1, 2).on_rgb(1, 5, 3)
+    puts "str: #{str}"
+    assert_equal "\x1b[48;5;85m\x1b[38;5;168mgaudy\e[0m\e[0m", str
+  end
+
+  def test_rgb_bold_underline
+    str = "hey!".rgb(0, 3, 5).on_rgb(5, 2, 1).bold.underline
+    puts "str: #{str}"
+    assert_equal "\e[4m\e[1m\e[48;5;209m\x1b[38;5;39mhey!\e[0m\e[0m\e[0m\e[0m", str
+  end
+
+  def assert_to_codes expected, rgbstr
+    codes = @hl.to_codes rgbstr
+    assert_equal expected, codes
+  end
+
+  def test_to_rgb_code
+    code = @hl.to_rgb_code 1, 3, 5
+    assert_equal "\e[38;5;75m", code
+  end
+
+  def test_to_rgb_code_background
+    code = @hl.to_rgb_code 1, 3, 5, :bg
+    assert_equal "\e[48;5;75m", code
+  end
+
+  def test_to_codes_rgb_foreground
+    assert_to_codes "\e[38;5;75m", '135'
+  end
+
+  def test_to_codes_rgb_onbackground
+    assert_to_codes "\e[48;5;75m", 'on135'
+  end
+
+  def test_to_codes_rgb_on_background
+    assert_to_codes "\e[48;5;75m", 'on_135'
+  end
+  
+  def test_rgb_fg_alias
+    @hl.add_alias :teal, 1, 4, 4
+    
+    str = "ABC".teal
+    assert_equal "\x1b[38;5;80mABC\e[0m", str
+  end
+
+  def test_rgb_bg_alias
+    @hl.add_alias :on_maroon, 1, 0, 2
+    
+    str = "ABC".on_maroon
+    assert_equal "\x1b[48;5;54mABC\e[0m", str
+  end
+  
+  def add_rrggbb name, red, green, blue
+    rr, gg, bb = @hl.rrggbb(red, green, blue)
+    @hl.add_alias name, rr, gg, bb
+  end
+  
+  def test_rgb_multiple_aliases
+    add_rrggbb :on_dahlia_mauve, 168, 83, 135
+    add_rrggbb :mauve_chalk, 228, 211, 210
+    
+    str = "mauve chalk on dahlia".mauve_chalk.on_dahlia_mauve
+    puts str
+    assert_equal "\x1b[48;5;133m\x1b[38;5;224mmauve chalk on dahlia\e[0m\e[0m", str
+  end
+
+  def test_rrggbb
+    rr, gg, bb = @hl.rrggbb(122, 212, 67)
+    puts "rr, gg, bb: #{rr}, #{gg}, #{bb}"
+
+    rr, gg, bb = @hl.rrggbb(121, 211, 62)
+    puts "rr, gg, bb: #{rr}, #{gg}, #{bb}"
+  end
+end

data/test/riel/text/highlightable_test.rb

@@ -2,6 +2,7 @@
 # -*- ruby -*-
 
 require 'test/unit'
+require 'riel/text/highlightable'
 require 'riel/text/ansi/ansi_highlight'
 require 'riel/text/string'
 
@@ -11,10 +12,6 @@ class HighlightableTestCase < Test::Unit::TestCase
     assert_equal "\e[34mfoo\e[0m", "foo".blue
   end
 
-  class String
-    include Text::Highlightable
-  end
-
   def test_string_include
     assert_equal "\e[34mfoo\e[0m", "foo".blue
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riel
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 51
   prerelease: 
   segments: 
   - 1
   - 1
-  - 15
-  version: 1.1.15
+  - 16
+  version: 1.1.16
 platform: ruby
 authors: 
 - Jeff Pace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-11 00:00:00 -05:00
+date: 2012-12-15 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -57,6 +57,7 @@ files:
 - lib/riel/text/ansi/ansi_color.rb
 - lib/riel/text/ansi/rgb_color.rb
 - lib/riel/text/ansi/attributes.rb
+- lib/riel/text/ansi/rgb_highlighter.rb
 - lib/riel/text/ansi/ansi_highlight.rb
 - lib/riel/text/ansi/grey_palette.rb
 - lib/riel/text/ansi/ansi_palette.rb
@@ -102,6 +103,7 @@ files:
 - test/riel/text/ansi/rgb_palette_test.rb
 - test/riel/text/ansi/grey_palette_test.rb
 - test/riel/text/ansi/ansi_highlight_test.rb
+- test/riel/text/ansi/rgb_highlighter_test.rb
 - test/riel/text/string_test.rb
 - test/riel/text/highlightable_test.rb
 - test/riel/integer_test.rb
@@ -169,6 +171,7 @@ test_files:
 - test/riel/text/ansi/rgb_palette_test.rb
 - test/riel/text/ansi/grey_palette_test.rb
 - test/riel/text/ansi/ansi_highlight_test.rb
+- test/riel/text/ansi/rgb_highlighter_test.rb
 - test/riel/text/string_test.rb
 - test/riel/text/highlightable_test.rb
 - test/riel/integer_test.rb