term-ansicolor 1.10.2 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cbfd241e244b761869192a65bdf1ca6a11ca79910c8daa6633ce6a5aec73d5f
-  data.tar.gz: afe01235e057c5b6faa4b31a13369b8f86a00f9aca4bf07baf95a246ec7cf473
+  metadata.gz: d75f19d115fdee4233a120ece01a38b75c7f0cff14243e477def07b314f55b42
+  data.tar.gz: 9a3c5f4ac0abbd01a552ce2e5358bd1d3b2825c392495c941209e71cdbfb8e07
 SHA512:
-  metadata.gz: ce2c8eaffdaa0e859738f01ab9276b70c2463fa5f647b5e2f5220b6c55c981eb5873a4255a404f17dfecf10479b4a6dfbd6a5bd7692ff1d2954a2d286658248c
-  data.tar.gz: 93733afa943c51b91c530897ce1cda156c927fd993a24defac4f647db9582ce0b8bb791bb272eb4b59f40afcc59af728dbf03ecb725a742013bca5ecb4696d3a
+  metadata.gz: '015294663f0738e6cbeed73b3aa34d7ff6a19a9bc13be6ab683a750956cc854dae0d7630e606ff298252142f35f10b3a4cd02592761d72403bfd2d3de845be82'
+  data.tar.gz: 18741931918cf7c07192263ea683c69c7b6074d44572267e0d01d84d27a0f00ea66a0ae2d95ed2b96eee0e176bdf5f791f92d5aefb78a806ede47f2cc2a3b0ae

data/README.md

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

data/Rakefile

@@ -21,7 +21,7 @@ GemHadar do
   executables.merge Dir['bin/*'].map { |x| File.basename(x) }
 
   dependency             'tins', '~>1.0'
-  dependency             'mize'
+  dependency             'mize', '~>0.5'
   development_dependency 'simplecov'
   development_dependency 'test-unit'
   development_dependency 'utils'

data/VERSION

@@ -1 +1 @@
-1.10.2
+1.10.4

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/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.2'
+  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,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.2 ruby lib
+# stub: term-ansicolor 1.10.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "term-ansicolor".freeze
-  s.version = "1.10.2".freeze
+  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 = "2024-06-22"
+  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_cdiff".freeze, "term_colortab".freeze, "term_decolor".freeze, "term_display".freeze, "term_mandel".freeze, "term_snow".freeze]
@@ -23,10 +23,10 @@ Gem::Specification.new do |s|
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.15.0".freeze])
+  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".freeze])
+  s.add_runtime_dependency(%q<mize>.freeze, ["~> 0.5".freeze])
 end

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/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.2
+  version: 1.10.4
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-22 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: mize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 description: This library uses ANSI escape sequences to control the attributes of
   terminal output
 email: flori@ping.de