term-ansicolor 1.9.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94f19feae65e9ff5aa9c4f79126eca941c7f824b2aa6fcb62dad77a2ef7e6d7
-  data.tar.gz: 0a94fdc003d7876d96b10e77170987786fccfa6013da118376c6b8ccf92fd876
+  metadata.gz: 768db698164c4d6226839c11932c868d2a6e93e2c6d6db03e5fbee3422b8ecf7
+  data.tar.gz: 025abdbb49d4c589a00e70c7f467612d24748cc7b43db3901ca7b9bde909e906
 SHA512:
-  metadata.gz: 6e5742e8fb06c4cbfcdd065619cc0b0a4af060f0708facb67190833e7a5f1d95a51fc0844e2e532d9d67332d2e419944c144116f9c82b363f1c4b387deb6dc3e
-  data.tar.gz: 8114385cec7788c819cfd1b70ebb8934afd4c7fd7bf68f85f5986869c840f7992e96c426c80b3debd864309211d3ad02c736a696be38b78fed6d8eff4777bd5b
+  metadata.gz: ea842c5808c77941ba10f1599cda75bd8a32c07317c126298b4000b7340111f83a0dc6c7b79862d8e708860f5b4e0f2ede10e82d7a7e678fb9cf3f7122473266
+  data.tar.gz: 2edff8a89a38ad47f54f9110923ae2a809e9196f8222d9da6ba82513bdd650eff66623baeacfb075cccc03e7b21728c1a3a58a6d759aceb61336f271a6a15add

data/Rakefile

@@ -21,6 +21,7 @@ GemHadar do
   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.9.0
+1.10.1

data/bin/term_colortab

@@ -66,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/examples/example.rb

@@ -76,7 +76,7 @@ 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"

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

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.direct?
+                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,31 +3,21 @@ 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, true_coloring: false)
@@ -60,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
@@ -95,14 +85,18 @@ module Term
 
       def initialize(name, code, options = {})
         @name       = name.to_sym
-        @background = @name.start_with?('on_')
+        @background = !!options[:background]
         @code       = code.to_s
+        @true_color = false
         if rgb = options[:true_color]
           @true_color = true
           @rgb = rgb
+        elsif rgb = options[:direct]
+          @direct = 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
@@ -116,25 +110,31 @@ module Term
           background? ? "48;2;#{@rgb.to_a * ?;}" : "38;2;#{@rgb.to_a * ?;}"
         elsif rgb_color?
           background? ? "48;5;#{@code}" : "38;5;#{@code}"
+        elsif direct?
+          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?
         !!@background
       end
 
+      def direct?
+        !!@direct
+      end
+
       attr_writer :background
 
       attr_reader :rgb
 
       def rgb_color?
-        !!@rgb && !@true_color
+        !!@rgb && !@true_color && !@direct
       end
 
       def true_color?

data/lib/term/ansicolor/version.rb

@@ -1,6 +1,6 @@
 module Term::ANSIColor
   # Term::ANSIColor version
-  VERSION         = '1.9.0'
+  VERSION         = '1.10.1'
   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,7 @@ module Term
     include Term::ANSIColor::Movement
     require 'term/ansicolor/hyperlink'
     include Term::ANSIColor::Hyperlink
-
-    # :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
+    include Term::ANSIColor::Attribute::Underline
 
     # Returns true, if the coloring function of this module
     # is switched on, false otherwise.
@@ -64,22 +49,9 @@ module Term
     end
     self.true_coloring = false
 
-    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
-    end
-
-    for attribute in Attribute.named_attributes
-       create_color_method(attribute.name, attribute.code)
-    end
-
     # 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}|2;\d{1,3}(;\d{1,3}){2}))?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.
@@ -97,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)
@@ -117,17 +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}"
+      attribute = Attribute[name] or
+        raise ArgumentError, "unknown attribute #{name.inspect}"
       attribute = attribute.dup
       attribute.background = true
-      color(attribute, string, &block)
+      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.9.0 ruby lib
+# stub: term-ansicolor 1.10.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "term-ansicolor".freeze
-  s.version = "1.9.0".freeze
+  s.version = "1.10.1".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-06-18"
+  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, ".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/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)

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,13 +59,13 @@ 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)
@@ -93,7 +93,7 @@ class AttributeTest < Test::Unit::TestCase
     assert_equal [], g0
     g1 = Attribute['#30ffaa'].gradient_to(
       Attribute['#ff507f'],
-      :steps => 9,
+      steps: 9,
       true_coloring: true
     )
     assert_equal %w[
@@ -101,9 +101,9 @@ class AttributeTest < Test::Unit::TestCase
     ], g1.map { _1.rgb.html }
     g2 = Attribute['#30ffaa'].gradient_to(
       Attribute['#ff507f'],
-      :steps  => 9,
+      steps: 9,
       true_coloring: true,
-      :metric => RGBColorMetrics::Euclidean
+      metric: RGBColorMetrics::Euclidean
     )
     assert_equal %w[
       #00ffaf #1febaa #3ed7a5 #5dc3a0 #7caf9b #9b9b96 #ba8791 #d9738c #ff5f87

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: term-ansicolor
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-18 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,6 @@ extra_rdoc_files:
 files:
 - ".all_images.yml"
 - ".gitignore"
-- ".tool-versions"
 - ".utilsrc"
 - CHANGES
 - COPYING
@@ -134,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
@@ -173,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