hyperlist 1.1.7 → 1.2.2

data/hyperlist

@@ -7,7 +7,7 @@
 # Check for help/version BEFORE loading any libraries
 if ARGV[0] == '-h' || ARGV[0] == '--help'
   puts <<~HELP
-    HyperList v1.1.7 - Terminal User Interface for HyperList files
+    HyperList v1.2.2 - Terminal User Interface for HyperList files
     
     USAGE
       hyperlist [OPTIONS] [FILE]
@@ -52,7 +52,7 @@ if ARGV[0] == '-h' || ARGV[0] == '--help'
   HELP
   exit 0
 elsif ARGV[0] == '-v' || ARGV[0] == '--version'
-  puts "HyperList v1.1.7"
+  puts "HyperList v1.2.2"
   exit 0
 end
 
@@ -64,13 +64,15 @@ require 'cgi'
 require 'openssl'
 require 'digest'
 require 'base64'
+require 'fileutils'
+require 'json'
 
 class HyperListApp
   include Rcurses
   include Rcurses::Input
   include Rcurses::Cursor
   
-  VERSION = "1.1.7"
+  VERSION = "1.2.2"
   
   def initialize(filename = nil)
     @filename = filename ? File.expand_path(filename) : nil
@@ -98,6 +100,8 @@ class HyperListApp
     @auto_save_enabled = false
     @auto_save_interval = 60  # seconds
     @last_auto_save = Time.now
+    @templates_dir = File.expand_path("~/.hyperlist/templates")
+    ensure_templates_dir
     @templates = load_templates
     @macro_recording = false
     @macro_register = {}  # Store macros by key
@@ -124,20 +128,24 @@ class HyperListApp
     # Debug: uncomment to see terminal size
     # puts "Terminal size: #{@rows}x#{@cols}"
     
-    # Load file if provided
+    # Setup UI first (to initialize @footer) before loading file
+    setup_ui
+    
+    # Load file if provided (after UI is set up)
     if @filename && File.exist?(@filename)
       load_file(@filename)
     else
       # Start with empty list
       @items = [{"text" => "New HyperList", "level" => 0, "fold" => false}]
     end
-    
-    setup_ui
   end
   
   def setup_ui
-    Rcurses.clear_screen
-    Cursor.hide
+    # Only do rcurses operations if initialized
+    if defined?(Rcurses.instance_variable_get) && Rcurses.instance_variable_get(:@initialized)
+      Rcurses.clear_screen
+      Cursor.hide
+    end
     
     # Ensure we have the latest terminal size
     if IO.console
@@ -190,6 +198,7 @@ class HyperListApp
     @redo_position = []
     
     # Check if file is encrypted (dot file or encrypted content)
+    is_encrypted = false
     if is_encrypted_file?(file)
       if content.start_with?("ENC:")
         # Whole file is encrypted
@@ -200,7 +209,8 @@ class HyperListApp
           return
         end
         lines = decrypted_content.split("\n")
-        @message = "File decrypted successfully"
+        @message = "File decrypted successfully (folded for privacy)"
+        is_encrypted = true
       else
         # Dot file but not encrypted yet - just load normally
         lines = content.split("\n")
@@ -240,6 +250,17 @@ class HyperListApp
     
     @items = [{"text" => "Empty file", "level" => 0, "fold" => false}] if @items.empty?
     
+    # Auto-fold for privacy/security on encrypted files
+    if is_encrypted
+      @fold_level = 0  # Set fold level to 0 (everything folded)
+      # Fold all items that have children
+      @items.each_with_index do |item, idx|
+        if has_children?(idx, @items)
+          item["fold"] = true
+        end
+      end
+    end
+    
     # Auto-fold deep levels for large files
     if large_file
       auto_fold_deep_levels(3)  # Auto-fold everything deeper than level 3
@@ -838,6 +859,9 @@ class HyperListApp
     
     # Helper method to safely apply regexes without corrupting ANSI sequences
     def safe_regex_replace(text, pattern, &block)
+      # Ensure text is UTF-8 encoded
+      text = text.to_s.force_encoding('UTF-8')
+      
       # Find all ANSI sequences and replace with placeholders
       ansi_sequences = []
       placeholder_text = text.gsub(/\e\[[0-9;]*m/) do |match|
@@ -2169,7 +2193,7 @@ class HyperListApp
     help_lines << help_line("#{"C-E".fg("10")}", "Encrypt/decrypt line", "#{"C-U".fg("10")}", "Toggle State/Trans underline")
     help_lines << help_line("#{"R".fg("10")}", "Go to reference", "#{"F".fg("10")}", "Open file")
     help_lines << help_line("#{"N".fg("10")}", "Next = marker", "#{"P".fg("10")}", "Presentation mode")
-    help_lines << help_line("#{"t".fg("10")}", "Insert template", "#{":template".fg("10")}", "Show templates")
+    help_lines << help_line("#{"t".fg("10")}", "Insert template", "#{":st".fg("10")}", "Save as template")
     help_lines << help_line("#{"Ma".fg("10")}", "Record macro 'a'", "#{"@a".fg("10")}", "Play macro 'a'")
     help_lines << help_line("#{":vsplit".fg("10")}", "Split view vertically", "#{"w".fg("10")}", "Switch panes")
     help_lines << ""
@@ -2180,6 +2204,11 @@ class HyperListApp
     help_lines << help_line("#{":graph :g".fg("10")}", "Export to PNG graph", "#{":vsplit :vs".fg("10")}", "Split view")
     help_lines << help_line("#{":as on".fg("10")}", "Enable autosave", "#{":as off".fg("10")}", "Disable autosave")
     help_lines << help_line("#{":as N".fg("10")}", "Set interval (secs)", "#{":as".fg("10")}", "Show autosave status")
+    help_lines << ""
+    help_lines << "#{"TEMPLATES".fg("14")}"
+    help_lines << help_line("#{":st".fg("10")}", "Save as template", "#{":dt".fg("10")}", "Delete template")
+    help_lines << help_line("#{":lt".fg("10")}", "List user templates", "#{"t".fg("10")}", "Insert template")
+    help_lines << ""
     help_lines << help_line("#{"q".fg("10")}", "Quit (asks to save)", "#{"Q".fg("10")}", "Force quit")
     help_lines << ""
     help_lines << "#{"COLOR SCHEME".fg("14")}"
@@ -2853,8 +2882,18 @@ class HyperListApp
     when "autosave", "as"
       status = @auto_save_enabled ? "enabled" : "disabled"
       @message = "Auto-save is #{status} (interval: #{@auto_save_interval}s)"
-    when "t"
+    when "t", "template", "templates"
       show_templates
+    when "save-template", "savetemplate", "st"
+      save_as_template
+    when /^save-template\s+(.+)/, /^savetemplate\s+(.+)/, /^st\s+(.+)/
+      save_as_template($1.strip)
+    when "delete-template", "deletetemplate", "dt"
+      delete_template
+    when /^delete-template\s+(.+)/, /^deletetemplate\s+(.+)/, /^dt\s+(.+)/
+      delete_template($1.strip)
+    when "list-templates", "listtemplates", "lt"
+      show_template_manager(:list)
     when "foldlevel"
       level = @footer.ask("Fold to level (0-9): ", "")
       if level =~ /^[0-9]$/
@@ -3085,8 +3124,24 @@ class HyperListApp
   end
 
   def encrypt_string(text, password = nil)
-    password ||= @encryption_key || prompt_password("Enter encryption password: ")
-    return nil unless password
+    if password.nil? && @encryption_key.nil?
+      # First time encrypting - ask for password twice
+      password = prompt_password("Enter encryption password: ")
+      return nil unless password
+      
+      confirm = prompt_password("Confirm encryption password: ")
+      return nil unless confirm
+      
+      if password != confirm
+        @message = "Passwords do not match - encryption cancelled"
+        return nil
+      end
+      
+      @encryption_key = password
+    else
+      password ||= @encryption_key || prompt_password("Enter encryption password: ")
+      return nil unless password
+    end
     
     # Store key for session if not already stored
     @encryption_key ||= password
@@ -3129,7 +3184,10 @@ class HyperListApp
       cipher.key = key
       cipher.iv = iv
       
-      cipher.update(encrypted) + cipher.final
+      decrypted = cipher.update(encrypted) + cipher.final
+      # Force UTF-8 encoding on decrypted content
+      decrypted.force_encoding('UTF-8')
+      decrypted
     rescue => e
       @message = "Decryption failed. Wrong password?"
       nil
@@ -3152,8 +3210,24 @@ class HyperListApp
   end
 
   def encrypt_file(content, password = nil)
-    password ||= @encryption_key || prompt_password("Enter file encryption password: ")
-    return nil unless password
+    if password.nil? && @encryption_key.nil?
+      # First time encrypting - ask for password twice
+      password = prompt_password("Enter encryption password: ")
+      return nil unless password
+      
+      confirm = prompt_password("Confirm encryption password: ")
+      return nil unless confirm
+      
+      if password != confirm
+        @message = "Passwords do not match - encryption cancelled"
+        return nil
+      end
+      
+      @encryption_key = password
+    else
+      password ||= @encryption_key || prompt_password("Enter file encryption password: ")
+      return nil unless password
+    end
     
     encrypt_string(content, password)
   end
@@ -3162,6 +3236,9 @@ class HyperListApp
     password ||= @encryption_key || prompt_password("Enter file decryption password: ")
     return nil unless password
     
+    # Store the key for the session so line encryption can use it
+    @encryption_key = password
+    
     decrypt_string(encrypted_content, password)
   end
 
@@ -3186,13 +3263,16 @@ class HyperListApp
         end
       else
         # Encrypt the line
-        encrypted = encrypt_string(current_text)
+        # Use the existing encryption key if available (from file decryption)
+        encrypted = encrypt_string(current_text, @encryption_key)
         if encrypted
           save_undo_state
           item["text"] = encrypted
           @encrypted_lines[@current] = true
           @modified = true
-          @message = "Line encrypted"
+          @message = "Line encrypted (🔒 indicator shown)"
+          # Clear the processed cache to force re-rendering
+          @processed_cache = {}
         else
           @message = "Encryption cancelled"
         end
@@ -3202,8 +3282,13 @@ class HyperListApp
     end
   end
   
+  def ensure_templates_dir
+    FileUtils.mkdir_p(@templates_dir) unless File.exist?(@templates_dir)
+  end
+
   def load_templates
-    {
+    # Start with built-in templates
+    templates = {
       "project" => [
         {"text" => "Project: =Project Name=", "level" => 0},
         {"text" => "[_] Define project scope", "level" => 1},
@@ -3306,6 +3391,214 @@ class HyperListApp
         {"text" => "=Tips, variations, serving suggestions=", "level" => 2}
       ]
     }
+    
+    # Load user templates from templates directory
+    if File.directory?(@templates_dir)
+      Dir.glob(File.join(@templates_dir, "*.hlt")).each do |template_file|
+        template_name = File.basename(template_file, ".hlt")
+        begin
+          template_data = JSON.parse(File.read(template_file))
+          # Convert template data to the expected format
+          if template_data.is_a?(Hash) && template_data["items"]
+            templates[template_name] = template_data["items"].map do |item|
+              {"text" => item["text"], "level" => item["level"]}
+            end
+          end
+        rescue => e
+          # Skip invalid template files
+        end
+      end
+    end
+    
+    templates
+  end
+  
+  def save_as_template(name = nil)
+    # Ask for template name if not provided
+    if name.nil? || name.empty?
+      name = @footer.ask("Template name: ", "")
+      return if name.nil? || name.empty?
+    end
+    
+    # Sanitize template name
+    name = name.gsub(/[^a-zA-Z0-9_-]/, '_')
+    
+    # Ask for description
+    description = @footer.ask("Template description (optional): ", "")
+    
+    # Prepare template data
+    template_data = {
+      "name" => name,
+      "description" => description,
+      "created" => Time.now.strftime("%Y-%m-%dT%H:%M:%S"),
+      "items" => @items.map do |item|
+        {
+          "text" => item["text"],
+          "level" => item["level"]
+        }
+      end
+    }
+    
+    # Save template file
+    template_path = File.join(@templates_dir, "#{name}.hlt")
+    
+    # Check if template already exists
+    if File.exist?(template_path)
+      response = @footer.ask("Template '#{name}' already exists. Overwrite? (y/n): ", "")
+      return unless response.downcase == 'y'
+    end
+    
+    File.write(template_path, JSON.pretty_generate(template_data))
+    @message = "Template '#{name}' saved successfully"
+  end
+  
+  def delete_template(name = nil)
+    # Get list of user templates
+    user_templates = get_user_templates
+    
+    if user_templates.empty?
+      @message = "No user templates found"
+      return
+    end
+    
+    # Show template list if name not provided
+    if name.nil? || name.empty?
+      show_template_manager(:delete)
+      return
+    end
+    
+    template_path = File.join(@templates_dir, "#{name}.hlt")
+    
+    if File.exist?(template_path)
+      response = @footer.ask("Delete template '#{name}'? (y/n): ", "")
+      if response.downcase == 'y'
+        File.delete(template_path)
+        @message = "Template '#{name}' deleted"
+        # Reload templates
+        @templates = load_templates
+      end
+    else
+      @message = "Template '#{name}' not found"
+    end
+  end
+  
+  def get_user_templates
+    templates = []
+    if File.directory?(@templates_dir)
+      Dir.glob(File.join(@templates_dir, "*.hlt")).each do |template_file|
+        template_name = File.basename(template_file, ".hlt")
+        begin
+          template_data = JSON.parse(File.read(template_file))
+          templates << {
+            "name" => template_name,
+            "description" => template_data["description"] || "",
+            "created" => template_data["created"] || "",
+            "path" => template_file
+          }
+        rescue => e
+          # Skip invalid template files
+        end
+      end
+    end
+    templates.sort_by { |t| t["name"] }
+  end
+  
+  def show_template_manager(action = :list)
+    # Store original state
+    original_state = {
+      items: @items.dup,
+      current: @current,
+      offset: @offset,
+      filename: @filename,
+      modified: @modified
+    }
+    
+    user_templates = get_user_templates
+    
+    # Build template manager view
+    @items = []
+    case action
+    when :delete
+      @items << {"text" => "DELETE TEMPLATE (press Enter to delete, q to cancel)", "level" => 0, "fold" => false, "raw" => true}
+    else
+      @items << {"text" => "USER TEMPLATES (press Enter to select, q to cancel)", "level" => 0, "fold" => false, "raw" => true}
+    end
+    @items << {"text" => "="*50, "level" => 0, "fold" => false, "raw" => true}
+    
+    if user_templates.empty?
+      @items << {"text" => "No user templates found", "level" => 0, "fold" => false, "raw" => true}
+    else
+      user_templates.each_with_index do |template, idx|
+        desc = template["description"].empty? ? "No description" : template["description"]
+        created = template["created"].empty? ? "" : " (#{Time.parse(template["created"]).strftime('%Y-%m-%d')})"
+        @items << {
+          "text" => "#{idx+1}. #{template["name"]}: #{desc}#{created}",
+          "level" => 0,
+          "fold" => false,
+          "raw" => true,
+          "template_name" => template["name"],
+          "template_action" => action
+        }
+      end
+    end
+    
+    @current = 2  # Start at first template
+    @offset = 0
+    
+    selected_template = nil
+    exit_loop = false
+    
+    # Template manager loop
+    while !exit_loop
+      begin
+        render_main
+        footer_text = case action
+        when :delete
+          "Delete Template | Enter: delete | q: cancel | j/k: navigate"
+        else
+          "User Templates | Enter: select | q: cancel | j/k: navigate"
+        end
+        @footer.text = footer_text
+        @footer.refresh
+        
+        c = getchr
+        next if c.nil?
+        
+        case c
+        when "q", "ESC", "C-c", "Q"
+          exit_loop = true
+        when "j", "DOWN"
+          @current = [@current + 1, @items.length - 1].min
+        when "k", "UP"
+          @current = [@current - 1, 2].max
+        when "ENTER", "RETURN", "\n", "\r"
+          if @current >= 2 && @current < @items.length
+            item = @items[@current]
+            if item && item.is_a?(Hash) && item["template_name"]
+              selected_template = item["template_name"]
+              exit_loop = true
+            end
+          end
+        end
+      rescue => e
+        @message = "Error in template manager: #{e.message}"
+        exit_loop = true
+      end
+    end
+    
+    # Restore original state
+    @items = original_state[:items]
+    @current = original_state[:current]
+    @offset = original_state[:offset]
+    @filename = original_state[:filename]
+    @modified = original_state[:modified]
+    
+    # Process selected template
+    if selected_template && action == :delete
+      delete_template(selected_template)
+    end
+    
+    selected_template
   end
   
   def show_templates
@@ -3318,24 +3611,33 @@ class HyperListApp
       modified: @modified
     }
     
-    # Create template selection view
+    # Create template selection view combining built-in and user templates
     template_list = [
-      ["project", "Project Plan - Complete project management template"],
-      ["meeting", "Meeting Agenda - Structure for meeting notes"],
-      ["daily", "Daily Planner - Daily task and schedule template"],
-      ["checklist", "Simple Checklist - Basic checkbox list"],
-      ["brainstorm", "Brainstorming Session - Idea generation template"],
-      ["recipe", "Recipe - Cooking recipe structure"]
+      ["project", "Project Plan - Complete project management template", "built-in"],
+      ["meeting", "Meeting Agenda - Structure for meeting notes", "built-in"],
+      ["daily", "Daily Planner - Daily task and schedule template", "built-in"],
+      ["checklist", "Simple Checklist - Basic checkbox list", "built-in"],
+      ["brainstorm", "Brainstorming Session - Idea generation template", "built-in"],
+      ["recipe", "Recipe - Cooking recipe structure", "built-in"]
     ]
     
+    # Add user templates to the list
+    user_templates = get_user_templates
+    user_templates.each do |template|
+      desc = template["description"].empty? ? "User template" : template["description"]
+      template_list << [template["name"], desc, "user"]
+    end
+    
     # Build template selection items
     @items = []
     @items << {"text" => "TEMPLATES (press Enter to insert, q to cancel)", "level" => 0, "fold" => false, "raw" => true}
     @items << {"text" => "="*50, "level" => 0, "fold" => false, "raw" => true}
     
-    template_list.each_with_index do |(key, desc), idx|
+    # Add built-in templates section
+    @items << {"text" => "BUILT-IN TEMPLATES:", "level" => 0, "fold" => false, "raw" => true}
+    template_list.select { |t| t[2] == "built-in" }.each_with_index do |(key, desc, type), idx|
       @items << {
-        "text" => "#{idx+1}. #{key.capitalize}: #{desc}", 
+        "text" => "  #{idx+1}. #{key.capitalize}: #{desc}", 
         "level" => 0, 
         "fold" => false, 
         "raw" => true, 
@@ -3343,6 +3645,21 @@ class HyperListApp
       }
     end
     
+    # Add user templates section if any exist
+    if user_templates.any?
+      @items << {"text" => "", "level" => 0, "fold" => false, "raw" => true}
+      @items << {"text" => "USER TEMPLATES:", "level" => 0, "fold" => false, "raw" => true}
+      template_list.select { |t| t[2] == "user" }.each_with_index do |(key, desc, type), idx|
+        @items << {
+          "text" => "  #{key}: #{desc}", 
+          "level" => 0, 
+          "fold" => false, 
+          "raw" => true, 
+          "template_key" => key
+        }
+      end
+    end
+    
     @current = 2  # Start at first template
     @offset = 0
     
@@ -4252,6 +4569,19 @@ class HyperListApp
   end
   
   def run
+    # Initialize rcurses explicitly (no longer auto-initialized)
+    Rcurses.init!
+    
+    # Flush any buffered input (like the Enter key from running the command)
+    while IO.select([$stdin], nil, nil, 0)
+      $stdin.read_nonblock(1024) rescue break
+    end
+    
+    # Now that rcurses is initialized, set up the UI properly
+    Rcurses.clear_screen
+    Cursor.hide
+    setup_ui
+    
     render
     
     loop do
@@ -4260,6 +4590,14 @@ class HyperListApp
       
       c = getchr
       
+      # Skip nil input (shouldn't happen normally)
+      next if c.nil?
+      
+      # Skip newline at the very start (buffered from command execution)
+      if c == "\n" && @last_key.nil?
+        next
+      end
+      
       # Track last key for double-key combinations
       prev_key = @last_key
       @last_key = c
@@ -4550,13 +4888,15 @@ class HyperListApp
     quit
   ensure
     Cursor.show
-    Rcurses.clear_screen
+    # Screen clearing disabled for debugging
+    # Rcurses.clear_screen
   end
 end
 
 # Main
-if __FILE__ == $0
-  # Normal operation - help/version already handled at top of file
+# When installed as a gem executable, this file is loaded (not executed directly)
+# so we can't use __FILE__ == $0. Just run unless we already handled help/version.
+unless ARGV[0] == '-h' || ARGV[0] == '--help' || ARGV[0] == '-v' || ARGV[0] == '--version'
   app = HyperListApp.new(ARGV[0])
   app.run
 end

data/hyperlist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "hyperlist"
-  spec.version       = "1.1.7"
+  spec.version       = "1.2.2"
   spec.authors       = ["Geir Isene"]
   spec.email         = ["g@isene.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperlist
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.2
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: "."
 cert_chain: []
-date: 2025-08-14 00:00:00.000000000 Z
+date: 2025-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -73,20 +73,12 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- debug_instructions.md
-- diagnose.rb
-- diagnose_ruby34.rb
-- diagnose_ruby34_detailed.rb
-- diagnose_safe.rb
-- fix_terminal.sh
 - hyperlist
 - hyperlist.gemspec
-- hyperlist_logo.svg
-- hyperlist_ruby34_wrapper.rb
-- rcurses_ruby34_patch.rb
+- img/hyperlist_logo.svg
+- img/screenshot_help.png
+- img/screenshot_sample.png
 - sample.hl
-- screenshot_help.png
-- screenshot_sample.png
 - test.hl
 homepage: https://github.com/isene/HyperList
 licenses: