term-ansicolor 1.7.1 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82f14903202a3f6e83de02c8c2b17784664a57a5cce01527a7d11337ec6a2e1f
-  data.tar.gz: c5ea599eacc7486ba0688dad5b3263b7aff4e435c5b1af9d93bd519b135162cb
+  metadata.gz: d75f19d115fdee4233a120ece01a38b75c7f0cff14243e477def07b314f55b42
+  data.tar.gz: 9a3c5f4ac0abbd01a552ce2e5358bd1d3b2825c392495c941209e71cdbfb8e07
 SHA512:
-  metadata.gz: 12d9a379cf7b8459f9bafdda098d1ea6b967bb00ad643fd7c5395c9332c958bdca0da8baf7748f3e787359fc5f67cbaaecb8d669a864b47047965144ba536cd6
-  data.tar.gz: cd51989c8ec30cdfc6dc3ce79e1e8c0e322473cefde6f2b2d757bbce2d76e79e14e5bb551d65fddd46d7a96f9404b89d95bcb3da96101125fb4f1af908276f27
+  metadata.gz: '015294663f0738e6cbeed73b3aa34d7ff6a19a9bc13be6ab683a750956cc854dae0d7630e606ff298252142f35f10b3a4cd02592761d72403bfd2d3de845be82'
+  data.tar.gz: 18741931918cf7c07192263ea683c69c7b6074d44572267e0d01d84d27a0f00ea66a0ae2d95ed2b96eee0e176bdf5f791f92d5aefb78a806ede47f2cc2a3b0ae

data/.all_images.yml

@@ -0,0 +1,27 @@
+dockerfile: |-
+  RUN apk add --no-cache build-base git bash
+  RUN bash <<NUR
+    if [[ "$(ruby -e 'print RUBY_VERSION')" > '3' ]]
+    then
+      gem update --system
+      gem install gem_hadar bundler
+    else
+      gem install gem_hadar
+      gem install bundler -v 2.4.22
+    fi
+  NUR
+
+script: &script |-
+  echo -e "\e[1m"
+  ruby -v
+  echo -e "\e[0m"
+  bundle
+  rake test
+
+images:
+  ruby:3.3-alpine: *script
+  ruby:3.2-alpine: *script
+  ruby:3.1-alpine: *script
+  ruby:3.0-alpine: *script
+  ruby:2.7-alpine: *script
+  ruby:2.6-alpine: *script

data/.gitignore

@@ -4,5 +4,6 @@
 .rvmrc
 Gemfile.lock
 coverage
+errors.lst
 pkg
 tags

data/.utilsrc

@@ -0,0 +1,26 @@
+# vim: set ft=ruby:
+
+search do
+  prune_dirs /\A(\.svn|\.git|CVS|tmp|tags|coverage|pkg)\z/
+  skip_files /(\A\.|\.sw[pon]\z|\.(log|fnm|jpg|jpeg|png|pdf|svg)\z|tags|~\z)/i
+end
+
+discover do
+  prune_dirs /\A(\.svn|\.git|CVS|tmp|tags|coverage|pkg)\z/
+  skip_files /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
+  binary false
+end
+
+strip_spaces do
+  prune_dirs /\A(\..*|CVS|pkg)\z/
+  skip_files /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
+end
+
+probe do
+  test_framework :"test-unit"
+end
+
+ssh_tunnel do
+  terminal_multiplexer :tmux
+end
+

data/README.md

@@ -22,13 +22,15 @@ The homepage of this library is located at
 
 The following executables are provided with Term::ANSIColor:
 
-* `cdiff`: colors a diff patch
-* `decolor`: decolors any text file that was colored with ANSI escape sequences
-* `colortab`: Displays a table of the 256 terminal colors with their indices and
+* `term_cdiff`: colors a diff patch
+* `term_colortab`: Displays a table of the 256 terminal colors with their indices and
   nearest html equivalents.
 * `term_display`: displays a ppm3 or ppm6 image file in the terminal. If the netpbm
   programs are installed it can handle a lot of other image file formats.
+* `term_decolor`: decolors any text file that was colored with ANSI escape sequences
 * `term_mandel`: displays the mandelbrot set in the terminal
+* `term_snow`: displays falling snow in the terminal using ANSI movement
+  sequences.
 
 Additionally the file examples/example.rb in the source/gem-distribution shows
 how this library can be used.

data/Rakefile

@@ -8,21 +8,21 @@ GemHadar do
   path_module 'Term::ANSIColor'
   author      'Florian Frank'
   email       'flori@ping.de'
-  homepage    "http://flori.github.com/#{name}"
+  homepage    "https://github.com/flori/#{name}"
   summary     'Ruby library that colors strings using ANSI escape sequences'
   description 'This library uses ANSI escape sequences to control the attributes of terminal output'
   licenses    << 'Apache-2.0'
 
   test_dir    'tests'
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.rvmrc', 'coverage',
-    'tags', '.bundle', '.byebug_history'
+    'tags', '.bundle', '.byebug_history', 'errors.lst'
 
   readme      'README.md'
   executables.merge Dir['bin/*'].map { |x| File.basename(x) }
 
   dependency             'tins', '~>1.0'
+  dependency             'mize', '~>0.5'
   development_dependency 'simplecov'
   development_dependency 'test-unit'
-
-  required_ruby_version '>= 2.0'
+  development_dependency 'utils'
 end

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.10.4

data/bin/term_colortab

@@ -15,6 +15,32 @@ def print_color(c)
   print ("%3u #{color.rgb.html} " % c).on_color(color.name).color(text.name)
 end
 
+if Term::ANSIColor.true_coloring = ENV['COLORTERM'] =~ /\A(truecolor|24bit)\z/
+
+  puts "True colors".bold, ""
+  step = 36
+  (0..255).step(step) do |g|
+    (0..255).step(step) do |r|
+      (0..255).step(step) do |b|
+        print Term::ANSIColor.on_color(Term::ANSIColor::RGBTriple.new(r, g, b)) { ' ' }
+      end
+      print ' '
+    end
+    puts
+  end
+
+  puts
+  (0..255).step(4) do |g|
+    print Term::ANSIColor.on_color(Term::ANSIColor::RGBTriple.new(g, g, g)) { ' ' }
+  end
+  puts
+  puts
+
+end
+
+Term::ANSIColor.true_coloring = false
+
+puts "256 colors".bold, ""
 for c in 0..3
   print_color c
 end
@@ -40,10 +66,10 @@ for c in 16..231
   (c - 16) % 36 == 0 and puts
   print_color c
 end
+puts
 
 for c in 232..255
   (c - 16) % 6 == 0 and puts
-  (c - 16) % 12 == 0 and puts
   print_color c
 end
 puts

data/bin/term_display

@@ -65,13 +65,14 @@ Options are
   -a ASPECT       x:y aspect, defaults to 2.2
   -C COLS         number of columns for rendering with aspect, defaults to max
   -R ROWS         number of rows for rendering with aspect, defaults to max - 1
+  -t              use true colors
   -h              this help
 
 EOT
   exit rc
 end
 
-opts = go 'hm:g:s:a:C:R:'
+opts = go 'hm:g:s:a:C:R:t'
 opts['h'] and usage
 filename = ARGV.shift or usage 1
 metric   = Term::ANSIColor::RGBColorMetrics.metric(opts['m'] || 'CIELab')
@@ -84,8 +85,9 @@ opts['R'] ||= [ Tins::Terminal.rows - 1, 0 ].max
 file = provide_ppm_file(filename, opts)
 ppm = Term::ANSIColor::PPMReader.new(
   file,
-  :metric => metric,
-  :gray   => gray
+  metric:        metric,
+  gray:          gray,
+  true_coloring: opts[?t]
 )
 
 puts ppm

data/bin/term_mandel

@@ -1,35 +1,32 @@
 #!/usr/bin/env ruby
 
 require 'term/ansicolor'
+include Term::ANSIColor
 require 'tins/xt'
-require "complex"
 include Tins::GO
+require "complex"
 
-@width, @height = Tins::Terminal.cols, Tins::Terminal.lines
+$width, $height = Tins::Terminal.cols, Tins::Terminal.lines
+$height *= 2
 
 def color_random
   (1..3).map { rand(255) }
 end
 
 def draw_set(rx, ry)
-  sx = (rx.end - rx.begin).abs / @width
-  sy = (ry.end - ry.begin).abs / @height
-
-  ac = Term::ANSIColor
-  color =
-    ac::Attribute[ color_random ].gradient_to(ac::Attribute[ color_random ], :steps => 16) +
-    ac::Attribute[ color_random ].gradient_to(ac::Attribute[ color_random ], :steps => 16) +
-    ac::Attribute[ color_random ].gradient_to(ac::Attribute[ color_random ], :steps => 16) +
-    ac::Attribute[ color_random ].gradient_to(ac::Attribute[ color_random ], :steps => 16) +
-    ac::Attribute[ color_random ].gradient_to(ac::Attribute[ color_random ], :steps => 16) +
-    ac::Attribute[ color_random ].gradient_to(ac::Attribute[ color_random ], :steps => 16) +
-    ac::Attribute[ color_random ].gradient_to(ac::Attribute[ color_random ], :steps => 16) +
-    ac::Attribute[ color_random ].gradient_to(ac::Attribute['#000'], :steps => 16)
+  sx = (rx.end - rx.begin).abs / $width
+  sy = (ry.end - ry.begin).abs / $height
+
+  steps = 16
+  color = (5.times.map { color_random } + [ 0, 0, 0 ]).map { Attribute[_1] }
+  color = color[1..-1].inject(color[0,1]) { |c, x|
+    c + c.last.gradient_to(x, steps:)
+  }
   iters = color.size - 2
 
-  text = ''
-  for j in 0...@height
-    for i in 0...@width
+  data = [ [] ]
+  for j in 0...$height
+    for i in 0...$width
       n, z_n = 0, Complex(0, 0)
       c = Complex(sx * i + rx.begin, sy * j + ry.begin)
       while n <= iters
@@ -37,16 +34,25 @@ def draw_set(rx, ry)
         z_n = z_n ** 2 + c
         n += 1
       end
-      text << ac.on_color(color[n]) << ' '
+      data.last << n
     end
-    text << ac.reset << "\n"
+    data << []
   end
-  puts text
+  screen = ''
+  (0...$height).step(2) do |j|
+    (0...$width).each do |i|
+      screen << color(color[data[j][i]]) <<
+        on_color(color[data[j + 1][i]]) << ?▀
+    end
+  end
+  print move_home, screen, reset
 end
 
-opts = go 'x:y:'
+opts = go 'x:y'
+
+Term::ANSIColor.true_coloring = ENV['COLORTERM'] =~ /\A(truecolor|24bit)\z/
 
-rx = opts['x'].full? { |r| Range.new(*(r.split('..', 2).map(&:to_f))) } || (-2.0..1.0)
-ry = opts['y'].full? { |r| Range.new(*(r.split('..', 2).map(&:to_f))) } || (-1.0..1.0)
+rx = opts[?x].full? { |r| Range.new(*(r.split('..', 2).map(&:to_f))) } || (-2.0..1.0)
+ry = opts[?y].full? { |r| Range.new(*(r.split('..', 2).map(&:to_f))) } || (-1.0..1.0)
 
 draw_set rx, ry

data/bin/term_snow

@@ -9,23 +9,23 @@ class SnowFlake
   extend Term::ANSIColor
 
   def initialize(x, y, shape: %w[ ❄ ❅ ❆ • • · · . . ])
-     @x, @y, @shape = x, y, Array(shape).sample
-     @shape.size != 1 and raise ArgumentError, "#@shape needs to be a character"
-   end
+    @x, @y, @shape = x, y, Array(shape).sample
+    @shape.size != 1 and raise ArgumentError, "#@shape needs to be a character"
+  end
 
-   attr_accessor :x
+  attr_accessor :x
 
-   attr_accessor :y
+  attr_accessor :y
 
-   attr_accessor :shape
+  attr_accessor :shape
 
-   def to_s
-     move_to(y, x) { white on_black @shape }
-   end
+  def to_s
+    move_to(y, x) { white on_black @shape }
+  end
 end
 
-opts = go 'n:s:'
-new_snowflakes  = (opts[?n] || 3).to_i
+opts           = go 'n:s:'
+new_snowflakes = (opts[?n] || 3).to_i
 sleep_duration = (opts[?s] || 0.2).to_f
 
 flakes = []
@@ -51,7 +51,7 @@ loop do
         sf.x = SnowFlake.terminal_columns
       end
     else
-      sf.x == 1
+      sf.x += 1
       if sf.x > SnowFlake.terminal_columns
         sf.x = 1
       end
@@ -64,7 +64,7 @@ loop do
     flakes << SnowFlake.new(rand(1..SnowFlake.terminal_columns), 1)
   end
 
-  print *flakes
+  print(*flakes)
 
   sleep sleep_duration
 rescue Interrupt

data/examples/example.rb

@@ -76,11 +76,39 @@ print "clear".clear, "reset".reset, "bold".bold, "dark".dark,
 
 symbols = Term::ANSIColor::attributes
 print red { bold { "All supported attributes = " } },
-  symbols.map { |s| __send__(s, s.inspect) } * ', ', "\n\n"
+  symbols.map { |s| __send__(s, s.inspect) } * ",\n", "\n\n"
 
 print "Send symbols to strings:".send(:red).send(:bold), "\n"
 print symbols[12, 8].map { |c| c.to_s.send(c) } * '', "\n\n"
 
+print red { bold { "Use true colors if supported" } }, "\n"
+
+colors = Term::ANSIColor::Attribute['#ff0000'].gradient_to(
+  Term::ANSIColor::Attribute['#ffff00'],
+  true_coloring: true,
+  step: 16
+)
+colors += Term::ANSIColor::Attribute[colors.last].gradient_to(
+  Term::ANSIColor::Attribute['#00ff00'],
+  true_coloring: true,
+  step: 16
+)
+colors += Term::ANSIColor::Attribute[colors.last].gradient_to(
+  Term::ANSIColor::Attribute['#00ffff'],
+  true_coloring: true,
+  step: 16
+)
+colors += Term::ANSIColor::Attribute[colors.last].gradient_to(
+  Term::ANSIColor::Attribute['#0000ff'],
+  true_coloring: true,
+  step: 16
+)
+
+chars = %w[ ⣾ ⣽ ⣻ ⢿ ⡿ ⣟ ⣯ ⣷ ]
+colors.each_with_index { |c, i| print c.apply { chars[i % chars.size] } }
+puts
+puts
+
 print red { bold { "Make strings monochromatic again:" } }, "\n"
 print [
     "red".red,
@@ -88,3 +116,5 @@ print [
     uncolored { "not red anymore".red },
     uncolored("not red anymore".red)
   ].map { |x| x + "\n" } * ''
+
+puts "Use the " + "Source".hyperlink("https://github.com/flori/term-ansicolor") + ", Luke!"

data/lib/term/ansicolor/attribute/color256.rb

@@ -2,65 +2,67 @@ module Term
   module ANSIColor
     class Attribute
       class Color256
-        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 :color0, 0, html: '#000000'
+        Attribute.set :color1, 1, html: '#800000'
+        Attribute.set :color2, 2, html: '#008000'
+        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'
+        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
+          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
+          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_color0, 0, html: '#000000', background: true
+        Attribute.set :on_color1, 1, html: '#800000', background: true
+        Attribute.set :on_color2, 2, html: '#808000', background: true
+        Attribute.set :on_color3, 3, html: '#808000', background: true
+        Attribute.set :on_color4, 4, html: '#000080', background: true
+        Attribute.set :on_color5, 5, html: '#800080', background: true
+        Attribute.set :on_color6, 6, html: '#008080', background: true
+        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'
+        Attribute.set :on_color8, 8, html: '#808080', background: true
+        Attribute.set :on_color9, 9, html: '#ff0000', background: true
+        Attribute.set :on_color10, 10, html: '#00ff00', background: true
+        Attribute.set :on_color11, 11, html: '#ffff00', background: true
+        Attribute.set :on_color12, 12, html: '#0000ff', background: true
+        Attribute.set :on_color13, 13, html: '#ff00ff', background: true
+        Attribute.set :on_color14, 14, html: '#00ffff', background: true
+        Attribute.set :on_color15, 15, html: '#ffffff', background: true
 
         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
+          Attribute.set "on_color#{i}", i,
+            red: red, green: green, blue: blue, background: true
         end
 
         grey = 8
         for i in 232..255
-          Attribute.set "on_color#{i}", i, :red => grey, :green => grey, :blue => grey
+          Attribute.set "on_color#{i}", i,
+            red: grey, green: grey, blue: grey, background: true
           grey += 10
         end
       end

data/lib/term/ansicolor/attribute/color8.rb

@@ -2,23 +2,23 @@ module Term
   module ANSIColor
     class Attribute
       class Color8
-        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 :black,   30, direct: '#000000'
+        Attribute.set :red,     31, direct: '#800000'
+        Attribute.set :green,   32, direct: '#008000'
+        Attribute.set :yellow,  33, direct: '#808000'
+        Attribute.set :blue,    34, direct: '#000080'
+        Attribute.set :magenta, 35, direct: '#800080'
+        Attribute.set :cyan,    36, direct: '#008080'
+        Attribute.set :white,   37, direct: '#c0c0c0'
 
-        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 :on_black,   40, direct: '#000000'
+        Attribute.set :on_red,     41, direct: '#800000'
+        Attribute.set :on_green,   42, direct: '#008000'
+        Attribute.set :on_yellow,  43, direct: '#808000'
+        Attribute.set :on_blue,    44, direct: '#000080'
+        Attribute.set :on_magenta, 45, direct: '#800080'
+        Attribute.set :on_cyan,    46, direct: '#008080'
+        Attribute.set :on_white,   47, direct: '#808080'
       end
     end
   end

data/lib/term/ansicolor/attribute/intense_color8.rb

@@ -2,41 +2,39 @@ module Term
   module ANSIColor
     class Attribute
       class IntenseColor8
-        # High intensity, aixterm (works in OS X)
-        Attribute.set :intense_black,   90
-        Attribute.set :bright_black,    90
-        Attribute.set :intense_red,     91
-        Attribute.set :bright_red,      91
-        Attribute.set :intense_green,   92
-        Attribute.set :bright_green,    92
-        Attribute.set :intense_yellow,  93
-        Attribute.set :bright_yellow,   93
-        Attribute.set :intense_blue,    94
-        Attribute.set :bright_blue,     94
-        Attribute.set :intense_magenta, 95
-        Attribute.set :bright_magenta,  95
-        Attribute.set :intense_cyan,    96
-        Attribute.set :bright_cyan,     96
-        Attribute.set :intense_white,   97
-        Attribute.set :bright_white,    97
+        Attribute.set :intense_black,   90, direct: '#808080'
+        Attribute.set :bright_black,    90, direct: '#808080'
+        Attribute.set :intense_red,     91, direct: '#ff0000'
+        Attribute.set :bright_red,      91, direct: '#ff0000'
+        Attribute.set :intense_green,   92, direct: '#00ff00'
+        Attribute.set :bright_green,    92, direct: '#00ff00'
+        Attribute.set :intense_yellow,  93, direct: '#ffff00'
+        Attribute.set :bright_yellow,   93, direct: '#ffff00'
+        Attribute.set :intense_blue,    94, direct: '#0000ff'
+        Attribute.set :bright_blue,     94, direct: '#0000ff'
+        Attribute.set :intense_magenta, 95, direct: '#ff00ff'
+        Attribute.set :bright_magenta,  95, direct: '#ff00ff'
+        Attribute.set :intense_cyan,    96, direct: '#00ffff'
+        Attribute.set :bright_cyan,     96, direct: '#00ffff'
+        Attribute.set :intense_white,   97, direct: '#ffffff'
+        Attribute.set :bright_white,    97, direct: '#ffffff'
 
-        # High intensity background,  aixterm (works in OS X)
-        Attribute.set :on_intense_black,   100
-        Attribute.set :on_bright_black,    100
-        Attribute.set :on_intense_red,     101
-        Attribute.set :on_bright_red,      101
-        Attribute.set :on_intense_green,   102
-        Attribute.set :on_bright_green,    102
-        Attribute.set :on_intense_yellow,  103
-        Attribute.set :on_bright_yellow,   103
-        Attribute.set :on_intense_blue,    104
-        Attribute.set :on_bright_blue,     104
-        Attribute.set :on_intense_magenta, 105
-        Attribute.set :on_bright_magenta,  105
-        Attribute.set :on_intense_cyan,    106
-        Attribute.set :on_bright_cyan,     106
-        Attribute.set :on_intense_white,   107
-        Attribute.set :on_bright_white,    107
+        Attribute.set :on_intense_black,   100, direct: '#808080'
+        Attribute.set :on_bright_black,    100, direct: '#808080'
+        Attribute.set :on_intense_red,     101, direct: '#ff0000'
+        Attribute.set :on_bright_red,      101, direct: '#ff0000'
+        Attribute.set :on_intense_green,   102, direct: '#00ff00'
+        Attribute.set :on_bright_green,    102, direct: '#00ff00'
+        Attribute.set :on_intense_yellow,  103, direct: '#ffff00'
+        Attribute.set :on_bright_yellow,   103, direct: '#ffff00'
+        Attribute.set :on_intense_blue,    104, direct: '#0000ff'
+        Attribute.set :on_bright_blue,     104, direct: '#0000ff'
+        Attribute.set :on_intense_magenta, 105, direct: '#ff00ff'
+        Attribute.set :on_bright_magenta,  105, direct: '#ff00ff'
+        Attribute.set :on_intense_cyan,    106, direct: '#00ffff'
+        Attribute.set :on_bright_cyan,     106, direct: '#00ffff'
+        Attribute.set :on_intense_white,   107, direct: '#ffffff'
+        Attribute.set :on_bright_white,    107, direct: '#ffffff'
       end
     end
   end

data/lib/term/ansicolor/attribute/text.rb

@@ -1,22 +1,25 @@
+require 'term/ansicolor/attribute/underline'
+
 module Term
   module ANSIColor
     class Attribute
       class Text
-        Attribute.set :clear,         0 # String#clear already used in String
-        Attribute.set :reset,         0 # synonym for :clear
-        Attribute.set :bold,          1
-        Attribute.set :dark,          2
-        Attribute.set :faint,         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 :reverse,       7 # String#reverse already used in String
-        Attribute.set :negative,      7 # synonym for :reverse
-        Attribute.set :concealed,     8
-        Attribute.set :conceal,       8 # synonym for :concealed
-        Attribute.set :strikethrough, 9 # not widely implemented
+        Attribute.set :clear,            0           # String#clear already used in String
+        Attribute.set :reset,            0           # synonym for :clear
+        Attribute.set :bold,             1
+        Attribute.set :dark,             2
+        Attribute.set :faint,            2
+        Attribute.set :italic,           3           # not widely implemented
+        Attribute.set :blink,            5
+        Attribute.set :rapid_blink,      6           # not widely implemented
+        Attribute.set :reverse,          7           # String#reverse already used in String
+        Attribute.set :negative,         7           # synonym for :reverse
+        Attribute.set :concealed,        8
+        Attribute.set :conceal,          8           # synonym for :concealed
+        Attribute.set :strikethrough,    9           # not widely implemented
+        Attribute.set :overline,         53
+
+        include Term::ANSIColor::Attribute::Underline
       end
     end
   end