ruby-shell 2.8.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55c80db8b211f00c2226a2bc38de34ca8bc448ff38545043f24931bde8441de6
-  data.tar.gz: 7f70a5858de2c5d64800202a35af757b9bef6d864ccf76ab23dc673b82451fc1
+  metadata.gz: 9ceae5891b4b0deebdf2e2876232999e8c64374f4730ab4d5e8ef09ff2dc3835
+  data.tar.gz: bee38e735fb5f9eb1b4b133471ea649faec9531c7138ef035c6c9a089db87f06
 SHA512:
-  metadata.gz: 6ad59802df4fc00d2d39191080b4a8df1d90ad5c567078c16562992b64d0aa8ad3ca59fdd9a0ab0bcefc35f6b02774305bec3f83872d463d27c2570887376901
-  data.tar.gz: 0a4cd352e6e20d25af578a689bffb6d460cc24f0b40328461b8a9ada40d3b03bda6e6c79674944170b752b7dc3787b9397869644025bc7925e90d54ce3bcff4e
+  metadata.gz: 7e586a0d583b1d3c33f441ce1dcabf001dc1a12d3a375581ad2337db8cab2822850455cf599b5a5e7ba21a31d750f2133c10b0a71c3e9bdc6ff62454c98296ee
+  data.tar.gz: 8b7ae87743f8fe9f0414dda5ae607f632ece3f8289131519d21d8ebc20d54d13d7d7361364b8eeef7d9c68d6af9006731790decbee4eb0862a159997af0f306c

data/README.md

@@ -33,7 +33,16 @@ Or simply `gem install ruby-shell`.
 * All colors are themeable in .rshrc (see github link for possibilities)
 * Copy current command line to primary selection (paste w/middle button) with `Ctrl-y`
 
-## NEW in v2.8.0 - Enhanced Help System & Nick Management ⭐
+## NEW in v2.9.0 - AI Integration ⭐
+* **AI-powered command assistance**: Get help with commands using natural language
+* **`@ <question>`**: Ask questions and get AI-generated text responses
+* **`@@ <request>`**: Describe what you want to do, and AI suggests the command
+* **Smart command suggestion**: AI suggestions appear directly on the command line, ready to execute
+* **Local AI support**: Works with Ollama for privacy-focused local AI
+* **External AI support**: Configure OpenAI or other providers via `.rshrc`
+* **Syntax highlighting**: @ and @@ commands are highlighted in blue
+
+## Enhanced Help System & Nick Management (v2.8.0)
 * **Two-column help display**: Compact, organized help that fits on one screen
 * **New `:info` command**: Shows introduction and feature overview
 * **`:nickdel` and `:gnickdel`**: Intuitive commands to delete nicks and gnicks
@@ -81,6 +90,21 @@ Background jobs:
 * Use `:fg` or `:fg job_id` to bring jobs to foreground
 * Use `Ctrl-Z` to suspend running jobs, `:bg job_id` to resume them
 
+## AI Configuration
+The AI features work out of the box with Ollama for local AI processing. To set up:
+
+### Local AI (Recommended)
+1. Install Ollama: `curl -fsSL https://ollama.com/install.sh | sh`
+2. Pull a model: `ollama pull llama3.2`
+3. That's it! Use `@ What is the capital of France?` or `@@ list files by size`
+
+### External AI (OpenAI)
+Add to your `.rshrc`:
+```ruby
+@aimodel = "gpt-4"
+@aikey = "your-api-key-here"
+```
+
 ## Moving around
 While you `cd` around to different directories, you can see the last 10 directories visited via the command `:dirs` or the convenient shortcut `#`. Entering the number in the list (like `6` and ENTER) will jump you to that directory. Entering `-` will jump you back to the previous dir (equivalent of `1`. Entering `~` will get you to your home dir. If you want to bookmark a special directory, you can do that via a general nick like this: `:gnick "x = /path/to/a/dir/"` - this would bookmark the directory to the single letter `x`.
 

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "2.8.0" # Feature release: nickdel functions, improved help system, info command
+@version    = "2.9.1" # Bug fix: Improved command coloring for local executables and after ENTER
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -109,6 +109,7 @@ begin # Initialization
   @dirs        = ["."]*10
   @jobs        = {}                       # Background jobs tracking
   @job_id      = 0                        # Job counter
+  @ai_suggestion = nil                    # Store AI command suggestion
   @last_exit   = 0                        # Last command exit status
   def pre_cmd; end                        # User-defined function to be run BEFORE command execution
   def post_cmd; end                       # User-defined function to be run AFTER  command execution
@@ -138,6 +139,7 @@ end
   * rsh specific commands and full set of Ruby commands available via :<command>
   * All colors are themeable in .rshrc (see github link for possibilities)
   * Copy current command line to primary selection (paste w/middle button) with `Ctrl-y`
+  * AI integration: Use @ for text responses and @@ for command suggestions (requires ollama or OpenAI)
   
   Use `:help` for command reference.
   
@@ -234,6 +236,12 @@ def getstr # A custom Readline-like function
   @pos  = 0
   chr   = ""
   @history.unshift("")
+  # Check if we have an AI suggestion to pre-fill
+  if @ai_suggestion
+    @history[0] = @ai_suggestion
+    @pos = @ai_suggestion.length
+    @ai_suggestion = nil
+  end
   @row0, p = @c.pos
   while chr != "ENTER" # Keep going with readline until user presses ENTER
     @ci   = nil
@@ -547,12 +555,24 @@ def hist_clean # Clean up @history
 end
 def cmd_check(str) # Check if each element on the readline matches commands, nicks, paths; color them
   return if str.nil?
+
+  # Special handling for @ and @@ commands
+  if str =~ /^(@@?)\s+(.*)$/
+    prefix = $1
+    rest = $2
+    return prefix.c(4) + " " + rest  # Color @ or @@ in blue (4), rest uncolored
+  end
+
   str.gsub(/(?:\S'[^']*'|[^ '])+/) do |el|
+    clean_el = el.gsub("'", "")
     if @exe.include?(el)
       el.c(@c_cmd)
     elsif el == "cd"
       el.c(@c_cmd)
-    elsif File.exist?(el.gsub("'", ""))
+    elsif clean_el =~ /^\.\/(.+)/ && File.exist?(clean_el) && File.executable?(clean_el)
+      # Color local executables starting with ./
+      el.c(@c_cmd)
+    elsif File.exist?(clean_el)
       el.c(@c_path)
     elsif @nick.include?(el)
       el.c(@c_nick)
@@ -646,6 +666,10 @@ def help
   right_col << "= <expr>            xrpn calculator"
   right_col << ":<ruby code>        Execute Ruby"
   right_col << ""
+  right_col << "AI FEATURES:".c(@c_prompt).b
+  right_col << "@ <question>        AI text response"
+  right_col << "@@ <request>        AI command → prompt"
+  right_col << ""
   right_col << "EXPANSIONS:".c(@c_prompt).b
   right_col << "~                   Home directory"
   right_col << "$VAR, ${VAR}        Environment var"
@@ -859,6 +883,226 @@ def expand_braces(str)
   end
 end
 
+# AI INTEGRATION FUNCTIONS
+def get_ollama_model
+  begin
+    # Try to get list of available models
+    output = `ollama list 2>/dev/null`
+    return nil if output.empty? || $?.exitstatus != 0
+    
+    # Parse the output to find a suitable model
+    lines = output.split("\n")
+    return nil if lines.length < 2
+    
+    # Skip header line and get first available model
+    model_line = lines[1]
+    return nil if model_line.nil?
+    
+    # Extract model name (first column)
+    model_name = model_line.split(/\s+/)[0]
+    return model_name
+  rescue => e
+    return nil
+  end
+end
+
+def ai_query(prompt)
+  # Get AI model configuration
+  model = @aimodel || nil
+  key = @aikey || nil
+  
+  if model.nil? || model.empty?
+    # Try ollama first
+    if File.exist?("/usr/local/bin/ollama") || File.exist?("/usr/bin/ollama") || system("command -v ollama >/dev/null 2>&1")
+      begin
+        require 'json'
+        require 'net/http'
+        
+        # First, get available models
+        ollama_model = get_ollama_model()
+        return ai_setup_help unless ollama_model
+        
+        uri = URI('http://localhost:11434/api/generate')
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.read_timeout = 30
+        
+        request = Net::HTTP::Post.new(uri)
+        request['Content-Type'] = 'application/json'
+        request.body = {
+          model: ollama_model,
+          prompt: prompt,
+          stream: false,
+          options: {
+            num_predict: 200
+          }
+        }.to_json
+        
+        response = http.request(request)
+        if response.code == '200'
+          result = JSON.parse(response.body)
+          return result['response']
+        else
+          return ai_setup_help
+        end
+      rescue => e
+        return ai_setup_help
+      end
+    else
+      return ai_setup_help
+    end
+  else
+    # Use external model
+    if model =~ /^gpt/i && key
+      begin
+        require 'json'
+        require 'net/http'
+        uri = URI('https://api.openai.com/v1/chat/completions')
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.read_timeout = 30
+        
+        request = Net::HTTP::Post.new(uri)
+        request['Content-Type'] = 'application/json'
+        request['Authorization'] = "Bearer #{key}"
+        request.body = {
+          model: model,
+          messages: [{role: 'user', content: prompt}],
+          max_tokens: 200,
+          temperature: 0.7
+        }.to_json
+        
+        response = http.request(request)
+        if response.code == '200'
+          result = JSON.parse(response.body)
+          return result['choices'][0]['message']['content']
+        else
+          return "Error: #{response.code} - #{response.body}"
+        end
+      rescue => e
+        return "Error connecting to OpenAI: #{e.message}"
+      end
+    else
+      return "Unsupported model: #{model}. Currently only ollama and OpenAI models are supported."
+    end
+  end
+end
+
+def ai_command_suggest(prompt)
+  # Get AI model configuration
+  model = @aimodel || nil
+  key = @aikey || nil
+  
+  # Modify prompt to request command output
+  cmd_prompt = "You are a Linux/Unix command line expert. Given this request: '#{prompt}', output ONLY the exact shell command that would accomplish this task. Output just the command itself with no explanation, no backticks, no markdown. For example, if asked 'list files' you would output: ls"
+  
+  if model.nil? || model.empty?
+    # Try ollama first
+    if File.exist?("/usr/local/bin/ollama") || File.exist?("/usr/bin/ollama") || system("command -v ollama >/dev/null 2>&1")
+      begin
+        require 'json'
+        require 'net/http'
+        
+        # First, get available models
+        ollama_model = get_ollama_model()
+        unless ollama_model
+          puts ai_setup_help
+          return nil
+        end
+        
+        uri = URI('http://localhost:11434/api/generate')
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.read_timeout = 30
+        
+        request = Net::HTTP::Post.new(uri)
+        request['Content-Type'] = 'application/json'
+        request.body = {
+          model: ollama_model,
+          prompt: cmd_prompt,
+          stream: false,
+          options: {
+            num_predict: 50,
+            temperature: 0.3
+          }
+        }.to_json
+        
+        response = http.request(request)
+        if response.code == '200'
+          result = JSON.parse(response.body)
+          cmd = result['response'].strip.split("\n")[0]
+          return cmd
+        else
+          puts ai_setup_help
+          return nil
+        end
+      rescue => e
+        puts ai_setup_help
+        return nil
+      end
+    else
+      puts ai_setup_help
+      return nil
+    end
+  else
+    # Use external model
+    if model =~ /^gpt/i && key
+      begin
+        require 'json'
+        require 'net/http'
+        uri = URI('https://api.openai.com/v1/chat/completions')
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.read_timeout = 30
+        
+        request = Net::HTTP::Post.new(uri)
+        request['Content-Type'] = 'application/json'
+        request['Authorization'] = "Bearer #{key}"
+        request.body = {
+          model: model,
+          messages: [{role: 'user', content: cmd_prompt}],
+          max_tokens: 50,
+          temperature: 0.3
+        }.to_json
+        
+        response = http.request(request)
+        if response.code == '200'
+          result = JSON.parse(response.body)
+          cmd = result['choices'][0]['message']['content'].strip.split("\n")[0]
+          return cmd
+        else
+          puts "Error: #{response.code} - #{response.body}"
+          return nil
+        end
+      rescue => e
+        puts "Error connecting to OpenAI: #{e.message}"
+        return nil
+      end
+    else
+      puts "Unsupported model: #{model}. Currently only ollama and OpenAI models are supported."
+      return nil
+    end
+  end
+end
+
+def ai_setup_help
+  help_text = <<~HELP
+    
+    AI is not configured. To use AI features, you have two options:
+    
+    1. Install Ollama (recommended for local AI):
+       curl -fsSL https://ollama.com/install.sh | sh
+       ollama pull llama3.2  # or any model you prefer
+    
+    2. Configure external AI model in ~/.rshrc:
+       @aimodel = "gpt-4"
+       @aikey = "your-api-key-here"
+    
+    Once configured:
+    - Use @ for AI text responses: @ What is the GDP of Norway?
+    - Use @@ for AI command suggestions: @@ list files sorted by size
+  HELP
+  return help_text.c(@c_path)
+end
+
 # INITIAL SETUP
 begin # Load .rshrc and populate @history
   trap "SIGINT" do end
@@ -935,6 +1179,10 @@ loop do
       hi = @history[@cmd.sub(/^!(\d+)$/, '\1').to_i+1] 
       @cmd = hi if hi
     end
+    # Move cursor to end of line and print the full command before clearing
+    @c.row(@row0)
+    @c.clear_line
+    print @prompt + cmd_check(@cmd)
     print "\n"; @c.clear_screen_down
     if @cmd == "r" # Integration with rtfm (https://github.com/isene/RTFM)
       t  = Time.now
@@ -951,6 +1199,23 @@ loop do
       @cmd.gsub!("  ", ",")
       @cmd = "echo \"#{@cmd[1...]},prx,off\" | xrpn" 
     end
+    # AI integration with @ and @@
+    if @cmd =~ /^@@\s+(.+)/ # AI command suggestion
+      prompt = $1
+      response = ai_command_suggest(prompt)
+      if response
+        # Store the suggestion for the next prompt
+        @ai_suggestion = response
+        # Also add to history for record keeping
+        @history.unshift(response)
+      end
+      next
+    elsif @cmd =~ /^@\s+(.+)/ # AI text response
+      prompt = $1
+      response = ai_query(prompt)
+      puts response if response
+      next
+    end
     if @cmd.match(/^\s*:/) # Ruby commands are prefixed with ":"
       begin
         eval(@cmd[1..-1])

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-08 00:00:00.000000000 Z
+date: 2025-09-13 00:00:00.000000000 Z
 dependencies: []
 description: 'A shell written in Ruby with extensive tab completions, aliases/nicks,
   history, syntax highlighting, theming, auto-cd, auto-opening files and more. UPDATE
-  v2.8.0: Enhanced help system with two-column display, new :info command, :nickdel/:gnickdel
-  commands for easier nick management. v2.7.0: Ruby Functions - define custom shell
-  commands using full Ruby power! Also: job control, command substitution, variable
-  expansion, conditional execution, and login shell support.'
+  v2.9.0: AI integration! Use @ for AI text responses and @@ for AI command suggestions.
+  Works with local Ollama or external providers like OpenAI. v2.8.0: Enhanced help
+  system, :info command, and easier nick management. v2.7.0: Ruby Functions, job control,
+  command substitution, and more.'
 email: g@isene.com
 executables:
 - rsh