thor-interactive 0.1.0.pre.4 → 0.1.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c927c297d565d278a09334334217dca98c5e05e72277f7fec4f5d07568f19c30
-  data.tar.gz: 353b4acde28a2a780a2b7a1ce85d7fb6e510f20d2862dd3dc4b2505140e2c014
+  metadata.gz: 7166b4156516b241939081e8c9fc67aba249ceae1be85b4693d4afdb7638b08d
+  data.tar.gz: 8c3f92ab064d86f27a028dd685037d8e205e452ae840a674c39025d21fd8acfb
 SHA512:
-  metadata.gz: 77f42909ede7bb049ea1675bc2ccc4f486437be713bc2dd9c16cb5bfdd98b8723b77cacb87147335cb85d439f79c57b0ae18f0bbb0d874f80dd56b27a39bd5c9
-  data.tar.gz: 11f5c9a01fa32839b669d968c7cb154827bfd4cbe910c272094403280193c5115bef46fa4eb430ad476f9437d75fe13a515f12eadaa1d91080e48d4724c4866d
+  metadata.gz: 66f640e0df6d3f1699c6cd1e9612bd6f149da4a7716bcc66e49092a4dbe0f6e568eb98e97dc9e8eecc12548f8149eadbf01ab4149e0ab832d6a57fcf7c3237fe
+  data.tar.gz: a5993427b1e28efaa8849440ff0a16e724cb25dc746d0f49292bad78c2d1f364f5526e57d30e73361c236c1460c248ddb4eaf7c32ec370965622583982881232

data/examples/completion_demo.rb

@@ -0,0 +1,191 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "thor/interactive"
+
+class CompletionDemo < Thor
+  include Thor::Interactive::Command
+  
+  configure_interactive(
+    prompt: "demo> "
+  )
+  
+  desc "process FILE", "Process a file"
+  option :output, type: :string, aliases: "-o", desc: "Output file"
+  option :format, type: :string, enum: ["json", "xml", "yaml"], desc: "Output format"
+  option :verbose, type: :boolean, aliases: "-v", desc: "Verbose output"
+  def process(file)
+    puts "Processing: #{file}"
+    puts "Output to: #{options[:output]}" if options[:output]
+    puts "Format: #{options[:format]}" if options[:format]
+    puts "Verbose: ON" if options[:verbose]
+  end
+  
+  desc "convert INPUT OUTPUT", "Convert file format"
+  option :from, type: :string, required: true, desc: "Source format"
+  option :to, type: :string, required: true, desc: "Target format"
+  def convert(input, output)
+    puts "Converting: #{input} -> #{output}"
+    puts "Format: #{options[:from]} -> #{options[:to]}"
+  end
+  
+  desc "read FILE", "Read a file"
+  def read(file)
+    if File.exist?(file)
+      puts "Reading #{file}:"
+      puts "-" * 40
+      puts File.read(file).lines.first(10).join
+      puts "-" * 40
+      puts "(Showing first 10 lines)"
+    else
+      puts "File not found: #{file}"
+    end
+  end
+  
+  desc "list [DIR]", "List files in directory"
+  option :all, type: :boolean, aliases: "-a", desc: "Show hidden files"
+  option :long, type: :boolean, aliases: "-l", desc: "Long format"
+  def list(dir = ".")
+    puts "Listing files in: #{dir}"
+    
+    pattern = options[:all] ? "*" : "[^.]*"
+    files = Dir.glob(File.join(dir, pattern))
+    
+    if options[:long]
+      files.each do |file|
+        stat = File.stat(file)
+        type = File.directory?(file) ? "d" : "-"
+        size = stat.size.to_s.rjust(10)
+        name = File.basename(file)
+        name += "/" if File.directory?(file)
+        puts "#{type} #{size} #{name}"
+      end
+    else
+      files.each { |f| puts File.basename(f) }
+    end
+  end
+  
+  desc "test", "Test completion features"
+  def test
+    puts <<~TEST
+    
+    === Path Completion Demo ===
+    
+    This demo showcases the new completion features:
+    
+    1. PATH COMPLETION
+       Start typing a path and press TAB:
+       /process <TAB>           # Shows files in current directory
+       /process ex<TAB>         # Completes to 'examples/'
+       /process ~/Doc<TAB>      # Completes home directory paths
+       /process ./lib/<TAB>     # Shows files in lib directory
+    
+    2. OPTION COMPLETION
+       Type - or -- and press TAB:
+       /process file.txt --<TAB>     # Shows all options
+       /process file.txt --v<TAB>    # Completes to --verbose
+       /process file.txt -<TAB>      # Shows short options
+    
+    3. SMART DETECTION
+       After file options, paths are completed:
+       /process --output <TAB>       # Completes paths
+       /process -o <TAB>             # Also completes paths
+    
+    4. COMMAND COMPLETION
+       Still works as before:
+       /proc<TAB>                    # Completes to /process
+       /con<TAB>                     # Completes to /convert
+    
+    TRY THESE EXAMPLES:
+    
+    Basic file completion:
+      /read <TAB>
+      /read README<TAB>
+      /read lib/<TAB>
+      
+    Option completion:
+      /process file.txt --<TAB>
+      /process file.txt --verb<TAB>
+      /convert input.txt output.json --<TAB>
+      
+    Path after options:
+      /process --output <TAB>
+      /process -o ~/Desktop/<TAB>
+      
+    Directory listing:
+      /list <TAB>
+      /list examples/<TAB>
+      /list --<TAB>
+    
+    TEST
+  end
+  
+  desc "create_test_files", "Create test files for demo"
+  def create_test_files
+    puts "Creating test files..."
+    
+    # Create some test files
+    files = [
+      "test_file.txt",
+      "test_data.json",
+      "test_doc.md",
+      "test_config.yaml",
+      "test_log.log"
+    ]
+    
+    files.each do |file|
+      File.write(file, "Test content for #{file}\n")
+      puts "  Created: #{file}"
+    end
+    
+    # Create a test directory
+    Dir.mkdir("test_dir") unless Dir.exist?("test_dir")
+    File.write("test_dir/nested.txt", "Nested file content\n")
+    puts "  Created: test_dir/nested.txt"
+    
+    puts "\nTest files created! Try tab completion with these files."
+  end
+  
+  desc "clean_test_files", "Remove test files"
+  def clean_test_files
+    puts "Cleaning up test files..."
+    
+    files = [
+      "test_file.txt",
+      "test_data.json", 
+      "test_doc.md",
+      "test_config.yaml",
+      "test_log.log",
+      "test_dir/nested.txt"
+    ]
+    
+    files.each do |file|
+      if File.exist?(file)
+        File.delete(file)
+        puts "  Removed: #{file}"
+      end
+    end
+    
+    Dir.rmdir("test_dir") if Dir.exist?("test_dir") && Dir.empty?("test_dir")
+    puts "Cleanup complete!"
+  end
+  
+  default_task :test
+end
+
+if __FILE__ == $0
+  puts "Path Completion Demo"
+  puts "==================="
+  puts
+  puts "Tab completion now supports:"
+  puts "  • File and directory paths"
+  puts "  • Command option names"
+  puts "  • Smart detection of when to complete paths"
+  puts
+  puts "Type '/test' for examples or '/create_test_files' to create test files"
+  puts "Press TAB at any time to see completions!"
+  puts
+  
+  CompletionDemo.new.interactive
+end

data/lib/thor/interactive/shell.rb

@@ -149,10 +149,182 @@ class Thor
       end
 
       def complete_command_options(text, preposing)
