term-ansicolor 1.8.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9718f060556740778ada5aec7993d0ed9e4b61548b037f437255c2b01697dafa
-  data.tar.gz: 2f8eebac308b3c1d46436916c4dd7e37d71bfce3bb4376ed0b88027da1a1af9e
+  metadata.gz: 1b4b022358ec0c08c813fd02b38a04f434d49fcd75db660e25b8fe99a7b1e847
+  data.tar.gz: a829c2406f9a20c5738297253bcf3e3dc46f497fbb0c3433bef01fa488cd9c10
 SHA512:
-  metadata.gz: 3a59e5c5c1ba7d9ece81227fc207be44959ac5c6f9d2b6c89c35a16563217f0f36c70c1ea33fa8a7ed89fc9e47e0a3ebf9827401e08b89b770b2f9a1c28c9701
-  data.tar.gz: a842928574662464fd5ad2bbd18bb9bcf0a45b1bd354e674462004ca07f60d3f36ef8b18bccb60faeba08f416f19652be501e51f17b216fce96f8068d7efdec5
+  metadata.gz: 1ee33e17663543ec540ae88b5e84ff8ea6651394d62fe71086258f1294e556180c3255a3f2615dba39f54ab712927b5d862607995e41e7a86cbd43e3ffc89230
+  data.tar.gz: b17b3b732562f3132f478d01c6ba8b96ae9c158d50ad0ca147c722ddc232125301d911574996e023a4e25696ef574bfce986df05b5a487bd43fb5d82fb6ba4ae

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/Rakefile

@@ -15,12 +15,13 @@ GemHadar do
 
   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'
   development_dependency 'simplecov'
   development_dependency 'test-unit'
   development_dependency 'utils'

data/VERSION

@@ -1 +1 @@
-1.8.0
+1.10.0

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

@@ -15,16 +15,12 @@ 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)
+  ac    = Term::ANSIColor
+  steps = 16
+  color = (5.times.map { color_random } + [ 0, 0, 0 ]).map { ac::Attribute[_1] }
+  color = color[1..-1].inject(color[0,1]) { |c, x|
+    c + c.last.gradient_to(x, steps:)
+  }
   iters = color.size - 2
 
   text = ''
@@ -44,9 +40,11 @@ def draw_set(rx, ry)
   puts text
 end
 
-opts = go 'x:y:'
+opts = go 'x:y'
 
-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)
+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)
 
 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,

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: '#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'
+        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, color8: '#000000'
+        Attribute.set :red,     31, color8: '#800000'
+        Attribute.set :green,   32, color8: '#008000'
+        Attribute.set :yellow,  33, color8: '#808000'
+        Attribute.set :blue,    34, color8: '#000080'
+        Attribute.set :magenta, 35, color8: '#800080'
+        Attribute.set :cyan,    36, color8: '#008080'
+        Attribute.set :white,   37, color8: '#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, color8: '#000000'
+        Attribute.set :on_red,     41, color8: '#800000'
+        Attribute.set :on_green,   42, color8: '#008000'
+        Attribute.set :on_yellow,  43, color8: '#808000'
+        Attribute.set :on_blue,    44, color8: '#000080'
+        Attribute.set :on_magenta, 45, color8: '#800080'
+        Attribute.set :on_cyan,    46, color8: '#008080'
+        Attribute.set :on_white,   47, color8: '#808080'
       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

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

@@ -0,0 +1,34 @@
+module Term
+  module ANSIColor
+    class Attribute
+      module Underline
+        Attribute.set :underline,  4, skip_definition: true
+        Attribute.set :underscore, 4, skip_definition: true # synonym for :underline
+
+        def underline(string = nil, color: nil, type: nil, &block)
+          code = {
+            nil =>   4,
+            default: '4:1',
+            double:  '4:2',
+            curly:   '4:3',
+            dotted:  '4:4',
+            dashed:  '4:5',
+          }.fetch(type) { raise ArgumentError, "invalid line type" }
+          if color
+            a          = Term::ANSIColor::Attribute[color]
+            color_code =
+              if a.true_color? || a.rgb_color? || a.color8?
+                color_code = "\e[58;2;#{a.rgb.to_a * ?;}"
+              else
+                raise ArgumentError, "invalid color #{a.name.inspect}"
+              end
+            code = "#{code}m#{color_code}"
+          end
+          apply_code(code, string, &block)
+        end
+
+        alias underscore underline
+      end
+    end
+  end
+end

data/lib/term/ansicolor/attribute.rb

@@ -3,42 +3,45 @@ module Term
     class Attribute
       @__store__ = {}
 
-      if RUBY_VERSION < '1.9'
-        @__order__ = []
-
-        def self.set(name, code, options = {})
-          name = name.to_sym
-          result = @__store__[name] = new(name, code, options)
-          @__order__ << name
-          @rgb_colors = nil
-          result
-        end
-
-        def self.attributes(&block)
-          @__order__.map { |name| @__store__[name] }
-        end
-      else
-        def self.set(name, code, options = {})
-          name = name.to_sym
-          result = @__store__[name] = new(name, code, options)
-          @rgb_colors = nil
-          result
+      def self.set(name, code, **options)
+        name = name.to_sym
+        result = @__store__[name] = new(name, code, options)
+        unless options[:skip_definition]
+          ::Term::ANSIColor.class_eval do
+            define_method(name) do |string = nil, &block|
+              apply_attribute(name, string, &block)
+            end
+          end
         end
+        result
+      end
 
-        def self.attributes(&block)
-          @__store__.each_value(&block)
-        end
+      def self.attributes(&block)
+        @__store__.each_value(&block)
       end
 
-      def self.[](name)
-        case
-        when self === name                              then name
-        when Array === name                             then nearest_rgb_color name
-        when name.respond_to?(:to_rgb_triple)           then nearest_rgb_color(name.to_rgb_triple.to_a)
-        when name.to_s =~ /\A(on_)?(\d+)\z/             then get "#$1color#$2"
-        when name.to_s =~ /\A#([0-9a-f]{3}){1,2}\z/i    then nearest_rgb_color name
-        when name.to_s =~ /\Aon_#([0-9a-f]{3}){1,2}\z/i then nearest_rgb_on_color name
-        else                                            get name
+      def self.[](name, true_coloring: false)
+        true_coloring ||= Term::ANSIColor.true_coloring?
+        if true_coloring
+          case
+          when self === name                              then name
+          when Array === name                             then true_color name
+          when name.respond_to?(:to_rgb_triple)           then true_color(name.to_rgb_triple.to_a)
+          when name.to_s =~ /\A(on_)?(\d+)\z/             then get "#$1color#$2"
+          when name.to_s =~ /\A#([0-9a-f]{3}){1,2}\z/i    then true_color name
+          when name.to_s =~ /\Aon_#([0-9a-f]{3}){1,2}\z/i then on_true_color name
+          else                                            get name
+          end
+        else
+          case
+          when self === name                              then name
+          when Array === name                             then nearest_rgb_color name
+          when name.respond_to?(:to_rgb_triple)           then nearest_rgb_color(name.to_rgb_triple.to_a)
+          when name.to_s =~ /\A(on_)?(\d+)\z/             then get "#$1color#$2"
+          when name.to_s =~ /\A#([0-9a-f]{3}){1,2}\z/i    then nearest_rgb_color name
+          when name.to_s =~ /\Aon_#([0-9a-f]{3}){1,2}\z/i then nearest_rgb_on_color name
+          else                                            get name
+          end
         end
       end
 
@@ -47,7 +50,7 @@ module Term
       end
 
       def self.rgb_colors(options = {}, &block)
-        colors = @rgb_colors ||= attributes.select(&:rgb_color?)
+        colors = attributes.select(&:rgb_color?)
         if options.key?(:gray) && !options[:gray]
           colors = colors.reject(&:gray?)
         end
@@ -70,12 +73,30 @@ module Term
         colors.select(&:background?).min_by { |c| c.distance_to(rgb, options) }
       end
 
+      def self.true_color(color, options = {})
+        rgb = RGBTriple[color]
+        new(:true, "", { true_color: rgb, background: false })
+      end
+
+      def self.on_true_color(color, options = {})
+        rgb = RGBTriple[color]
+        new(:on_true, "", { true_color: rgb, background: true })
+      end
+
       def initialize(name, code, options = {})
-        @name = name.to_sym
-        @code = code.to_s
-        if html = options[:html]
+        @name       = name.to_sym
+        @background = !!options[:background]
+        @code       = code.to_s
+        @true_color = false
+        if rgb = options[:true_color]
+          @true_color = true
+          @rgb = rgb
+        elsif rgb = options[:color8]
+          @color8 = true
+          @rgb = RGBTriple.from_html(rgb)
+        elsif html = options[:html]
           @rgb = RGBTriple.from_html(html)
-        elsif !options.empty?
+        elsif options.slice(:red, :green, :blue).size == 3
           @rgb = RGBTriple.from_hash(options)
         else
           @rgb = nil # prevent instance variable not initialized warnings
@@ -85,25 +106,39 @@ module Term
       attr_reader :name
 
       def code
-        if rgb_color?
+        if true_color?
+          background? ? "48;2;#{@rgb.to_a * ?;}" : "38;2;#{@rgb.to_a * ?;}"
+        elsif rgb_color?
           background? ? "48;5;#{@code}" : "38;5;#{@code}"
+        elsif color8?
+          background? ? (@code.to_i + 10).to_s : @code
         else
           @code
         end
       end
 
       def apply(string = nil, &block)
-        ::Term::ANSIColor.color(self, string, &block)
+        ::Term::ANSIColor.apply_attribute(self, string, &block)
       end
 
       def background?
-        @name.to_s.start_with?('on_')
+        !!@background
       end
 
+      def color8?
+        !!@color8
+      end
+
+      attr_writer :background
+
       attr_reader :rgb
 
       def rgb_color?
-        !!@rgb
+        !!@rgb && !@true_color && !@color8
+      end
+
+      def true_color?
+        !!(@rgb && @true_color)
       end
 
       def gray?
@@ -127,11 +162,16 @@ module Term
 
       def gradient_to(other, options = {})
         if our_rgb = to_rgb_triple and
-          other.respond_to?(:to_rgb_triple) and
-          other_rgb = other.to_rgb_triple
-        then
+            other.respond_to?(:to_rgb_triple) and
+            other_rgb = other.to_rgb_triple
+          then
+          true_coloring = options[:true_coloring] || Term::ANSIColor.true_coloring?
           our_rgb.gradient_to(other_rgb, options).map do |rgb_triple|
-            self.class.nearest_rgb_color(rgb_triple, options)
+            if true_coloring
+              self.class.true_color(rgb_triple, options)
+            else
+              self.class.nearest_rgb_color(rgb_triple, options)
+            end
           end
         else
           []

data/lib/term/ansicolor/ppm_reader.rb

@@ -4,9 +4,10 @@ module Term
       include Term::ANSIColor
 
       def initialize(io, options = {})
-        @io      = io
-        @options = options
-        @buffer  = ''
+        @io            = io
+        @options       = options
+        @buffer        = ''
+        @true_coloring = options[:true_coloring]
       end
 
       def reset_io
@@ -34,7 +35,11 @@ module Term
           last_pixel = nil
           for pixel in row
             if pixel != last_pixel
-              color = Attribute.nearest_rgb_color(pixel, @options)
+              color = if @true_coloring
+                        Attribute.true_color(pixel, @options)
+                      else
+                        Attribute.nearest_rgb_color(pixel, @options)
+                      end
               result << on_color(color)
               last_pixel = pixel
             end

data/lib/term/ansicolor/version.rb

@@ -1,6 +1,6 @@
 module Term::ANSIColor
   # Term::ANSIColor version
-  VERSION         = '1.8.0'
+  VERSION         = '1.10.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/term/ansicolor.rb

@@ -1,4 +1,5 @@
 require 'tins/xt/full'
+require 'mize'
 
 module Term
 
@@ -18,23 +19,8 @@ module Term
     include Term::ANSIColor::Movement
     require 'term/ansicolor/hyperlink'
     include Term::ANSIColor::Hyperlink
+    include Term::ANSIColor::Attribute::Underline
 
-    # :stopdoc:
-    ATTRIBUTE_NAMES = Attribute.named_attributes.map(&:name)
-    # :startdoc:
-
-    # Returns true if Term::ANSIColor supports the +feature+.
-    #
-    # The feature :clear, that is mixing the clear color attribute into String,
-    # is only supported on ruby implementations, that do *not* already
-    # implement the String#clear method. It's better to use the reset color
-    # attribute instead.
-    def support?(feature)
-      case feature
-      when :clear
-        !String.instance_methods(false).map(&:to_sym).include?(:clear)
-      end
-    end
     # Returns true, if the coloring function of this module
     # is switched on, false otherwise.
     def self.coloring?
@@ -43,31 +29,32 @@ module Term
 
     # Turns the coloring on or off globally, so you can easily do
     # this for example:
-    #  Term::ANSIColor::coloring = STDOUT.isatty
+    #   Term::ANSIColor::coloring = STDOUT.isatty
     def self.coloring=(val)
-      @coloring = val
+      @coloring = !!val
     end
     self.coloring = true
 
