typr 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756f4c526a47e141947600b8ab1f712f5f55809709415bdc08182f7c84a02885
-  data.tar.gz: 0ffb023fb815985b242d77c95e0b7fb314ffe1025c3eaa309b1df615ee7575bd
+  metadata.gz: 5a6c88b12b4be9c1fe406898172147d1d874e0353af72d211d2530ef5a48d82f
+  data.tar.gz: 36dd949f072aa3ab232256d4c7d7c10d6989812c97977f65f72bd25ef7d6124a
 SHA512:
-  metadata.gz: f5bcf29384273fe9a5fbdf47474b7160485d180b0c29ddb963644a38eaf3a9695cd54d74dc7a2955fa8e25331701f3bc0295f0a8570f85a66c9b8250ef460290
-  data.tar.gz: a05c2a49dfaf00d42510e9961ba21eb0a5075ee9f37fb2be685b212dd91a17c10e4622bbac1b958c44f5fdb385e5895f3f4d8dbbb68e8b31b949fc70252fb192
+  metadata.gz: 87a3993d064a814f0c819a5466c4245029d38aeabd3b6b869a9d5f2f505b60daa45aecea6447dac70cee577605e8ec1d66ee5ce858751d1122614905a9983610
+  data.tar.gz: f29f2787e8cc2b606bfb215adebe21b1384bcc860b986318bfcff334105ebea72f30844124083dc6471c81a215698dbd3aa2fcfca9b63d92594c09ab89373bdf

data/CHANGELOG.md

@@ -1,3 +1,73 @@
+# Changelog
+
+## [v1.2.0] — 2026-08-02
+
+### Added
+- `Typr.read_key` / `Typr.read_line` — the public terminal input API: `read_key` reads a raw key; `read_line` is the shared interactive line editor that renders a prompt + query at any position with arrow keys, ctrl-arrow word jumps, Home/End/Delete/Backspace, Escape aborts (`nil`), Enter confirms, and an optional block runs after each keypress
+- `Line#ask` strict question types — `Array` (pick from an object/column), `:key`, `:line`; the question and answer are rendered in `@colors[:question]`/`@colors[:answer]`
+- `Line#align` attribute (`:left`/`:right`) for text alignment in draw
+- `dark_*` named colors (`dark_red`, `dark_green`, `dark_yellow`, `dark_blue`, `dark_magenta`, `dark_cyan`) and a `COLOR_MAP` of popular named colors in `color_code`
+- `Text#search` / `Text#search_next` / `Text#search_prev` (`/`, `n`, `p`) — less-style live search with smart-case matching, String/Regexp queries, and wrap-around; `Text#highlight` / `Text#highlight_clear` per-line match highlighting (`@colors[:search]`)
+- `Browser#search` — `/` binding routing through `pick :none, column: NAME`
+- `Browser#cd` data rows include an `executable` column (`Typr::EXECUTABLE`, after `permissions`), shown in the `:full` view
+- `Browser#pick` returns raw absolute paths (double-quoted, joined with a space for multi-select)
+- `Space` symbolizes string keys in the `colors:` hash, so string-keyed config (as loaded from YAML) is honored
+- Full documentation comments for the `Typr` module and `Line#ask`
+
+### Changed
+- Renamed `Typr.read` → `Typr.read_key` and `Typr.edit` → `Typr.read_line`
+- Renamed the frontend `show` → `draw` and the widget render `draw` → `show`
+- `Line#ask` dispatch is strict — only `Array`, `:key`, and `:line` question types; `:string`/`:integer` are gone
+- Removed the Readline dependency
+- `Typr.init` duplicates the default color array instead of aliasing the caller's
+
+### Removed
+- Alphabet hinting from `Grid#pick` and `Stack` — hints are numbers only
+
+### Fixed
+- `Grid#pick column:` live-filter/search — prompt drawn at `self.bottom + 1`, backspace broadens the result set, Escape restores the pre-search state, PageUp/PageDown/Home/End scroll, TAB cycles hints, `:none` pick works
+- `Stack#send` key normalization — only printable ASCII normalized so control keys match keymap entries
+- `Browser#cd` MIME lookup handles filenames with `:`, `'`, `(`, and full-width UTF-8 (argv invocation, greedy regex parsing)
+- `Typr.read_line` renders colored prompts without shifting the cursor (`Typr.text_width` is escape-aware)
+- `Grid#sort` re-applies active filters after sorting
+- `Typr.height`/`width` consistency so `bottom: -1` stays on screen
+- Suppressed constant-redefinition warnings from `Grid#header=`
+
+## [v1.1.4] — 2026-07-28
+
+### Added
+- `Browser#toggle_hidden` — show/hide dotfiles with `H` key
+- `Browser#help` keybinding (`?h`)
+- `Terminal.on_resize` — trap SIGWINCH for terminal resize
+- `Stack#draw_hints` clears hint area before redrawing
+
+### Changed
+- `Space` boundary methods: per-boundary nil defaults (`left: 0`, `top: 0`, `right: left + @max`, `bottom: rows + headspace`) instead of a single clamped formula
+- `Space#initialize` no longer sets `@left`/`@top` defaults
+- `Browser#initialize` defaults `@left`/`@top` to 0
+- `Browser#cd` filters dotfiles when `@show_hidden` is false
+- `Browser#reset_view` re-calls `cd` to refresh directory listing
+- `Stack#pick` no longer resets `@hints_start` on each call
+- Removed unused `@totals` from Grid, `@highlight` from Stack
+- Removed shebangs and `frozen_string_literal` comments from library files
+- Terminal: graceful non-TTY handling for non-interactive environments
+- Curses and graphical frontends: cleaned up dead code and whitespace
+
+### Fixed
+- `Space` specs check method returns instead of instance variables
+
+---
+
+## [v1.1.3] — 2026-07-27
+
+### Added
+
+### Changed
+
+### Fixed
+- `Stack#draw_hints` compared a relative offset against an absolute position, drawing one extra hint below the data
+
+---
 
 ## [v1.1.0] — 2026-07-26
 

data/README.md

@@ -1,15 +1,15 @@
 # typr — Terminal UI Toolkit
 
-typr is a Ruby library for building interactive terminal-based user interfaces. It provides data-object based views and keyboard-driven interaction.
+typr is a Ruby library for building interactive terminal-based user interfaces. It provides data-object based spaces and keyboard-driven interaction.
 
 ## Features
 
-### Views
+### Spaces
 
 - **Grid** — sortable, filterable table with formatted columns, colors, and row selection
 - **Text** — scrollable text viewer with word/line picking, search, and borders
 - **Browser** — file-system directory browser with MIME type detection
-- **Stack, Space** — layout containers for composing views
+- **Stack, Space** — layout containers for composing spaces
 - **Line** — interactive prompt/input with colored questions and answers
 
 ### Frontends
@@ -19,7 +19,7 @@ typr supports two rendering backends, selectable via `require`:
 - **Terminal** (`require 'typr'`) — raw terminal IO, no dependencies beyond Ruby stdlib
 - **Graphical** (`require 'typr/graphical'`) — SDL2-based, for desktop GUI windows
 
-All views work identically across frontends.
+All spaces work identically across frontends.
 
 ### Keyboard interaction
 
@@ -58,7 +58,7 @@ Typr.init
 )
 
 Typr.clear
-@grid.draw
+@grid.show
 key = Typr.read(:key)   # reads a single keypress
 @grid.reset               # reset grid to default view
 Typr.exit
@@ -81,7 +81,7 @@ Typr.init
 
 Typr.clear
 loop do
-  @text.draw
+  @text.show
   key = Typr.read(:key)
   case key
   when ?q then break
@@ -138,8 +138,8 @@ class MyApp
   def run
     Typr.clear
     loop do
-      @grid.draw
-      @prompt.draw
+      @grid.show
+      @prompt.show
       key = Typr.read(:key)
       case key
       when ?s then @grid.sort_by(@prompt.ask("sort column": [@grid, :column]))
@@ -173,7 +173,7 @@ Reads input from the terminal. Types:
 - `:key` — a single keypress (returns `KEY_ESCAPE`, `?q`, etc.)
 - `:line` — a full line of text input
 
