formatador 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f775eb2a13c13d00ecb5b23150628a0336716adcf9b3125c35b6d6ca3e12827
-  data.tar.gz: f9cfbb270ef4f89f465bbc09711329e379329c84ba603721c736c8ea59146c42
+  metadata.gz: 907613ddcc1485d890419b8198c117fb441e02e487e61371f50bd455d8aca4a1
+  data.tar.gz: 9f8ad9ea1d10ad47831a6132328aaf7d4cb80e87eb21bcc1f42fda5f0dd81a2a
 SHA512:
-  metadata.gz: 39fe3363f0bb482dc4709c37323f13cfd4422d6e3ad493f4913d9da7f76683c629c61e1d4cf8bc02e89e0bbad6d72b3fa9d4dab6abcab124f7e1289ad0ee9255
-  data.tar.gz: 30d4ea6d8fd9acb1908c39851fd288b215ae11c8c4aebb089e0b1564fa0ee6a93939252f2c4a15e8ecc23e744e21850aaa0f56cb8a345d01ed43eeab96527ae2
+  metadata.gz: 1aaf1339006a7791ccdd9941e21d7b28ab993e528c463aaf089014cbcc88e9861f6fc5aef9b8654d8cce3fbefd81be949b4dc3f20dcd0a5731030345ea3d7ecf
+  data.tar.gz: 8f4026b8a0d35a4ba1eae4eff98d45cff61edc498d6378cf5dc10d86b1b04677669541096bf67a29883eb6306a53af6ba2c23f9b4134b4ad8cfa5526df90adfb

data/changelog.txt

@@ -1,3 +1,14 @@
+v1.2.1 09/17/25
+===============
+
+add color output support for github actions
+fix most lints
+
+v1.2.0 08/08/25
+===============
+
+switch to reline for table-width calculations
+
 v1.1.1 07/11/25
 ===============
 

data/formatador.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'formatador'
-  s.version           = '1.1.1'
-  s.date              = '2025-07-11'
+  s.version           = '1.2.1'
+  s.date              = '2025-09-17'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   # s.add_dependency('DEPNAME', [">= 1.1.0", "< 2.0.0"])
+  s.add_dependency('reline')
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development

data/lib/formatador/table.rb

@@ -80,11 +80,7 @@ class Formatador
   private
 
   def length(value)
-    if Module.const_defined?(:Unicode) && Unicode.respond_to?(:width)
-      Unicode.width(value.to_s.gsub(PARSE_REGEX, ''))
-    else
-      value.to_s.gsub(PARSE_REGEX, '').chars.reduce(0) { |sum, char| sum += char.bytesize > 1 ? 2 : 1 }
-    end
+    Reline::Unicode.calculate_width(value.to_s.gsub(PARSE_REGEX, ''))
 
   rescue NotImplementedError
     value.to_s.gsub(PARSE_REGEX, '').chars.reduce(0) { |sum, char| sum += char.bytesize > 1 ? 2 : 1 }

data/lib/formatador.rb

@@ -1,60 +1,63 @@
+# frozen_string_literal: true
+
 require File.join(File.dirname(__FILE__), 'formatador', 'table')
 require File.join(File.dirname(__FILE__), 'formatador', 'progressbar')
 
-class Formatador
+require 'reline' # for table char width calculations
 
-  VERSION = '1.1.1'
+class Formatador
+  VERSION = '1.2.1'
 
   STYLES = {
-    :"\/"             => "0",
-    :reset            => "0",
-    :bold             => "1",
-    :underline        => "4",
-    :blink_slow       => "5",
-    :blink_fast       => "6",
-    :negative         => "7", # invert color/color
-    :normal           => "22",
-    :underline_none   => "24",
-    :blink_off        => "25",
-    :positive         => "27", # revert color/color
-    :_black_          => "40",
-    :_red_            => "41",
-    :_green_          => "42",
-    :_yellow_         => "43",
-    :_blue_           => "44",
-    :_magenta_        => "45",
-    :_purple_         => "45",
-    :_cyan_           => "46",
-    :_white_          => "47",
-    :_light_black_    => "100",
-    :_light_red_      => "101",
-    :_light_green_    => "102",
-    :_light_yellow_   => "103",
-    :_light_blue_     => "104",
-    :_light_magenta_  => "105",
-    :_light_purple_   => "105",
-    :_light_cyan_     => "106",
-    :black            => "30",
-    :red              => "31",
-    :green            => "32",
-    :yellow           => "33",
-    :blue             => "34",
-    :magenta          => "35",
-    :purple           => "35",
-    :cyan             => "36",
-    :white            => "37",
-    :light_black      => "90",
-    :light_red        => "91",
-    :light_green      => "92",
-    :light_yellow     => "93",
-    :light_blue       => "94",
-    :light_magenta    => "95",
-    :light_purple     => "95",
-    :light_cyan       => "96",
-  }
-
-  PARSE_REGEX  = /\[(#{ STYLES.keys.join('|') })\]/ix
-  INDENT_REGEX = /\[indent\]/ix
+    "\/": '0',
+    reset: '0',
+    bold: '1',
+    underline: '4',
+    blink_slow: '5',
+    blink_fast: '6',
+    negative: '7', # invert color/color
+    normal: '22',
+    underline_none: '24',
+    blink_off: '25',
+    positive: '27', # revert color/color
+    _black_: '40',
+    _red_: '41',
+    _green_: '42',
+    _yellow_: '43',
+    _blue_: '44',
+    _magenta_: '45',
+    _purple_: '45',
+    _cyan_: '46',
+    _white_: '47',
+    _light_black_: '100',
+    _light_red_: '101',
+    _light_green_: '102',
+    _light_yellow_: '103',
+    _light_blue_: '104',
+    _light_magenta_: '105',
+    _light_purple_: '105',
+    _light_cyan_: '106',
+    black: '30',
+    red: '31',
+    green: '32',
+    yellow: '33',
+    blue: '34',
+    magenta: '35',
+    purple: '35',
+    cyan: '36',
+    white: '37',
+    light_black: '90',
+    light_red: '91',
+    light_green: '92',
+    light_yellow: '93',
+    light_blue: '94',
+    light_magenta: '95',
+    light_purple: '95',
+    light_cyan: '96'
+  }.freeze
+
+  PARSE_REGEX  = /\[(#{STYLES.keys.join('|')})\]/ix.freeze
+  INDENT_REGEX = /\[indent\]/ix.freeze
 
   def initialize
     @indent = 1
@@ -73,21 +76,21 @@ class Formatador
   end
 
   def display_lines(lines = [])
-    for line in [*lines]
+    [*lines].each do |line|
       display_line(line)
     end
     nil
   end
 
   def parse(string)
-    if $stdout.tty?
-      string.gsub(PARSE_REGEX) { "\e[#{STYLES[$1.to_sym]}m" }.gsub(INDENT_REGEX) { indentation }
+    if color_support
+      string.gsub(PARSE_REGEX) { "\e[#{STYLES[::Regexp.last_match(1).to_sym]}m" }.gsub(INDENT_REGEX) { indentation }
     else
       strip(string)
     end
   end
 
-  def indent(&block)
+  def indent
     @indent += 1
     yield
   ensure
@@ -100,7 +103,7 @@ class Formatador
 
   def redisplay(string = '', width = 120)
     print("\r#{' ' * width}\r")
-    display("#{string}")
+    display(string.to_s)
     nil
   end
 
@@ -119,7 +122,7 @@ class Formatador
     string.gsub(PARSE_REGEX, '').gsub(INDENT_REGEX) { indentation }
   end
 
-  %w{display display_line display_lines indent parse redisplay redisplay_line new_line redisplay_progressbar}.each do |method|
+  %w[display display_line display_lines indent parse redisplay redisplay_line new_line redisplay_progressbar].each do |method|
     eval <<-DEF
       def self.#{method}(*args, &block)
         Thread.current[:formatador] ||= new
@@ -128,7 +131,7 @@ class Formatador
     DEF
   end
 
-  %w{display_table display_compact_table}.each do |method|
+  %w[display_table display_compact_table].each do |method|
     eval <<-DEF
       def self.#{method}(*args, **kwargs, &block)
         Thread.current[:formatador] ||= new
@@ -137,4 +140,9 @@ class Formatador
     DEF
   end
 
+  private
+
+  def color_support
+    @color_support ||= $stdout.tty? || ENV['GITHUB_ACTIONS'] == 'true'
+  end
 end

data/tests/table_tests.rb

@@ -153,4 +153,22 @@ OUTPUT
     end
   end
 
+output = <<-OUTPUT
+    +----+
+    | [bold]a[/]  |
+    +----+
+    | 1  |
+    +----+
+    | 🤷 |
+    +----+
+OUTPUT
+  output = Formatador.parse(output)
+
+  tests("#display_table([{:a => 1}, {:a => '🤷'}])").returns(output) do
+    capture_stdout do
+      Formatador.display_table([{:a => 1}, {:a => '🤷'}])
+    end
+  end
+
+
 end

metadata

@@ -1,14 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: formatador
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - geemus (Wesley Beary)
 bindir: bin
 cert_chain: []
-date: 2025-07-11 00:00:00.000000000 Z
+date: 2025-09-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: reline
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement