fatty 0.99.3 → 0.99.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16ab2485e0ddf5436af8c84cddf1e63abff8ec918bb30f4f364b318a8695676a
-  data.tar.gz: 13f60ac107b8da8b610916e9a8e085db2bcc7ea1992f5dbab3922697fad46f4e
+  metadata.gz: 9bc94398dc11c48330c27d9a4e72197c0d0cbb402b426b248d1f0c3cc4d910fa
+  data.tar.gz: 112dbdaa9afb4e637dc405f2a8f69f73afea6375878604cc952598b498bf1ed9
 SHA512:
-  metadata.gz: 6fa1efde1b8ae334344d604869ec8ffdbfc6abe843c0424f5dfdc22cd65b7073c1b09fee5769bc09d19e968fe7728c6b48ef80584bd64e65a1fa43f8633aaed4
-  data.tar.gz: b38f20ea770d1cbc29474f574753c1b7909d34aa9a2eb7adf8610fc171bca18842d8b802c5c59d7be2881efa50288b3c25c8e68296ddafe2da33bb6745c352cc
+  metadata.gz: f47fc3c3e387c39d761022f06fb8486a692ef7b20b81bd97aaa00e250d6f05b06f4f57f3a7a24963e007b6ec56aaf598db6d7ac0991909bf0995529170f2546f
+  data.tar.gz: 2debc225cd6ee1e2a3dc7f14e4f6951f0d1263b01db556fdac9a7f50101ef27a737a7f13495707bc656ac90baebbc57e53819c92f0735888e81ea3ef8c5b2749

data/lib/fatty/ansi/renderer.rb

@@ -9,6 +9,13 @@ module Fatty
         @io = io
       end
 
+      def style(text, role:, palette:)
+        spec = palette&.[](role.to_sym)
+        return text.to_s unless spec
+
+        "#{sgr_for_spec(spec)}#{text}#{reset}"
+      end
+
       def render_line(row:, col:, width:, text:, role:, palette:)
         spec = palette&.[](role)
         return unless spec

data/lib/fatty/api/output.rb

@@ -2,13 +2,20 @@
 
 module Fatty
   module OutputApi
-    def append(text, follow: true)
-      queue(Command.session(output_id, :append, text: text.to_s, follow: follow))
+    def append(text, follow: true, role: nil)
+      payload = {
+        text: output_text(text, role: role),
+        follow: follow,
+      }
+      queue(Command.session(output_id, :append, **payload))
       nil
     end
 
-    def append_now(text, follow: true, mode: nil)
-      payload = { text: text.to_s, follow: follow }
+    def append_now(text, follow: true, mode: nil, role: nil)
+      payload = {
+        text: output_text(text, role: role),
+        follow: follow,
+      }
       payload[:mode] = mode if mode
 
       terminal.apply_command(Command.session(output_id, :append, **payload))
@@ -30,6 +37,19 @@ module Fatty
 
     private
 
+    def output_text(text, role:)
+      text = text.to_s
+      if role
+        Fatty::Ansi::Renderer.new.style(
+          text,
+          role: role,
+          palette: markdown_palette,
+        )
+      else
+        text
+      end
+    end
+
     def markdown_palette
       terminal.renderer.palette if terminal.respond_to?(:renderer) && terminal.renderer
     end

data/lib/fatty/progress.rb

@@ -104,10 +104,14 @@ module Fatty
       text.empty? ? DEFAULT_LABEL : text
     end
 
+    # Return the total but not less than 1 to avoid division-by-zero errors
+    # when calculating percentages.
     def normalize_total(value)
       return if value.nil?
 
-      Integer(value, exception: false)
+      val = Integer(value, exception: false)
+      val = 1 unless val
+      [1, val].max
     end
 
     def normalize_style(value)

data/lib/fatty/session/modal_session.rb

@@ -34,9 +34,18 @@ module Fatty
       cols = ::Curses.cols
       rows = ::Curses.lines
       width, height = geometry(cols: cols, rows: rows)
+
+      # Center the popup horizontally
       x = (cols - width) / 2
+
+      # Put the bottom of the popup window one row above the top of the status
+      # area.
       input_row = renderer.screen.input_rect.row
-      y = [input_row - height - 1, 0].max
+      status_rows =
+        Fatty::Config.config.dig(:status, :max_rows)&.to_i ||
+        StatusSession::DEFAULT_MAX_ROWS
+      y = [input_row - status_rows - height - 1, 0].max
+
       self.win = ::Curses::Window.new(height, width, y, x)
       nil
     end

data/lib/fatty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fatty
-  VERSION = "0.99.3"
+  VERSION = "0.99.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fatty
 version: !ruby/object:Gem::Version
-  version: 0.99.3
+  version: 0.99.5
 platform: ruby
 authors:
 - Daniel E. Doherty
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.0
+rubygems_version: 4.0.17
 specification_version: 4
 summary: Stateful terminal UI with editable input and scrollback
 test_files: []