fatty 0.99.8 → 0.99.8.2

data/lib/fatty/session/output_session.rb

@@ -2,7 +2,11 @@
 
 module Fatty
   class OutputSession < Session
-    VisibleLine = Data.define(:number, :text) do
+    VisibleLine = Data.define(:number, :text, :fragments) do
+      def initialize(number:, text:, fragments: [])
+        super
+      end
+
       def to_s
         text.to_s
       end
@@ -55,9 +59,14 @@ module Fatty
             pager.toggle_paging_mode if pager.mode == :scrolling
           end
           before = output.lines.length
+          Fatty.debug(
+            "output append role=#{payload[:role].inspect} text=#{payload[:text].inspect}",
+            tag: :session,
+          )
           append_output(
             payload.fetch(:text, ""),
             follow: payload.fetch(:follow, true),
+            role: payload[:role],
           )
           reveal_appended_block(before) if payload[:scroll]
           []
@@ -245,17 +254,24 @@ module Fatty
     def visible_lines
       @visible_lines ||=
         if narrowed?
-          terms = narrow_query.split
-
+          terms = narrow_query.downcase.split
           output.lines.each_with_index.filter_map do |text, index|
-            visible_text = visible_output_text(text)
+            visible_text = visible_output_text(text).downcase
             next unless terms.all? { |term| visible_text.include?(term) }
 
-            VisibleLine.new(number: index + 1, text: text)
+            VisibleLine.new(
+              number: index + 1,
+              text: text,
+              fragments: output.fragments_for(index),
+            )
           end
         else
           output.lines.each_with_index.map do |text, index|
-            VisibleLine.new(number: index + 1, text: text)
+            VisibleLine.new(
+              number: index + 1,
+              text: text,
+              fragments: output.fragments_for(index),
+            )
           end
         end
     end
@@ -377,8 +393,8 @@ module Fatty
       vp
     end
 
-    def append_output(text, follow: true)
-      ntrim = @output.append(text.to_s)
+    def append_output(text, follow: true, role: nil)
+      ntrim = @output.append(text.to_s, role: role)
       invalidate_visible_lines!
       @pager.on_append(ntrim: ntrim)
 
@@ -474,7 +490,7 @@ module Fatty
     end
 
     def reset_output!
-      @output.lines.clear
+      @output.clear
       invalidate_visible_lines!
       @viewport.reset
     end

data/lib/fatty/terminal.rb

@@ -139,6 +139,18 @@ module Fatty
       preflight!
       start_curses!
       install_default_sessions!
+
+      if (warning = Fatty::Themes::Manager.warning)
+        apply_command(
+          Command.session(
+            :alert,
+            :show,
+            role: :warn,
+            text: warning,
+          ),
+        )
+      end
+
       Fatty.debug("@sessions: #{@sessions.map(&:id).join('==')}")
 
       @running = true

data/lib/fatty/themes/manager.rb

@@ -3,8 +3,14 @@
 module Fatty
   module Themes
     module Manager
+      attr_reader :warning
+
       FALLBACK_THEME = :terminal
 
+      def self.warning
+        @warning
+      end
+
       def self.registry
         @registry ||=
           begin
@@ -16,6 +22,7 @@ module Fatty
       end
 
       def self.load!
+        @warning = nil
         registry.clear
         Loader.load_dir(Fatty::Config.user_themes_dir, registry: registry)
         Loader.load_dir(Fatty::Config.app_themes_dir, registry: registry) if Fatty::Config.app_themes_dir
@@ -30,10 +37,9 @@ module Fatty
         return @current if @current
 
         theme = Fatty::Config.config[:theme]
-
         @current =
           if theme && !theme.to_s.strip.empty?
-            theme.to_sym
+            set(theme)
           else
             FALLBACK_THEME
           end
@@ -43,10 +49,13 @@ module Fatty
         return current unless theme
 
         t = theme.to_sym
+
         if theme_names.include?(t)
+          @warning = nil
           @current = t
         else
-          Fatty.warn("Unknown theme: #{theme}, falling back to #{FALLBACK_THEME}", tag: :theme)
+          @warning = "Unknown theme in config: '#{theme}'; using '#{FALLBACK_THEME}'"
+          Fatty.warn(@warning, tag: :theme)
           @current = FALLBACK_THEME
         end
       end

data/lib/fatty/themes/resolver.rb

@@ -74,7 +74,7 @@ module Fatty
           info: :output,
           good: :info,
           warn: :info,
-          error: :warn,
+          error: :info,
 
           pager_status: :status,
           line_number: :output,

data/lib/fatty/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fatty
 version: !ruby/object:Gem::Version
-  version: 0.99.8
+  version: 0.99.8.2
 platform: ruby
 authors:
 - Daniel E. Doherty
@@ -128,6 +128,7 @@ email:
 - ded@ddoherty.net
 executables:
 - fatty
+- themer
 extensions: []
 extra_rdoc_files: []
 files:
@@ -136,6 +137,7 @@ files:
 - README.md
 - README.org
 - exe/fatty
+- exe/themer
 - help/help.md
 - lib/fatty.rb
 - lib/fatty/action.rb
@@ -154,6 +156,7 @@ files:
 - lib/fatty/api/progress.rb
 - lib/fatty/api/prompt.rb
 - lib/fatty/api/status.rb
+- lib/fatty/api/suspend.rb
 - lib/fatty/callback_environment.rb
 - lib/fatty/colors.rb
 - lib/fatty/colors/color.rb