term-ansicolor 1.10.1 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 768db698164c4d6226839c11932c868d2a6e93e2c6d6db03e5fbee3422b8ecf7
-  data.tar.gz: 025abdbb49d4c589a00e70c7f467612d24748cc7b43db3901ca7b9bde909e906
+  metadata.gz: 4ec4bd5406d6a919febb9444a996f99a153a18562d1728bc94483b2a1ac32f8a
+  data.tar.gz: 48e114e79275436a11dc3db76a2308a0ad804125195196ff24ace6cbe4e2354d
 SHA512:
-  metadata.gz: ea842c5808c77941ba10f1599cda75bd8a32c07317c126298b4000b7340111f83a0dc6c7b79862d8e708860f5b4e0f2ede10e82d7a7e678fb9cf3f7122473266
-  data.tar.gz: 2edff8a89a38ad47f54f9110923ae2a809e9196f8222d9da6ba82513bdd650eff66623baeacfb075cccc03e7b21728c1a3a58a6d759aceb61336f271a6a15add
+  metadata.gz: 9013380ea29dd3b95d46d878c033a7f1e0d686b9f37d117dd2794fea5262122074685bf064bec5277116089f8b6b747e2e12a8daf33045ef0a501a3cd16c59f8
+  data.tar.gz: fd371c1dc99443dd49c30406930a2f1c687d6584f364b01505192746d851dacae619502c00ce90731812b148eab22de4f245e1256a2fc5dd7eb3980b520c3190

data/.all_images.yml

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

data/README.md

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

data/VERSION

@@ -1 +1 @@
-1.10.1
+1.10.3

data/bin/term_mandel

@@ -1,31 +1,32 @@
 #!/usr/bin/env ruby
 
 require 'term/ansicolor'
+include Term::ANSIColor
 require 'tins/xt'
-require "complex"
 include Tins::GO
+require "complex"
 
-@width, @height = Tins::Terminal.cols, Tins::Terminal.lines
+$width, $height = Tins::Terminal.cols, Tins::Terminal.lines
+$height *= 2
 
 def color_random
   (1..3).map { rand(255) }
 end
 
 def draw_set(rx, ry)
-  sx = (rx.end - rx.begin).abs / @width
-  sy = (ry.end - ry.begin).abs / @height
+  sx = (rx.end - rx.begin).abs / $width
+  sy = (ry.end - ry.begin).abs / $height
 
-  ac    = Term::ANSIColor
   steps = 16
-  color = (5.times.map { color_random } + [ 0, 0, 0 ]).map { ac::Attribute[_1] }
+  color = (5.times.map { color_random } + [ 0, 0, 0 ]).map { Attribute[_1] }
   color = color[1..-1].inject(color[0,1]) { |c, x|
     c + c.last.gradient_to(x, steps:)
   }
   iters = color.size - 2
 
-  text = ''
-  for j in 0...@height
-    for i in 0...@width
+  data = [ [] ]
+  for j in 0...$height
+    for i in 0...$width
       n, z_n = 0, Complex(0, 0)
       c = Complex(sx * i + rx.begin, sy * j + ry.begin)
       while n <= iters
@@ -33,11 +34,18 @@ def draw_set(rx, ry)
         z_n = z_n ** 2 + c
         n += 1
       end
-      text << ac.on_color(color[n]) << ' '
+      data.last << n
+    end
+    data << []
+  end
+  screen = ''
+  (0...$height).step(2) do |j|
+    (0...$width).each do |i|
+      screen << color(color[data[j][i]]) <<
+        on_color(color[data[j + 1][i]]) << ?▀
     end
-    text << ac.reset << "\n"
   end
-  puts text
+  print move_home, screen, reset
 end
 
 opts = go 'x:y'

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

@@ -15,12 +15,12 @@ module Term
             dashed:  '4:5',
           }.fetch(type) { raise ArgumentError, "invalid line type" }
           if color
-            a          = Term::ANSIColor::Attribute[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 * ?;}"
+              if rgb = a.ask_and_send(:to_rgb_triple).full?(:to_a)
+                "\e[58;2;#{rgb * ?;}"
               else
-                raise ArgumentError, "invalid color #{a.name.inspect}"
+                raise ArgumentError, "invalid color #{a&.name.inspect}"
               end
             code = "#{code}m#{color_code}"
           end

data/lib/term/ansicolor/attribute.rb

@@ -87,6 +87,7 @@ module Term
         @name       = name.to_sym
         @background = !!options[:background]
         @code       = code.to_s
+        @direct     = false
         @true_color = false
         if rgb = options[:true_color]
           @true_color = true

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/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.10.1'
+  VERSION         = '1.10.3'
   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 'tins/xt/ask_and_send'
 require 'mize'
 
 module Term

data/term-ansicolor.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: term-ansicolor 1.10.1 ruby lib
+# stub: term-ansicolor 1.10.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "term-ansicolor".freeze
-  s.version = "1.10.1".freeze
+  s.version = "1.10.3".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-21"
+  s.date = "2024-07-14"
   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]

data/tests/ansicolor_test.rb

@@ -134,6 +134,14 @@ 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 }

data/tests/attribute_test.rb

@@ -98,7 +98,7 @@ class AttributeTest < Test::Unit::TestCase
     )
     assert_equal %w[
       #00ffaf #1febaa #3ed7a5 #5dc3a0 #7caf9b #9b9b96 #ba8791 #d9738c #ff5f87
-    ], g1.map { _1.rgb.html }
+    ], g1.map { |c| c.rgb.html }
     g2 = Attribute['#30ffaa'].gradient_to(
       Attribute['#ff507f'],
       steps: 9,
@@ -107,6 +107,6 @@ class AttributeTest < Test::Unit::TestCase
     )
     assert_equal %w[
       #00ffaf #1febaa #3ed7a5 #5dc3a0 #7caf9b #9b9b96 #ba8791 #d9738c #ff5f87
-    ], g2.map { _1.rgb.html }
+    ], g2.map { |c| c.rgb.html }
   end
 end

data/tests/hsl_triple_test.rb

@@ -80,6 +80,6 @@ class HSLTripleTest < Test::Unit::TestCase
   end
 
   def test_method_missing
-    assert_raise(NoMethodError) { @pastel_green_hsl.foo }
+    assert_raises(NoMethodError) { @pastel_green_hsl.foo }
   end
 end

data/tests/hyperlink_test.rb

@@ -43,7 +43,7 @@ class HyperlinkTest < Test::Unit::TestCase
   end
 
   def test_hyperlink_block_arg
-    assert_raise(ArgumentError) { hyperlink(@link, 'bar') { 'baz' } }
+    assert_raises(ArgumentError) { hyperlink(@link, 'bar') { 'baz' } }
     assert_equal(
       "\e]8;;#@link\e\\foo\e]8;;\e\\",
       hyperlink(@link) { 'foo' }

data/tests/rgb_triple_test.rb

@@ -96,6 +96,6 @@ class RgbTripleTest < Test::Unit::TestCase
   end
 
   def test_method_missing
-    assert_raise(NoMethodError) { RGBTriple.new(0, 0, 0).foo }
+    assert_raises(NoMethodError) { RGBTriple.new(0, 0, 0).foo }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: term-ansicolor
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.3
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-21 00:00:00.000000000 Z
+date: 2024-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar