ansi256 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf28c245bf8d2c7a888e05572ea1270a590bd2c0a906e37171099388ff4eb3a3
-  data.tar.gz: 1e5e1531cd270090d5ccaf931774f4d0cc54afbe2f0e1ba2d298829f5c5de651
+  metadata.gz: 6e0c06de0d942deeb5906752ed223248b699408b93a2bba463bbb848d6b06aea
+  data.tar.gz: a7ea18e9b3902806d43fe46e7b388c8d0152e4e0e365bdb552ad35d11064b12a
 SHA512:
-  metadata.gz: a4209529d49b0ce7ef7acdbfd7072264840c276502281bef42944fe07609828ca02de4b3542d4fafc68f0cfaeb7ef17ddfef24db5fcdcd5e2b12f13caf1723f6
-  data.tar.gz: 59462bdc1e6c8072957674d8fcf7548a0eb20c76cf7021f82a6bffdb93befd7012704991f9190cac4b7587bd27eb1b9b62142a7246d9176cd0e07c1ac5a16686
+  metadata.gz: 8d10be011d96e91b58ccfef63608a466052dfaca7bd25e05ee1c6b83cabc6deaeeefc1e0de4e9f99b19267714f0b88a04b42bac031fe4c5937fc39b9c078c043
+  data.tar.gz: b15f5eab61b1f5be118a69bd9cdbd5972a7ea0adc13a51e462665aaf282c71b4967d917d6ebbc8b17c7e6eb97ecbdae76e2a1d7349ef014330177926ff4829b6

data/lib/ansi256/code.rb