-        # Basic implementation - can be enhanced later
-        # For now, just return empty array to let Reline handle file completion
+        # Parse the command and check what we're completing
+        parts = preposing.split(/\s+/)
+        command = parts[0].sub(/^\//, '') if parts[0]
+
+        # Check if this is a subcommand
+        subcommand_class = @thor_class.subcommand_classes[command] if command
+        if subcommand_class
+          return complete_subcommand_args(subcommand_class, text, parts)
+        end
+
+        # Get the Thor task if it exists
+        task = @thor_class.tasks[command] if command
+
+        # Check if we're likely completing a path
+        if path_like?(text) || after_path_option?(preposing)
+          complete_path(text)
+        elsif text.start_with?('--') || text.start_with?('-')
+          # Complete option names
+          complete_option_names(task, text)
+        else
+          # Default to path completion for positional args that might be files
+          # This helps with commands that take file arguments
+          complete_path(text)
+        end
+      end
+
+      def complete_subcommand_args(subcommand_class, text, parts)
+        # parts[0] = "/db" or "db", parts[1..] = subcommand args
+        if parts.length <= 1
+          # No subcommand yet typed, complete subcommand names
+          # e.g. "/db <TAB>"
+          complete_subcommands(subcommand_class, text)
+        else
+          # A subcommand name has been typed, check for option completion
+          sub_cmd_name = parts[1]
+          sub_task = subcommand_class.tasks[sub_cmd_name]
+
+          if text.start_with?('--') || text.start_with?('-')
+            complete_option_names(sub_task, text)
+          else
+            # Could be completing a subcommand name or a positional arg
+            if parts.length == 2 && !text.empty?
+              # Still typing the subcommand name, e.g. "/db cr<TAB>"
+              # But only if 'text' is part of a subcommand name being typed
+              # (parts[1] is the preposing word, text is what's being completed)
+              complete_subcommands(subcommand_class, text)
+            else
+              complete_path(text)
+            end
+          end
+        end
+      end
+
+      def complete_subcommands(subcommand_class, text)
+        return [] if text.nil?
+
+        command_names = subcommand_class.tasks.keys
+        command_names.select { |cmd| cmd.start_with?(text) }.sort
+      end
+      
+      def path_like?(text)
+        # Check if text looks like a path
+        text.match?(%r{^[~./]|/}) || text.match?(/\.(txt|rb|md|json|xml|yaml|yml|csv|log|html|css|js)$/i)
+      end
+      
+      def after_path_option?(preposing)
+        # Check if we're after a common file/path option
+        preposing.match?(/(?:--file|--output|--input|--path|--dir|--directory|-f|-o|-i|-d)\s*$/)
+      end
+      
+      def complete_path(text)
+        return [] if text.nil?
+        
+        # Special case for empty text - show files in current directory
+        if text.empty?
+          matches = Dir.glob("*", File::FNM_DOTMATCH).select do |path|
+            basename = File.basename(path)
+            basename != '.' && basename != '..'
+          end
+          return format_path_completions(matches, text)
+        end
+        
+        # Expand ~ to home directory for matching
+        expanded = text.start_with?('~') ? File.expand_path(text) : text
+        
+        # Determine directory and prefix for matching
+        if text.end_with?('/')
+          # User typed a directory with trailing slash - show its contents
+          dir = expanded
+          prefix = ''
+        elsif File.directory?(expanded) && !text.end_with?('/')
+          # It's a directory without trailing slash - complete the directory name
+          dir = File.dirname(expanded)
+          prefix = File.basename(expanded)
+        else
+          # Completing a partial filename
+          dir = File.dirname(expanded)
+          prefix = File.basename(expanded)
+        end
+        
+        # Get matching files/dirs
+        pattern = File.join(dir, "#{prefix}*")
+        matches = Dir.glob(pattern, File::FNM_DOTMATCH).select do |path|
+          # Filter out . and .. entries
+          basename = File.basename(path)
+          basename != '.' && basename != '..'
+        end
+        
+        format_path_completions(matches, text)
+      rescue => e
+        # If path completion fails, return empty array
         []
       end
+      
+      def format_path_completions(matches, original_text)
+        # Format the completions based on how the user typed the path
+        matches.map do |path|
+          # Add trailing / for directories
+          display_path = File.directory?(path) && !path.end_with?('/') ? "#{path}/" : path
+          
+          # Handle paths with spaces by escaping them
+          display_path = display_path.gsub(' ', '\ ')
+          
+          # Return path as user would type it
+          if original_text.start_with?('~')
+            # Replace home directory with ~
+            home = ENV['HOME']
+            if display_path.start_with?(home)
+              "~#{display_path[home.length..-1]}"
+            else
+              display_path.sub(ENV['HOME'], '~')
+            end
+          elsif original_text.start_with?('./')
+            # Keep ./ prefix and make path relative
+            if display_path.start_with?(Dir.pwd)
+              rel_path = display_path.sub(/^#{Regexp.escape(Dir.pwd)}\//, '')
+              "./#{rel_path}"
+            else
+              # Already relative, just ensure ./ prefix
+              display_path.start_with?('./') ? display_path : "./#{File.basename(display_path)}"
+            end
+          elsif original_text.start_with?('/')
+            # Absolute path - return as is
+            display_path
+          else
+            # Relative path without ./ prefix
+            # If the matched path is in current dir, just return the basename
+            dir = File.dirname(display_path)
+            if dir == '.' || display_path.start_with?('./')
+              basename = File.basename(display_path)
+              basename += '/' if File.directory?(display_path.gsub('\ ', ' ')) && !basename.end_with?('/')
+              basename
+            else
+              display_path.sub(/^#{Regexp.escape(Dir.pwd)}\//, '')
+            end
+          end
+        end.sort
+      end
+      
+      def complete_option_names(task, text)
+        return [] unless task && task.options
+        
+        # Get all option names (long and short forms)
+        options = []
+        task.options.each do |name, option|
+          options << "--#{name}"
+          if option.aliases
+            # Aliases can be string or array
+            aliases = option.aliases.is_a?(Array) ? option.aliases : [option.aliases]
+            aliases.each { |a| options << a if a.start_with?('-') }
+          end
+        end
+        
+        # Filter by what user has typed
+        options.select { |opt| opt.start_with?(text) }.sort
+      end
 
       def process_input(input)
         # Handle completely empty input
@@ -300,8 +472,11 @@ class Thor
           
           if task && task.options && !task.options.empty?
             # Parse options if the command has them defined
-            parsed_args, parsed_options = parse_thor_options(args, task)
-            
+            result = parse_thor_options(args, task)
+            return unless result # Parse failed, error already shown
+
+            parsed_args, parsed_options = result
+
             # Set options on the Thor instance
             @thor_instance.options = Thor::CoreExt::HashWithIndifferentAccess.new(parsed_options)
             
@@ -341,12 +516,11 @@ class Thor
         # Convert args array to a format Thor's option parser expects
         remaining_args = []
         parsed_options = {}
-        
-        # Create a temporary parser using Thor's options
-        parser = Thor::Options.new(task.options)
-        
-        # Parse the arguments
+
         begin
+          # Create a temporary parser using Thor's options
+          parser = Thor::Options.new(task.options)
+
           if args.is_a?(Array)
             # Parse the options from the array
             parsed_options = parser.parse(args)
@@ -358,17 +532,32 @@ class Thor
             remaining_args = parser.remaining
           end
         rescue Thor::Error => e
-          # If parsing fails, treat everything as arguments (backward compatibility)
-          puts "Option parsing error: #{e.message}" if ENV["DEBUG"]
-          remaining_args = args.is_a?(Array) ? args : [args]
-          parsed_options = {}
+          # Show user-friendly error for option parsing failures (e.g. invalid numeric value)
+          puts "Option error: #{e.message}"
+          return nil
         end
-        
+
+        # Check for unknown options left in remaining args
+        unknown = remaining_args.select { |a| a.start_with?('--') || (a.start_with?('-') && a.length > 1 && !a.match?(/^-\d/)) }
+        unless unknown.empty?
+          puts "Unknown option#{'s' if unknown.length > 1}: #{unknown.join(', ')}"
+          puts "Run '/help #{task.name}' to see available options."
+          return nil
+        end
+
         [remaining_args, parsed_options]
       end
 
       def show_help(command = nil)
-        if command && @thor_class.tasks.key?(command)
+        if command && @thor_class.subcommand_classes.key?(command)
+          # Show help for a subcommand — list its available commands
+          subcommand_class = @thor_class.subcommand_classes[command]
+          puts "Commands for '#{command}':"
+          subcommand_class.tasks.each do |name, task|
+            puts "  /#{command} #{name.ljust(15)} #{task.description}"
+          end
+          puts
+        elsif command && @thor_class.tasks.key?(command)
           @thor_class.command_help(Thor::Base.shell.new, command)
         else
           puts "Available commands (prefix with /):"

data/lib/thor/interactive/version_constant.rb

@@ -4,5 +4,5 @@
 # This file is separate to avoid circular dependencies during gem installation
 
 module ThorInteractive
-  VERSION = "0.1.0.pre.4"
+  VERSION = "0.1.0.pre.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thor-interactive
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.4
+  version: 0.1.0.pre.5
 platform: ruby
 authors:
 - Chris Petersen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-08 00:00:00.000000000 Z
+date: 2026-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -54,6 +54,7 @@ files:
 - README.md
 - Rakefile
 - examples/README.md
+- examples/completion_demo.rb
 - examples/demo_session.rb
 - examples/edge_case_test.rb
 - examples/nested_example.rb