riel 1.1.12 → 1.1.13

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

@@ -0,0 +1,125 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'test/unit'
+require 'riel/text/ansi/ansi_highlight'
+require 'riel/text/string'
+
+class AnsiHighlightTestCase < Test::Unit::TestCase
+  def run_ansi_test str, input, *chars
+    escape_sequence = chars.collect { |ch| "\e[#{ch}m" }.join("")
+    assert_equal "#{escape_sequence}#{str}\e[0m", input
+  end
+
+  def setup
+    Text::Highlightable.add_to String
+  end
+  
+  def test_ansi_highlight
+    str = "precision"
+
+    run_ansi_test str, str.none,        0
+    run_ansi_test str, str.bold,        1
+    run_ansi_test str, str.underline,   4
+    run_ansi_test str, str.underscore,  4
+    run_ansi_test str, str.blink,       5 # every geocities site circa 1998
+    run_ansi_test str, str.negative,    7
+    run_ansi_test str, str.concealed,   8
+
+    run_ansi_test str, str.black,      30
+    run_ansi_test str, str.red,        31
+    run_ansi_test str, str.green,      32
+    run_ansi_test str, str.yellow,     33
+    run_ansi_test str, str.blue,       34
+    run_ansi_test str, str.magenta,    35
+    run_ansi_test str, str.cyan,       36
+    run_ansi_test str, str.white,      37
+
+    run_ansi_test str, str.on_black,   40
+    run_ansi_test str, str.on_red,     41
+    run_ansi_test str, str.on_green,   42
+    run_ansi_test str, str.on_yellow,  43
+    run_ansi_test str, str.on_blue,    44
+    run_ansi_test str, str.on_magenta, 45
+    run_ansi_test str, str.on_cyan,    46
+    run_ansi_test str, str.on_white,   47
+
+    run_ansi_test str, str.none_on_white,  0, 47
+    run_ansi_test str, str.none_on_black,  0, 40
+    run_ansi_test str, str.none_on_blue,   0, 44
+    run_ansi_test str, str.red_on_white,  31, 47
+    run_ansi_test str, str.bold_red_on_white,  1, 31, 47
+  end
+
+  def test_highlighter
+    hl = Text::ANSIHighlighter.instance
+    assert_equal "\e[1m", hl.code('bold')
+  end
+
+  def test_gsub
+    hl = Text::ANSIHighlighter.instance
+    assert_equal "...\e[34mthis\e[0m... is blue",       hl.gsub("...this... is blue", %r{this}, "blue")
+    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
+  end
+
+  def test_on_grey
+    str = "123".on_grey(4)
+    assert_equal "\x1b[48;5;236m123\e[0m", str
+  end
+
+  def test_gray
+    str = "123".gray(14)
+    assert_equal "\x1b[38;5;246m123\e[0m", str
+  end
+
+  def test_on_gray
+    str = "123".on_gray(4)
+    assert_equal "\x1b[48;5;236m123\e[0m", str
+  end
+
+  def test_multiple
+    str = "ABC".bold.blue.on_green
+    assert_equal "\e[42m\e[34m\e[1mABC\e[0m\e[0m\e[0m", str
+  end
+
+  def test_multiple_add_to
+    Text::Highlightable.add_to Integer
+    str = "ABC".blue
+    int = 123.red
+    # puts str + int.to_s
+    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
+    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
+  end
+end

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

@@ -0,0 +1,65 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'riel/text/ansi/ansi_palette'
+require 'riel/text/ansi/palette_tc'
+
+module Text
+  class AnsiPaletteTest < PaletteTest
+    def cls
+      AnsiPalette
+    end
+
+    def test_ansi_foregrounds
+      expected = [
+                  "ansi foregrounds\n",
+                  "0/. 1/. 2/. 3/. 4/. 5/. 6/. 7/. \n",
+                  "\n",
+                 ]
+
+      assert_print expected, :print_foregrounds
+    end
+
+    def test_ansi_backgrounds
+      expected = [
+                  "ansi backgrounds\n",
+                  "./0 ./1 ./2 ./3 ./4 ./5 ./6 ./7 \n",
+                  "\n",
+                 ]
+
+      assert_print expected, :print_backgrounds
+    end
+
+    def test_ansi_combinations
+      expected = [
+                  "ansi combinations\n",
+                  "bg: 000\n",
+                  "0/. 1/. 2/. 3/. 4/. 5/. 6/. 7/. \n",
+                  "\n",
+                  "bg: 001\n",
+                  "0/. 1/. 2/. 3/. 4/. 5/. 6/. 7/. \n",
+                  "\n",
+                  "bg: 002\n",
+                  "0/. 1/. 2/. 3/. 4/. 5/. 6/. 7/. \n",
+                  "\n",
+                  "bg: 003\n",
+                  "0/. 1/. 2/. 3/. 4/. 5/. 6/. 7/. \n",
+                  "\n",
+                  "bg: 004\n",
+                  "0/. 1/. 2/. 3/. 4/. 5/. 6/. 7/. \n",
+                  "\n",
+                  "bg: 005\n",
+                  "0/. 1/. 2/. 3/. 4/. 5/. 6/. 7/. \n",
+                  "\n",
+                  "bg: 006\n",
+                  "0/. 1/. 2/. 3/. 4/. 5/. 6/. 7/. \n",
+                  "\n",
+                  "bg: 007\n",
+                  "0/. 1/. 2/. 3/. 4/. 5/. 6/. 7/. \n",
+                  "\n",
+                 ]
+
+      assert_print expected, :print_combinations
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'riel/text/ansi/grey_palette'
+require 'riel/text/ansi/palette_tc'
+
+module Text
+  class GreyPaletteTest < PaletteTest
+    def cls
+      GreyPalette
+    end
+
+    def test_foregrounds
+      expected = [
+                  "grey foreground colors\n",
+                  "232 233 234 235 236 237 \n",
+                  "238 239 240 241 242 243 \n",
+                  "244 245 246 247 248 249 \n",
+                  "250 251 252 253 254 255 \n",
+                  "\n",
+                 ]
+
+      assert_print expected, :print_foregrounds
+    end
+
+    def test_backgrounds
+      expected = [
+                  "grey background colors\n",
+                  "232 233 234 235 236 237 \n",
+                  "238 239 240 241 242 243 \n",
+                  "244 245 246 247 248 249 \n",
+                  "250 251 252 253 254 255 \n",
+                  "\n",
+                 ]
+
+      assert_print expected, :print_backgrounds
+    end
+  end
+end

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