@@ -1,28 +1,30 @@
 module Ansi256
   CODE = {
-    :reset      => 0,
-    :bold       => 1,
-    :dim        => 2,
-    :italic     => 3,
-    :underline  => 4,
+    reset: 0,
+    bold: 1,
+    dim: 2,
+    italic: 3,
+    underline: 4,
+    inverse: 7,
+    strikethrough: 9,
 
-    :black      => 30,
-    :red        => 31,
-    :green      => 32,
-    :yellow     => 33,
-    :blue       => 34,
-    :magenta    => 35,
-    :cyan       => 36,
-    :white      => 37,
+    black: 30,
+    red: 31,
+    green: 32,
+    yellow: 33,
+    blue: 34,
+    magenta: 35,
+    cyan: 36,
+    white: 37,
 
-    :on_black   => 40,
-    :on_red     => 41,
-    :on_green   => 42,
-    :on_yellow  => 43,
-    :on_blue    => 44,
-    :on_magenta => 45,
-    :on_cyan    => 46,
-    :on_white   => 47,
+    on_black: 40,
+    on_red: 41,
+    on_green: 42,
+    on_yellow: 43,
+    on_blue: 44,
+    on_magenta: 45,
+    on_cyan: 46,
+    on_white: 47
   }.freeze
 
   NAMED_COLORS = Set[

data/lib/ansi256/mixin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ansi256
   class << self
     def enabled= bool

data/lib/ansi256/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ansi256
-  VERSION = "0.4.0"
+  VERSION = '0.5.0'
 end

data/lib/ansi256.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 require 'ansi256/version'
 require 'ansi256/code'
@@ -5,7 +7,7 @@ require 'ansi256/mixin'
 
 module Ansi256
   class << self
-    def fg code, str = nil
+    def fg(code, str = nil)
       if str
         wrap str, Ansi256.fg(code)
       elsif NAMED_COLORS.include?(code)
@@ -19,7 +21,7 @@ module Ansi256
       end
     end
 
-    def bg code, str = nil
+    def bg(code, str = nil)
       if str
         wrap str, Ansi256.bg(code)
       elsif NAMED_COLORS.include?(code)
@@ -43,16 +45,17 @@ module Ansi256
       end
     end
 
-    def plain str
+    def plain(str)
       str.gsub(PATTERN, '')
     end
 
-  private
-    PATTERN       = /\e\[[0-9;]+m/.freeze
-    MULTI_PATTERN = /(?:\e\[[0-9;]+m)+/.freeze
+    private
+
+    PATTERN       = /\e\[[0-9;]+m/
+    MULTI_PATTERN = /(?:\e\[[0-9;]+m)+/
     EMPTY_TRIPLE  = [nil, nil, Set.new].freeze
 
-    def ansify prev, curr
+    def ansify(prev, curr)
       nums = []
       nums << curr[0] if prev[0] != curr[0]
       nums << curr[1] if prev[1] != curr[1]
@@ -60,10 +63,11 @@ module Ansi256
       "\e[#{nums.compact.join ';'}m"
     end
 
-    def ansicode_for_rgb rgb
+    def ansicode_for_rgb(rgb)
       return unless rgb.is_a?(String) &&
                     rgb =~ /^#?([0-9a-f]+)$/i
-      rgb = $1
+
+      rgb = ::Regexp.last_match(1)
 
       case rgb.length
       when 2
@@ -81,16 +85,16 @@ module Ansi256
       r * 36 + g * 6 + b + 16
     end
 
-    def wrap str, color
+    def wrap(str, color)
       current = [nil, nil, Set.new]
 
-      (color + str.gsub(PATTERN) { |m|
+      (color + str.gsub(PATTERN) do |m|
         if m =~ /\e\[[^m]*\b0m/
           m + color
         else
           m
         end
-      } << reset).gsub(MULTI_PATTERN) { |ansi|
+      end << reset).gsub(MULTI_PATTERN) do |ansi|
         prev = current.dup
         prev[2] = prev[2].dup
         codes = ansi.scan(/\d+/).map(&:to_i)
@@ -128,7 +132,7 @@ module Ansi256
             ''
           end + ansify(prev, current)
         end
-      }
+      end
     end
   end
 end

data/test/test_ansi256.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 $VERBOSE = true
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'ansi256'
 require 'minitest/autorun'
 
 class TestAnsi256 < Minitest::Test
-  def cfmt col
+  def cfmt(col)
     col.to_s.rjust(5).fg(232).bg(col)
   end
 
@@ -28,40 +30,40 @@ class TestAnsi256 < Minitest::Test
 
   def test_nesting_hello_world
     # Nesting
-    puts world = "World".bg(226).fg(232).underline
+    puts world = 'World'.bg(226).fg(232).underline
     puts hello = "Hello #{world} !".fg(230).bg(75)
     puts say_hello_world = "Say '#{hello}'".fg(30)
     puts say_hello_world.plain.fg(27)
   end
 
   def test_nesting_hello_world2
-    puts world = "World".bg(226).blue.underline
+    puts world = 'World'.bg(226).blue.underline
     puts hello = "Hello #{world} Hello".white.bold
     puts say_hello_world = "Say '#{hello}'".fg(30).underline
     puts say_hello_world.plain.fg(27)
   end
 
   def test_nesting_hello_world3
-    puts world = "World".blue.underline
+    puts world = 'World'.blue.underline
     puts hello = "Hello #{world} Hello".blue.bold
     puts say_hello_world = "Say '#{hello}'".fg(30).underline
     puts say_hello_world.plain.fg(27)
   end
 
   def test_named_colors
-    s = "Colorize me"
-    puts [ s.black,   s.black.bold,   s.white.bold.on_black   ].join ' '
-    puts [ s.red,     s.red.bold,     s.white.bold.on_red     ].join ' '
-    puts [ s.green,   s.green.bold,   s.white.bold.on_green   ].join ' '
-    puts [ s.yellow,  s.yellow.bold,  s.white.bold.on_yellow  ].join ' '
-    puts [ s.blue,    s.blue.bold,    s.white.bold.on_blue    ].join ' '
-    puts [ s.magenta, s.magenta.bold, s.white.bold.on_magenta ].join ' '
-    puts [ s.cyan,    s.cyan.bold,    s.white.bold.on_cyan    ].join ' '
-    puts [ s.white,   s.white.bold,   s.white.bold.on_white   ].join ' '
+    s = 'Colorize me'
+    puts [s.black,   s.black.bold,   s.white.bold.on_black].join ' '
+    puts [s.red,     s.red.bold,     s.white.bold.on_red].join ' '
+    puts [s.green,   s.green.bold,   s.white.bold.on_green].join ' '
+    puts [s.yellow,  s.yellow.bold,  s.white.bold.on_yellow].join ' '
+    puts [s.blue,    s.blue.bold,    s.white.bold.on_blue].join ' '
+    puts [s.magenta, s.magenta.bold, s.white.bold.on_magenta].join ' '
+    puts [s.cyan,    s.cyan.bold,    s.white.bold.on_cyan].join ' '
+    puts [s.white,   s.white.bold,   s.white.bold.on_white].join ' '
   end
 
   def test_named_color_code_with_fg_bg
-    puts "Colorize me".fg(:green).bg(:red).bold.underline
+    puts 'Colorize me'.fg(:green).bg(:red).bold.underline
   end
 
   def test_just_code
@@ -70,6 +72,8 @@ class TestAnsi256 < Minitest::Test
     assert_equal "\e[2m", Ansi256.dim
     assert_equal "\e[3m", Ansi256.italic
     assert_equal "\e[4m", Ansi256.underline
+    assert_equal "\e[7m", Ansi256.inverse
+    assert_equal "\e[9m", Ansi256.strikethrough
 
     assert_equal "\e[30m", Ansi256.black
     assert_equal "\e[31m", Ansi256.red
@@ -130,50 +134,50 @@ class TestAnsi256 < Minitest::Test
 
     assert_equal "\e[38;5;100mHello\e[38;5;200m world\e[0m", "#{'Hello'.fg(100)} world".fg(200)
     assert_equal "\e[38;5;200;4mWow \e[38;5;100mhello\e[38;5;200m world\e[0m",
-      "Wow #{'hello'.fg(100)} world".fg(200).underline
+                 "Wow #{'hello'.fg(100)} world".fg(200).underline
     assert_equal "\e[38;5;200mWow \e[38;5;100;4mhello\e[0m\e[38;5;200m world\e[0m",
-      "Wow #{'hello'.fg(100).underline} world".fg(200)
+                 "Wow #{'hello'.fg(100).underline} world".fg(200)
     assert_equal "\e[38;5;200mWow \e[38;5;100;48;5;50;4mhello\e[0m\e[38;5;200m world\e[0m",
-      "Wow #{'hello'.fg(100).underline.bg(50)} world".fg(200)
+                 "Wow #{'hello'.fg(100).underline.bg(50)} world".fg(200)
     assert_equal "\e[38;5;200;48;5;250mWow \e[38;5;100;48;5;50;4mhello\e[0m\e[38;5;200;48;5;250m world\e[0m",
-      "Wow #{'hello'.fg(100).underline.bg(50)} world".fg(200).bg(250)
-    assert_equal "Wow hello world",
-      "Wow #{'hello'.fg(100).underline.bg(50)} world".fg(200).bg(250).plain
+                 "Wow #{'hello'.fg(100).underline.bg(50)} world".fg(200).bg(250)
+    assert_equal 'Wow hello world',
+                 "Wow #{'hello'.fg(100).underline.bg(50)} world".fg(200).bg(250).plain
 
     assert_equal "\e[32;48;5;200;1mWow \e[38;5;100;44;1;4mhello\e[0m\e[32;48;5;200;1m world\e[0m",
-      "Wow #{'hello'.fg(100).underline.on_blue} world".green.bold.bg(200)
+                 "Wow #{'hello'.fg(100).underline.on_blue} world".green.bold.bg(200)
   end
 
   def test_rgb
     {
-      '00'     => 16,
+      '00' => 16,
       '000000' => 16,
-      '111'    => 16,
-      '11'     => 232,
+      '111' => 16,
+      '11' => 232,
       '101010' => 16,
-      '1a'     => 233,
+      '1a' => 233,
       '1a1a1a' => 16,
-      '20'     => 234,
-      '22'     => 234,
+      '20' => 234,
+      '22' => 234,
       '202020' => 16,
       '222222' => 16,
       '222222' => 16,
-      'ff'     => 255,
+      'ff' => 255,
       'ffffff' => 231,
       'FFFFFF' => 231,
-      'ff0'    => 226,
+      'ff0' => 226,
       'ffff00' => 226,
       'ff0000' => 196,
       '00ff00' => 46,
       '0000ff' => 21,
       'ff9900' => 214,
       '00ffff' => 51,
-      '0ff'    => 51,
+      '0ff' => 51
     }.each do |rgb, ansi|
       assert_equal ansi, Ansi256.fg(rgb).scan(/[0-9]+/).last.to_i
       assert_equal ansi, Ansi256.bg(rgb).scan(/[0-9]+/).last.to_i
     end
-    [:bg, :fg].each do |m|
+    %i[bg fg].each do |m|
       (0..255).each do |r|
         color = r.to_s(16).rjust(2, '0') * 3
         print Ansi256.send(m, color, color + ' ')
@@ -191,27 +195,27 @@ class TestAnsi256 < Minitest::Test
         end
       end
     end
-    puts "RGB Color".fg('ff9900').bg('003366')
-    puts "RGB Color".fg('f90').bg('#036')
-    puts "RGB Color".fg('#ff9900').bg('#003366')
-    puts "RGB Color (Monochrome)".fg('ef').bg('3a')
+    puts 'RGB Color'.fg('ff9900').bg('003366')
+    puts 'RGB Color'.fg('f90').bg('#036')
+    puts 'RGB Color'.fg('#ff9900').bg('#003366')
+    puts 'RGB Color (Monochrome)'.fg('ef').bg('3a')
   end
 
   def test_enabled
     2.times do
-      [:fg, :bg].each do |m|
+      %i[fg bg].each do |m|
         assert Ansi256.enabled?
-        hello = "hello".send(m, 'f90')
+        hello = 'hello'.send(m, 'f90')
         assert_equal 'hello', hello.plain
 
         Ansi256.enabled = false
         assert !Ansi256.enabled?
-        assert hello.length > "hello".send(m, 'f90').length
+        assert hello.length > 'hello'.send(m, 'f90').length
         assert_equal 'hello', hello.plain
 
         Ansi256.enabled = true
         assert Ansi256.enabled?
-        assert_equal hello, "hello".send(m, 'f90')
+        assert_equal hello, 'hello'.send(m, 'f90')
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ansi256
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Junegunn Choi
 bindir: bin
 cert_chain: []
-date: 2025-02-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Colorize text using 256-color ANSI codes
 test_files: