term-ansicolor 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec07d4e73ee2229632950fb11a792a7ac58d46fe
-  data.tar.gz: b131e1eb5f84b05ec06341874f13b95ff3c14d9a
+  metadata.gz: 6c9a92f957cb6c294806caa9b03a2c04445d76a9
+  data.tar.gz: 5eac0662983ec23f174bd5d0af4687120fd49cb9
 SHA512:
-  metadata.gz: 615c2efc5fa34346c987a16dec877656dae1a19f6893dc60c4a63f8a62393d785dbb932c898d3eb203ed223c9525fcc64a191ece401ea77d96eba44413b7cd8f
-  data.tar.gz: c96ce5a595656b357047bad7dfbdcddc19f37debfb51857a23ef8debd9327ec3e127a4905b7f1c96fd5f5d4f65db61a65c58e4d59a8cc69e55f1557b0d218b50
+  metadata.gz: e633cda3e9d3b749c7c3a5282012e0f9f0bda78c1674c8de081461b4df16719e7916191c4d7bb57eefa0817c13c7bafc6557a303fdcab8c635c7c786f8598663
+  data.tar.gz: ec810aa236b5ff82b942de368b30f262b82189423afb3abcbc1ade2f6f3673794b29564799008fbf4b2d753f6fe02c20534dff3b530155240f9e52f7b9e55263

data/CHANGES

@@ -1,3 +1,11 @@
+2013-03-25 - 1.1.2 * Change the API: color0 - color255 to color(:color0) -
+                     color(:color255), and on_color0 to on_color(:color0) -
+                     on_color(:color255); the previous way caused some
+                     failures, sorry. On the plus side you can now do
+                     color('#4a6ab4') and get the nearest terminal color to
+                     this html color.
+                   * Add colortab executable to display the 255 colors and
+                     related HTML colors.
 2013-03-08 - 1.1.1 * Avoid possible conflicts with other people's attributes
                      methods.
                    * Cache attributes globally, also fix caching for frozen

data/Rakefile

@@ -10,12 +10,15 @@ GemHadar do
   email       'flori@ping.de'
   homepage    "http://flori.github.com/#{name}"
   summary     'Ruby library that colors strings using ANSI escape sequences'
-  description ''
+  description 'This library uses ANSI escape sequences to control the attributes of terminal output'
+  licenses    << 'GPL-2'
   test_dir    'tests'
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.rvmrc', 'coverage'
   readme      'README.rdoc'
   executables << 'cdiff' << 'decolor'
 
+  development_dependency 'simplecov'
+
   install_library do
     destdir = "#{ENV['DESTDIR']}"
     libdir = CONFIG["sitelibdir"]

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/bin/colortab

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+
+require 'term/ansicolor'
+
+class String
+  include Term::ANSIColor
+end
+
+$colors = Term::ANSIColor::Attribute.rgb_colors.to_a
+
+def print_color(c)
+  color = $colors[c]
+  text = [
+    Term::ANSIColor::Attribute.nearest_rgb_color('#000'),
+    Term::ANSIColor::Attribute.nearest_rgb_color('#fff'),
+  ].max_by { |t| t.distance_to(color) }
+  print ("%3u #{color.rgb.html} " % c).on_color(color.name).color(text.name)
+end
+
+for c in 0..3
+  print_color c
+end
+puts
+
+for c in 4..7
+  print_color c
+end
+puts
+
+for c in 8..11
+  print_color c
+end
+puts
+
+for c in 12..15
+  print_color c
+end
+puts
+
+for c in 16..231
+  (c - 16) % 6 == 0 and puts
+  print_color c
+end
+puts
+
+for c in 232..255
+  (c - 16) % 6 == 0 and puts
+  print_color c
+end
+puts

data/lib/term/ansicolor.rb

@@ -4,56 +4,122 @@ module Term
   # classes.
   module ANSIColor
     require 'term/ansicolor/version'
+    require 'term/ansicolor/attribute'
+    require 'term/ansicolor/rgb_triple'
+
+    Attribute.set :clear             ,   0 # String#clear is already used to empty string in Ruby 1.9
+    Attribute.set :reset             ,   0 # synonym for :clear
+    Attribute.set :bold              ,   1
+    Attribute.set :dark              ,   2
+    Attribute.set :italic            ,   3 # not widely implemented
+    Attribute.set :underline         ,   4
+    Attribute.set :underscore        ,   4 # synonym for :underline
+    Attribute.set :blink             ,   5
+    Attribute.set :rapid_blink       ,   6 # not widely implemented
+    Attribute.set :negative          ,   7 # no reverse because of String#reverse
+    Attribute.set :concealed         ,   8
+    Attribute.set :strikethrough     ,   9 # not widely implemented
+
+    Attribute.set :black             ,  30
+    Attribute.set :red               ,  31
+    Attribute.set :green             ,  32
+    Attribute.set :yellow            ,  33
+    Attribute.set :blue              ,  34
+    Attribute.set :magenta           ,  35
+    Attribute.set :cyan              ,  36
+    Attribute.set :white             ,  37
+
+    Attribute.set :on_black          ,  40
+    Attribute.set :on_red            ,  41
+    Attribute.set :on_green          ,  42
+    Attribute.set :on_yellow         ,  43
+    Attribute.set :on_blue           ,  44
+    Attribute.set :on_magenta        ,  45
+    Attribute.set :on_cyan           ,  46
+    Attribute.set :on_white          ,  47
+
+    Attribute.set :intense_black     ,  90 # High intensity, aixterm (works in OS X)
+    Attribute.set :intense_red       ,  91
+    Attribute.set :intense_green     ,  92
+    Attribute.set :intense_yellow    ,  93
+    Attribute.set :intense_blue      ,  94
+    Attribute.set :intense_magenta   ,  95
+    Attribute.set :intense_cyan      ,  96
+    Attribute.set :intense_white     ,  97
+
+    Attribute.set :on_intense_black  , 100 # High intensity background, aixterm (works in OS X)
+    Attribute.set :on_intense_red    , 101
+    Attribute.set :on_intense_green  , 102
+    Attribute.set :on_intense_yellow , 103
+    Attribute.set :on_intense_blue   , 104
+    Attribute.set :on_intense_magenta, 105
+    Attribute.set :on_intense_cyan   , 106
+    Attribute.set :on_intense_white  , 107
+
+    Attribute.set :color0, 0, :html => '#000000'
+    Attribute.set :color1, 1, :html => '#800000'
+    Attribute.set :color2, 2, :html => '#808000'
+    Attribute.set :color3, 3, :html => '#808000'
+    Attribute.set :color4, 4, :html => '#000080'
+    Attribute.set :color5, 5, :html => '#800080'
+    Attribute.set :color6, 6, :html => '#008080'
+    Attribute.set :color7, 7, :html => '#c0c0c0'
+
+    Attribute.set :color8, 8, :html => '#808080'
+    Attribute.set :color9, 9, :html => '#ff0000'
+    Attribute.set :color10, 10, :html => '#00ff00'
+    Attribute.set :color11, 11, :html => '#ffff00'
+    Attribute.set :color12, 12, :html => '#0000ff'
+    Attribute.set :color13, 13, :html => '#ff00ff'
+    Attribute.set :color14, 14, :html => '#00ffff'
+    Attribute.set :color15, 15, :html => '#ffffff'
+
+    steps = [ 0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff ]
+
+    for i in 16..231
+      red, green, blue = (i - 16).to_s(6).rjust(3, '0').each_char.map { |c| steps[c.to_i] }
+      Attribute.set "color#{i}", i, :red => red, :green => green, :blue => blue
+    end
+
+    grey = 8
+    for i in 232..255
+      Attribute.set "color#{i}", i, :red => grey, :green => grey, :blue => grey
+      grey += 10
+    end
+
+    Attribute.set :on_color0, 0, :html => '#000000'
+    Attribute.set :on_color1, 1, :html => '#800000'
+    Attribute.set :on_color2, 2, :html => '#808000'
+    Attribute.set :on_color3, 3, :html => '#808000'
+    Attribute.set :on_color4, 4, :html => '#000080'
+    Attribute.set :on_color5, 5, :html => '#800080'
+    Attribute.set :on_color6, 6, :html => '#008080'
+    Attribute.set :on_color7, 7, :html => '#c0c0c0'
+
+    Attribute.set :on_color8, 8, :html => '#808080'
+    Attribute.set :on_color9, 9, :html => '#ff0000'
+    Attribute.set :on_color10, 10, :html => '#00ff00'
+    Attribute.set :on_color11, 11, :html => '#ffff00'
+    Attribute.set :on_color12, 12, :html => '#0000ff'
+    Attribute.set :on_color13, 13, :html => '#ff00ff'
+    Attribute.set :on_color14, 14, :html => '#00ffff'
+    Attribute.set :on_color15, 15, :html => '#ffffff'
+
+    steps = [ 0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff ]
+
+    for i in 16..231
+      red, green, blue = (i - 16).to_s(6).rjust(3, '0').each_char.map { |c| steps[c.to_i] }
+      Attribute.set "on_color#{i}", i, :red => red, :green => green, :blue => blue
+    end
+
+    grey = 8
+    for i in 232..255
+      Attribute.set "on_color#{i}", i, :red => grey, :green => grey, :blue => grey
+      grey += 10
+    end
 
     # :stopdoc:
-    ATTRIBUTES = [
-      [ :clear              ,   0 ],     # String#clear is already used to empty string in Ruby 1.9
-      [ :reset              ,   0 ],     # synonym for :clear
-      [ :bold               ,   1 ],
-      [ :dark               ,   2 ],
-      [ :italic             ,   3 ],     # not widely implemented
-      [ :underline          ,   4 ],
-      [ :underscore         ,   4 ],     # synonym for :underline
-      [ :blink              ,   5 ],
-      [ :rapid_blink        ,   6 ],     # not widely implemented
-      [ :negative           ,   7 ],     # no reverse because of String#reverse
-      [ :concealed          ,   8 ],
-      [ :strikethrough      ,   9 ],     # not widely implemented
-      [ :black              ,  30 ],
-      [ :red                ,  31 ],
-      [ :green              ,  32 ],
-      [ :yellow             ,  33 ],
-      [ :blue               ,  34 ],
-      [ :magenta            ,  35 ],
-      [ :cyan               ,  36 ],
-      [ :white              ,  37 ],
-      [ :on_black           ,  40 ],
-      [ :on_red             ,  41 ],
-      [ :on_green           ,  42 ],
-      [ :on_yellow          ,  43 ],
-      [ :on_blue            ,  44 ],
-      [ :on_magenta         ,  45 ],
-      [ :on_cyan            ,  46 ],
-      [ :on_white           ,  47 ],
-      [ :intense_black      ,  90 ],    # High intensity, aixterm (works in OS X)
-      [ :intense_red        ,  91 ],
-      [ :intense_green      ,  92 ],
-      [ :intense_yellow     ,  93 ],
-      [ :intense_blue       ,  94 ],
-      [ :intense_magenta    ,  95 ],
-      [ :intense_cyan       ,  96 ],
-      [ :intense_white      ,  97 ],
-      [ :on_intense_black   , 100 ],    # High intensity background, aixterm (works in OS X)
-      [ :on_intense_red     , 101 ],
-      [ :on_intense_green   , 102 ],
-      [ :on_intense_yellow  , 103 ],
-      [ :on_intense_blue    , 104 ],
-      [ :on_intense_magenta , 105 ],
-      [ :on_intense_cyan    , 106 ],
-      [ :on_intense_white   , 107 ]
-    ]
-
-    ATTRIBUTE_NAMES = ATTRIBUTES.transpose.first
+    ATTRIBUTE_NAMES = Attribute.named_attributes.map(&:name)
     # :startdoc:
 
     # Returns true if Term::ANSIColor supports the +feature+.
@@ -84,41 +150,15 @@ module Term
 
     def self.create_color_method(color_name, color_value)
       module_eval <<-EOT
