terminal-join 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4f77b2eedaa198dd5276fd1b44e2906ad53f2425111441b09003c9f0993827
-  data.tar.gz: ca825fc10dedb431f3c4b1e0b301ce0af35560068078a2ed46765fa488947cb7
+  metadata.gz: 4632ed70f1e9f11fd27622d9a3275adc5620d42feb6f756d517bf06e71450664
+  data.tar.gz: 9d4c892f9f18caa6169fd335fffcac2ca21c7225d101265244d36448486e3866
 SHA512:
-  metadata.gz: 2528e5cbdf18dba398b877dbb0f762d911280765d15964b616c84d2cb0587b54616cadcfd69aa56f29591d8f1c795c471bf355edc170499c45fc97fb394ef098
-  data.tar.gz: 217f084bb96ef62fa5fd7db87f31144878e2efbf5fc35153ca41ca511cdc0fcbff4ddff7e38c5d213d28f4ae32204ab59b1d96b26fffd1a68c58a80636f7e213
+  metadata.gz: 52a73493b0b3e6a07ab821cc5c475395ad4029ac80a878e2f0ad43b6e3ddde97453b01928ce1666b1c1f3aad1caf309eb8ced68f6f4e51a3f19702d22bf93122
+  data.tar.gz: 3e61d912fb3feaa607a270b45810bb75dfb8336fec8d9405fef166c92aeaf511b04053e23add74d7a91157e4c7fe1c246933ac5e7a18844a513f0f04c82ac2cf

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.0.2] - 2023-08-14
+
+- Change `Terminal::Join` from class to module.
+- Added `.rbs`.
+
+## [1.0.2] - 2023-08-08
+
+- Fixed `style` bug when string have ansi code after last newline.
+
 ## [1.0.1] - 2023-01-30
 
 - Downgrade required Ruby version from `3.1.3` to `3.1.2`.

data/Gemfile

@@ -8,3 +8,5 @@ gemspec
 gem 'rake', '~> 13.0'
 
 gem 'rubocop', '~> 1.21'
+
+gem 'rbs'

data/lib/terminal/join/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Terminal
-  class Join
-    VERSION = '1.0.1'
+  module Join
+    VERSION = '1.0.3'
   end
 end

data/lib/terminal/join.rb

@@ -6,10 +6,13 @@ require 'unicode/display_width'
 require_relative 'join/version'
 
 module Terminal
-  class Join
-    def self.style(string, *ansi, halign: :center, valign: :center, width: 0, height: 0, margin: 0)
+  module Join
+    module_function
+
+    def style(string, *ansi, halign: :center, valign: :center, width: 0, height: 0, margin: 0)
       margin = [margin, margin] unless margin.is_a?(Array)
       widths = Paint.unpaint(string).lines.map { Unicode::DisplayWidth.of _1.chomp }
+      widths = [0] if widths.empty?
       max_width = [width, *widths].max
       pad_width = max_width - widths.max + margin[0] * 2
       pad_height = [(height - string.lines.size), 0].max + margin[1] * 2
@@ -25,7 +28,7 @@ module Terminal
             center: pad_width / 2
           }[valign],
           Paint[line.chomp, *ansi] +
-          Paint[' ' * (widths.max - widths[index]), *ansi || nil]
+          Paint[' ' * (widths.max - (widths[index] || 0)), *ansi || nil]
         )
       end
       .then do
@@ -42,7 +45,7 @@ module Terminal
       .join("\n")
     end
 
-    def self.horizontal(*strings, separator: nil, align: :center, &block)
+    def horizontal(*strings, separator: nil, align: :center, &block)
       max_height = strings.flatten.map { _1.to_s.lines.size }.max
       separator = block.call max_height if block
 
@@ -51,12 +54,12 @@ module Terminal
       else
         strings.flat_map { [_1, separator] }[0...-1]
       end
-      .map { self.style _1.to_s, halign: align, height: max_height }
+      .map { style _1.to_s, halign: align, height: max_height }
       .map { _1.lines.map(&:chomp) }
       .transpose.map(&:join).join("\n")
     end
 
-    def self.vertical(*strings, separator: nil, align: :center, &block)
+    def vertical(*strings, separator: nil, align: :center, &block)
       Paint.unpaint(strings.flatten.join("\n"))
       .lines.map { Unicode::DisplayWidth.of _1 }.max => max_width
       separator = block.call max_width if block
@@ -66,7 +69,7 @@ module Terminal
       else
         strings.flat_map { [_1, separator] }[0...-1]
       end
-      .map { self.style _1.to_s, valign: align, width: max_width }
+      .map { style _1.to_s, valign: align, width: max_width }
       .join("\n")
     end
   end

data/sig/ansi_layout.rbs

@@ -1,6 +1,9 @@
 module Terminal
-  class Join
-    VERSION: String
-    # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+  module Join
+    def self?.style: (untyped string, *untyped ansi, ?halign: Symbol, ?valign: Symbol, ?width: Integer, ?height: Integer, ?margin: Integer) -> untyped
+
+    def self?.horizontal: (*untyped strings, ?separator: untyped?, ?align: Symbol) ?{ () -> untyped } -> untyped
+
+    def self?.vertical: (*untyped strings, ?separator: untyped?, ?align: Symbol) ?{ () -> untyped } -> untyped
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal-join
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - NNB
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-29 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Join ANSI strings horizontally/vertically with style.