-    def self.create_color_method(color_name, color_value)
-      module_eval <<-EOT
-        def #{color_name}(string = nil, &block)
-          color(:#{color_name}, string, &block)
-        end
-      EOT
-      self
+    # Returns true, if the tue coloring mode of this module is switched on,
+    # false otherwise.
+    def self.true_coloring?
+      @true_coloring
     end
 
-    for attribute in Attribute.named_attributes
-       create_color_method(attribute.name, attribute.code)
+    # Turns the true coloring mode on or off globally, that will display 24-bit
+    # colors if your terminal supports it:
+    #  Term::ANSIColor::true_coloring = ENV['COLORTERM'] =~ /\A(truecolor|24bit)\z/
+    def self.true_coloring=(val)
+      @true_coloring = !!val
     end
+    self.true_coloring = false
 
     # 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/
+    COLORED_REGEXP = /\e\[(?:(?:[349]|10)[0-7]|[0-9]|[34]8;(5;\d{1,3}|2;\d{1,3}(;\d{1,3}){2})|4:\d|53)?m/
 
-    # Returns an uncolored version of the string, that is all
-    # ANSI-Attributes are stripped from the string.
+    # Returns an uncolored version of the string, that is all ANSI-Attributes
+    # are stripped from the string.
     def uncolor(string = nil) # :yields:
       if block_given?
         yield.to_str.gsub(COLORED_REGEXP, '')
@@ -82,13 +69,9 @@ 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[name] or raise ArgumentError, "unknown attribute #{name.inspect}"
+    def apply_code(code, string = nil, &block)
       result = ''
-      result << "\e[#{attribute.code}m" if Term::ANSIColor.coloring?
+      result << "\e[#{code}m" if Term::ANSIColor.coloring?
       if block_given?
         result << yield.to_s
       elsif string.respond_to?(:to_str)
@@ -102,15 +85,34 @@ module Term
       result.extend(Term::ANSIColor)
     end
 
+    def apply_attribute(name, string = nil, &block)
+      attribute = Attribute[name] or
+        raise ArgumentError, "unknown attribute #{name.inspect}"
+      apply_code(attribute.code, string, &block)
+    end
+
+    # 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)
+      apply_attribute(name, string, &block)
+    end
+
+    # Return +string+ or the result string of the given +block+ with a
+    # background colored with color +name+. If string isn't a string only the
+    # escape sequence to switch on the color +name+ is returned.
     def on_color(name, string = nil, &block)
-      attribute = Attribute[name] or raise ArgumentError, "unknown attribute #{name.inspect}"
-      color("on_#{attribute.name}", string, &block)
+      attribute = Attribute[name] or
+        raise ArgumentError, "unknown attribute #{name.inspect}"
+      attribute = attribute.dup
+      attribute.background = true
+      apply_attribute(attribute, string, &block)
     end
 
     class << self
       # Returns an array of all Term::ANSIColor attributes as symbols.
-      def term_ansicolor_attributes
-        ::Term::ANSIColor::ATTRIBUTE_NAMES
+      memoize method: def term_ansicolor_attributes
+        ::Term::ANSIColor::Attribute.attributes.map(&:name)
       end
 
       alias attributes term_ansicolor_attributes

data/term-ansicolor.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: term-ansicolor 1.8.0 ruby lib
+# stub: term-ansicolor 1.10.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "term-ansicolor".freeze
-  s.version = "1.8.0".freeze
+  s.version = "1.10.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2024-04-13"
+  s.date = "2024-06-21"
   s.description = "This library uses ANSI escape sequences to control the attributes of terminal output".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["term_cdiff".freeze, "term_colortab".freeze, "term_decolor".freeze, "term_display".freeze, "term_mandel".freeze, "term_snow".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/term/ansicolor.rb".freeze, "lib/term/ansicolor/attribute.rb".freeze, "lib/term/ansicolor/attribute/color256.rb".freeze, "lib/term/ansicolor/attribute/color8.rb".freeze, "lib/term/ansicolor/attribute/intense_color8.rb".freeze, "lib/term/ansicolor/attribute/text.rb".freeze, "lib/term/ansicolor/hsl_triple.rb".freeze, "lib/term/ansicolor/hyperlink.rb".freeze, "lib/term/ansicolor/movement.rb".freeze, "lib/term/ansicolor/ppm_reader.rb".freeze, "lib/term/ansicolor/rgb_color_metrics.rb".freeze, "lib/term/ansicolor/rgb_triple.rb".freeze, "lib/term/ansicolor/version.rb".freeze]
-  s.files = [".all_images.yml".freeze, ".gitignore".freeze, ".tool-versions".freeze, "CHANGES".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/term_cdiff".freeze, "bin/term_colortab".freeze, "bin/term_decolor".freeze, "bin/term_display".freeze, "bin/term_mandel".freeze, "bin/term_snow".freeze, "examples/example.rb".freeze, "examples/lambda-red-plain.ppm".freeze, "examples/lambda-red.png".freeze, "examples/lambda-red.ppm".freeze, "lib/term/ansicolor.rb".freeze, "lib/term/ansicolor/.keep".freeze, "lib/term/ansicolor/attribute.rb".freeze, "lib/term/ansicolor/attribute/color256.rb".freeze, "lib/term/ansicolor/attribute/color8.rb".freeze, "lib/term/ansicolor/attribute/intense_color8.rb".freeze, "lib/term/ansicolor/attribute/text.rb".freeze, "lib/term/ansicolor/hsl_triple.rb".freeze, "lib/term/ansicolor/hyperlink.rb".freeze, "lib/term/ansicolor/movement.rb".freeze, "lib/term/ansicolor/ppm_reader.rb".freeze, "lib/term/ansicolor/rgb_color_metrics.rb".freeze, "lib/term/ansicolor/rgb_triple.rb".freeze, "lib/term/ansicolor/version.rb".freeze, "term-ansicolor.gemspec".freeze, "tests/ansicolor_test.rb".freeze, "tests/attribute_test.rb".freeze, "tests/hsl_triple_test.rb".freeze, "tests/hyperlink_test.rb".freeze, "tests/ppm_reader_test.rb".freeze, "tests/rgb_color_metrics_test.rb".freeze, "tests/rgb_triple_test.rb".freeze, "tests/test_helper.rb".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/term/ansicolor.rb".freeze, "lib/term/ansicolor/attribute.rb".freeze, "lib/term/ansicolor/attribute/color256.rb".freeze, "lib/term/ansicolor/attribute/color8.rb".freeze, "lib/term/ansicolor/attribute/intense_color8.rb".freeze, "lib/term/ansicolor/attribute/text.rb".freeze, "lib/term/ansicolor/attribute/underline.rb".freeze, "lib/term/ansicolor/hsl_triple.rb".freeze, "lib/term/ansicolor/hyperlink.rb".freeze, "lib/term/ansicolor/movement.rb".freeze, "lib/term/ansicolor/ppm_reader.rb".freeze, "lib/term/ansicolor/rgb_color_metrics.rb".freeze, "lib/term/ansicolor/rgb_triple.rb".freeze, "lib/term/ansicolor/version.rb".freeze]
+  s.files = [".all_images.yml".freeze, ".gitignore".freeze, ".utilsrc".freeze, "CHANGES".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/term_cdiff".freeze, "bin/term_colortab".freeze, "bin/term_decolor".freeze, "bin/term_display".freeze, "bin/term_mandel".freeze, "bin/term_snow".freeze, "examples/example.rb".freeze, "examples/lambda-red-plain.ppm".freeze, "examples/lambda-red.png".freeze, "examples/lambda-red.ppm".freeze, "lib/term/ansicolor.rb".freeze, "lib/term/ansicolor/.keep".freeze, "lib/term/ansicolor/attribute.rb".freeze, "lib/term/ansicolor/attribute/color256.rb".freeze, "lib/term/ansicolor/attribute/color8.rb".freeze, "lib/term/ansicolor/attribute/intense_color8.rb".freeze, "lib/term/ansicolor/attribute/text.rb".freeze, "lib/term/ansicolor/attribute/underline.rb".freeze, "lib/term/ansicolor/hsl_triple.rb".freeze, "lib/term/ansicolor/hyperlink.rb".freeze, "lib/term/ansicolor/movement.rb".freeze, "lib/term/ansicolor/ppm_reader.rb".freeze, "lib/term/ansicolor/rgb_color_metrics.rb".freeze, "lib/term/ansicolor/rgb_triple.rb".freeze, "lib/term/ansicolor/version.rb".freeze, "term-ansicolor.gemspec".freeze, "tests/ansicolor_test.rb".freeze, "tests/attribute_test.rb".freeze, "tests/hsl_triple_test.rb".freeze, "tests/hyperlink_test.rb".freeze, "tests/ppm_reader_test.rb".freeze, "tests/rgb_color_metrics_test.rb".freeze, "tests/rgb_triple_test.rb".freeze, "tests/test_helper.rb".freeze]
   s.homepage = "https://github.com/flori/term-ansicolor".freeze
   s.licenses = ["Apache-2.0".freeze]
   s.rdoc_options = ["--title".freeze, "Term-ansicolor - Ruby library that colors strings using ANSI escape sequences".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "3.5.3".freeze
+  s.rubygems_version = "3.5.11".freeze
   s.summary = "Ruby library that colors strings using ANSI escape sequences".freeze
   s.test_files = ["tests/ansicolor_test.rb".freeze, "tests/attribute_test.rb".freeze, "tests/hsl_triple_test.rb".freeze, "tests/hyperlink_test.rb".freeze, "tests/ppm_reader_test.rb".freeze, "tests/rgb_color_metrics_test.rb".freeze, "tests/rgb_triple_test.rb".freeze, "tests/test_helper.rb".freeze]
 
@@ -28,4 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<test-unit>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<utils>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.0".freeze])
+  s.add_runtime_dependency(%q<mize>.freeze, [">= 0".freeze])
 end

data/tests/ansicolor_test.rb

@@ -103,9 +103,22 @@ class ANSIColorTest < Test::Unit::TestCase
 
   def test_attributes
     foo = 'foo'
-    for a in Term::ANSIColor.attributes
+    attributes = %i[
+      clear reset bold dark faint italic underline underscore
+      blink rapid_blink reverse negative concealed conceal strikethrough black
+      red green yellow blue magenta cyan white on_black on_red on_green on_yellow
+      on_blue on_magenta on_cyan on_white intense_black bright_black intense_red
+      bright_red intense_green bright_green intense_yellow bright_yellow
+      intense_blue bright_blue intense_magenta bright_magenta intense_cyan
+      bright_cyan intense_white bright_white on_intense_black on_bright_black
+      on_intense_red on_bright_red on_intense_green on_bright_green
+      on_intense_yellow on_bright_yellow on_intense_blue on_bright_blue
+      on_intense_magenta on_bright_magenta on_intense_cyan on_bright_cyan
+      on_intense_white on_bright_white
+    ]
+    for a in attributes
       # skip :clear and :reverse b/c Ruby implements them on string
-      if a != :clear && a != :reverse || Term::ANSIColor.support?(:clear)
+      if a != :clear && a != :reverse
         refute_equal foo, foo_colored = foo.__send__(a)
         assert_equal foo, foo_colored.uncolor
       end
@@ -121,6 +134,36 @@ class ANSIColorTest < Test::Unit::TestCase
     assert_equal Term::ANSIColor.attributes, 'foo'.attributes
   end
 
+  def test_underline
+    foo = 'foo'
+    assert_equal "\e[4mfoo\e[0m", Term::ANSIColor.underline { foo }
+    assert_equal "\e[4m\e[58;2;255;135;95mfoo\e[0m", Term::ANSIColor.underline(color: '#ff8040') { foo }
+  end
+
+  def test_underline_double
+    foo = 'foo'
+    assert_equal "\e[4:2mfoo\e[0m", Term::ANSIColor.underline(type: :double) { foo }
+    assert_equal "\e[4:2m\e[58;2;255;135;95mfoo\e[0m", Term::ANSIColor.underline(type: :double, color: '#ff8040') { foo }
+  end
+
+  def test_underline_curly
+    foo = 'foo'
+    assert_equal "\e[4:3mfoo\e[0m", Term::ANSIColor.underline(type: :curly) { foo }
+    assert_equal "\e[4:3m\e[58;2;255;135;95mfoo\e[0m", Term::ANSIColor.underline(type: :curly, color: '#ff8040') { foo }
+  end
+
+  def test_underline_dotted
+    foo = 'foo'
+    assert_equal "\e[4:4mfoo\e[0m", Term::ANSIColor.underline(type: :dotted) { foo }
+    assert_equal "\e[4:4m\e[58;2;255;135;95mfoo\e[0m", Term::ANSIColor.underline(type: :dotted, color: '#ff8040') { foo }
+  end
+
+  def test_underline_dashed
+    foo = 'foo'
+    assert_equal "\e[4:5mfoo\e[0m", Term::ANSIColor.underline(type: :dashed) { foo }
+    assert_equal "\e[4:5m\e[58;2;255;135;95mfoo\e[0m", Term::ANSIColor.underline(type: :dashed, color: '#ff8040') { foo }
+  end
+
   def test_move_to
     string_23_23 = "\e[23;23Hred"
     assert_equal string_23_23, string.move_to(23, 23)
@@ -157,4 +200,20 @@ class ANSIColorTest < Test::Unit::TestCase
     string = Color.red(string)
     assert_kind_of Term::ANSIColor, 'new'
   end
+
+  def test_coloring
+    assert Term::ANSIColor.coloring?
+    Term::ANSIColor.coloring = false
+    assert_false Term::ANSIColor.coloring?
+  ensure
+    Term::ANSIColor.coloring = true
+  end
+
+  def test_true_coloring
+    assert_false Term::ANSIColor.true_coloring?
+    Term::ANSIColor.true_coloring = true
+    assert Term::ANSIColor.true_coloring?
+  ensure
+    Term::ANSIColor.true_coloring = false
+  end
 end

data/tests/attribute_test.rb

@@ -32,7 +32,7 @@ class AttributeTest < Test::Unit::TestCase
     assert_in_delta 250.954, Attribute.get(:color0).distance_to(color), 1e-3
     color = Attribute.nearest_rgb_color('#0f0')
     assert_in_delta 255, Attribute.get(:color0).distance_to(color,
-      :metric => RGBColorMetrics::Euclidean), 1e-3
+      metric: RGBColorMetrics::Euclidean), 1e-3
     assert_equal 1 / 0.0, Attribute.get(:color0).distance_to(nil)
   end
 
@@ -40,14 +40,14 @@ class AttributeTest < Test::Unit::TestCase
     assert_equal Attribute.get(:color0).rgb, Attribute.nearest_rgb_color('#000').rgb
     assert_equal Attribute.get(:color15).rgb, Attribute.nearest_rgb_color('#ffffff').rgb
     assert_equal :color248, Attribute.nearest_rgb_color('#aaa').name
-    assert_equal :color109, Attribute.nearest_rgb_color('#aaa', :gray => false).name
+    assert_equal :color109, Attribute.nearest_rgb_color('#aaa', gray: false).name
   end
 
   def test_nearest_rgb_on_color
     assert_equal Attribute.get(:on_color0).rgb, Attribute.nearest_rgb_on_color('#000').rgb
     assert_equal Attribute.get(:on_color15).rgb, Attribute.nearest_rgb_on_color('#ffffff').rgb
     assert_equal :on_color248, Attribute.nearest_rgb_on_color('#aaa').name
-    assert_equal :on_color109, Attribute.nearest_rgb_on_color('#aaa', :gray => false).name
+    assert_equal :on_color109, Attribute.nearest_rgb_on_color('#aaa', gray: false).name
   end
 
   def test_apply
@@ -59,15 +59,54 @@ class AttributeTest < Test::Unit::TestCase
   def test_gradient
     g0 = Attribute[:blink].gradient_to Attribute['#30ffaa']
     assert_equal [], g0
-    g1 = Attribute['#30ffaa'].gradient_to(Attribute['#ff507f'], :steps => 9)
+    g1 = Attribute['#30ffaa'].gradient_to(Attribute['#ff507f'], steps: 9)
     assert_equal [ :color49, :color49, :color43, :color79, :color108,
       :color247, :color138, :color168, :color204 ], g1.map(&:name)
     g2 = Attribute['#30ffaa'].gradient_to(
       Attribute['#ff507f'],
-      :steps  => 9,
-      :metric => RGBColorMetrics::Euclidean
+      steps: 9,
+      metric: RGBColorMetrics::Euclidean
     )
     assert_equal [ :color49, :color43, :color79, :color73, :color108,
       :color247, :color138, :color168, :color204 ], g2.map(&:name)
   end
+
+  def test_true_color
+    pinkish = Attribute['#f050a0', true_coloring: true]
+    assert_equal [ 240, 80, 160 ], pinkish.to_rgb_triple.to_a
+    on_pinkish = Attribute['on_#f050a0', true_coloring: true]
+    assert_equal [ 240, 80, 160 ], on_pinkish.to_rgb_triple.to_a
+    red = Attribute['9', true_coloring: true]
+    assert_equal [ 255, 0, 0 ], red.to_rgb_triple.to_a
+    red = Attribute['red', true_coloring: true]
+    assert_equal :red, red.name
+    pinkish_pinkish = Attribute[pinkish, true_coloring: true]
+    assert_equal pinkish, pinkish_pinkish
+    pinkish_pinkish = Attribute[pinkish.to_rgb_triple, true_coloring: true]
+    assert_equal pinkish.to_rgb_triple, pinkish_pinkish.to_rgb_triple
+    pinkish_pinkish = Attribute[pinkish.to_rgb_triple.to_a, true_coloring: true]
+    assert_equal pinkish.to_rgb_triple, pinkish_pinkish.to_rgb_triple
+  end
+
+  def test_true_color_gradient
+    g0 = Attribute[:blink].gradient_to Attribute['#30ffaa']
+    assert_equal [], g0
+    g1 = Attribute['#30ffaa'].gradient_to(
+      Attribute['#ff507f'],
+      steps: 9,
+      true_coloring: true
+    )
+    assert_equal %w[
+      #00ffaf #1febaa #3ed7a5 #5dc3a0 #7caf9b #9b9b96 #ba8791 #d9738c #ff5f87
+    ], g1.map { _1.rgb.html }
+    g2 = Attribute['#30ffaa'].gradient_to(
+      Attribute['#ff507f'],
+      steps: 9,
+      true_coloring: true,
+      metric: RGBColorMetrics::Euclidean
+    )
+    assert_equal %w[
+      #00ffaf #1febaa #3ed7a5 #5dc3a0 #7caf9b #9b9b96 #ba8791 #d9738c #ff5f87
+    ], g2.map { _1.rgb.html }
+  end
 end

data/tests/hsl_triple_test.rb

@@ -13,7 +13,7 @@ class HSLTripleTest < Test::Unit::TestCase
 
   def test_hsl_cast
     assert_equal '#85e085', HSLTriple[ @pastel_green_hsl ].html
-    assert_equal '#85e085', HSLTriple[ :hue => 120, :saturation => 59.4, :lightness => 70 ].html
+    assert_equal '#85e085', HSLTriple[ hue: 120, saturation: 59.4, lightness: 70 ].html
     assert_equal '#11ddff', HSLTriple[ '#1df' ].html
     assert_equal '#8000ff', HSLTriple[ 'rgb(128,0,255)' ].html
     assert_equal '#85e085', HSLTriple[ 'hsl(120.0,59.4%,70.0%)' ].html

data/tests/hyperlink_test.rb

@@ -1,3 +1,5 @@
+require 'test_helper'
+
 class HyperlinkTest < Test::Unit::TestCase
   include Term::ANSIColor
 
@@ -49,6 +51,8 @@ class HyperlinkTest < Test::Unit::TestCase
   end
 
   def test_with_stringy_self
-    assert_equal "\e]8;;#@link\e\\foo\e]8;;\e\\", "foo".hyperlink(@link)
+    string = 'foo'
+    string.extend Term::ANSIColor
+    assert_equal "\e]8;;#@link\e\\foo\e]8;;\e\\", string.hyperlink(@link)
   end
 end

data/tests/ppm_reader_test.rb

@@ -28,6 +28,14 @@ class PPMReaderTest < Test::Unit::TestCase
     end
   end
 
+  def test_rendering_ppm_with_true_colors
+    File.open(example_path('lambda-red.ppm')) do |ppm6|
+      ppm_reader = PPMReader.new(ppm6, :true_coloring => true)
+      assert_equal '5faa2b046cc3e030f86588e472683834',
+        Digest::MD5.hexdigest(ppm_reader.to_s)
+    end
+  end
+
   def test_to_a
     File.open(example_path('lambda-red.ppm')) do |ppm6|
       ppm_reader = PPMReader.new(ppm6, :gray => false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: term-ansicolor
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-13 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
@@ -99,6 +113,7 @@ extra_rdoc_files:
 - lib/term/ansicolor/attribute/color8.rb
 - lib/term/ansicolor/attribute/intense_color8.rb
 - lib/term/ansicolor/attribute/text.rb
+- lib/term/ansicolor/attribute/underline.rb
 - lib/term/ansicolor/hsl_triple.rb
 - lib/term/ansicolor/hyperlink.rb
 - lib/term/ansicolor/movement.rb
@@ -109,7 +124,7 @@ extra_rdoc_files:
 files:
 - ".all_images.yml"
 - ".gitignore"
-- ".tool-versions"
+- ".utilsrc"
 - CHANGES
 - COPYING
 - Gemfile
@@ -133,6 +148,7 @@ files:
 - lib/term/ansicolor/attribute/color8.rb
 - lib/term/ansicolor/attribute/intense_color8.rb
 - lib/term/ansicolor/attribute/text.rb
+- lib/term/ansicolor/attribute/underline.rb
 - lib/term/ansicolor/hsl_triple.rb
 - lib/term/ansicolor/hyperlink.rb
 - lib/term/ansicolor/movement.rb
@@ -172,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Ruby library that colors strings using ANSI escape sequences

data/.tool-versions

@@ -1 +0,0 @@
-ruby 3.3.0