clack 0.4.6 → 0.6.0

data/lib/clack/utils.rb

@@ -11,11 +11,28 @@ module Clack
         text.to_s.gsub(/\e\[[0-9;]*[a-zA-Z]/, "")
       end
 
-      # Get visible length of text (excluding ANSI codes)
-      # @param text [String] Text potentially containing ANSI codes
-      # @return [Integer] Visible character count
+      # Get visible length (display width in columns) of text after stripping ANSI.
+      # Uses display_width to correctly measure CJK, emoji, combining chars.
+      # @param text [String]
+      # @return [Integer] display columns
       def visible_length(text)
-        strip_ansi(text).length
+        display_width(strip_ansi(text))
+      end
+
+      # Calculate the terminal display width (columns) of a string.
+      # ASCII and most chars: width 1. CJK ideographs, fullwidth forms, common emoji: width 2.
+      # Zero-width joiners, combining marks, variation selectors: width 0.
+      # @param string [String]
+      # @return [Integer]
+      def display_width(string)
+        str = string.to_s
+        return 0 if str.empty?
+
+        width = 0
+        str.grapheme_clusters.each do |cluster|
+          width += grapheme_width(cluster)
+        end
+        width
       end
 
       # Wrap text to a specified width, preserving ANSI codes
@@ -54,7 +71,7 @@ module Clack
       def truncate(text, width, ellipsis: "...")
         return text if visible_length(text) <= width
 
-        target = width - ellipsis.length
+        target = width - visible_length(ellipsis)
         return ellipsis if target <= 0
 
         # Handle ANSI codes: we need to truncate visible chars while preserving codes
@@ -98,38 +115,105 @@ module Clack
 
       def break_long_word(word, width)
         lines = []
-        stripped = strip_ansi(word)
-        position = 0
-
-        while position < stripped.length
-          lines << stripped[position, width]
-          position += width
+        clusters = strip_ansi(word).grapheme_clusters
+
+        chunk = +""
+        chunk_width = 0
+        clusters.each do |gc|
+          gw = grapheme_width(gc)
+          if chunk_width + gw > width && !chunk.empty?
+            lines << chunk
+            chunk = +""
+            chunk_width = 0
+          end
+          chunk << gc
+          chunk_width += gw
+          # Force include first grapheme even if its width exceeds limit
+          if gw > width && chunk_width == gw
+            lines << chunk
+            chunk = +""
+            chunk_width = 0
+          end
         end
+        lines << chunk unless chunk.empty?
 
         lines
       end
 
       def truncate_visible(text, target_len)
-        result = ""
-        visible_count = 0
+        result = +""
+        visible_width = 0
         position = 0
+        ansi_re = /\A\e\[[0-9;]*[a-zA-Z]/
 
-        while position < text.length && visible_count < target_len
-          if text[position] == "\e" && (match = text[position..].match(/\A\e\[[0-9;]*[a-zA-Z]/))
-            # ANSI sequence - include it but don't count
-            result += match[0]
+        while position < text.length && visible_width < target_len
+          if text[position] == "\e" && (match = text[position..].match(ansi_re))
+            result << match[0]
             position += match[0].length
           else
-            result += text[position]
-            visible_count += 1
-            position += 1
+            # Extract the grapheme cluster starting at this position
+            gc = text[position..].grapheme_clusters.first
+            break unless gc
+
+            gw = grapheme_width(gc)
+            break if visible_width + gw > target_len
+            result << gc
+            visible_width += gw
+            position += gc.length
           end
         end
 
-        # Add reset if we have unclosed ANSI codes
-        result += "\e[0m" if result.include?("\e[") && !result.end_with?("\e[0m")
+        result << "\e[0m" if result.include?("\e[") && !result.end_with?("\e[0m")
         result
       end
+
+      # Width of a grapheme cluster: the max char_width among its codepoints.
+      # Handles ZWJ emoji sequences, combining marks, and flag sequences correctly.
+      def grapheme_width(cluster)
+        max_w = 0
+        cluster.each_char do |char|
+          w = char_width(char)
+          max_w = w if w > max_w
+        end
+        max_w
+      end
+
+      def char_width(char)
+        code = char.ord
+        return 0 if zero_width_code?(code)
+        return 2 if wide_char_code?(code)
+        1
+      end
+
+      def zero_width_code?(code)
+        return true if (0x0300..0x036F).cover?(code)
+        return true if (0x1AB0..0x1AFF).cover?(code)
+        return true if (0x20D0..0x20FF).cover?(code)
+        return true if [0x200B, 0x200C, 0x200D, 0xFEFF].include?(code)
+        return true if (0xFE00..0xFE0F).cover?(code)
+        false
+      end
+
+      def wide_char_code?(code)
+        # CJK Unified + extensions + compatibility
+        return true if (0x4E00..0x9FFF).cover?(code)
+        return true if (0x3400..0x4DBF).cover?(code)
+        return true if (0xF900..0xFAFF).cover?(code)
+        # Korean Hangul syllables
+        return true if (0xAC00..0xD7AF).cover?(code)
+        # Japanese kana
+        return true if (0x3040..0x309F).cover?(code)
+        return true if (0x30A0..0x30FF).cover?(code)
+        # Fullwidth and wide punctuation
+        return true if (0x3000..0x303F).cover?(code)
+        return true if (0xFF01..0xFF5E).cover?(code)
+        return true if (0xFFE0..0xFFE6).cover?(code)
+        # Common emoji / symbols blocks that render as wide
+        return true if (0x1F000..0x1F9FF).cover?(code)
+        return true if (0x2600..0x26FF).cover?(code)
+        return true if (0x2700..0x27BF).cover?(code)
+        false
+      end
     end
   end
 end

data/lib/clack/version.rb

@@ -2,5 +2,5 @@
 
 module Clack
   # Current gem version.
-  VERSION = "0.4.6"
+  VERSION = "0.6.0"
 end

data/lib/clack.rb

@@ -13,6 +13,7 @@ require_relative "clack/core/options_helper"
 require_relative "clack/core/text_input_helper"
 require_relative "clack/core/scroll_helper"
 require_relative "clack/core/fuzzy_matcher"
+require_relative "clack/core/selection_manager"
 require_relative "clack/core/ci_mode"
 require_relative "clack/prompts/text"
 require_relative "clack/prompts/multiline_text"
@@ -505,47 +506,80 @@ module Clack
       load demo_path
       run_demo
     end
-  end
-end
 
-# Terminal cleanup on exit — show cursor if it was hidden.
-# Uses raw write(2) for async-signal safety in trap handlers.
-CURSOR_SHOW = "\e[?25h"
+    # Install signal handlers for clean terminal cleanup.
+    # Call this once in your CLI entry point. Handles INT, TERM, and SIGWINCH.
+    # Without calling this, Ctrl+C may leave the cursor hidden.
+    #
+    # @return [void]
+    def setup!
+      return if @setup_done
 
-at_exit do
-  $stdout.print Clack::Core::Cursor.show
-rescue IOError, SystemCallError
-  # Output unavailable
-end
+      @setup_done = true
+      install_signal_handlers
+      install_at_exit
+      Core::Prompt.setup_signal_handler
+    end
 
-# Chain INT handler to restore cursor before passing to previous handler.
-previous_int_handler = trap("INT") do
-  begin
-    $stdout.write_nonblock(CURSOR_SHOW)
-  rescue IOError, SystemCallError
-    # Output unavailable — nothing we can do
-  end
-  case previous_int_handler
-  when Proc
-    begin
-      previous_int_handler.call
-    rescue
-      exit(130)
-    end
-  when "DEFAULT", "SYSTEM_DEFAULT" then exit(130)
-  else exit(130)
-  end
-end
+    # @return [Boolean] whether setup! has been called
+    def setup? = !!@setup_done
 
-# Handle SIGTERM similarly to INT — restore cursor on graceful kill.
-trap("TERM") do
-  begin
-    $stdout.write_nonblock(CURSOR_SHOW)
-  rescue IOError, SystemCallError
-    # Output unavailable
+    private
+
+    CURSOR_SHOW = "\e[?25h"
+    private_constant :CURSOR_SHOW
+
+    def install_at_exit
+      at_exit do
+        $stdout.print Core::Cursor.show
+      rescue IOError, SystemCallError
+        # Output unavailable
+      end
+    end
+
+    def install_signal_handlers
+      # Chain INT handler to restore cursor before passing to previous handler.
+      previous_int_handler = trap("INT") do
+        begin
+          $stdout.write_nonblock(CURSOR_SHOW)
+        rescue IOError, SystemCallError
+          # Output unavailable
+        end
+        case previous_int_handler
+        when Proc
+          begin
+            previous_int_handler.call
+          rescue
+            exit(130)
+          end
+        when "DEFAULT", "SYSTEM_DEFAULT" then exit(130)
+        else exit(130)
+        end
+      end
+
+      # Chain TERM handler to restore cursor, then delegate to previous handler.
+      previous_term_handler = trap("TERM") do
+        begin
+          $stdout.write_nonblock(CURSOR_SHOW)
+        rescue IOError, SystemCallError
+          # Output unavailable
+        end
+        case previous_term_handler
+        when Proc
+          begin
+            previous_term_handler.call
+          rescue
+            exit(143)
+          end
+        when "DEFAULT", "SYSTEM_DEFAULT" then exit(143)
+        else exit(143)
+        end
+      end
+    end
   end
-  exit(143)
 end
 
-# Set up SIGWINCH handler for terminal resize
-Clack::Core::Prompt.setup_signal_handler
+# Auto-setup for backwards compatibility.
+# Libraries that require 'clack' get signal handlers installed automatically.
+# To opt out, set CLACK_NO_AUTO_SETUP=1 before requiring clack.
+Clack.setup! unless ENV["CLACK_NO_AUTO_SETUP"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clack
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Steve Whittaker
@@ -50,6 +50,7 @@ files:
 - lib/clack/core/options_helper.rb
 - lib/clack/core/prompt.rb
 - lib/clack/core/scroll_helper.rb
+- lib/clack/core/selection_manager.rb
 - lib/clack/core/settings.rb
 - lib/clack/core/text_input_helper.rb
 - lib/clack/environment.rb
@@ -84,7 +85,6 @@ homepage: https://github.com/swhitt/clackrb
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/swhitt/clackrb
   source_code_uri: https://github.com/swhitt/clackrb
   changelog_uri: https://github.com/swhitt/clackrb/blob/main/CHANGELOG.md
   bug_tracker_uri: https://github.com/swhitt/clackrb/issues
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Beautiful, minimal CLI prompts
 test_files: []