aia 0.3.3 → 0.3.19

data/lib/aia/prompt_processing.rb

@@ -5,14 +5,20 @@ module AIA::PromptProcessing
 
   # Fetch the first argument which should be the prompt id
   def get_prompt
-    prompt_id = @arguments.shift
+    prompt_id = AIA.config.arguments.shift
 
     # TODO: or maybe go to a generic search and select process
 
+    # TODO: if external options were provided but no prompt id
+    #       then by pass prompt process and send the extra
+    #       options to the backend.  For example:
+    #         aia -- --settings
+    #       should send --settings to mods and nothing else
+    
     abort("Please provide a prompt id") unless prompt_id
 
     search_for_a_matching_prompt(prompt_id) unless existing_prompt?(prompt_id)
-    edit_prompt if edit?
+    edit_prompt if AIA.config.edit?
   end
 
 
@@ -178,8 +184,17 @@ module AIA::PromptProcessing
 
 
   def edit_prompt
-    `#{EDITOR} #{@prompt.path}`
-    @options[:edit?][0] = false
+    # FIXME: replace with the editor from the configuration
+    
+    @editor   = AIA::Subl.new(
+                  file: @prompt.path
+                )
+    
+    @editor.run # blocks until file is closed
+
+    @options[:edit?][0] = false # turn off the --edit switch
+
+    # reload the edited prompt
     @prompt = PromptManager::Prompt.get(id: @prompt.id)
   end
 
@@ -210,3 +225,192 @@ module AIA::PromptProcessing
   end
 end
 
+
+
+__END__
+
+# lib/aia/prompt_processing.rb
+
+class AIA::PromptProcessing
+  KW_HISTORY_MAX = 5
+  
+  def initialize(arguments, options)
+    @arguments = arguments
+    @options = options
+    @prompt = nil
+  end
+
+  def execute
+    get_prompt
+    process_prompt
+  end
+
+  private
+  
+  def get_prompt
+    prompt_id = @arguments.shift
+    abort("Please provide a prompt id") unless prompt_id
+    search_for_a_matching_prompt(prompt_id) unless existing_prompt?(prompt_id)
+    edit_prompt if edit?
+  end
+
+  def existing_prompt?(prompt_id)
+    @prompt = PromptManager::Prompt.get(id: prompt_id)
+    @prompt.keywords.each do |kw|
+      @prompt.parameters[kw] = Array(@prompt.parameters[kw])
+    end
+    true
+  rescue ArgumentError
+    false
+  end
+
+  def process_prompt
+    return if @prompt.keywords.empty?
+    replace_keywords
+    @prompt.build
+    @prompt.save
+  end
+
+  def replace_keywords
+    puts "ID: #{@prompt.id}"
+    show_prompt_without_comments
+    puts_instructions
+    @prompt.keywords.each do |kw|
+      value = keyword_value(kw, @prompt.parameters[kw])
+      update_keyword_history(kw, value) unless value.nil? || value.strip.empty?
+    end
+  end
+
+  def puts_instructions
+    puts "\nPress up/down arrow to scroll through history."
+    puts "Type new input or edit the current input."
+    puts  "Quit #{MY_NAME} with a CNTL-D or a CNTL-C"
+    puts
+  end
+
+  def update_keyword_history(kw, value)
+    params = @prompt.parameters[kw]
+    params.delete(value)
+    params << value
+    params.shift if params.size > KW_HISTORY_MAX
+  end
+
+  def keyword_value(kw, history_array)
+    Readline::HISTORY.clear
+    Array(history_array).each { |entry| Readline::HISTORY.push(entry) unless entry.nil? || entry.empty? }
+    puts "Parameter #{kw} ..."
+    begin
+      a_string = Readline.readline("\n-=> ", true)
+    rescue Interrupt
+      a_string = nil
+    end
+    abort("okay. Come back soon.") if a_string.nil?
+    a_string.empty? ? history_array.first : a_string
+  end
+
+  def search_for_a_matching_prompt(prompt_id)
+    found_prompts = PromptManager::Prompt.search(prompt_id)
+    handle_no_prompts_found(prompt_id) if found_prompts.empty?
+    prompt_id = found_prompts.size == 1 ? found_prompts.first : handle_multiple_prompts(found_prompts, prompt_id)
+    @prompt = PromptManager::Prompt.get(id: prompt_id)
+  end
+
+  def handle_no_prompts_found(prompt_id)
+    if edit?
+      create_prompt(prompt_id)
+      edit_prompt
+    else
+      abort_no_prompts_error(prompt_id)
+    end
+  end
+
+  def abort_no_prompts_error(prompt_id)
+    abort <<~EOS
+    
+      No prompts were found for: #{prompt_id}
+      To create a prompt with this ID use the --edit option
+      like this:
+        #{MY_NAME} #{prompt_id} --edit
+
+    EOS
+  end
+
+  def handle_multiple_prompts(found_these, while_looking_for_this)
+    raise ArgumentError, "Argument is not an Array" unless found_these.is_a?(Array)
+    result = execute_fzf(found_these, while_looking_for_this)
+    abort unless result
+    result
+  end
+
+  def execute_fzf(found_these, while_looking_for_this)
+    fzf_options = build_fzf_options(while_looking_for_this)
+    temp_file = create_tempfile_with_entries(found_these)
+    selected = `cat #{temp_file.path} | fzf #{fzf_options}`.strip
+    temp_file.unlink
+    selected.empty? ? nil : selected
+  end
+
+  def build_fzf_options(search_term)
+    [
+      "--tabstop=2",
+      "--header='Prompt IDs which contain: #{search_term}\nPress ESC to cancel.'",
+      "--header-first",
+      "--prompt='Search term: '",
+      '--delimiter :',
+      "--preview 'cat $PROMPTS_DIR/{1}.txt'",
+      "--preview-window=down:50%:wrap"
+    ].join(' ')
+  end
+
+  def create_tempfile_with_entries(entries)
+    temp_file = Tempfile.new('fzf-input')
+    temp_file.puts(entries)
+    temp_file.close
+    temp_file
+  end
+
+  def create_prompt(prompt_id)
+    @prompt = PromptManager::Prompt.create(id: prompt_id)
+    # Additional prompt config...
+  end
+
+
+
+  def edit_prompt
+    # FIXME: replace with the editor from the configuration
+    
+    @editor   = AIA::Subl.new(
+                  file: @prompt.path
+                )
+    
+    @editor.run # blocks until file is closed
+
+    @options[:edit?][0] = false # turn off the --edit switch
+
+    # reload the edited prompt
+    @prompt = PromptManager::Prompt.get(id: @prompt.id)
+  end
+
+
+  def show_prompt_without_comments
+    puts remove_comments.wrap(indent: 4)
+  end
+
+  def remove_comments
+    lines = @prompt.text.lines
+             .reject { |a_line| a_line.strip.start_with?('#') }
+             .drop_while(&:empty?)
+    logical_end_inx = lines.index("__END__")
+    lines = lines[0...logical_end_inx] if logical_end_inx
+    lines.join("\n")
+  end
+  
+  def edit?
+    @options[:edit?] && @options[:edit?][0] == true
+  end
+end
+
+
+
+
+

data/lib/aia/tools/editor.rb

@@ -0,0 +1,50 @@
+# lib/aia/tools/editor.rb
+# This is the default editor setup in the
+# system environment variable EDITOR
+
+
+class AIA::Editor < AIA::Tools
+  DEFAULT_PARAMETERS = ""
+  
+  attr_accessor :command
+
+
+  def initialize(file: "")
+    super
+    
+    @role         = :editor
+    @description  = "Your default system $EDITOR"
+    @url          = "unknown"
+    @install      = "should already be installed"
+
+    @file     = file
+
+    discover_editor
+
+    build_command
+  end
+
+
+  def discover_editor
+    editor = ENV['EDITOR']  # This might be nil
+
+    if editor.nil?
+      @name         = "echo"
+      @description  = "You have no default editor"
+      @install      = "Set your system environment variable EDITOR"
+    else
+      @name = editor
+    end    
+  end
+
+
+  def build_command
+    @command = "#{name} #{DEFAULT_PARAMETERS} #{@file}"
+  end
+
+  
+  def run
+    `#{command}`
+  end
+end
+

data/lib/aia/{external → tools}/mods.rb

@@ -1,22 +1,81 @@
-# lib/aia/external/mods.rb
+# lib/aia/tools/mods.rb
 
-class AIA::External::Mods < AIA::External::Tool
-  def initialize
+class AIA::Mods < AIA::Tools
+  DEFAULT_PARAMETERS = [
+    "--no-limit"              # no limit on input context
+  ].join(' ').freeze
+
+  attr_accessor :command, :extra_options, :text, :files
+
+  # TODO: put the prompt text to be resolved into a 
+  #       temporary text file then cat that file into mods.
+  #       This will keep from polluting the CLI history with
+  #       lots of text
+
+
+  def initialize(
+      extra_options:  "", # everything after -- on command line
+      text:           "", # prompt text after keyword replacement
+      files:          []  # context file paths (Array of Pathname)
+    )
     super
-    @role = :search
-    @desc = 'AI on the command-line'
-    @url  = 'https://github.com/charmbracelet/mods'
+    @role         = :gen_ai
+    @description  = 'AI on the command-line'
+    @url          = 'https://github.com/charmbracelet/mods'
+  
+    @extra_options  = extra_options
+    @text           = text
+    @files          = files
+
+    build_command
+  end
+
+
+  def build_command
+    parameters  = DEFAULT_PARAMETERS.dup + " "
+    parameters += "-f "                     if ::AIA.config.markdown?
+    parameters += "-m #{AIA.config.model} " if ::AIA.config.model
+    parameters += @extra_options
+    @command    = "mods #{parameters} "
+    @command   += %Q["#{@text}"]        # TODO: consider using the pipeline
+
+    @files.each {|f| @command += " < #{f}" }
+
+    @command
   end
 
-  def command(extra_options = [])
-    model = ENV['MODS_MODEL'] || 'gpt-4-1106-preview'
-    ai_default_opts = "-m #{model} --no-limit -f"
-    "#{name} #{ai_default_opts} #{extra_options.join(' ')}"
+
+  def run
+    `#{command}`
   end
 end
 
 __END__
 
+
+  # Execute the command and log the results
+  def send_prompt_to_external_command
+    command = build_command
+
+    puts command if verbose?
+    @result = `#{command}`
+
+    if @output.nil?
+      puts @result
+    else
+      @output.write @result
+    end
+
+    @result
+  end
+
+
+
+
+
+##########################################################
+
+
 GPT on the command line. Built for pipelines.
 
 Usage:

data/lib/aia/{external → tools}/sgpt.rb

@@ -1,6 +1,6 @@
-# lib/aia/external/sgpt.rb
+# lib/aia/tools/sgpt.rb
 
-class AIA::External::Sgpt < AIA::External::Tool
+class AIA::Sgpt < AIA::Tools
   def initialize
     super
     @role     = :backend

data/lib/aia/{external → tools}/subl.rb

@@ -1,17 +1,35 @@
-# lib/aia/external/subl.rb
+# lib/aia/tools/subl.rb
 
-class AIA::External::Subl < AIA::External::Tool
-  def initialize
+class AIA::Subl < AIA::Tools
+  DEFAULT_PARAMETERS = [
+    "--new-window",   # Open a new window
+    "--wait",         # Wait for the files to be closed before returning
+  ].join(' ')
+  
+  attr_accessor :command
+
+
+  def initialize(file: "")
     super
+    
     @role     = :editor
     @desc     = "Sublime Text Editor"
     @url      = "https://www.sublimetext.com/"
     @install  = "echo 'Download from website'"
+
+    @file     = file
+
+    build_command
+  end
+
+
+  def build_command
+    @command = "#{name} #{DEFAULT_PARAMETERS} #{@file}"
   end
 
   
-  def open(file)
-    `#{name} #{file}`
+  def run
+    `#{command}`
   end
 end
 

data/lib/aia/tools/vim.rb

@@ -0,0 +1,91 @@
+# lib/aia/tools/vim.rb
+
+class AIA::Vim < AIA::Tools
+  DEFAULT_PARAMETERS = [
+    " ", # no parameters 
+  ].join(' ')
+  
+  attr_accessor :command
+
+
+  def initialize(file: "")
+    super
+    
+    @role         = :editor
+    @description  = "Vi IMproved (VIM)"
+    @url          = "https://www.vim.org"
+    @install      = "brew install vim"
+
+    @file     = file
+
+    build_command
+  end
+
+
+  def build_command
+    @command = "#{name} #{DEFAULT_PARAMETERS} #{@file}"
+  end
+
+  
+  def run
+    # Using 'system' instead of backticks becuase
+    # with the back ticks vim was complaining that it
+    # was not connected to a terminal.
+    system command
+  end
+end
+
+__END__
+
+VIM - Vi IMproved 9.0 (2022 Jun 28, compiled Sep 30 2023 05:45:56)
+
+Usage: vim [arguments] [file ..]       edit specified file(s)
+   or: vim [arguments] -               read text from stdin
+   or: vim [arguments] -t tag          edit file where tag is defined
+   or: vim [arguments] -q [errorfile]  edit file with first error
+
+Arguments:
+   --			Only file names after this
+   -v			Vi mode (like "vi")
+   -e			Ex mode (like "ex")
+   -E			Improved Ex mode
+   -s			Silent (batch) mode (only for "ex")
+   -d			Diff mode (like "vimdiff")
+   -y			Easy mode (like "evim", modeless)
+   -R			Readonly mode (like "view")
+   -Z			Restricted mode (like "rvim")
+   -m			Modifications (writing files) not allowed
+   -M			Modifications in text not allowed
+   -b			Binary mode
+   -l			Lisp mode
+   -C			Compatible with Vi: 'compatible'
+   -N			Not fully Vi compatible: 'nocompatible'
+   -V[N][fname]		Be verbose [level N] [log messages to fname]
+   -D			Debugging mode
+   -n			No swap file, use memory only
+   -r			List swap files and exit
+   -r (with file name)	Recover crashed session
+   -L			Same as -r
+   -T <terminal>	Set terminal type to <terminal>
+   --not-a-term		Skip warning for input/output not being a terminal
+   --ttyfail		Exit if input or output is not a terminal
+   -u <vimrc>		Use <vimrc> instead of any .vimrc
+   --noplugin		Don't load plugin scripts
+   -p[N]		Open N tab pages (default: one for each file)
+   -o[N]		Open N windows (default: one for each file)
+   -O[N]		Like -o but split vertically
+   +			Start at end of file
+   +<lnum>		Start at line <lnum>
+   --cmd <command>	Execute <command> before loading any vimrc file
+   -c <command>		Execute <command> after loading the first file
+   -S <session>		Source file <session> after loading the first file
+   -s <scriptin>	Read Normal mode commands from file <scriptin>
+   -w <scriptout>	Append all typed commands to file <scriptout>
+   -W <scriptout>	Write all typed commands to file <scriptout>
+   -x			Edit encrypted files
+   --startuptime <file>	Write startup timing messages to <file>
+   --log <file>		Start logging to <file> early
+   -i <viminfo>		Use <viminfo> instead of .viminfo
+   --clean		'nocompatible', Vim defaults, no plugins, no viminfo
+   -h  or  --help	Print Help (this message) and exit
+   --version		Print version information and exit

data/lib/aia/{external/tool.rb → tools.rb}

@@ -1,27 +1,21 @@
-# lib/aia/external/tool.rb
+# lib/aia/tools.rb
 
-class AIA::External::Tool
+class AIA::Tools
   @@subclasses = []
 
-  # This method is called whenever a subclass is created
   def self.inherited(subclass)
     @@subclasses << subclass
   end
 
+  attr_accessor :role, :name, :description, :url, :install
+  
 
-  attr_reader :name, :description, :url
-
-  def initialize
-    @role     = :role
-    @name     = self.class.name.split('::').last.downcase
-    @desc     = "description"
-    @url      = "URL"
-    @install  = "brew install #{name}"
-  end
-
-
-  def self.tools
-    @@subclasses.map(&:name)
+  def initialize(*)
+    @role         = :role
+    @name         = self.class.name.split('::').last.downcase
+    @description  = "description"
+    @url          = "URL"
+    @install      = "brew install #{name}"
   end
 
 
@@ -31,14 +25,25 @@ class AIA::External::Tool
   end
 
 
-  def help    = `#{name} --help`
-  def version = `#{name} --version`
+  def help
+    `#{name} --help`
+  end
+  
+
+  def version
+    `#{name} --version`
+  end
 
 
-  ###################################################
+  #########################################
   class << self
-    def verify_tools(tools)
-      missing_tools = tools.reject(&:installed?)
+    def tools
+      @@subclasses.map(&:name)
+    end
+
+
+    def verify_tools
+      missing_tools = @@subclasses.map(&:new).reject(&:installed?)
       unless missing_tools.empty?
         puts format_missing_tools_response(missing_tools)
       end
@@ -64,10 +69,9 @@ class AIA::External::Tool
 end
 
 
-Pathname.new(__dir__)
+(Pathname.new(__dir__)+"tools")
   .glob('*.rb')
-  .reject{|f| f.basename.to_s.end_with?('tool.rb') }
   .each do |tool|
-    require_relative tool.basename.to_s 
+    require_relative "tools/#{tool.basename.to_s}" 
   end
 

data/lib/aia/version.rb

@@ -1,6 +1,10 @@
 # lib/aia/version.rb
 # frozen_string_literal: true
 
+require 'semver'
+
 module AIA
-  VERSION = "0.3.3"
+  # .semver is located at the gem's root directory
+  version_file_path = File.join(__dir__, '..', '..')
+  VERSION = SemVer.find(version_file_path).to_s[1..]
 end

data/lib/aia.rb

@@ -1,5 +1,9 @@
 # lib/aia.rb
 
+require 'debug_me'
+include DebugMe
+
+require 'hashie'
 require 'pathname'
 require 'readline'
 require 'tempfile'
@@ -12,9 +16,19 @@ require_relative "aia/main"
 require_relative "core_ext/string_wrap"
 
 module AIA
-  def self.run(args=ARGV)
-    args = args.split(' ') if args.is_a?(String)
-    AIA::Main.new(args).call
+  class << self
+    attr_accessor :config
+
+    def run(args=ARGV)
+      args = args.split(' ') if args.is_a?(String)
+
+      # TODO: Currently this is a one and done architecture.
+      #       If the args contain an "-i" or and "--interactive"
+      #       flag could this turn into some kind of
+      #       conversation REPL?
+      
+      AIA::Main.new(args).call
+    end
   end
 end
 

data/main.just

@@ -0,0 +1,56 @@
+# aia/main.just
+#
+# Support man pages with ...
+# gem install kramdown-man
+#
+
+RR := env_var('RR')
+
+with ~/.justfile
+
+# FIXME: justprep module process still has an issue with ~ and $HOME
+# FIXME: justprep does not like more than one space between module name and path.
+
+module repo /Users/dewayne/sandbox/git_repos/repo.just
+module gem /Users/dewayne/sandbox/git_repos/gem.just
+module version /Users/dewayne/just_modules/version.just
+
+
+# Preview man page
+preview_man_page:
+  kramdown-man {{RR}}/man/aia.1.md
+
+
+# View man page
+view_man_page: create_man_page
+  man {{RR}}/man/aia.1
+
+
+# Create man page
+create_man_page:
+  rake man
+
+##########################################
+
+# Tag the current commit, push it, then bump the version
+tag_push_and_bump: tag push bump
+
+
+# Create a git tag for the current version
+tag:
+  git tag $(semver)
+
+# Push the git current working directory and all tags
+push:
+  git push
+  git push origin --tags
+
+
+alias inc := bump
+
+# Increament version's level: major.minor.patch
+@bump level='patch':
+  semver increment {{level}}
+  echo "Now working on: $(semver)"
+  git add {{RR}}/.semver
+