ollama_chat 0.0.52 → 0.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ecb3e69adc69e9ce8c09eac40af1fb1078dd85d9b7edf33eb5c0cf33027a3c
-  data.tar.gz: cbfc1d833db9239d5d354fd9388bc48247c2dfa3e1ea92500a08f3f85e5dce9b
+  metadata.gz: f0a01656cc0ad8d063570956971ee34ebf94929e90feb3c5f8207879d8367a12
+  data.tar.gz: 87ce3880db6bfcbdaf049618a8922536bdcbdd20b15366187612fb0e33594fa0
 SHA512:
-  metadata.gz: 91fd323ab11c5b9b44787163978c8862310054939b591ff9566a182783d20cda4768ee0aa1c55b90b30a3a7e475e1df33f0f2c81f2c1e4b99b757daead3c18fe
-  data.tar.gz: 57b4ca9f70ed945a947a099d4323f909a74bb8b6f97e4925af06692552962124cb0244e2b1208cd414b6022ef68b164fbe64b0dee1e87568c2ca4cbec4fe3013
+  metadata.gz: c53b7fa09b117940de484fda33145e8f68ef7340da1e392e335f7aca5952c11ecbcad30a32e78551df1ff7972b20d7519a58a64dd808b5e9fecb309445ab12f8
+  data.tar.gz: c83bb2ae1c82af0aa66a99262c94d0fc7060807d3333d6ffd261bd558d0d338502419ca6ddf3a8b9b31f5a7ef48dc2c15ad6bd42d227a86290506bab12f3f7de

data/CHANGES.md

@@ -1,5 +1,35 @@
 # Changes
 
+## 2026-01-08 v0.0.54
+
+### New Features
+
+- Added `/revise_last` command for editing the last message
+- Implemented `OllamaChat::MessageEditing` module with editor integration
+- Enhanced message editing with proper error handling and user feedback
+
+### Improvements
+
+- Improved `InputContent` module with better error handling (replaced `$?` with
+  direct `system` return)
+- Updated `choose_filename` to use `_1` parameter for Ruby idioms
+- Added comprehensive test suite for `InputContent` module with **100%** line
+  coverage
+
+## 2026-01-07 v0.0.53
+
+- Added `/compose` command functionality to compose content using an external
+  editor
+    - Introduced `OllamaChat::EnvConfig::EDITOR?` and
+      `OllamaChat::EnvConfig::EDITOR!` methods for editor configuration access
+    - Implemented `compose` method in `InputContent` module using `Tempfile` for
+      temporary file handling
+    - Added `EDITOR` configuration with default value of `vim` or `vi` if available
+    - Updated help text to include the new `/compose` command
+    - Added graceful error handling for editor failures, returning `nil` and
+      printing error to `STDERR`
+    - Required `tempfile` gem for temporary file handling functionality
+
 ## 2026-01-06 v0.0.52
 
 - Enabled verbose context generation to provide real-time feedback during

data/README.md

@@ -180,6 +180,7 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 /links [clear]                  display (or clear) links used in the chat
 /save filename                  store conversation messages
 /load filename                  load conversation messages
+/compose                        compose content using an EDITOR
 /input [pattern]                select and read content from a file (default: **/*)
 /context [pattern...]           collect context with glob patterns
 /output filename                save last response to filename

data/lib/ollama_chat/chat.rb

@@ -51,6 +51,7 @@ class OllamaChat::Chat
   include OllamaChat::KramdownANSI
   include OllamaChat::Conversation
   include OllamaChat::InputContent
+  include OllamaChat::MessageEditing
 
   # Initializes a new OllamaChat::Chat instance with the given command-line
   # arguments.
@@ -338,6 +339,11 @@ class OllamaChat::Chat
       arg and patterns = arg.scan(/(\S+)/).flatten
       @parse_content = false
       context_spook(patterns) or :next
+    when %r(^/compose$)
+      compose or :next
+    when %r(^/revise_last$)
+      revise_last
+      :next
     when %r(^/save\s+(.+)$)
       save_conversation($1)
       :next

data/lib/ollama_chat/env_config.rb

@@ -30,6 +30,18 @@ module OllamaChat
       end
     end
 
+    EDITOR = set do
+      description 'Editor to use'
+
+      default do
+        if  editor = %w[ vim vi ].find { `which #{_1}`.full?(:chomp) }
+          editor
+        else
+          warn 'Need an editor command configured via env var "EDITOR"'
+        end
+      end
+    end
+
     DIFF_TOOL = set do
       description 'Diff tool to apply changes with'
 

data/lib/ollama_chat/information.rb

@@ -147,6 +147,7 @@ module OllamaChat::Information
       /links [clear]                  display (or clear) links used in the chat
       /save filename                  store conversation messages
       /load filename                  load conversation messages
+      /compose                        compose content using an EDITOR
       /input [pattern]                select and read content from a file (default: **/*)
       /context [pattern...]           collect context with glob patterns
       /output filename                save last response to filename

data/lib/ollama_chat/input_content.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 # A module that provides input content processing functionality for OllamaChat.
 #
 # The InputContent module encapsulates methods for reading and returning
@@ -34,7 +36,7 @@ module OllamaChat::InputContent
   #
   # @return [ String, nil ] the path to the selected file or nil if no file was chosen
   def choose_filename(pattern)
-    files = Dir.glob(pattern).select { File.file?(it) }
+    files = Dir.glob(pattern).select { File.file?(_1) }
     files.unshift('[EXIT]')
     case chosen = OllamaChat::Utils::Chooser.choose(files)
     when '[EXIT]', nil
@@ -88,4 +90,30 @@ module OllamaChat::InputContent
       end
     end
   end
+
+  # The compose method opens an editor to compose content.
+  #
+  # This method checks for a configured editor and opens a temporary file in
+  # that editor for the user to compose content. Upon successful editing, it
+  # reads the content from the temporary file and returns it. If the editor
+  # fails or no editor is configured, appropriate error messages are displayed
+  # and nil is returned.
+  #
+  # @return [ String, nil ] the composed content if successful, nil otherwise
+  def compose
+    unless editor = OllamaChat::EnvConfig::EDITOR?
+      STDERR.puts "Editor reqired for compose, set env var "\
+        "#{OllamaChat::EnvConfig::EDITOR!.env_var.inspect}."
+      return
+    end
+    Tempfile.open do |tmp|
+      result = system %{#{editor} #{tmp.path.inspect}}
+      if result
+        return File.read(tmp.path)
+      else
+        STDERR.puts "Editor failed to edit #{tmp.path.inspect}."
+      end
+    end
+    nil
+  end
 end

data/lib/ollama_chat/message_editing.rb

@@ -0,0 +1,47 @@
+# A module that provides message editing functionality for OllamaChat.
+#
+# The MessageEditing module encapsulates methods for modifying existing chat
+# messages using an external editor. It allows users to edit the last message
+# in the conversation, whether it's a system prompt, user message, or assistant
+# response.
+module OllamaChat::MessageEditing
+  # The revise_last method opens the last message in an external editor for
+  # modification.
+  #
+  # This method retrieves the last message from the conversation, writes its
+  # content to a temporary file, opens that file in the configured editor,
+  # and then updates the message with the edited content upon successful
+  # completion.
+  #
+  # @return [String, nil] the edited content if successful, nil otherwise
+  def revise_last
+    if message = @messages.last
+      unless editor = OllamaChat::EnvConfig::EDITOR?
+        STDERR.puts "Editor required for revise, set env var " \
+          "#{OllamaChat::EnvConfig::EDITOR!.env_var.inspect}."
+        return
+      end
+
+      Tempfile.open do |tmp|
+        tmp.write(message.content)
+        tmp.flush
+
+        result = system %{#{editor} #{tmp.path.inspect}}
+
+        if result
+          new_content           = File.read(tmp.path)
+          old_message           = @messages.messages.pop.as_json
+          old_message[:content] = new_content
+          @messages << Ollama::Message.from_hash(old_message)
+          STDOUT.puts "Message edited and updated."
+          return new_content
+        else
+          STDERR.puts "Editor failed to edit message."
+        end
+      end
+    else
+      STDERR.puts "No message available to revise."
+    end
+    nil
+  end
+end

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.52'
+  VERSION         = '0.0.54'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/ollama_chat.rb

@@ -37,5 +37,6 @@ require 'ollama_chat/server_socket'
 require 'ollama_chat/kramdown_ansi'
 require 'ollama_chat/conversation'
 require 'ollama_chat/input_content'
+require 'ollama_chat/message_editing'
 require 'ollama_chat/env_config'
 require 'ollama_chat/chat'

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.52 ruby lib
+# stub: ollama_chat 0.0.54 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.52".freeze
+  s.version = "0.0.54".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,15 +12,15 @@ Gem::Specification.new do |s|
   s.description = "The app provides a command-line interface (CLI) to an Ollama AI model,\nallowing users to engage in text-based conversations and generate\nhuman-like responses. Users can import data from local files or web pages,\nwhich are then processed through three different modes: fully importing the\ncontent into the conversation context, summarizing the information for\nconcise reference, or storing it in an embedding vector database for later\nretrieval based on the conversation.\n".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ollama_chat".freeze, "ollama_chat_send".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/env_config.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/input_content.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze]
-  s.files = [".utilsrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_chat_send".freeze, "config/searxng/settings.yml".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/env_config.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/input_content.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/example_with_quote.html".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/assets/searxng.json".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/env_config.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/input_content.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_editing.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze]
+  s.files = [".utilsrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_chat_send".freeze, "config/searxng/settings.yml".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/env_config.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/input_content.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_editing.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/example_with_quote.html".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/assets/searxng.json".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/input_content_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_editing_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
   s.homepage = "https://github.com/flori/ollama_chat".freeze
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "OllamaChat - A command-line interface (CLI) for interacting with an Ollama AI model.".freeze, "--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 3.2".freeze)
   s.rubygems_version = "4.0.2".freeze
   s.summary = "A command-line interface (CLI) for interacting with an Ollama AI model.".freeze
-  s.test_files = ["spec/assets/example.rb".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze]
+  s.test_files = ["spec/assets/example.rb".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/input_content_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_editing_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   s.specification_version = 4
 

data/spec/ollama_chat/input_content_spec.rb

@@ -0,0 +1,127 @@
+require 'spec_helper'
+
+describe OllamaChat::InputContent do
+  let :chat do
+    OllamaChat::Chat.new
+  end
+
+  connect_to_ollama_server
+
+  describe '#input' do
+    it 'can read content from a selected file' do
+      # Mock the file selection process
+      expect(chat).to receive(:choose_filename).with('**/*').
+        and_return('spec/assets/example.rb')
+
+      # Test that it returns the file content
+      result = chat.input(nil)
+      expect(result).to include('puts "Hello World!"')
+    end
+
+    it 'returns nil when no file is selected' do
+      expect(chat).to receive(:choose_filename).with('**/*').and_return(nil)
+      expect(chat.input(nil)).to be_nil
+    end
+
+    it 'can read content with specific pattern' do
+      expect(chat).to receive(:choose_filename).with('spec/assets/*').
+        and_return('spec/assets/example.rb')
+      result = chat.input('spec/assets/*')
+      expect(result).to include('puts "Hello World!"')
+    end
+  end
+
+  describe '#choose_filename' do
+    it 'can select a file from matching patterns' do
+      # Test with a pattern that matches existing files
+      files = Dir.glob('spec/assets/*')
+      expect(files).to_not be_empty
+
+      # Mock the selection process
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).
+        with(files.unshift('[EXIT]')).and_return(files[1])
+
+      result = chat.choose_filename('spec/assets/*')
+      expect(result).to eq files[1]
+    end
+
+    it 'returns nil when user exits selection' do
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return(nil)
+      expect(chat.choose_filename('spec/assets/*')).to be_nil
+    end
+
+    it 'returns nil when user chooses exit' do
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('[EXIT]')
+      expect(chat.choose_filename('spec/assets/*')).to be_nil
+    end
+  end
+
+  describe '#context_spook' do
+    it 'can collect context with patterns' do
+      # Test with specific patterns
+      patterns = ['spec/assets/example.rb']
+      expect(ContextSpook).to receive(:generate_context).with(hash_including(verbose: true))
+
+      # This should not raise an error, but return nil since we're not mocking the full implementation
+      expect { chat.context_spook(patterns) }.not_to raise_error
+    end
+
+    it 'can load default context when no patterns provided' do
+      # Mock finding a context definition file
+      filename = '.contexts/code_comment.rb'
+      expect(chat).to receive(:choose_filename).with('.contexts/*.rb').
+        and_return(filename)
+
+      expect(ContextSpook).to receive(:generate_context).
+        with(filename, hash_including(verbose: true))
+
+      # This should not raise an error
+      expect { chat.context_spook(nil) }.not_to raise_error
+    end
+
+    it 'returns nil when no context file is found' do
+      expect(chat).to receive(:choose_filename).with('.contexts/*.rb').
+        and_return(nil)
+      expect(chat.context_spook(nil)).to be_nil
+    end
+  end
+
+  describe '#compose' do
+    it 'can open editor to compose content' do
+      # Mock editor configuration
+      const_conf_as('OllamaChat::EnvConfig::EDITOR' => '/usr/bin/vim')
+
+      # Mock Tempfile behavior
+      tmp_double = double('tmp', path: '/tmp/test')
+      expect(Tempfile).to receive(:open).and_yield(tmp_double)
+
+      # Mock system call to simulate successful editor execution
+      expect(chat).to receive(:system).with('/usr/bin/vim "/tmp/test"').and_return(true)
+
+      # Mock file reading to return content
+      expect(File).to receive(:read).with('/tmp/test').and_return('composed content')
+
+      result = chat.compose
+      expect(result).to eq 'composed content'
+    end
+
+    it 'handles missing editor gracefully' do
+      const_conf_as('OllamaChat::EnvConfig::EDITOR' => nil)
+
+      expect(STDERR).to receive(:puts).with(/Editor reqired for compose/)
+      expect(chat.compose).to be_nil
+    end
+
+    it 'handles editor failure' do
+      const_conf_as('OllamaChat::EnvConfig::EDITOR' => '/usr/bin/vim')
+
+      tmp_double = double('tmp', path: '/tmp/test')
+      expect(Tempfile).to receive(:open).and_yield(tmp_double)
+
+      expect(chat).to receive(:system).with('/usr/bin/vim "/tmp/test"').and_return(false)
+
+      expect(STDERR).to receive(:puts).with(/Editor failed to edit/)
+      expect(chat.compose).to be_nil
+    end
+  end
+end

data/spec/ollama_chat/message_editing_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe OllamaChat::MessageEditing do
+  let :chat do
+    OllamaChat::Chat.new
+  end
+
+  connect_to_ollama_server
+
+  describe '#revise_last' do
+    it 'can revise the last message' do
+      # First add a message to work with
+      chat.messages << Ollama::Message.new(role: 'assistant', content: 'original content')
+
+      const_conf_as('OllamaChat::EnvConfig::EDITOR' => '/usr/bin/vim')
+
+      # Mock Tempfile behavior to simulate editor interaction
+      tmp_double = double('tmp', write: true, flush: true, path: '/tmp/test')
+      expect(Tempfile).to receive(:open).and_yield(tmp_double)
+
+      # Mock system call to simulate successful editor execution
+      expect(chat).to receive(:system).with('/usr/bin/vim "/tmp/test"').and_return(true)
+
+      # Mock file reading to return edited content
+      expect(File).to receive(:read).with('/tmp/test').and_return('edited content')
+
+      # The method should return the edited content
+      expect(chat.revise_last).to eq 'edited content'
+    end
+
+    it 'handles missing last message' do
+      expect(STDERR).to receive(:puts).with(/No message available to revise/)
+      expect(chat.revise_last).to be_nil
+    end
+
+    it 'handles missing editor gracefully' do
+      chat.messages << Ollama::Message.new(role: 'assistant', content: 'original content')
+
+      const_conf_as('OllamaChat::EnvConfig::EDITOR' => nil)
+
+      expect(STDERR).to receive(:puts).with(/Editor required for revise/)
+      expect(chat.revise_last).to be_nil
+    end
+
+    it 'handles no messages to revise' do
+      # Clear messages array
+      chat.instance_variable_get(:@messages).clear
+
+      expect(STDERR).to receive(:puts).with(/No message available to revise/)
+      expect(chat.revise_last).to be_nil
+    end
+
+    it 'handles editor failure' do
+      const_conf_as('OllamaChat::EnvConfig::EDITOR' => '/usr/bin/vim')
+      chat.messages << Ollama::Message.new(role: 'assistant', content: 'original content')
+      tmp_double = double('tmp', write: true, flush: true, path: '/tmp/test')
+      expect(Tempfile).to receive(:open).and_yield(tmp_double)
+      expect(chat).to receive(:system).with('/usr/bin/vim "/tmp/test"').and_return(false)
+      expect(STDERR).to receive(:puts).with(/Editor failed to edit message/)
+      expect(chat.revise_last).to be_nil
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.52
+  version: 0.0.54
 platform: ruby
 authors:
 - Florian Frank
@@ -420,6 +420,7 @@ extra_rdoc_files:
 - lib/ollama_chat/information.rb
 - lib/ollama_chat/input_content.rb
 - lib/ollama_chat/kramdown_ansi.rb
+- lib/ollama_chat/message_editing.rb
 - lib/ollama_chat/message_format.rb
 - lib/ollama_chat/message_list.rb
 - lib/ollama_chat/message_output.rb
@@ -461,6 +462,7 @@ files:
 - lib/ollama_chat/information.rb
 - lib/ollama_chat/input_content.rb
 - lib/ollama_chat/kramdown_ansi.rb
+- lib/ollama_chat/message_editing.rb
 - lib/ollama_chat/message_format.rb
 - lib/ollama_chat/message_list.rb
 - lib/ollama_chat/message_output.rb
@@ -504,7 +506,9 @@ files:
 - spec/ollama_chat/clipboard_spec.rb
 - spec/ollama_chat/follow_chat_spec.rb
 - spec/ollama_chat/information_spec.rb
+- spec/ollama_chat/input_content_spec.rb
 - spec/ollama_chat/kramdown_ansi_spec.rb
+- spec/ollama_chat/message_editing_spec.rb
 - spec/ollama_chat/message_list_spec.rb
 - spec/ollama_chat/message_output_spec.rb
 - spec/ollama_chat/model_handling_spec.rb
@@ -550,7 +554,9 @@ test_files:
 - spec/ollama_chat/clipboard_spec.rb
 - spec/ollama_chat/follow_chat_spec.rb
 - spec/ollama_chat/information_spec.rb
+- spec/ollama_chat/input_content_spec.rb
 - spec/ollama_chat/kramdown_ansi_spec.rb
+- spec/ollama_chat/message_editing_spec.rb
 - spec/ollama_chat/message_list_spec.rb
 - spec/ollama_chat/message_output_spec.rb
 - spec/ollama_chat/model_handling_spec.rb