-### Layout properties (all views)
+### Layout properties (all spaces)
 - `top`, `bottom`, `left`, `right` — placement. Integers for absolute offsets, floats (0-1) for relative sizing. Negative values position from the opposite edge. (`bottom: -1` = last row)
 
 ### Grid options

data/example/grid

@@ -43,7 +43,7 @@ class GridTest
     @user = Line.new( top: -1, default: 
       "(s)ort, (f)ilter, (r)eset, select (R)ows/(C)olumns/(F)ields, [esc] quit")
     @head = Line.new( interval: 1,
-      default: proc{ show " %s, sort:%s filter:%s selected:%s" % 
+      default: proc{ draw " %s, sort:%s filter:%s selected:%s" % 
         [ Time.now.strftime("%D %T"), 
           (@grid.header[@grid.sorted_by.abs] if @grid.sorted_by),
           @grid.filters.join, @grid.selected ||= [] ] } )
@@ -52,14 +52,14 @@ class GridTest
   def run
     Typr.clear
     loop do       
-      @grid.draw
-      @user.draw
+      @grid.show
+      @user.show
       @head.start  
       key = Typr.read( :key )
       @head.stop
       case key
       	when KEY_ESCAPE; exit
-      	when ?` then @user.draw eval( Typr.read(:line) )
+      	when ?` then (line = Typr.read(:line)) and @user.show(eval(line))
         when ?s then @grid.sort_by( @user.ask "sort column": [@grid, :column] )
         when ?F then @user.ask("pick fields": [@grid, :fields])
         when ?R then @user.ask("pick rows": [@grid, :rows])

data/example/text

@@ -9,6 +9,9 @@
 # word-wrapped scrollable viewport with a border.
 #
 # Keys:
+#   /         Search (type pattern, Enter to run)
+#   n         Next match
+#   p         Previous match
 #   arrows    Scroll up/down
 #   w         Pick a single word (hint-driven)
 #   W         Pick multiple words
@@ -35,18 +38,18 @@ class TextTest
       colors: { header: [:yellow, :grey30], hints: [:black, :white] }
     )
     @user = Line.new( top: -1, 
-      default: "pick [r]ow / [R]ows, pick [w]ord / [W]ords, [esc] quit",
+      default: "[/]:search [n]ext [p]rev, pick [r]ow/[R]ows, [w]ord/[W]ords, [esc] quit",
       colors: { question: :blue, answer: :yellow } )
   end
   
   def run
     Typr.clear
     loop do
-      @text.draw 
-      @user.draw
+      @text.show 
+      @user.show
       case key = Typr.read( :key )
         when KEY_ESCAPE; exit
-        # when ?/; @text.search( @user.ask filter: :string )
+        when ?/; @text.search
         when ?w; @user.ask( 'pick word':  [@text, :field] )
         when ?W; @user.ask( 'pick words': [@text, :fields] )
         when ?r; @user.ask( 'pick rows': [@text, :row] )

data/example/top500.csv

@@ -1,3 +1,4 @@
+rank,word,pos,count,quot
 1,the,a,22038615,0.98
 2,be,v,12545825,0.97
 3,and,c,10741073,0.99

data/lib/browser.rb

@@ -1,7 +1,3 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-# frozen_string_literal: true
-
 require 'etc'
 require 'find'
 require_relative 'grid.rb'
@@ -37,12 +33,12 @@ module Typr
   #   Escape          | quit, returns nil
 
   class Browser < Grid
-    attr_accessor :directory, :user, :pwd, :view, :dir_history
+    attr_accessor :directory, :user, :pwd, :view
     attr_accessor :mimetype_db, :mimetype_magic
 
     ## Height minus 2 rows reserved for path bar and command line.
 
-    def bottom; super - 2 end
+    def bottom; super - 1 end
 
     ## Top offset plus one row for the path info bar.
 
@@ -63,20 +59,17 @@ module Typr
       data, missing = [],{}
       unless append
         @colors[:fields] = {}
-        dir = @dir_history[dir+1] if dir.is_a? Integer
         clear
         Dir.chdir( @directory = File.expand_path( dir ) )
-        unless [?/, ENV["HOME"]].include? dir
-          @dir_history.unshift @directory
-          @dir_history.uniq!
-        end
       end
-      data = Dir.new(@directory).children.map.with_index do |file,id|
+      data = Dir.new(@directory).children.reject{|f|
+        !@show_hidden and f[0] == ?. }.map.with_index do |file,id|
         if File.symlink? file
           target = File.readlink( file ) rescue $!.to_s
-          next [file, target] + [??]*7 + ["inode","symlink"] unless File.exist?(file)
+          next [file, target, "????", false, "?", "?", 0, 0, 0, 0, "inode", "symlink"] unless File.exist?(file)
         end
-        stat = File.stat(file)
+        stat = File.stat(file) rescue nil
+        next [file, "", "????", false, "?", "?", 0, 0, 0, 0, "?", "?"] unless stat
         type = stat.ftype.to_sym
 
         mime = { "directory": "inode/directory",
@@ -91,17 +84,23 @@ module Typr
         ( missing[file] = id ; mime = "?/?" ) unless mime
         [  file, target, stat.mode.to_s(8)[-3..-1].chars.map{|d|
           "rwx".chars.map.with_index{|c,i| d.to_i[2-i]==0 ? ?- : c } }.join,
-          stat.uid, stat.gid, stat.size,
+          File.executable?(file), stat.uid, stat.gid, stat.size,
           stat.atime.to_i, stat.mtime.to_i, stat.ctime.to_i,
           *mime.to_s.split( ?/ ) ]
       end
 
-      `file --mime-type '#{missing.keys.join "' '"}'
-        `.split($/).each.with_index{ |line,id|
-          next unless line[/^.+:\s+\w+\/[\w\-\.]+$/]
-          file, mime = line.split(/:\s*/)
-          data[ missing[file] ][-2,2] = mime.rstrip.split( ?/ ) } if
-            @mimetype_magic and not missing.empty?
+      if @mimetype_magic and not missing.empty?
+        begin
+          out = IO.popen(['file', '--mime-type', *missing.keys]){ |io| io.read }
+        rescue Errno::ENOENT
+          out = ''
+        end
+        out.split($/).each{ |line|
+          file, mime = line.match(/^(.*):\s+(\w+\/[\w\-\.]+)$/)&.captures
+          next unless file
+          data[ missing[file] ][-2,2] = mime.split( ?/ ) if missing[file] }
+      end
+      data.each { |row| row[0] = File.join(@directory, row[0]) }
       self << data
       sort
       filter
@@ -203,6 +202,15 @@ module Typr
 
     def home; cd ?~ end
 
+    ## Toggle visibility of hidden files (those starting with a dot).
+    #
+    #   browser.toggle_hidden
+
+    def toggle_hidden
+      @show_hidden = !@show_hidden
+      cd @directory
+    end
+
     ## Display a help grid listing all keybindings.
 
     def help; @user.help end
@@ -213,23 +221,26 @@ module Typr
     #
     #   browser.recurse   # flattens tree into leaf names
 
-    def recurse
-      sort_by NAME
-      @procs[NAME] = :filetree
-    end
-
     ## Reset display, selection, and position state then re-sort.
     #
     #   browser.reset_view
 
-    def reset_view; reset [:display, :selection, :position]; sort end
+    def reset_view; cd @directory; reset [:display, :selection, :position]; sort end
 
     ## Open a filter popup on the chosen row/column and apply the input.
     #
     #   browser.filter_view   # prompts for filter text
 
+    def search; pick :none, 0, column: NAME end
+
     def filter_view; add_filter *@user.ask(
-      filter: [ popup( type: :"[f]ilter" ), :row], with: :line ) end
+      filter: [ popup( type: :"[f]ilter" ), :row, NAME], with: :line ) end
+
+    def search
+      @suppress_user = true
+      pick :none, column: NAME
+      @suppress_user = false
+    end
 
     ## Open a sort-picker popup to choose a column to sort by.
     #
@@ -243,19 +254,11 @@ module Typr
 
     def views; switch_to( popup( type: :"[v]iews", input: @views.keys ).pick :row )  end
 
-    ## Open a directory history picker and cd to the chosen entry.
-    #
-    #   browser.dir_history   # pick from previously visited dirs
-
-    def dir_history; cd( popup( { input: @dir_history[1..-1],
-      colors: { columns: [ colors[:dir_history] ] },
-      align: [:left], left: left } ).pick(:row) )  end
-
     ## True when the row is a directory or passes base Grid filtering.
     #
     #   browser.check 0   # => true if navigable
 
-    def check row; super or @data[row][SUBTYPE] == "directory" end
+    def check row; super or ( !@filter_dirs and @data[row][SUBTYPE] == "directory" ) end
 
     ##
     # Interactive file/directory picker. Blocks until a selection or Escape.
@@ -267,23 +270,26 @@ module Typr
     #   browser.pick 'image'      # => '/path/to/photo.png' (images only)
     #   browser.pick nil          # => anything, same as 'file'
 
-    def pick type='file'
+    def pick type='file', **kw
       type ||= 'file'
       type = type.to_s
-      return super if type[/row|column|field|none/]
+      return super(type, **kw) if type[/row|column|field|none/]
       add_filter ( %w[audio video image text application inode].include?(
         type) ? TYPE : SUBTYPE ), type if type != 'file'
       loop do
-        draw
+        show
         draw_hints :row
-        key = Typr.read( :key )
+        key = Typr.read_key
+        if key == @keymap[:exit]
+          reset :display
+          return
+        end
         next unless choice = send( key )
         case choice
-          when Array; choice = ?' + choice.map{ |id|
-            @directory+?/+@data[id][NAME] }.join("' '") + ?'
+          when Array; choice = choice.map{ |id| @data[id][NAME] }.join('" "')
           when Integer; file = @data[ choice ]
             if file[SUBTYPE] == 'directory'; cd file[TARGET] || file[NAME]; next
-            else choice = ?'+@directory+?/+file[NAME]+?' end
+            else choice = file[NAME] end
         end
         reset :display
         return choice
@@ -294,19 +300,35 @@ module Typr
     # Renders the grid with an info bar above showing the current directory
     # path and colored status items for filter, sort, and view.
     #
-    #   browser.draw   # draws browser with info bar
-
-    def draw; super
-      info = { "[f]ilter": @filters.empty? ? "no filter" : @filters.to_s[1..-2],
-        "[s]ort": sorted_by(true), "[v]iews": @view }
-      move left, top - 1
-      show prepare( @directory, width - info.values.join.size - 3, :left, :left, 5 )
-      @colors[:actions].each do |type,col|
-        color col
-        show ' ' + info[type].to_s
-        @positions[type] = Typr.column - (type==@positions.keys.last ? 0:1 )
-      end
-      @user.draw
+    #   browser.show   # shows browser with info bar
+
+    def show; super
+      user = ENV["USER"] || Etc.getlogin
+      @head.colors[:columns][0] = user == "root" ? [:red, :black] : [:green, :black]
+      @head.reset :format
+      @head.show
+      move @head.positions(0)[1] - @head.separator.size, @parent.top - 1
+      color @colors[:default]
+      draw '@'
+      @positions = { :"[f]ilter" => 2, :"[s]ort" => 3, :"[v]iews" => 4
+        }.transform_values do |col|
+          @head.left + @head.positions(0)[col] + @head.width_for(col) - 1
+        end
+      @user.show unless @suppress_user
+    end
+
+    ## Formats active filters as 'column: query', joined by ' / '.
+    #
+    #   browser.filter_display  # => "name: foo / size: big"
+    #
+    # @return [String]
+
+    def filter_display
+      return "no filter" if @filters.empty?
+      @filters.map { |col, q|
+        q = "/#{q.source}/" if q.is_a?(Regexp)
+        "#{col.is_a?(Symbol) ? col : @header[col] || col}:#{q}"
+      }.join(" / ")
     end
 
     ## Returns row ids for all directories in the current listing.
@@ -364,13 +386,15 @@ module Typr
     #   'x-msdownload': :red  'x-pie-executable': :red
 
     def initialize args={}
-      @dir_history, @mimetype_db, @mimetype_magic = [], true, true
-      @view, @sort, @views, @positions = :compact, 0, {}, {}
+      @mimetype_db, @mimetype_magic = true, true
+      @view, @sort, @views, @positions, @show_hidden = :compact, 0, {}, {}, false
+      @filter_dirs = args[:filter_dirs]
       super
+      @left ||= 0
+      @top ||= 0
       @directory ||= ?~
       @colors[:actions] = { "[f]ilter": :red, "[s]ort": :blue, "[v]iews": :green
         }.merge @colors[:actions] || {}
-      @colors[:dir_history] ||= :yellow
       @colors[ :types ] = {
             image: :blue,
             audio: :green,
@@ -385,12 +409,13 @@ module Typr
       }.merge( @colors[ :types ] || {} )
 
       @keymap = { back: KEY_BACKSPACE, confirm: KEY_RETURN, help: ?h,
-        home: ?~, root: ?`, views: ?v, sort_view: ?s, dir_history: ?d,
+        home: ?~, views: ?v,         sort_view: ?s, search: ?/,
         mark: ?m, mark_range: ?M, mark_all: ?a, mark_invert: ?i,
-        filter_view: ?f, reset_view: ?r, recurse: ?R}.merge @keymap
+        filter_view: ?f, reset_view: ?r,
+        toggle_hidden: ?H}.merge @keymap
 
-      self.header = %w[ name target permissions owner group size accessed
-        modified created type subtype ]
+      self.header = %w[ name target permissions executable owner group size
+        accessed modified created type subtype ]
 
       @format[NAME] = :max
       @format[TYPE] = 5
@@ -404,26 +429,31 @@ module Typr
       @procs[GROUP] = Proc.new{|gid| Etc.getgrgid(gid).name rescue gid }
 
       @procs[NAME] = Proc.new{ |name, row| target = @data[row][TARGET]
-        name + ( target ? " > " + color_code(File.exist?(target) ? :green : :red) +
+        File.basename(name.to_s) + ( target ? " > " + color_code(File.exist?(target) ? :green : :red) +
           target : "" ) }
 
       @views = { simple: %i[ name ],
         compact: %i[ name size type],
         stats:   %i[ name size permissions owner group modified ],
-        full:    %i[ name size permissions owner group
+        full:    %i[ name size permissions executable owner group
                      accessed modified created type subtype ] }.merge @views
       @parent = self
-      @head ||= Grid.new( parent:self, left: ->{@parent.left}, top: ->{@parent.top-1},
-        input: [ [->{@parent.directory}, ->{@parent.filters.empty? ? "no filter" :
-          @parent.filters.to_s[1..-2] }, ->{@parent.sorted_by(true)},
-          ->{@parent.view} ] ], format: [:max, :min, :min, :min],
-        colors: { columns: [@colors[:default]] + @colors[:actions].values } )
+      @head ||= Grid.new( parent:self, left: ->{@parent.left}, margin: '',
+        right: ->{@parent.width + @parent.left - 1}, top: ->{@parent.top-1},
+        input: [ [->{ENV["USER"] || Etc.getlogin}, ->{@parent.directory},
+          ->{@parent.filter_display},
+          ->{ (s = @parent.sorted_by(true)) &&
+            "#{s} #{@parent.reverse ? "\u2193" : "\u2191"}"},
+          ->{@parent.view} ] ], format: [:min, :max, :min, :min, :min],
+        colors: { columns: [@colors[:default], @colors[:default],
+          @colors[:actions][:"[f]ilter"], @colors[:actions][:"[s]ort"],
+          @colors[:actions][:"[v]iews"]] } )
 
       @user ||= Line.new( parent:self, left:->{@parent.left},top:->{@parent.bottom+1},
-        bindings: %w[ [h]elp ] + @colors[:actions].map{|name,color|
+        bindings: %w[ [h]elp [/]:search ] + @colors[:actions].map{|name,color|
           color_code( color ) + name.to_s + color_code(@colors[:default]) } +
-            %w[ [r]eset [d]irectories [m]ark [M]ark\ range mark\ [a]ll
-            [i]nvert\ mark [`]:root [~]:home [back]:.. [up] [down] [pageup] [pagedown] [home] [end] [esc]:quit [return]:confirm\  ])
+            %w[ [r]eset [d]irectories [m]ark [M]ark_range mark_[a]ll
+            [i]nvert_mark [~]:home [H]idden_files [back]:.. [up] [down] [pageup] [pagedown] [home] [end] [esc]:quit [return]:confirm\  ])
       cd @directory
     end
   end