sergeant 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36d4f8c54ef4d4f7168cb42c81abe472b8094bf67c648096e9513bdfcca9ad15
-  data.tar.gz: 820962c25da75cc167c88dfe3407fb1de3e294444bd5c737ec09779c46414aed
+  metadata.gz: 41cc1fef750cecd3e0a9a530976e8818955bc0db86a434319420dbe250496405
+  data.tar.gz: 60db0f330203e559828d1cc87f701af503d174a6577bc351bfcc2fce2dc88752
 SHA512:
-  metadata.gz: 1838e264508e70d0c4012560764396c7772e9fb2a50ea1517c52ad584ced2f5d2cecdc7d19efab344ae25d80bb036964f8aa11d39667d5f79afedac05c4c75e4
-  data.tar.gz: 8e00de4e37bb7e3d971f39eb1dbce3932131941b80af2549c0e778d23a3c5a6a90b0d57e5aa956582467e112d3e052e0f496c71d602c61ccebbd06a453bff2cd
+  metadata.gz: 1b14250ce188e25a4c709b94ffcf16a88d57f4ceb715c737feaab66d1628fcbc041993ffc9e71c2e6496670e1f78846464932a804f392619608896f059aaf62f
+  data.tar.gz: 696600fa8dbf40b884949ca2cd1bb4ab16c21b5f1ec947fa77acb7593274638cbb54fb41be80a40ec820981e164ac9eeddf0643c6e9f52e0335b91ccd1c84b60

data/CHANGELOG.md

@@ -6,6 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [1.0.10] - 2026-08-24
+
+### Fixed
+- **Help modal silently truncating its own key list** - `show_help_modal` capped its height at a hardcoded value that no longer fit all the key mappings, cutting off everything from the ownership toggle (`o`) onward - including `b`, `H`, `R`, and even `q`/`ESC` to quit - on any normal-sized terminal. The modal now sizes itself from the actual number of key mappings, so it never happens again.
+
+## [1.0.9] - 2026-08-19
+
+### Added
+- **Syntax highlighting in the side preview panel** - text file previews are now colorized (keywords, strings, comments, numbers, names) using [Rouge](https://github.com/rouge-ruby/rouge), which guesses the language from the filename
+
+### Fixed
+- **Starship / Ruby-version-manager compatibility** - `Gemfile` no longer declares `ruby '>= 2.7.0'`, a version-range constraint that tools which auto-detect a project's Ruby version from the Gemfile (e.g. Starship's prompt) can't parse, causing an `Unknown ruby interpreter version` error just from `cd`-ing into the project. The constraint is already enforced by `required_ruby_version` in the gemspec.
+
 ## [1.0.8] - 2026-08-19
 
 ### Fixed

data/Gemfile

@@ -5,6 +5,9 @@ source 'https://rubygems.org'
 # Terminal UI library
 gem 'curses', '~> 1.4'
 
+# Syntax highlighting for the file preview panel
+gem 'rouge', '~> 4.0'
+
 group :development do
   # Code linting and style checking
   gem 'rubocop', '~> 1.81', require: false

data/README.md

@@ -16,7 +16,7 @@ Simple, fast, and elegant.
 - 🗂️  **Visual Directory Navigation** - See all directories and files at a glance
 - ⌨️  **Keyboard Driven** - Arrow keys, vim bindings (hjkl), and shortcuts
 - 🎨 **Color-Coded Display** - Directories in cyan; files colored by type (code, archives, media, executables)
-- 👀 **Live Preview Pane** - Text files and directory contents preview in a side panel as you move (press 'P' to toggle)
+- 👀 **Live Preview Pane** - Text files and directory contents preview in a side panel as you move (press 'P' to toggle), with syntax highlighting powered by [Rouge](https://github.com/rouge-ruby/rouge)
 - 📊 **Smart Scrolling** - Handles directories with hundreds of items
 - 🔍 **Git Branch Display** - Shows current git branch in header
 - 👤 **Ownership Toggle** - View file permissions and ownership (press 'o')

data/lib/sergeant/modals/help.rb

@@ -9,39 +9,6 @@ module Sergeant
         max_y = lines
         max_x = cols
 
-        modal_height = [28, max_y - 4].min  # Adaptive height
-        modal_width = [70, max_x - 4].min   # Adaptive width
-        modal_y = (max_y - modal_height) / 2
-        modal_x = (max_x - modal_width) / 2
-
-        (modal_y..(modal_y + modal_height)).each do |y|
-          setpos(y, modal_x)
-          attron(color_pair(3)) do
-            addstr(' ' * modal_width)
-          end
-        end
-
-        setpos(modal_y, modal_x)
-        attron(color_pair(4) | Curses::A_BOLD) do
-          addstr("\u250C#{'─' * (modal_width - 2)}\u2510")
-        end
-
-        setpos(modal_y + 1, modal_x)
-        attron(color_pair(4) | Curses::A_BOLD) do
-          addstr('│')
-        end
-        attron(color_pair(5) | Curses::A_BOLD) do
-          addstr(' Key Mappings '.center(modal_width - 2))
-        end
-        attron(color_pair(4) | Curses::A_BOLD) do
-          addstr('│')
-        end
-
-        setpos(modal_y + 2, modal_x)
-        attron(color_pair(4)) do
-          addstr("\u251C#{'─' * (modal_width - 2)}\u2524")
-        end
-
         help_lines = [
           'Navigation:',
           '  ↑/k               - Move up',
@@ -75,6 +42,42 @@ module Sergeant
           '  q / ESC           - Quit and cd to current directory'
         ]
 
+        # Height must track the number of help lines - a fixed cap silently
+        # truncates the bottom of the list (including "quit"!) every time a
+        # new key mapping is added without also bumping the cap by hand.
+        modal_height = [help_lines.length + 4, max_y - 4].min
+        modal_width = [70, max_x - 4].min   # Adaptive width
+        modal_y = (max_y - modal_height) / 2
+        modal_x = (max_x - modal_width) / 2
+
+        (modal_y..(modal_y + modal_height)).each do |y|
+          setpos(y, modal_x)
+          attron(color_pair(3)) do
+            addstr(' ' * modal_width)
+          end
+        end
+
+        setpos(modal_y, modal_x)
+        attron(color_pair(4) | Curses::A_BOLD) do
+          addstr("\u250C#{'─' * (modal_width - 2)}\u2510")
+        end
+
+        setpos(modal_y + 1, modal_x)
+        attron(color_pair(4) | Curses::A_BOLD) do
+          addstr('│')
+        end
+        attron(color_pair(5) | Curses::A_BOLD) do
+          addstr(' Key Mappings '.center(modal_width - 2))
+        end
+        attron(color_pair(4) | Curses::A_BOLD) do
+          addstr('│')
+        end
+
+        setpos(modal_y + 2, modal_x)
+        attron(color_pair(4)) do
+          addstr("\u251C#{'─' * (modal_width - 2)}\u2524")
+        end
+
         help_lines.each_with_index do |line, idx|
           break if idx >= modal_height - 4  # Stop if we run out of vertical space
 

data/lib/sergeant/rendering.rb

@@ -26,6 +26,18 @@ module Sergeant
       executable: 10
     }.freeze
 
+    # Maps token_category (Sergeant::Utils) to the syntax-highlight color
+    # pairs set up in Sergeant#apply_color_theme (pairs 11-16).
+    PREVIEW_TOKEN_COLOR_PAIRS = {
+      keyword: 11,
+      string: 12,
+      comment: 13,
+      number: 14,
+      function: 15,
+      constant: 15,
+      error: 16
+    }.freeze
+
     def draw_screen
       # `erase` only rewrites the virtual buffer; `refresh` then diffs it
       # against the physical screen and repaints just the changed cells.
@@ -222,7 +234,7 @@ module Sergeant
         if @preview_lines.empty?
           draw_preview_message(col, width, '(empty file)')
         else
-          draw_preview_lines(col, width, visible_lines, @preview_lines, color_pair(2))
+          draw_preview_highlighted_lines(col, width, visible_lines, @preview_lines)
         end
       when :directory
         if @preview_lines.empty?
@@ -274,6 +286,37 @@ module Sergeant
       end
     end
 
+    # Like draw_preview_lines, but each line is an array of
+    # {text:, category:} segments (built by Sergeant#build_text_preview via
+    # Rouge) instead of a single string, so every token can carry its own
+    # syntax-highlight color.
+    def draw_preview_highlighted_lines(col, width, visible_lines, lines)
+      visible_lines.times do |idx|
+        setpos(idx + 3, col)
+        draw_preview_segments(lines[idx] || [], width)
+      end
+    end
+
+    def draw_preview_segments(segments, width)
+      remaining = width
+
+      segments.each do |segment|
+        break if remaining <= 0
+
+        text = segment[:text]
+        chunk = text.length > remaining ? text[0, remaining] : text
+
+        attron(preview_token_attr(segment[:category])) { addstr(chunk) }
+        remaining -= chunk.length
+      end
+
+      attron(color_pair(2)) { addstr(' ' * remaining) } if remaining.positive?
+    end
+
+    def preview_token_attr(category)
+      color_pair(PREVIEW_TOKEN_COLOR_PAIRS[category] || 2)
+    end
+
     def draw_preview_message(col, width, message)
       setpos(3, col)
       attron(color_pair(2) | Curses::A_DIM) do

data/lib/sergeant/utils.rb

@@ -26,6 +26,22 @@ module Sergeant
       :file
     end
 
+    # Maps a Rouge token's qualified name (e.g. "Literal.String.Double") to
+    # one of the syntax-highlight color pairs set up in
+    # Sergeant#apply_color_theme. Unmatched token types (Text, Punctuation,
+    # Operator, ...) return nil, meaning "draw in the default text color".
+    def token_category(qualname)
+      case qualname
+      when /\AComment/ then :comment
+      when /\AKeyword/ then :keyword
+      when /\ALiteral\.String/ then :string
+      when /\ALiteral\.Number/ then :number
+      when /\AName\.(Function|Class|Namespace|Tag)/ then :function
+      when /\AName\.(Constant|Builtin|Variable\.Class)/ then :constant
+      when /\A(Error|Generic\.Error|Generic\.Traceback)/ then :error
+      end
+    end
+
     def get_git_branch
       return nil unless Dir.exist?(File.join(@current_dir, '.git'))
 

data/lib/sergeant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sergeant
-  VERSION = '1.0.8'
+  VERSION = '1.0.10'
 end

data/lib/sergeant.rb

@@ -7,6 +7,7 @@ require 'curses'
 require 'pathname'
 require 'etc'
 require 'fileutils'
+require 'rouge'
 
 require_relative 'sergeant/version'
 require_relative 'sergeant/config'
@@ -184,6 +185,15 @@ class SergeantApp
     init_pair(8, Sergeant::Config.get_color(@config['media']), Curses::COLOR_BLACK)
     init_pair(9, Sergeant::Config.get_color(@config['code']), Curses::COLOR_BLACK)
     init_pair(10, Sergeant::Config.get_color(@config['executables']), Curses::COLOR_BLACK)
+
+    # Syntax highlighting for the preview panel - not user-configurable
+    # (yet), curses only gives us the 8 base colors to work with anyway.
+    init_pair(11, Curses::COLOR_MAGENTA, Curses::COLOR_BLACK) # keyword
+    init_pair(12, Curses::COLOR_GREEN, Curses::COLOR_BLACK)   # string
+    init_pair(13, Curses::COLOR_WHITE, Curses::COLOR_BLACK)   # comment (dimmed)
+    init_pair(14, Curses::COLOR_CYAN, Curses::COLOR_BLACK)    # number
+    init_pair(15, Curses::COLOR_YELLOW, Curses::COLOR_BLACK)  # function/class name
+    init_pair(16, Curses::COLOR_RED, Curses::COLOR_BLACK)     # error token
   end
 
   def search_files
@@ -384,7 +394,7 @@ class SergeantApp
     if item[:type] == :directory
       [:directory, build_directory_preview(item[:path])]
     elsif text_file?(item[:path])
-      [:text, build_text_preview(item[:path])]
+      [:text, build_text_preview(item[:path], item[:name])]
     else
       [:binary, []]
     end
@@ -405,20 +415,65 @@ class SergeantApp
     []
   end
 
-  def build_text_preview(path)
-    lines = []
+  def build_text_preview(path, filename)
+    raw_lines = []
 
     File.foreach(path, mode: 'rb') do |line|
       text = line.byteslice(0, PREVIEW_LINE_MAX_BYTES).to_s.chomp
-      lines << text.force_encoding('UTF-8').scrub('?').gsub("\t", '    ')
-      break if lines.length >= PREVIEW_LINE_LIMIT
+      raw_lines << text.force_encoding('UTF-8').scrub('?').gsub("\t", '    ')
+      break if raw_lines.length >= PREVIEW_LINE_LIMIT
     end
 
-    lines
+    highlight_lines(raw_lines, filename)
   rescue StandardError
     []
   end
 
+  # Runs the preview text through Rouge and reassembles it into one array
+  # per line of [{text:, category:}, ...] segments, so the preview panel can
+  # paint each token in its own color. Falls back to plain (uncategorized)
+  # lines if Rouge can't make sense of the file - a highlighting bug should
+  # never be able to break the preview itself.
+  def highlight_lines(raw_lines, filename)
+    return [] if raw_lines.empty?
+
+    text = raw_lines.join("\n")
+    lexer = guess_lexer(filename, text)
+    tokens_to_lines(lexer, text)
+  rescue StandardError
+    raw_lines.map { |line| [{ text: line, category: nil }] }
+  end
+
+  def guess_lexer(filename, text)
+    Rouge::Lexer.guess(filename: filename, source: text)
+  rescue Rouge::Guesser::Ambiguous => e
+    e.alternatives.first || Rouge::Lexers::PlainText
+  rescue StandardError
+    Rouge::Lexers::PlainText
+  end
+
+  def tokens_to_lines(lexer, text)
+    lines = []
+    current = []
+
+    lexer.lex(text) do |token, value|
+      category = token_category(token.qualname)
+      pieces = value.split("\n", -1)
+
+      pieces.each_with_index do |piece, idx|
+        current << { text: piece, category: category } unless piece.empty?
+
+        next if idx == pieces.length - 1
+
+        lines << current
+        current = []
+      end
+    end
+
+    lines << current unless current.empty?
+    lines
+  end
+
   def refresh_items
     entries = Dir.entries(@current_dir).reject { |e| e == '.' || e == '..' }
     @items = []

data/sergeant.gemspec

@@ -57,6 +57,7 @@ Gem::Specification.new do |spec|
 
   # Runtime dependencies
   spec.add_dependency 'curses', '~> 1.4'
+  spec.add_dependency 'rouge', '~> 4.0'
 
   # Development dependencies
   spec.add_development_dependency 'rspec', '~> 3.13'

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sergeant
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Mateusz Grotha
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -23,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Interactive TUI Directory Navigator for Terminal
 test_files: []