-        def #{color_name}(string = nil)
-          result = ''
-          result << "\e[#{color_value}m" if Term::ANSIColor.coloring?
-          if block_given?
-            result << yield
-          elsif string.respond_to?(:to_str)
-            result << string.to_str
-          elsif respond_to?(:to_str)
-            result << to_str
-          else
-            return result #only switch on
-          end
-          result << "\e[0m" if Term::ANSIColor.coloring?
-          result
+        def #{color_name}(string = nil, &block)
+          color(:#{color_name}, string, &block)
         end
       EOT
       self
     end
 
-    def method_missing(name, *args, &block)
-      color_name, color_value = Term::ANSIColor::ATTRIBUTES.assoc(name)
-      if color_name
-        ::Term::ANSIColor.create_color_method(name, color_value)
-        return __send__(color_name, *args, &block)
-      end
-      color_name = name.to_s
-      if color_name =~ /\A(?:(on_)?color)(\d+)\z/
-        code  = $1 ? 48 : 38
-        index = $2.to_i
-        if (0..255).include?(index)
-          ::Term::ANSIColor.create_color_method($&, "#{code};5;#{index}")
-          return __send__(color_name, *args, &block)
-        end
-      end
-      super
+    for attribute in Attribute.named_attributes
+       create_color_method(attribute.name, attribute.code)
     end
 
     module RespondTo
@@ -129,12 +169,12 @@ module Term
     include RespondTo
     extend RespondTo
 
-    # Regular expression that is used to scan for ANSI-sequences while
+    # Regular expression that is used to scan for ANSI-Attributes while
     # uncoloring strings.
     COLORED_REGEXP = /\e\[(?:(?:[349]|10)[0-7]|[0-9]|[34]8;5;\d{1,3})?m/
 
     # Returns an uncolored version of the string, that is all
-    # ANSI-sequences are stripped from the string.
+    # ANSI-Attributes are stripped from the string.
     def uncolor(string = nil) # :yields:
       if block_given?
         yield.to_str.gsub(COLORED_REGEXP, '')
@@ -149,17 +189,41 @@ module Term
 
     alias uncolored uncolor
 
+    # Return +string+ or the result string of the given +block+ colored with
+    # color +name+. If string isn't a string only the escape sequence to switch
+    # on the color +name+ is returned.
+    def color(name, string = nil, &block)
+      attribute = Attribute.get(name) || Attribute.nearest_rgb(name) or
+        raise ArgumentError, "unknown attribute #{name.inspect}"
+      result = ''
+      result << "\e[#{attribute.code}m" if Term::ANSIColor.coloring?
+      if block_given?
+        result << yield
+      elsif string.respond_to?(:to_str)
+        result << string.to_str
+      elsif respond_to?(:to_str)
+        result << to_str
+      else
+        return result #only switch on
+      end
+      result << "\e[0m" if Term::ANSIColor.coloring?
+      result
+    end
+
+    def on_color(name, string = nil, &block)
+      color("on_#{name}", string, &block)
+    end
+
     class << self
       # Returns an array of all Term::ANSIColor attributes as symbols.
       def term_ansicolor_attributes
-        @term_ansicolor_attributes ||= Term::ANSIColor::ATTRIBUTE_NAMES +
-          (0..255).map { |index| "color#{index}".to_sym } +
-          (0..255).map { |index| "on_color#{index}".to_sym }
+        @term_ansicolor_attributes ||= Term::ANSIColor::ATTRIBUTE_NAMES
       end
 
       alias attributes term_ansicolor_attributes
     end
 
+    # Returns an array of all Term::ANSIColor attributes as symbols.
     def  term_ansicolor_attributes
       ::Term::ANSIColor.term_ansicolor_attributes
     end

data/lib/term/ansicolor/attribute.rb

@@ -0,0 +1,83 @@
+module Term
+  module ANSIColor
+    class Attribute
+      @__store__ = {}
+
+      def self.set(name, code, options = {})
+        name = name.to_sym
+        result = @__store__[name] = new(name, code, options)
+        @rgb_colors = nil
+        result
+      end
+
+      def self.get(name)
+        @__store__[name.to_sym]
+      end
+
+      def self.attributes(&block)
+        @__store__.each_value(&block)
+      end
+
+      def self.rgb_colors(&block)
+        @rgb_colors ||= attributes.select(&:rgb_color?).each(&block)
+      end
+
+      def self.named_attributes(&block)
+        @named_attributes ||= attributes.reject(&:rgb_color?).each(&block)
+      end
+
+      def self.nearest_rgb_color(color)
+        rgb = RGBTriple[color]
+        rgb_colors.reject(&:background?).min_by { |c| c.distance_to(rgb) }
+      end
+
+      def self.nearest_rgb_on_color(color)
+        rgb = RGBTriple[color]
+        rgb_colors.select(&:background?).min_by { |c| c.distance_to(rgb) }
+      end
+
+      def initialize(name, code, options = {})
+        @name = name.to_sym
+        @code = code.to_s
+        if html = options[:html]
+          @rgb = RGBTriple.from_html(html)
+        elsif !options.empty?
+          @rgb = RGBTriple.from_hash(options)
+        end
+      end
+
+      attr_reader :name
+
+      def code
+        if rgb_color?
+          background? ? "48;5;#{@code}" : "38;5;#{@code}"
+        else
+          @code
+        end
+      end
+
+      def background?
+        @name.to_s.start_with?('on_')
+      end
+
+      attr_reader :rgb
+
+      def rgb_color?
+        !!@rgb
+      end
+
+      def to_rgb_triple
+        @rgb
+      end
+
+      def distance_to(other)
+        if our_rgb = to_rgb_triple and
+          other.respond_to?(:to_rgb_triple) and
+          other_rgb = other.to_rgb_triple
+        then
+          our_rgb.distance_to other_rgb
+        end
+      end
+    end
+  end
+end

data/lib/term/ansicolor/rgb_triple.rb

@@ -0,0 +1,91 @@
+module Term
+  module ANSIColor
+    class RGBTriple
+      def self.convert_value(color)
+        color.nil? and raise ArgumentError, "missing color value"
+        color = Integer(color)
+        (0..0xff) === color or raise ArgumentError,
+          "color value #{color.inspect} not between 0 and 255"
+        color
+      end
+
+      private_class_method :convert_value
+
+      def self.from_html(html)
+        case html
+        when /\A#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})\z/i
+          new(*$~.captures.map { |c| convert_value(c.to_i(16)) })
+        when /\A#([0-9a-f])([0-9a-f])([0-9a-f])\z/i
+          new(*$~.captures.map { |c| convert_value(c.to_i(16) << 4) })
+        end
+      end
+
+      def self.from_hash(options)
+        new(
+          convert_value(options[:red]),
+          convert_value(options[:green]),
+          convert_value(options[:blue])
+        )
+      end
+
+      def self.from_array(array)
+        new(*array)
+      end
+
+      def self.[](thing)
+        case
+        when thing.respond_to?(:to_rgb_triple) then thing
+        when thing.respond_to?(:to_ary)        then RGBTriple.from_array(thing.to_ary)
+        when thing.respond_to?(:to_str)        then RGBTriple.from_html(thing.to_str)
+        when thing.respond_to?(:to_hash)       then RGBTriple.from_hash(thing.to_hash)
+        else raise ArgumentError, "cannot convert #{thing.inspect} into #{self}"
+        end
+      end
+
+      def initialize(red, green, blue)
+        @values = [ red, green, blue ]
+      end
+
+      def red
+        @values[0]
+      end
+
+      def green
+        @values[1]
+      end
+
+      def blue
+        @values[2]
+      end
+
+      def html
+        s = '#'
+        @values.each { |c| s << '%02x' % c }
+        s
+      end
+
+      def to_rgb_triple
+        self
+      end
+
+      attr_reader :values
+      protected :values
+
+      def to_a
+        @values.dup
+      end
+
+      def ==(other)
+        @values == other.values
+      end
+
+      def distance_to(other)
+        Math.sqrt(
+          ((red - other.red) * 0.299) ** 2 +
+          ((green - other.green) * 0.587) ** 2 +
+          ((blue - other.blue) * 0.114) ** 2
+        )
+      end
+    end
+  end
+end

data/lib/term/ansicolor/version.rb

@@ -1,7 +1,7 @@
 module Term::ANSIColor
   # Term::ANSIColor version
-  VERSION         = '1.1.1'
-  VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
+  VERSION         = '1.1.2'
+  VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
   VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:

data/term-ansicolor.gemspec

@@ -2,32 +2,36 @@
 
 Gem::Specification.new do |s|
   s.name = "term-ansicolor"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2013-03-08"
-  s.description = ""
+  s.date = "2013-03-26"
+  s.description = "This library uses ANSI escape sequences to control the attributes of terminal output"
   s.email = "flori@ping.de"
   s.executables = ["cdiff", "decolor"]
-  s.extra_rdoc_files = ["README.rdoc", "lib/term/ansicolor.rb", "lib/term/ansicolor/version.rb"]
-  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "bin/cdiff", "bin/decolor", "examples/example.rb", "lib/term/ansicolor.rb", "lib/term/ansicolor/.keep", "lib/term/ansicolor/version.rb", "term-ansicolor.gemspec", "tests/ansicolor_test.rb"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/term/ansicolor.rb", "lib/term/ansicolor/attribute.rb", "lib/term/ansicolor/rgb_triple.rb", "lib/term/ansicolor/version.rb"]
+  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "bin/cdiff", "bin/colortab", "bin/decolor", "examples/example.rb", "lib/term/ansicolor.rb", "lib/term/ansicolor/.keep", "lib/term/ansicolor/attribute.rb", "lib/term/ansicolor/rgb_triple.rb", "lib/term/ansicolor/version.rb", "term-ansicolor.gemspec", "tests/ansicolor_test.rb", "tests/rgb_triple_test.rb", "tests/test_helper.rb"]
   s.homepage = "http://flori.github.com/term-ansicolor"
+  s.licenses = ["GPL-2"]
   s.rdoc_options = ["--title", "Term-ansicolor - Ruby library that colors strings using ANSI escape sequences", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.0"
+  s.rubygems_version = "2.0.3"
   s.summary = "Ruby library that colors strings using ANSI escape sequences"
-  s.test_files = ["tests/ansicolor_test.rb"]
+  s.test_files = ["tests/ansicolor_test.rb", "tests/rgb_triple_test.rb", "tests/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.8"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.3.0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.3.0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.3.0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end

data/tests/ansicolor_test.rb

@@ -1,7 +1,4 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'term/ansicolor'
+require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class String
   include Term::ANSIColor
@@ -51,6 +48,25 @@ class ANSIColorTest < Test::Unit::TestCase
     assert_equal string_red_on_green, on_green { red { string } }
   end
 
+  def test_color
+    assert_equal "\e[38;5;128mfoo\e[0m", Color.color(:color128, "foo")
+    assert_equal "\e[38;5;128mfoo\e[0m", "foo".color(:color128)
+    assert_equal "\e[38;5;128mfoo\e[0m", color(:color128, "foo")
+    assert_equal "\e[38;5;128mfoo\e[0m", Color.color(:color128) { "foo" }
+    assert_equal "\e[38;5;128mfoo\e[0m", "foo".color(:color128) { "foo" }
+    assert_equal "\e[38;5;128mfoo\e[0m", color(:color128) { "foo" }
+    assert_equal "\e[38;5;128mfoo\e[0m", color(:color128) + "foo" + color(:reset)
+  end
+
+  def test_on_color
+    assert_equal "\e[48;5;128mfoo\e[0m", Color.on_color(:color128, "foo")
+    assert_equal "\e[48;5;128mfoo\e[0m", "foo".on_color(:color128)
+    assert_equal "\e[48;5;128mfoo\e[0m", on_color(:color128, "foo")
+    assert_equal "\e[48;5;128mfoo\e[0m", Color.on_color(:color128) { "foo" }
+    assert_equal "\e[48;5;128mfoo\e[0m", "foo".on_color(:color128) { "foo" }
+    assert_equal "\e[48;5;128mfoo\e[0m", on_color(:color128) { "foo" }
+    assert_equal "\e[48;5;128mfoo\e[0m", on_color(:color128) + "foo" + color(:reset)
+  end
 
   def test_uncolor
     assert_equal string, string_red.uncolor
@@ -64,8 +80,8 @@ class ANSIColorTest < Test::Unit::TestCase
     assert_equal string, uncolor { string_like_red }
     assert_equal "", uncolor(Object.new)
     for index in 0..255
-      assert_equal "foo", Color.uncolor(Color.__send__("color#{index}", "foo"))
-      assert_equal "foo", Color.uncolor(Color.__send__("on_color#{index}", "foo"))
+      assert_equal "foo", Color.uncolor(Color.color("color#{index}", "foo"))
+      assert_equal "foo", Color.uncolor(Color.on_color("color#{index}", "foo"))
     end
   end
 
@@ -99,4 +115,14 @@ class ANSIColorTest < Test::Unit::TestCase
     assert string.frozen?
     assert_equal red, string.red
   end
+
+  def test_nearest_rgb_color
+    assert_equal Term::ANSIColor::Attribute.get(:color0).rgb, Term::ANSIColor::Attribute.nearest_rgb_color('#000').rgb
+    assert_equal Term::ANSIColor::Attribute.get(:color15).rgb, Term::ANSIColor::Attribute.nearest_rgb_color('#ffffff').rgb
+  end
+
+  def test_nearest_rgb_color
+    assert_equal Term::ANSIColor::Attribute.get(:on_color0).rgb, Term::ANSIColor::Attribute.nearest_rgb_on_color('#000').rgb
+    assert_equal Term::ANSIColor::Attribute.get(:on_color15).rgb, Term::ANSIColor::Attribute.nearest_rgb_on_color('#ffffff').rgb
+  end
 end

data/tests/rgb_triple_test.rb

@@ -0,0 +1,29 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class RgbTripleTest < Test::Unit::TestCase
+  include Term::ANSIColor
+
+  def test_rgb_cast
+    rgb = RGBTriple.new(128, 0, 255)
+    assert_equal '#8000ff', RGBTriple[ rgb ].html
+    assert_equal '#8000ff', RGBTriple[ [ 128, 0, 255 ] ].html
+    assert_equal '#8000ff', RGBTriple[ :red => 128, :green => 0, :blue => 255 ].html
+    assert_raise ArgumentError do
+      RGBTriple[ nil ]
+    end
+  end
+
+  def test_rgb_to_a
+    rgb = RGBTriple.new(128, 0, 255)
+    assert_equal [ 128, 0, 255 ], rgb.to_a
+  end
+
+  def test_rgb_distace
+    rgb1 = RGBTriple.new(128, 0, 255)
+    rgb2 = RGBTriple.new(128, 200, 64)
+    assert_in_delta 0.0, rgb1.distance_to(rgb1), 1e-3
+    assert_in_delta 170.481, RGBTriple.new(0, 0, 0).distance_to(RGBTriple.new(255, 255, 255)), 1e-3
+    assert_in_delta 119.402, rgb1.distance_to(rgb2), 1e-3
+  end
+end
+

data/tests/test_helper.rb

@@ -0,0 +1,8 @@
+if ENV['START_SIMPLECOV'].to_i == 1
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "#{File.basename(File.dirname(__FILE__))}/"
+  end
+end
+require 'test/unit'
+require 'term/ansicolor'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: term-ansicolor
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,15 +16,30 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.8
-description: ''
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: This library uses ANSI escape sequences to control the attributes of
+  terminal output
 email: flori@ping.de
 executables:
 - cdiff
@@ -33,6 +48,8 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 - lib/term/ansicolor.rb
+- lib/term/ansicolor/attribute.rb
+- lib/term/ansicolor/rgb_triple.rb
 - lib/term/ansicolor/version.rb
 files:
 - .gitignore
@@ -44,15 +61,21 @@ files:
 - Rakefile
 - VERSION
 - bin/cdiff
+- bin/colortab
 - bin/decolor
 - examples/example.rb
 - lib/term/ansicolor.rb
 - lib/term/ansicolor/.keep
+- lib/term/ansicolor/attribute.rb
+- lib/term/ansicolor/rgb_triple.rb
 - lib/term/ansicolor/version.rb
 - term-ansicolor.gemspec
 - tests/ansicolor_test.rb
+- tests/rgb_triple_test.rb
+- tests/test_helper.rb
 homepage: http://flori.github.com/term-ansicolor
-licenses: []
+licenses:
+- GPL-2
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -74,9 +97,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby library that colors strings using ANSI escape sequences
 test_files:
 - tests/ansicolor_test.rb
+- tests/rgb_triple_test.rb
+- tests/test_helper.rb