term-ansicolor 1.7.1 → 1.10.4

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 rgb = a.ask_and_send(:to_rgb_triple).full?(:to_a)
+                "\e[58;2;#{rgb * ?;}"
+              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,31 @@ 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
+        @direct     = false
+        @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
@@ -85,25 +107,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 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?
-        @name.to_s.start_with?('on_')
+        !!@background
       end
 
+      def direct?
+        !!@direct
+      end
+
+      attr_writer :background
+
       attr_reader :rgb
 
       def rgb_color?
-        !!@rgb
+        !!@rgb && !@true_color && !@direct
+      end
+
+      def true_color?
+        !!(@rgb && @true_color)
       end
 
       def gray?
@@ -127,11 +163,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/hsl_triple.rb

@@ -72,8 +72,8 @@ module Term
 
       def initialize(hue, saturation, lightness)
         @hue        = Float(hue) % 360
-        @saturation = [ [ Float(saturation), 0 ].max, 100 ].min
-        @lightness  = [ [ Float(lightness), 0 ].max, 100 ].min
+        @saturation = Float(saturation).clamp(0, 100)
+        @lightness  = Float(lightness).clamp(0, 100)
       end
 
       attr_reader :hue

data/lib/term/ansicolor/hyperlink.rb

@@ -0,0 +1,34 @@
+require 'tins/terminal'
+
+module Term
+  module ANSIColor
+    module Hyperlink
+      def hyperlink(link, string = nil, id: nil, as_link: false)
+        block_given? && string != nil && !respond_to?(:to_str) and
+          raise ArgumentError,
+          "Require either the string argument or a block argument"
+        if link.nil?
+          link = ''
+        end
+        if as_link && !link.empty?
+          string ||= link
+        end
+        result = ''
+        if Term::ANSIColor.coloring?
+          result = "\e]8;#{"id=#{id}" unless id.nil?};" << link.to_str << "\e\\"
+        end
+        if block_given?
+          result << yield.to_s
+        elsif string.respond_to?(:to_str)
+          result << string.to_str
+        elsif respond_to?(:to_str)
+          result << to_str
+        else
+          return result # only switch on
+        end
+        result << "\e]8;;\e\\" if Term::ANSIColor.coloring?
+        result
+      end
+    end
+  end
+end

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/rgb_triple.rb

@@ -59,9 +59,7 @@ module Term
       end
 
       def initialize(red, green, blue)
-        @values = [ red, green, blue ].map { |v|
-          [ [ Integer(v), 0 ].max, 0xff ].min
-        }
+        @values = [ red, green, blue ].map! { |v| v.clamp(0, 0xff) }
       end
 
       def red

data/lib/term/ansicolor/version.rb

@@ -1,6 +1,6 @@
 module Term::ANSIColor
   # Term::ANSIColor version
-  VERSION         = '1.7.1'
+  VERSION         = '1.10.4'
   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,6 @@
 require 'tins/xt/full'
+require 'tins/xt/ask_and_send'
+require 'mize'
 
 module Term
 
@@ -15,25 +17,11 @@ module Term
     require 'term/ansicolor/attribute/intense_color8'
     require 'term/ansicolor/attribute/color256'
     require 'term/ansicolor/movement'
-
     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?
@@ -42,31 +30,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, '')
@@ -81,13 +70,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)
@@ -95,21 +80,40 @@ module Term
       elsif respond_to?(:to_str)
         result << to_str
       else
-        return result #only switch on
+        return result # only switch on
       end
       result << "\e[0m" if Term::ANSIColor.coloring?
       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,45 +1,32 @@
 # -*- encoding: utf-8 -*-
-# stub: term-ansicolor 1.7.1 ruby lib
+# stub: term-ansicolor 1.10.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "term-ansicolor".freeze
-  s.version = "1.7.1"
+  s.version = "1.10.4".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 = "2019-01-18"
+  s.date = "2024-07-15"
   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_snow".freeze, "term_display".freeze, "term_decolor".freeze, "term_cdiff".freeze, "term_mandel".freeze, "term_colortab".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/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 = [".gitignore".freeze, ".travis.yml".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/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/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 = "http://flori.github.com/term-ansicolor".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/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.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
-  s.rubygems_version = "3.0.1".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/ppm_reader_test.rb".freeze, "tests/rgb_color_metrics_test.rb".freeze, "tests/rgb_triple_test.rb".freeze, "tests/test_helper.rb".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]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.0"])
-    else
-      s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_dependency(%q<test-unit>.freeze, [">= 0"])
-      s.add_dependency(%q<tins>.freeze, ["~> 1.0"])
-    end
-  else
-    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
-    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    s.add_dependency(%q<test-unit>.freeze, [">= 0"])
-    s.add_dependency(%q<tins>.freeze, ["~> 1.0"])
-  end
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.16.0".freeze])
+  s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
+  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.5".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,44 @@ class ANSIColorTest < Test::Unit::TestCase
     assert_equal Term::ANSIColor.attributes, 'foo'.attributes
   end
 
+  def test_underline_invalid_type
+    assert_raises(ArgumentError) { Term::ANSIColor.underline(type: :nix) { 'foo' } }
+  end
+
+  def test_underline_invalid_color
+    assert_raises(ArgumentError) { Term::ANSIColor.underline(color: :nix) { 'foo' } }
+  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 +208,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