clack 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efda51d5b5f8c7aac33181bc36f72761117fc3b3e6c5707d8197d55d2fde99c0
-  data.tar.gz: 1e324cda3ac98ccefd939e213827e89f36e4cdd22aa237186412ce82bb43d915
+  metadata.gz: e27f6e6ab9835d2855570ebdcd9b74a581becaffad5ba6a814e54ec5d44097b2
+  data.tar.gz: 8788e05802f917a1a6abe06697a4ca47ff451da0235d7336b560adf8558451a0
 SHA512:
-  metadata.gz: 96263cb6a717237125ba7e48cc6bdce5166a49b7ed65d7755c86a0ca3ff0db5e7a4616cc4e84b88577dd67cbda189a02dc7f8dc6f2b2b998c72b7c2475c5ca65
-  data.tar.gz: 5a3179bd6b5d393bbc4dc871584101a929b21fc1ee081b109845905a716e19a54ed2dbd39f6a13b5d3acdfa20c13a8f73d1cb9fd05991d16b4dbcbc74d48a3f5
+  metadata.gz: 173ead18da184ea230092d263bb4e607eb623c788fcdfae7d4315afbebe140bbe5335e42fa7c7ee460481916e46a6fda464f9b13f8d011228648dcf13a799704
+  data.tar.gz: 56fd6c8cbca6c610cb73941f565c84e62c6bcc38d5b48741c35c52b86c14e45ff858219e5973669d1db7beb4bb045259d11daa60d172d3e2603ad16c04e2e812

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.4.6] - 2026-03-22
+
+### Fixed
+- `Settings.printable?` now accepts combining characters and multi-codepoint grapheme clusters (accented letters, emoji)
+- Signal handlers use `write_nonblock` instead of `print` for async safety
+- `S_STEP_ERROR` ASCII fallback changed from `x` to `!` (was identical to `S_STEP_CANCEL`)
+- CI mode validation warnings now print to stderr instead of stdout
+
+### Changed
+- Colors, Cursor, and Symbols ANSI detection unified through `Environment.colors_supported?`
+- Extracted `build_final_frame` template into `Core::Prompt` with `final_display` hook (11 prompt classes simplified)
+- Date prompt: consolidated duplicated segment logic into `update_segment`
+
 ## [0.4.5] - 2026-02-22
 
 ### Fixed

data/lib/clack/colors.rb

@@ -8,12 +8,7 @@ module Clack
   # - FORCE_COLOR environment variable forces colors on
   module Colors
     class << self
-      def enabled?
-        return true if ENV["FORCE_COLOR"] && ENV["FORCE_COLOR"] != "0"
-        return false if ENV["NO_COLOR"]
-
-        $stdout.tty?
-      end
+      def enabled? = Environment.colors_supported?
 
       # @!group Foreground Colors (standard)
 

data/lib/clack/core/cursor.rb

@@ -13,9 +13,7 @@ module Clack
         def enabled?
           return @enabled unless @enabled.nil?
 
-          # Default: check if output supports ANSI escape sequences
-          return true if ENV["FORCE_COLOR"] && ENV["FORCE_COLOR"] != "0"
-          $stdout.tty? && ENV["TERM"] != "dumb" && !ENV["NO_COLOR"]
+          Environment.colors_supported?
         end
 
         # Visibility

data/lib/clack/core/prompt.rb

@@ -316,13 +316,23 @@ module Clack
       end
 
       # Build the final frame shown after interaction ends.
-      # Override to show a different view for completed prompts.
+      # Default renders a one-line summary: bar, symbol+message, styled final value.
+      # Override {#final_display} to customize what value is shown.
+      # Override this entirely for multi-line final output (e.g. MultilineText).
       #
       # @return [String] the final frame content
       def build_final_frame
-        build_frame
+        "#{bar}\n" \
+          "#{symbol_for_state}  #{@message}\n" \
+          "#{bar}  #{styled_final_display}\n"
       end
 
+      # The text to display in the final frame after submit/cancel.
+      # Override in subclasses to customize (e.g. masked password, formatted date).
+      #
+      # @return [String]
+      def final_display = @value.to_s
+
       # Check if prompt has reached a terminal state.
       #
       # @return [Boolean] true if state is :submit or :cancel
@@ -337,13 +347,18 @@ module Clack
       def run_ci_mode
         submit
         if @state == :error
-          @output.print "#{Colors.yellow("!")}  #{Colors.yellow("CI mode: validation failed for")} \"#{@message}\": #{@error_message}\n"
+          $stderr.print "#{Colors.yellow("!")}  #{Colors.yellow("CI mode: validation failed for")} \"#{@message}\": #{@error_message}\n"
         end
         @value
       end
 
       private
 
+      def styled_final_display
+        text = final_display
+        (@state == :cancel) ? Colors.strikethrough(Colors.dim(text)) : Colors.dim(text)
+      end
+
       def warn_narrow_terminal
         return unless Environment.tty?(@output)
 

data/lib/clack/core/settings.rb

@@ -91,9 +91,9 @@ module Clack
           aliases[key] if ACTIONS.include?(aliases[key])
         end
 
-        # Check if a key is a printable character
+        # Check if a key is a printable character (handles combining marks and multi-codepoint grapheme clusters)
         def printable?(key)
-          key && key.length == 1 && key.ord >= PRINTABLE_CHAR_MIN
+          key && key.grapheme_clusters.length == 1 && key.ord >= PRINTABLE_CHAR_MIN
         end
 
         # Check if a key is a backspace/delete

data/lib/clack/prompts/autocomplete.rb

@@ -121,17 +121,7 @@ module Clack
         lines.join
       end
 
-      def build_final_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-
-        display_value = @filtered[@selected_index]&.[](:label) || @value
-        display = (@state == :cancel) ? Colors.strikethrough(Colors.dim(display_value)) : Colors.dim(display_value)
-        lines << "#{bar}  #{display}\n"
-
-        lines.join
-      end
+      def final_display = @filtered[@selected_index]&.[](:label) || @value
 
       private
 

data/lib/clack/prompts/autocomplete_multiselect.rb

@@ -130,17 +130,8 @@ module Clack
         lines.join
       end
 
-      def build_final_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-
-        labels = @all_options.select { |o| @selected.include?(o[:value]) }.map { |o| o[:label] }
-        display_text = labels.join(", ")
-        display = (@state == :cancel) ? Colors.strikethrough(Colors.dim(display_text)) : Colors.dim(display_text)
-        lines << "#{bar}  #{display}\n"
-
-        lines.join
+      def final_display
+        @all_options.select { |o| @selected.include?(o[:value]) }.map { |o| o[:label] }.join(", ")
       end
 
       private

data/lib/clack/prompts/confirm.rb

@@ -71,17 +71,7 @@ module Clack
         lines.join
       end
 
-      def build_final_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-
-        selected = @value ? @active_label : @inactive_label
-        display = (@state == :cancel) ? Colors.strikethrough(Colors.dim(selected)) : Colors.dim(selected)
-        lines << "#{bar}  #{display}\n"
-
-        lines.join
-      end
+      def final_display = @value ? @active_label : @inactive_label
 
       private
 

data/lib/clack/prompts/date.rb

@@ -99,17 +99,7 @@ module Clack
         lines.join
       end
 
-      def build_final_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-
-        display_text = formatted_date
-        display = (@state == :cancel) ? Colors.strikethrough(Colors.dim(display_text)) : Colors.dim(display_text)
-        lines << "#{bar}  #{display}\n"
-
-        lines.join
-      end
+      def final_display = formatted_date
 
       private
 
@@ -164,28 +154,7 @@ module Clack
       def adjust_segment(delta)
         commit_input_buffer
         @input_buffer = ""
-
-        case current_segment_type
-        when :year
-          @year = (@year + delta).clamp(1, 9999)
-          clamp_day_to_month
-        when :month
-          @month += delta
-          @month = wrap_value(@month, 1, 12)
-          clamp_day_to_month
-        when :day
-          max_day = days_in_month(@year, @month)
-          @day = wrap_value(@day + delta, 1, max_day)
-        end
-
-        enforce_bounds
-      end
-
-      def wrap_value(val, min, max)
-        return min if val > max
-        return max if val < min
-
-        val
+        update_segment(segment_value + delta, wrap: true)
       end
 
       def handle_digit(digit)
@@ -201,23 +170,38 @@ module Clack
       def commit_input_buffer
         return if @input_buffer.empty?
 
-        value = @input_buffer.to_i
+        update_segment(@input_buffer.to_i)
         @input_buffer = ""
+      end
 
+      def segment_value
         case current_segment_type
-        when :year
-          @year = value.clamp(1, 9999)
-          clamp_day_to_month
-        when :month
-          @month = value.clamp(1, 12)
-          clamp_day_to_month
-        when :day
-          @day = value.clamp(1, days_in_month(@year, @month))
+        when :year then @year
+        when :month then @month
+        when :day then @day
         end
+      end
+
+      def update_segment(value, wrap: false)
+        constrain = wrap ? method(:wrap_value) : :clamp.to_proc
 
+        case current_segment_type
+        when :year then @year = value.clamp(1, 9999)
+        when :month then @month = constrain.call(value, 1, 12)
+        when :day then @day = constrain.call(value, 1, days_in_month(@year, @month))
+        end
+
+        clamp_day_to_month
         enforce_bounds
       end
 
+      def wrap_value(val, min, max)
+        return min if val > max
+        return max if val < min
+
+        val
+      end
+
       def current_segment_type = FORMATS[@format][:order][@segment]
 
       def days_in_month(year, month)

data/lib/clack/prompts/group_multiselect.rb

@@ -126,18 +126,7 @@ module Clack
         lines.join
       end
 
-      def build_final_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-
-        labels = selected_options.map { |o| o[:label] }
-        display_text = labels.join(", ")
-        display = (@state == :cancel) ? Colors.strikethrough(Colors.dim(display_text)) : Colors.dim(display_text)
-        lines << "#{bar}  #{display}\n"
-
-        lines.join
-      end
+      def final_display = selected_options.map { |o| o[:label] }.join(", ")
 
       private
 

data/lib/clack/prompts/multiselect.rb

@@ -103,17 +103,8 @@ module Clack
         lines.join
       end
 
-      def build_final_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-
-        labels = @options.select { |o| @selected.include?(o[:value]) }.map { |o| o[:label] }
-        display_text = labels.join(", ")
-        display = (@state == :cancel) ? Colors.strikethrough(Colors.dim(display_text)) : Colors.dim(display_text)
-        lines << "#{bar}  #{display}\n"
-
-        lines.join
+      def final_display
+        @options.select { |o| @selected.include?(o[:value]) }.map { |o| o[:label] }.join(", ")
       end
 
       private

data/lib/clack/prompts/password.rb

@@ -51,17 +51,7 @@ module Clack
         lines.join
       end
 
-      def build_final_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-
-        masked = @mask * @value.grapheme_clusters.length
-        display = (@state == :cancel) ? Colors.strikethrough(Colors.dim(masked)) : Colors.dim(masked)
-        lines << "#{bar}  #{display}\n"
-
-        lines.join
-      end
+      def final_display = @mask * @value.grapheme_clusters.length
 
       private
 

data/lib/clack/prompts/path.rb

@@ -124,17 +124,6 @@ module Clack
         lines.join
       end
 
-      def build_final_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-
-        display = (@state == :cancel) ? Colors.strikethrough(Colors.dim(@value)) : Colors.dim(@value)
-        lines << "#{bar}  #{display}\n"
-
-        lines.join
-      end
-
       private
 
       def update_suggestions

data/lib/clack/prompts/range.rb

@@ -67,17 +67,7 @@ module Clack
         lines.join
       end
 
-      def build_final_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-
-        display = format_value(@value)
-        styled = (@state == :cancel) ? Colors.strikethrough(Colors.dim(display)) : Colors.dim(display)
-        lines << "#{bar}  #{styled}\n"
-
-        lines.join
-      end
+      def final_display = format_value(@value)
 
       private
 

data/lib/clack/prompts/select.rb

@@ -80,17 +80,7 @@ module Clack
         lines.join
       end
 
-      def build_final_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-
-        label = current_option[:label]
-        display = (@state == :cancel) ? Colors.strikethrough(Colors.dim(label)) : Colors.dim(label)
-        lines << "#{bar}  #{display}\n"
-
-        lines.join
-      end
+      def final_display = current_option[:label]
 
       private
 

data/lib/clack/prompts/select_key.rb

@@ -63,17 +63,7 @@ module Clack
         lines.join
       end
 
-      def build_final_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-
-        label = @options.find { |o| o[:value] == @value }&.dig(:label).to_s
-        display = (@state == :cancel) ? Colors.strikethrough(Colors.dim(label)) : Colors.dim(label)
-        lines << "#{bar}  #{display}\n"
-
-        lines.join
-      end
+      def final_display = @options.find { |o| o[:value] == @value }&.dig(:label).to_s
 
       private
 

data/lib/clack/prompts/text.rb

@@ -104,17 +104,6 @@ module Clack
         lines.join
       end
 
-      def build_final_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-
-        display = (@state == :cancel) ? Colors.strikethrough(Colors.dim(@value)) : Colors.dim(@value)
-        lines << "#{bar}  #{display}\n"
-
-        lines.join
-      end
-
       private
 
       # Complete the current input using the longest common prefix of matching candidates.

data/lib/clack/symbols.rb

@@ -26,8 +26,7 @@ module Clack
         # Explicit override
         return ENV["CLACK_UNICODE"] == "1" if ENV["CLACK_UNICODE"]
 
-        # Default: TTY and not dumb terminal
-        $stdout.tty? && ENV["TERM"] != "dumb" && !ENV["NO_COLOR"]
+        Environment.colors_supported?
       end
     end
 
@@ -36,7 +35,7 @@ module Clack
     # Unicode cancel step indicator, or ASCII fallback.
     S_STEP_CANCEL = unicode? ? "■" : "x"
     # Unicode error step indicator, or ASCII fallback.
-    S_STEP_ERROR = unicode? ? "▲" : "x"
+    S_STEP_ERROR = unicode? ? "▲" : "!"
     # Unicode submit step indicator, or ASCII fallback.
     S_STEP_SUBMIT = unicode? ? "◇" : "o"
 

data/lib/clack/version.rb

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

data/lib/clack.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require_relative "clack/version"
+require_relative "clack/environment"
 require_relative "clack/symbols"
 require_relative "clack/colors"
-require_relative "clack/environment"
 require_relative "clack/utils"
 require_relative "clack/core/cursor"
 require_relative "clack/core/settings"
@@ -508,15 +508,20 @@ module Clack
   end
 end
 
-# Terminal cleanup on exit - show cursor if it was hidden
+# 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"
+
 at_exit do
-  print "\e[?25h"
+  $stdout.print Clack::Core::Cursor.show
+rescue IOError, SystemCallError
+  # Output unavailable
 end
 
-# Chain INT handler to restore cursor before passing to previous handler
+# Chain INT handler to restore cursor before passing to previous handler.
 previous_int_handler = trap("INT") do
   begin
-    print "\e[?25h"
+    $stdout.write_nonblock(CURSOR_SHOW)
   rescue IOError, SystemCallError
     # Output unavailable — nothing we can do
   end
@@ -532,10 +537,10 @@ previous_int_handler = trap("INT") do
   end
 end
 
-# Handle SIGTERM similarly to INT — restore cursor on graceful kill
+# Handle SIGTERM similarly to INT — restore cursor on graceful kill.
 trap("TERM") do
   begin
-    print "\e[?25h"
+    $stdout.write_nonblock(CURSOR_SHOW)
   rescue IOError, SystemCallError
     # Output unavailable
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clack
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Steve Whittaker
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.8
 specification_version: 4
 summary: Beautiful, minimal CLI prompts
 test_files: []