ansi256 0.2.1 → 0.2.2

data/README.md

@@ -51,6 +51,16 @@ puts [ s.white,   s.white.bold,   s.white.bold.on_white   ].join ' '
 
 ![colorize-me-16](https://github.com/junegunn/ansi256/raw/master/colorize-me-16.png)
 
+### RGB color approximated to 256-color ANSI code
+
+```ruby
+puts "RGB Color (RRGGBB)".fg('ff9930').bg('203366')
+
+puts "RGB Color (R-G-B-)".fg('f90').bg('036')
+
+puts "RGB Color (Monochrome)".fg('ef').bg('3f')
+```
+
 Nesting
 -------
 

data/ansi256.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 end

data/lib/ansi256.rb

@@ -12,6 +12,8 @@ module Ansi256
         "\e[#{CODE[code]}m"
       elsif code.is_a?(Fixnum) && (0..255).include?(code)
         "\e[38;5;#{code}m"
+      elsif ansirgb = ansicode_for_rgb(code)
+        "\e[38;5;#{ansirgb}m"
       else
         raise ArgumentError, "Invalid color code: #{code}"
       end
@@ -24,6 +26,8 @@ module Ansi256
         "\e[#{CODE[code] + 10}m"
       elsif code.is_a?(Fixnum) && (0..255).include?(code)
         "\e[48;5;#{code}m"
+      elsif ansirgb = ansicode_for_rgb(code)
+        "\e[48;5;#{ansirgb}m"
       else
         raise ArgumentError, "Invalid color code: #{code}"
       end
@@ -56,6 +60,27 @@ module Ansi256
       "\e[#{nums.compact.join ';'}m"
     end
 
+    def ansicode_for_rgb rgb
+      return unless rgb.is_a?(String) &&
+                    rgb =~ /^#?([0-9a-f]+)$/i
+      rgb = $1
+
+      case rgb.length
+      when 2
+        m = (256 - 231) * rgb.to_i(16) / 256
+        return m == 0 ? 16 : (231 + m)
+      when 3
+        r, g, b = rgb.each_char.map { |e| (e * 2).to_i(16) }
+      when 6
+        r, g, b = rgb.each_char.each_slice(2).map { |e| e.join.to_i(16) }
+      else
+        return
+      end
+
+      r, g, b = [r, g, b].map { |e| 6 * e / 256 }
+      r * 36 + g * 6 + b + 16
+    end
+
     def wrap str, color
       current = [nil, nil, Set.new]
 

data/lib/ansi256/version.rb

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

data/test/test_ansi256.rb

@@ -115,6 +115,8 @@ class TestAnsi256 < MiniTest::Unit::TestCase
     assert_raises(ArgumentError) { Ansi256.fg(300) }
     assert_raises(ArgumentError) { Ansi256.bg(-1) }
     assert_raises(ArgumentError) { Ansi256.bg(300) }
+    assert_raises(ArgumentError) { Ansi256.bg('ffaa') }
+    assert_raises(ArgumentError) { Ansi256.bg('ffeeffaa') }
   end
 
   def test_fg_bg_underline
@@ -139,4 +141,57 @@ class TestAnsi256 < MiniTest::Unit::TestCase
     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
+
+  def test_rgb
+    {
+      '00'     => 16,
+      '000000' => 16,
+      '111'    => 16,
+      '11'     => 232,
+      '101010' => 16,
+      '1a'     => 233,
+      '1a1a1a' => 16,
+      '20'     => 234,
+      '22'     => 234,
+      '202020' => 16,
+      '222222' => 16,
+      '222222' => 16,
+      'ff'     => 255,
+      'ffffff' => 231,
+      'FFFFFF' => 231,
+      'ff0'    => 226,
+      'ffff00' => 226,
+      'ff0000' => 196,
+      '00ff00' => 46,
+      '0000ff' => 21,
+      'ff9900' => 214,
+      '00ffff' => 51,
+      '0ff'    => 51,
+    }.each do |rgb, ansi|
+      assert_equal ansi, Ansi256.fg(rgb).scan(/[0-9]+/).last.to_i
+      assert_equal ansi, Ansi256.bg(rgb).scan(/[0-9]+/).last.to_i
+    end
+    [:bg, :fg].each do |m|
+      (0..255).each do |r|
+        color = r.to_s(16).rjust(2, '0') * 3
+        print Ansi256.send(m, color, color + ' ')
+      end
+      (0..255).each do |r|
+        color = r.to_s(16).rjust(2, '0')
+        print Ansi256.send(m, color, color + ' ')
+      end
+    end
+    0.step(255, 20) do |r|
+      0.step(255, 20) do |g|
+        0.step(255, 20) do |b|
+          color = [r, g, b].map { |c| c.to_s(16).rjust(2, '0') }.join
+          print Ansi256.bg(color, color + ' ')
+        end
+      end
+    end
+    puts "RGB Color".fg('ff9900').bg('003366')
+    puts "RGB Color".fg('f90').bg('#036')
+    puts "RGB Color".fg('#ff9900').bg('#003366')
+    puts "RGB Color (Monochrome)".fg('ef').bg('3a')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansi256
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Colorize text using 256-color ANSI codes
 email:
 - junegunn.c@gmail.com
@@ -76,18 +92,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3827977892707263520
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3827977892707263520
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25