foruiman 0.1.2 → 0.3.0

data/lib/foruiman/tui/input_line.rb

@@ -0,0 +1,217 @@
+# frozen_string_literal: true
+
+module Foruiman::TUI
+  class InputLine
+    # Leave room for the newline in the child's canonical terminal buffer.
+    MAX_BYTES = 4095
+    HISTORY_SIZE = 100
+    SEQUENCES = {
+      "\e[A" => :history_previous, "\e[B" => :history_next,
+      "\e[C" => :right, "\e[D" => :left,
+      "\e[H" => :home, "\e[F" => :end,
+      "\e[1~" => :home, "\e[4~" => :end, "\e[3~" => :delete
+    }.freeze
+    CONTROLS = {
+      1 => :home, 3 => :interrupt, 4 => :eof, 5 => :end, 8 => :backspace,
+      10 => :submit, 13 => :submit, 18 => :history_previous, 21 => :clear, 23 => :delete_word,
+      24 => :detach, 127 => :backspace
+    }.freeze
+
+    attr_reader :text, :cursor
+
+    def initialize
+      @text = +""
+      @cursor = 0
+      @bytes = +"".b
+      @history = []
+      @history_index = nil
+      @draft = nil
+    end
+
+    def feed(bytes)
+      bytes, detach, = bytes.b.partition("\x18")
+      @bytes << bytes
+      events = []
+      until @bytes.empty?
+        if @bytes.start_with?("\e")
+          if @bytes.bytesize > 64 && incomplete_escape?
+            @bytes.clear
+            break
+          end
+          break if incomplete_escape?
+
+          sequence = SEQUENCES.keys.find { |candidate| @bytes.start_with?(candidate) }
+          if sequence
+            edit(SEQUENCES.fetch(sequence))
+            @bytes.slice!(0, sequence.bytesize)
+          else
+            match = @bytes.match(%r{\A\e(?:\[[0-?]*[ -/]*[@-~]|O.|.)}m)
+            @bytes.slice!(0, match ? match[0].bytesize : 1)
+          end
+          next
+        end
+
+        byte = @bytes.getbyte(0)
+        if @after_cr && byte == 10
+          @bytes.slice!(0, 1)
+          @after_cr = false
+          next
+        end
+        @after_cr = byte == 13
+        if CONTROLS.key?(byte)
+          @bytes.slice!(0, 1)
+          event = edit(CONTROLS.fetch(byte))
+          events << event if event
+        elsif byte < 32
+          @bytes.slice!(0, 1)
+        else
+          character = next_character
+          break unless character
+
+          insert(character)
+        end
+      end
+      unless detach.empty?
+        @bytes.clear
+        clear
+        events << :detach
+      end
+      events
+    end
+
+    def clear
+      replace("")
+      @history_index = nil
+      @draft = nil
+    end
+
+    private
+
+    def edit(action)
+      case action
+      when :left then @cursor -= 1 if cursor.positive?
+      when :right then @cursor += 1 if cursor < graphemes.size
+      when :home then @cursor = 0
+      when :end then @cursor = graphemes.size
+      when :backspace then remove(cursor - 1) if cursor.positive?
+      when :delete then remove(cursor) if cursor < graphemes.size
+      when :delete_word then delete_word
+      when :clear then clear
+      when :history_previous then history_previous
+      when :history_next then history_next
+      when :submit then return submit
+      when :interrupt
+        clear
+        return :interrupt
+      when :eof
+        return :eof if text.empty?
+
+        remove(cursor) if cursor < graphemes.size
+      when :detach
+        clear
+        return :detach
+      end
+      nil
+    end
+
+    def submit
+      line = text.dup
+      @history << line.freeze unless line.empty? || @history.last == line
+      @history.shift if @history.size > HISTORY_SIZE
+      clear
+      [:submit, line]
+    end
+
+    def insert(character)
+      return if text.bytesize + character.bytesize > MAX_BYTES
+      return if character.match?(/[\u0080-\u009f]/)
+
+      if character.ascii_only? && cursor == text.length
+        @text << character
+        @cursor += 1
+        @history_index = nil
+        return
+      end
+
+      parts = graphemes
+      parts.insert(cursor, character)
+      @text = parts.join
+      @cursor = [cursor + 1, graphemes.size].min
+      @history_index = nil
+    end
+
+    def remove(index)
+      parts = graphemes
+      parts.delete_at(index)
+      @text = parts.join
+      @cursor -= 1 if index < cursor
+      @history_index = nil
+    end
+
+    def delete_word
+      parts = graphemes
+      index = cursor
+      index -= 1 while index.positive? && parts[index - 1].match?(/\s/)
+      index -= 1 while index.positive? && !parts[index - 1].match?(/\s/)
+      parts.slice!(index...cursor)
+      @text = parts.join
+      @cursor = index
+      @history_index = nil
+    end
+
+    def history_previous
+      return if @history.empty?
+
+      @draft = text.dup unless @history_index
+      @history_index = [(@history_index || @history.size) - 1, 0].max
+      replace(@history.fetch(@history_index))
+    end
+
+    def history_next
+      return unless @history_index
+
+      @history_index += 1
+      if @history_index >= @history.size
+        @history_index = nil
+        replace(@draft.to_s)
+        @draft = nil
+      else
+        replace(@history.fetch(@history_index))
+      end
+    end
+
+    def replace(value)
+      @text = +value
+      @cursor = graphemes.size
+    end
+
+    def graphemes
+      text.scan(/\X/)
+    end
+
+    def next_character
+      size = utf8_size(@bytes.getbyte(0))
+      return @bytes.slice!(0, 1).force_encoding(Encoding::UTF_8).scrub unless size
+      unless @bytes.byteslice(1, size - 1).bytes.all? { |byte| byte.between?(128, 191) }
+        return @bytes.slice!(0, 1).force_encoding(Encoding::UTF_8).scrub
+      end
+      return if @bytes.bytesize < size
+
+      @bytes.slice!(0, size).force_encoding(Encoding::UTF_8).scrub
+    end
+
+    def utf8_size(byte)
+      case byte
+      when 0..127 then 1
+      when 194..223 then 2
+      when 224..239 then 3
+      when 240..244 then 4
+      end
+    end
+
+    def incomplete_escape?
+      @bytes == "\e" || @bytes == "\e[" || @bytes == "\eO" ||
+        (@bytes.start_with?("\e[") && !@bytes.match?(%r{\A\e\[[0-?]*[ -/]*[@-~]}))
+    end
+  end
+end

data/lib/foruiman/tui/keyboard.rb

@@ -12,7 +12,7 @@ module Foruiman::TUI
       "\t" => :next, "h" => :previous, "l" => :next, "k" => :up, "j" => :down,
       "g" => :home, "G" => :end, "f" => :follow, " " => :toggle_follow,
       "r" => :restart, "R" => :restart_all, "s" => :stop, "S" => :stop_all,
-      "?" => :help, "q" => :quit, "\x03" => :quit,
+      "i" => :input, "?" => :help, "q" => :quit, "\x03" => :quit,
       "\x15" => :page_up, "\x04" => :page_down
     }.freeze
 

data/lib/foruiman/tui/log_formatter.rb

@@ -30,6 +30,7 @@ module Foruiman::TUI
 
     def stream_style(stream)
       case stream
+      when :stdin then ["in ", :cyan]
       when :stderr then ["err", :red]
       when :lifecycle then ["sys", :amber]
       else ["out", :faint]
@@ -38,6 +39,7 @@ module Foruiman::TUI
 
     def body_color(stream)
       case stream
+      when :stdin then :cyan
       when :stderr then :red
       when :lifecycle then :muted
       else :text

data/lib/foruiman/tui/renderer.rb

@@ -16,7 +16,8 @@ module Foruiman::TUI
       [nil, "f / G / End", "Follow newest output", nil],
       [nil, "Space", "Pause / resume following", nil],
       ["⚙ PROCESSES", "r / R", "Restart selected / all", "r on all restarts all"],
-      [nil, "s / S", "Stop selected / all", nil],
+      [nil, "s / S", "Start/stop selected / stop all", "s on all stops all"],
+      ["⌨ INPUT", "i", "Edit a command; Enter sends", "Ctrl-X returns to Foruiman"],
       ["◇ SESSION", "? / Escape", "Close help", nil],
       [nil, "q / Ctrl-C", "Stop processes and quit", nil]
     ].freeze
@@ -30,16 +31,16 @@ module Foruiman::TUI
       rows >= 14 && columns >= 60
     end
 
-    def self.log_height(rows:, columns:)
+    def self.log_height(rows:, columns:, input: false)
       return 0 if rows < 6 || columns < 24
 
-      rows - (expanded?(rows: rows, columns: columns) ? 7 : 5)
+      rows - (expanded?(rows: rows, columns: columns) ? 7 : 5) - (input && rows >= 8 ? 2 : 0)
     end
 
     def render(state, engine, rows:, columns:)
       @width = [columns - 1, 1].max
       @inside = [@width - 4, 0].max
-      @height = self.class.log_height(rows: rows, columns: columns)
+      @height = self.class.log_height(rows: rows, columns: columns, input: state.input?)
       return tiny_frame(state, engine, rows) if @height.zero?
 
       lines = [header(engine)]
@@ -54,6 +55,7 @@ module Foruiman::TUI
       lines << log_header(state, engine)
       lines.concat(state.help ? help_rows : log_rows(state, engine))
       lines << log_footer(state, engine)
+      lines.concat(input_rows(state)) if state.input? && rows >= 8
       lines << controls(state, engine)
       frame(lines, rows)
     end
@@ -157,7 +159,9 @@ module Foruiman::TUI
                else
                  engine.state(state.name).status == :running
                end
-      mode = if !state.viewport.following
+      mode = if state.input?
+               @theme.paint(" ▶ INPUT ", :cyan)
+             elsif !state.viewport.following
                @theme.paint(" Ⅱ PAUSED ", :amber)
              elsif active
                @theme.paint(" ● LIVE ", :green)
@@ -244,28 +248,61 @@ module Foruiman::TUI
     end
 
     def controls(state, engine)
+      if state.input?
+        left = @theme.paint(" Enter send · ↑↓ history · Ctrl-C interrupt", :muted)
+        right = @theme.paint(" Ctrl-X back ", :amber, bold: true)
+        return distribute(left, right, @width)
+      end
+
       quit = @theme.paint(" q ", :accent, bold: true) + @theme.paint(" × quit ", :muted)
       left = if engine.shutting_down?
-               @theme.paint(" ◌ Stopping process groups · TERM → KILL after 5s", :amber)
+               seconds = format("%g", engine.term_timeout)
+               @theme.paint(" ◌ Stopping process groups · TERM → KILL after #{seconds}s", :amber)
              elsif state.feedback
                @theme.paint(" #{state.feedback}", :amber)
              elsif state.help
                @theme.paint(" ? / Escape close help", :muted)
              else
-               shortcuts(state)
+               shortcuts(state, engine)
              end
       distribute(left, quit, @width)
     end
 
-    def shortcuts(state)
+    def shortcuts(state, engine)
       restart = ["r", state.name == "all" ? "↻ restart all" : "↻ restart"]
-      pairs = [%w[Tab switch], ["↑↓", "scroll"], %w[f follow], restart, ["?", "help"]]
-      pairs = [restart, ["?", "help"]] if @width < 65
+      toggle = if state.name == "all"
+                 ["s", "■ stop all"]
+               elsif process_active?(engine.state(state.name))
+                 ["s", "■ stop"]
+               else
+                 ["s", "▶ start"]
+               end
+      pairs = [%w[Tab switch], ["↑↓", "scroll"], %w[f follow], restart,
+               toggle, %w[i input], ["?", "help"]]
+      pairs = [restart, toggle, %w[i input], ["?", "help"]] if @width < 85
       pairs.map do |key, label|
         @theme.paint(" #{key} ", :accent, bold: true) + @theme.paint(" #{label}  ", :muted)
       end.join
     end
 
+    def process_active?(entry)
+      entry.pgid || %i[running restarting stopping].include?(entry.status)
+    end
+
+    def input_rows(state)
+      editor = state.input_line
+      parts = editor.text.scan(/\X/)
+      before = parts.take(editor.cursor)
+      current = parts[editor.cursor] || " "
+      after = parts.drop(editor.cursor + 1).join
+      available = [@inside - 5, 1].max
+      before.shift while !before.empty? && Text.width(before.join + current) > available
+      draft = @theme.paint("❯ ", :cyan, bold: true) + before.join +
+              @theme.paint(current,
+                           selected: true) + Text.clip(after, [available - Text.width(before.join + current), 0].max)
+      [border(@theme.paint(" ⌨ Input to #{state.input_target} ", :cyan, bold: true)), panel(draft)]
+    end
+
     def border(left, right = "", bottom: false)
       corners = bottom ? %w[╰ ╯] : %w[╭ ╮]
       middle = distribute(left, right, @inside, fill: "─")
@@ -290,7 +327,7 @@ module Foruiman::TUI
       title = @theme.paint(" FORUIMAN", :accent, bold: true)
       message = engine.shutting_down? ? " Stopping…" : " #{state.name} · enlarge terminal"
       lines = [title, @theme.paint(message, :muted)]
-      lines[rows - 1] = @theme.paint(" q quit", :accent) if rows > 2
+      lines[rows - 1] = @theme.paint(state.input? ? " Ctrl-X back" : " q quit", :accent) if rows > 2
       frame(lines, rows)
     end
 

data/lib/foruiman/tui/state.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require_relative "viewport"
+require_relative "input_line"
 
 module Foruiman::TUI
   class State
     attr_reader :tabs, :selected, :viewports
-    attr_accessor :help, :feedback
+    attr_accessor :help, :feedback, :input_target
 
     def initialize(names)
       @tabs = [*names, "all"].freeze
@@ -13,6 +14,8 @@ module Foruiman::TUI
       @viewports = tabs.to_h { |name| [name, Viewport.new] }
       @help = false
       @feedback = nil
+      @input_target = nil
+      @input_lines = names.to_h { |name| [name, InputLine.new] }
     end
 
     def name
@@ -23,6 +26,14 @@ module Foruiman::TUI
       viewports.fetch(name)
     end
 
+    def input?
+      !input_target.nil?
+    end
+
+    def input_line
+      @input_lines.fetch(input_target || name)
+    end
+
     def select(index)
       @selected = index if index.between?(0, tabs.size - 1)
     end

data/lib/foruiman/tui/theme.rb

@@ -16,8 +16,8 @@ module Foruiman::TUI
       stopped: :muted, exited: :muted, failed: :red
     }.freeze
     STATUS_MARKS = {
-      pending: "○", running: "●", restarting: "↻", stopping: "◌",
-      stopped: "■", exited: "✓", failed: "×"
+      pending: "○", running: "▶", restarting: "↻", stopping: "◼",
+      stopped: "■", exited: "✓", failed: "✕"
     }.freeze
 
     attr_reader :enabled

data/lib/foruiman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Foruiman
-  VERSION = "0.1.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foruiman
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Foruiman contributors
@@ -70,16 +70,19 @@ files:
 - lib/foruiman.rb
 - lib/foruiman/ansi.rb
 - lib/foruiman/cli.rb
+- lib/foruiman/configuration.rb
 - lib/foruiman/diagnostics.rb
 - lib/foruiman/engine.rb
 - lib/foruiman/env.rb
 - lib/foruiman/log_store.rb
 - lib/foruiman/output.rb
+- lib/foruiman/output_line.rb
 - lib/foruiman/plain.rb
 - lib/foruiman/process.rb
 - lib/foruiman/procfile.rb
 - lib/foruiman/ring.rb
 - lib/foruiman/tui/application.rb
+- lib/foruiman/tui/input_line.rb
 - lib/foruiman/tui/keyboard.rb
 - lib/foruiman/tui/log_formatter.rb
 - lib/foruiman/tui/renderer.rb
@@ -110,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A Procfile supervisor with process tabs, bounded logs, and isolated restarts
 test_files: []