@@ -0,0 +1,122 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'riel/text/ansi/rgb_palette'
+require 'riel/text/ansi/palette_tc'
+
+module Text
+  class RGBPaletteTest < PaletteTest
+    def cls
+      RGBPalette
+    end
+
+    def test_foregrounds
+      expected = [
+                  "rgb foreground colors\n",
+                  "000 001 002 003 004 005 \n",
+                  "010 011 012 013 014 015 \n",
+                  "020 021 022 023 024 025 \n",
+                  "030 031 032 033 034 035 \n",
+                  "040 041 042 043 044 045 \n",
+                  "050 051 052 053 054 055 \n",
+                  "\n",
+                  "100 101 102 103 104 105 \n",
+                  "110 111 112 113 114 115 \n",
+                  "120 121 122 123 124 125 \n",
+                  "130 131 132 133 134 135 \n",
+                  "140 141 142 143 144 145 \n",
+                  "150 151 152 153 154 155 \n",
+                  "\n",
+                  "200 201 202 203 204 205 \n",
+                  "210 211 212 213 214 215 \n",
+                  "220 221 222 223 224 225 \n",
+                  "230 231 232 233 234 235 \n",
+                  "240 241 242 243 244 245 \n",
+                  "250 251 252 253 254 255 \n",
+                  "\n",
+                  "300 301 302 303 304 305 \n",
+                  "310 311 312 313 314 315 \n",
+                  "320 321 322 323 324 325 \n",
+                  "330 331 332 333 334 335 \n",
+                  "340 341 342 343 344 345 \n",
+                  "350 351 352 353 354 355 \n",
+                  "\n",
+                  "400 401 402 403 404 405 \n",
+                  "410 411 412 413 414 415 \n",
+                  "420 421 422 423 424 425 \n",
+                  "430 431 432 433 434 435 \n",
+                  "440 441 442 443 444 445 \n",
+                  "450 451 452 453 454 455 \n",
+                  "\n",
+                  "500 501 502 503 504 505 \n",
+                  "510 511 512 513 514 515 \n",
+                  "520 521 522 523 524 525 \n",
+                  "530 531 532 533 534 535 \n",
+                  "540 541 542 543 544 545 \n",
+                  "550 551 552 553 554 555 \n",
+                  "\n",
+                 ]
+
+      assert_print expected, :print_foregrounds
+    end
+
+    def test_backgrounds
+      expected = [
+                  "rgb background colors\n",
+                  "000 001 002 003 004 005 \n",
+                  "010 011 012 013 014 015 \n",
+                  "020 021 022 023 024 025 \n",
+                  "030 031 032 033 034 035 \n",
+                  "040 041 042 043 044 045 \n",
+                  "050 051 052 053 054 055 \n",
+                  "\n",
+                  "100 101 102 103 104 105 \n",
+                  "110 111 112 113 114 115 \n",
+                  "120 121 122 123 124 125 \n",
+                  "130 131 132 133 134 135 \n",
+                  "140 141 142 143 144 145 \n",
+                  "150 151 152 153 154 155 \n",
+                  "\n",
+                  "200 201 202 203 204 205 \n",
+                  "210 211 212 213 214 215 \n",
+                  "220 221 222 223 224 225 \n",
+                  "230 231 232 233 234 235 \n",
+                  "240 241 242 243 244 245 \n",
+                  "250 251 252 253 254 255 \n",
+                  "\n",
+                  "300 301 302 303 304 305 \n",
+                  "310 311 312 313 314 315 \n",
+                  "320 321 322 323 324 325 \n",
+                  "330 331 332 333 334 335 \n",
+                  "340 341 342 343 344 345 \n",
+                  "350 351 352 353 354 355 \n",
+                  "\n",
+                  "400 401 402 403 404 405 \n",
+                  "410 411 412 413 414 415 \n",
+                  "420 421 422 423 424 425 \n",
+                  "430 431 432 433 434 435 \n",
+                  "440 441 442 443 444 445 \n",
+                  "450 451 452 453 454 455 \n",
+                  "\n",
+                  "500 501 502 503 504 505 \n",
+                  "510 511 512 513 514 515 \n",
+                  "520 521 522 523 524 525 \n",
+                  "530 531 532 533 534 535 \n",
+                  "540 541 542 543 544 545 \n",
+                  "550 551 552 553 554 555 \n",
+                  "\n",
+                 ]
+
+      assert_print expected, :print_backgrounds
+    end
+
+    def test_combinations
+      # not checking this, since it is over 9000 lines of output:
+      expected = [
+                  # a lot
+                 ]
+
+      # assert_print expected, :print_combinations
+    end
+  end
+end

data/test/riel/text/highlightable_test.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'test/unit'
+require 'riel/text/ansi/ansi_highlight'
+require 'riel/text/string'
+
+class HighlightableTestCase < Test::Unit::TestCase
+  def test_string_add_to
+    Text::Highlightable.add_to String
+    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
+
+  def test_string_respond_to
+    str = ""
+    assert str.respond_to? :blue
+    assert !str.respond_to?(:azure)
+  end
+end

data/test/riel/text/string_test.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'test/unit'
+require 'riel/text/ansi/ansi_highlight'
+require 'riel/text/string'
+
+class StringTestCase < Test::Unit::TestCase
+  def run_test str, input, *chars
+    escape_sequence = chars.collect { |ch| "\e[#{ch}m" }.join("")
+    assert_equal "#{escape_sequence}#{str}\e[0m", input
+  end
+  
+  def test_all_ansi
+    String.highlighter = "ANSI"
+
+    str = "precision"
+
+    run_test str, str.none,           0
+    run_test str, str.bold,           1
+    run_test str, str.underline,      4
+    run_test str, str.underscore,     4
+    run_test str, str.blink,          5 # every geocities site circa 1998
+    run_test str, str.negative,       7
+    run_test str, str.concealed,      8
+    run_test str, str.black,         30
+    run_test str, str.red,           31
+    run_test str, str.green,         32
+    run_test str, str.yellow,        33
+    run_test str, str.blue,          34
+    run_test str, str.magenta,       35
+    run_test str, str.cyan,          36
+    run_test str, str.white,         37
+    run_test str, str.on_black,      40
+    run_test str, str.on_red,        41
+    run_test str, str.on_green,      42
+    run_test str, str.on_yellow,     43
+    run_test str, str.on_blue,       44
+    run_test str, str.on_magenta,    45
+    run_test str, str.on_cyan,       46
+    run_test str, str.on_white,      47
+    run_test str, str.none_on_white,  0, 47
+    run_test str, str.none_on_black,  0, 40
+    run_test str, str.none_on_blue,   0, 44
+    run_test str, str.red_on_white,  31, 47
+    run_test str, str.bold_red_on_white,  1, 31, 47
+  end
+end

data/test/riel/text_test.rb

@@ -92,7 +92,7 @@ class TextTestCase < Test::Unit::TestCase
 
     str = "precision"
 
-    # this tests that string.reverse does not mean ANSI reverse
+    # string.reverse does not mean ANSI reverse:
     assert_equal "noisicerp", str.reverse
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riel
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
   - 1
-  - 12
-  version: 1.1.12
+  - 13
+  version: 1.1.13
 platform: ruby
 authors: 
 - Jeff Pace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-23 00:00:00 -05:00
+date: 2012-12-08 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -26,7 +26,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.md
 files: 
 - lib/riel/array.rb
 - lib/riel/size_converter.rb
@@ -47,6 +47,25 @@ files:
 - lib/riel/tempfile.rb
 - lib/riel/string.rb
 - lib/riel/command.rb
+- lib/riel/text/non_highlight.rb
+- lib/riel/text/html_highlight.rb
+- lib/riel/text/string.rb
+- lib/riel/text/highlightable.rb
+- lib/riel/text/highlight.rb
+- lib/riel/text/ansi/backgrounds.rb
+- lib/riel/text/ansi/color.rb
+- lib/riel/text/ansi/ansi_color.rb
+- lib/riel/text/ansi/rgb_color.rb
+- lib/riel/text/ansi/attributes.rb
+- lib/riel/text/ansi/ansi_highlight.rb
+- lib/riel/text/ansi/grey_palette.rb
+- lib/riel/text/ansi/ansi_palette.rb
+- lib/riel/text/ansi/rgb_palette.rb
+- lib/riel/text/ansi/foregrounds.rb
+- lib/riel/text/ansi/ansi_colors.rb
+- lib/riel/text/ansi/palette.rb
+- lib/riel/text/ansi/grey.rb
+- lib/riel/text/ansi/ansi_list.rb
 - lib/riel/pathname.rb
 - lib/riel/file.rb
 - lib/riel/integer.rb
@@ -78,6 +97,12 @@ files:
 - test/riel/tempfile_test.rb
 - test/riel/filetype_test.rb
 - test/riel/log_test.rb
+- test/riel/text/ansi/ansi_palette_test.rb
+- 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/string_test.rb
+- test/riel/text/highlightable_test.rb
 - test/riel/integer_test.rb
 - test/riel/rcfile_test.rb
 - test/riel/log_stack_test.rb
@@ -86,7 +111,7 @@ files:
 - test/riel/string_test.rb
 - test/riel/command_test.rb
 - test/riel/timer_test.rb
-- README
+- README.md
 has_rdoc: true
 homepage: http://www.incava.org/projects/riel
 licenses: []
@@ -138,6 +163,12 @@ test_files:
 - test/riel/tempfile_test.rb
 - test/riel/filetype_test.rb
 - test/riel/log_test.rb
+- test/riel/text/ansi/ansi_palette_test.rb
+- 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/string_test.rb
+- test/riel/text/highlightable_test.rb
 - test/riel/integer_test.rb
 - test/riel/rcfile_test.rb
 - test/riel/log_stack_test.rb