ansi256 0.2.0 → 0.2.1

data/README.md

@@ -15,7 +15,7 @@ Features:
 Basic usage
 -----------
 
-### 256-colors
+### Numeric 256-color codes
 
 ```ruby
 require 'ansi256'
@@ -87,14 +87,32 @@ ansi256 executable
 Ansi256 comes with `ansi256` script which can be used as follows
 
 ```bash
-> ansi256
 usage: ansi256 [-u] <[fg][/bg]> [mesage]
 
-> ansi256 232/226 "Hello world"
+# Numeric color codes
+ansi256 232 "Hello world"
+ansi256 /226 "Hello world"
+ansi256 232/226 "Hello world"
 
-> ls | ansi256 -u /226
+# Named color codes
+ansi256 yellow "Hello world"
+ansi256 /blue "Hello world"
+ansi256 yellow/blue "Hello world"
 
-> ansi256 30 "Say '$(ansi256 230/75 "Hello $(ansi256 -u 232/226 World)")'"
+# Mixed color codes
+ansi256 yellow/232 "Hello world"
+
+# Bold yellow
+ansi256 yellow/232 -b "Hello world"
+
+# With underline
+ansi256 yellow/232 -b -u "Hello world"
+
+# Colorizing STDIN
+find / | ansi256 -u /226
+
+# Nesting
+ansi256 30 "Say '$(ansi256 230/75 "Hello $(ansi256 -u 232/226 World)")'"
 ```
 
 Color chart

data/bin/ansi256

@@ -2,29 +2,35 @@
 require 'rubygems'
 require 'ansi256'
 
+bold      = ARGV.delete '-b'
 underline = ARGV.delete '-u'
 
 if ARGV.length < 1
-  puts 'usage: ansi256 [-u] <[fg][/bg]> [message]'
+  puts 'usage: ansi256 [-b] [-u] <[fg][/bg]> [message]'
   exit 1
 end
 
 fgbg, *msg = ARGV
-fg,   bg  = fgbg.split '/'
+fg,   bg   = fgbg.split('/').map { |e|
+  if !e.to_s.empty?
+    (e =~ /^\d+$/) ? e.to_i : e.downcase.to_sym
+  end
+}
 
-def output msg, fg, bg, ul
+def output msg, fg, bg, ul, b
   msg = msg.fg(fg)    if fg
   msg = msg.bg(bg)    if bg
   msg = msg.underline if ul
+  msg = msg.bold      if b
   puts msg
 end
 
 if !msg.empty?
   msg.each do |m|
-    output m, fg, bg, underline
+    output m, fg, bg, underline, bold
   end
 else
   while msg = $stdin.gets
-    output msg.chomp, fg, bg, underline
+    output msg.chomp, fg, bg, underline, bold
   end
 end

data/lib/ansi256.rb

@@ -1,23 +1,31 @@
-require "ansi256/version"
-require "ansi256/code"
-require "ansi256/mixin"
 require 'set'
+require 'ansi256/version'
+require 'ansi256/code'
+require 'ansi256/mixin'
 
 module Ansi256
   class << self
     def fg code, str = nil
       if str
         wrap str, Ansi256.fg(code)
-      else
+      elsif NAMED_COLORS.include?(code)
+        "\e[#{CODE[code]}m"
+      elsif code.is_a?(Fixnum) && (0..255).include?(code)
         "\e[38;5;#{code}m"
+      else
+        raise ArgumentError, "Invalid color code: #{code}"
       end
     end
 
     def bg code, str = nil
       if str
         wrap str, Ansi256.bg(code)
-      else
+      elsif NAMED_COLORS.include?(code)
+        "\e[#{CODE[code] + 10}m"
+      elsif code.is_a?(Fixnum) && (0..255).include?(code)
         "\e[48;5;#{code}m"
+      else
+        raise ArgumentError, "Invalid color code: #{code}"
       end
     end
 
@@ -36,9 +44,9 @@ module Ansi256
     end
 
   private
-    PATTERN = /\e\[[0-9;]+m/
-    MULTI_PATTERN = /(?:\e\[[0-9;]+m)+/
-    EMPTY_TRIPLE = [nil, nil, Set.new]
+    PATTERN       = /\e\[[0-9;]+m/.freeze
+    MULTI_PATTERN = /(?:\e\[[0-9;]+m)+/.freeze
+    EMPTY_TRIPLE  = [nil, nil, Set.new].freeze
 
     def ansify prev, curr
       nums = []

data/lib/ansi256/code.rb

@@ -21,5 +21,16 @@ module Ansi256
     :on_magenta => 45,
     :on_cyan    => 46,
     :on_white   => 47,
-  }
+  }.freeze
+
+  NAMED_COLORS = Set[
+   :black,
+   :red,
+   :green,
+   :yellow,
+   :blue,
+   :magenta,
+   :cyan,
+   :white,
+  ].freeze
 end

data/lib/ansi256/version.rb

@@ -1,3 +1,3 @@
 module Ansi256
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/test_ansi256.rb

@@ -1,51 +1,142 @@
 $VERBOSE = true
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'ansi256'
+require 'minitest/autorun'
 
-def cfmt col
-  col.to_s.rjust(5).fg(232).bg(col)
-end
+class TestAnsi256 < MiniTest::Unit::TestCase
+  def cfmt col
+    col.to_s.rjust(5).fg(232).bg(col)
+  end
 
-puts (0..7).map  { |col| cfmt col }.join
-puts (8..15).map { |col| cfmt col }.join
-(16..255).each_slice(6) do |slice|
-  puts slice.map { |col| cfmt col }.join
-end
+  # TODO: assertions :p
 
-# Wrap
+  def test_256_color_table
+    puts (0..7).map  { |col| cfmt col }.join
+    puts (8..15).map { |col| cfmt col }.join
+    (16..255).each_slice(6) do |slice|
+      puts slice.map { |col| cfmt col }.join
+    end
+  end
 
-a = ' '
-(16..60).each do |i|
-  a = "<#{a}>".bg(i).fg(i * 2).underline
-end
-puts a
-
-# Nesting
-puts world = "World".bg(226).fg(232).underline
-puts hello = "Hello #{world} !".fg(230).bg(75)
-puts say_hello_world = "Say '#{hello}'".fg(30)
-puts say_hello_world.plain.fg(27)
-
-# Nesting 2
-puts world = "World".bg(226).blue.underline
-puts hello = "Hello #{world} Hello".white.bold
-puts say_hello_world = "Say '#{hello}'".fg(30).underline
-puts say_hello_world.plain.fg(27)
-
-# Nesting 3
-puts world = "World".blue.underline
-puts hello = "Hello #{world} Hello".blue.bold
-puts say_hello_world = "Say '#{hello}'".fg(30).underline
-puts say_hello_world.plain.fg(27)
-
-# Named colors
-s = "Colorize me"
-puts [ s.black,   s.black.bold,   s.white.bold.on_black   ].join ' '
-puts [ s.red,     s.red.bold,     s.white.bold.on_red     ].join ' '
-puts [ s.green,   s.green.bold,   s.white.bold.on_green   ].join ' '
-puts [ s.yellow,  s.yellow.bold,  s.white.bold.on_yellow  ].join ' '
-puts [ s.blue,    s.blue.bold,    s.white.bold.on_blue    ].join ' '
-puts [ s.magenta, s.magenta.bold, s.white.bold.on_magenta ].join ' '
-puts [ s.cyan,    s.cyan.bold,    s.white.bold.on_cyan    ].join ' '
-puts [ s.white,   s.white.bold,   s.white.bold.on_white   ].join ' '
+  def test_nesting
+    a = ' '
+    (16..60).each do |i|
+      a = "<#{a}>".bg(i).fg(i * 2).underline
+    end
+    puts a
+  end
+
+  def test_nesting_hello_world
+    # Nesting
+    puts world = "World".bg(226).fg(232).underline
+    puts hello = "Hello #{world} !".fg(230).bg(75)
+    puts say_hello_world = "Say '#{hello}'".fg(30)
+    puts say_hello_world.plain.fg(27)
+  end
+
+  def test_nesting_hello_world2
+    puts world = "World".bg(226).blue.underline
+    puts hello = "Hello #{world} Hello".white.bold
+    puts say_hello_world = "Say '#{hello}'".fg(30).underline
+    puts say_hello_world.plain.fg(27)
+  end
+
+  def test_nesting_hello_world3
+    puts world = "World".blue.underline
+    puts hello = "Hello #{world} Hello".blue.bold
+    puts say_hello_world = "Say '#{hello}'".fg(30).underline
+    puts say_hello_world.plain.fg(27)
+  end
+
+  def test_named_colors
+    s = "Colorize me"
+    puts [ s.black,   s.black.bold,   s.white.bold.on_black   ].join ' '
+    puts [ s.red,     s.red.bold,     s.white.bold.on_red     ].join ' '
+    puts [ s.green,   s.green.bold,   s.white.bold.on_green   ].join ' '
+    puts [ s.yellow,  s.yellow.bold,  s.white.bold.on_yellow  ].join ' '
+    puts [ s.blue,    s.blue.bold,    s.white.bold.on_blue    ].join ' '
+    puts [ s.magenta, s.magenta.bold, s.white.bold.on_magenta ].join ' '
+    puts [ s.cyan,    s.cyan.bold,    s.white.bold.on_cyan    ].join ' '
+    puts [ s.white,   s.white.bold,   s.white.bold.on_white   ].join ' '
+  end
+
+  def test_named_color_code_with_fg_bg
+    puts "Colorize me".fg(:green).bg(:red).bold.underline
+  end
+
+  def test_just_code
+    assert_equal "\e[0m", Ansi256.reset
+    assert_equal "\e[1m", Ansi256.bold
+    assert_equal "\e[4m", Ansi256.underline
 
+    assert_equal "\e[30m", Ansi256.black
+    assert_equal "\e[31m", Ansi256.red
+    assert_equal "\e[32m", Ansi256.green
+    assert_equal "\e[33m", Ansi256.yellow
+    assert_equal "\e[34m", Ansi256.blue
+    assert_equal "\e[35m", Ansi256.magenta
+    assert_equal "\e[36m", Ansi256.cyan
+    assert_equal "\e[37m", Ansi256.white
+
+    assert_equal "\e[40m", Ansi256.on_black
+    assert_equal "\e[41m", Ansi256.on_red
+    assert_equal "\e[42m", Ansi256.on_green
+    assert_equal "\e[43m", Ansi256.on_yellow
+    assert_equal "\e[44m", Ansi256.on_blue
+    assert_equal "\e[45m", Ansi256.on_magenta
+    assert_equal "\e[46m", Ansi256.on_cyan
+    assert_equal "\e[47m", Ansi256.on_white
+
+    assert_equal "\e[30m", Ansi256.fg(:black)
+    assert_equal "\e[31m", Ansi256.fg(:red)
+    assert_equal "\e[32m", Ansi256.fg(:green)
+    assert_equal "\e[33m", Ansi256.fg(:yellow)
+    assert_equal "\e[34m", Ansi256.fg(:blue)
+    assert_equal "\e[35m", Ansi256.fg(:magenta)
+    assert_equal "\e[36m", Ansi256.fg(:cyan)
+    assert_equal "\e[37m", Ansi256.fg(:white)
+
+    assert_equal "\e[40m", Ansi256.bg(:black)
+    assert_equal "\e[41m", Ansi256.bg(:red)
+    assert_equal "\e[42m", Ansi256.bg(:green)
+    assert_equal "\e[43m", Ansi256.bg(:yellow)
+    assert_equal "\e[44m", Ansi256.bg(:blue)
+    assert_equal "\e[45m", Ansi256.bg(:magenta)
+    assert_equal "\e[46m", Ansi256.bg(:cyan)
+    assert_equal "\e[47m", Ansi256.bg(:white)
+  end
+
+  def test_invalid_color_code
+    assert_raises(ArgumentError) { Ansi256.fg(:none) }
+    assert_raises(ArgumentError) { Ansi256.fg(:on_green) }
+    assert_raises(ArgumentError) { Ansi256.bg(:none) }
+    assert_raises(ArgumentError) { Ansi256.bg(:on_green) }
+    assert_raises(ArgumentError) { Ansi256.fg(-1) }
+    assert_raises(ArgumentError) { Ansi256.fg(300) }
+    assert_raises(ArgumentError) { Ansi256.bg(-1) }
+    assert_raises(ArgumentError) { Ansi256.bg(300) }
+  end
+
+  def test_fg_bg_underline
+    assert_equal "\e[38;5;100mHello\e[0m", 'Hello'.fg(100)
+    assert_equal "\e[48;5;100mHello\e[0m", 'Hello'.bg(100)
+
+    assert_equal "\e[31mHello\e[0m", 'Hello'.red
+    assert_equal "\e[41mHello\e[0m", 'Hello'.on_red
+
+    assert_equal "\e[38;5;100mHello\e[38;5;200m world\e[0m", "#{'Hello'.fg(100)} world".fg(200)
+    assert_equal "\e[38;5;200;4mWow \e[38;5;100mhello\e[38;5;200m world\e[0m",
+      "Wow #{'hello'.fg(100)} world".fg(200).underline
+    assert_equal "\e[38;5;200mWow \e[38;5;100;4mhello\e[0m\e[38;5;200m world\e[0m",
+      "Wow #{'hello'.fg(100).underline} world".fg(200)
+    assert_equal "\e[38;5;200mWow \e[38;5;100;48;5;50;4mhello\e[0m\e[38;5;200m world\e[0m",
+      "Wow #{'hello'.fg(100).underline.bg(50)} world".fg(200)
+    assert_equal "\e[38;5;200;48;5;250mWow \e[38;5;100;48;5;50;4mhello\e[0m\e[38;5;200;48;5;250m world\e[0m",
+      "Wow #{'hello'.fg(100).underline.bg(50)} world".fg(200).bg(250)
+    assert_equal "Wow hello world",
+      "Wow #{'hello'.fg(100).underline.bg(50)} world".fg(200).bg(250).plain
+
+    assert_equal "\e[32;48;5;200;1mWow \e[38;5;100;44;1;4mhello\e[0m\e[32;48;5;200;1m world\e[0m",
+      "Wow #{'hello'.fg(100).underline.on_blue} world".green.bold.bg(200)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansi256
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2355104005458200198
+      hash: -3827977892707263520
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2355104005458200198
+      hash: -3827977892707263520
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25