ollama_chat 0.0.49 → 0.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5636cead23d0a8b39d9a170149f20826553fb038be13dd1b1ed9eb1eef21cce3
-  data.tar.gz: 06de0d2ea5695997b9284ff656ea307a8d4da6e9638c09a60515a3092f4c220e
+  metadata.gz: 6fb9a8c4d866252bfa8ace6399ae3a9c7b72ace633c5b98b7a5c40543be105ba
+  data.tar.gz: d899a33db800219a4874d1db8da428dfacf14d6013fd2a2b76f58c12c7cece82
 SHA512:
-  metadata.gz: e6ba37eaeac77525769df31a8b068e2a8c87bc4bf5ca3e6422df7443e3e8f46a82b0fe95f344795eec5f938a9661042585f37fdd2d9737f7f0440d33f6822a57
-  data.tar.gz: 85a386b337e1f3a73fc6099d85ee954e458db117c97a64e48851c06278a7f3c02d2dfd11d8a68c41cc287145c20b346e29f8af3b4ba1e8e87a857315fa691694
+  metadata.gz: 303e0bda16f1cf0eba110271a63e40eb4563a90af5cb152465ba51bde1a3dcfaf3b317210df77cfcdc78541f1c0c0bbcf0346edfd134821928922083cc37cddd
+  data.tar.gz: b05f2ead74ccb3e534beb407203fb26d6070715337255ab09b451b52fd355a740c0a3ceaad348091a5e302b11db4d56cd9c3c71e0e207268c4fc0a93d2231b8f

data/CHANGES.md

@@ -1,5 +1,57 @@
 # Changes
 
+## 2026-01-06 v0.0.51
+
+- Added `/input` command to allow users to select files using glob patterns
+  like `src/*.c` or `**/*.rb`
+    - Implemented `input` method in `OllamaChat::Chat` class using `Dir.glob` for
+      pattern matching
+    - Integrated with `OllamaChat::Utils::Chooser` for interactive file selection
+    - Added `/input` command to help text in `OllamaChat::Information` module
+    - Supports default pattern `**/*` when no argument is provided
+    - Returns file content as string for use in chat conversations
+- Integrated `/context` command in `OllamaChat::Chat` with pattern matching
+  support
+    - Updated `display_chat_help_message` to document `/context [pattern...]`
+      command
+    - Modified `README.md` to include `/context` command in help section
+    - Introduced `context_spook` **~> 1.1** dependency
+    - Created `OllamaChat::InputContent` module with `input`, `choose_filename`,
+      and `context_spook` methods
+    - Extracted input functionality from `Chat` class to `InputContent` module for
+      better organization
+    - Support both static context files (`.contexts/*.rb`) and dynamic pattern
+      matching (`lib/**/*.rb`)
+    - Implemented proper content handling with `@parse_content = false` to prevent
+      parsing of URLs
+    - Used `File.file?` instead of `File.stat(it).file?` for cleaner file checking
+    - Support multiple space-separated patterns in `/context` command
+- Added comprehensive YARD documentation for all new methods and parameters
+- Improved pipe command handling with dynamic command resolution
+- Moved `RedisCache` class comment
+
+## 2026-01-03 v0.0.50
+
+- Use Redis-based expiring cache implementation with the new
+  `OllamaChat::RedisCache` class
+- Replaced `Documentrix::Documents::RedisCache` with `OllamaChat::RedisCache`
+  in the `setup_cache` method
+- Updated `GemHadar` development dependency to version **2.16.3**
+- Integrated changelog generation capability into GemHadar configuration
+- Updated Redis image to valkey version **8.1.5** with latest bug fixes and
+  improvements
+- Improved file path resolution using `Pathname` for better handling of
+  relative paths and home directory shortcuts
+- Enhanced test suite configuration and stubbing for more consistent test
+  execution
+- Updated Ruby image tag to stable **4.0**-alpine
+- Added `lib/ollama_chat/redis_cache.rb` to `extra_rdoc_files` and `files`
+  lists in gemspec
+- Added `spec/ollama_chat/redis_cache_spec.rb` to `test_files` list in gemspec
+- Removed duplicate entry for `lib/ollama_chat/redis_cache.rb` from `files`
+  list
+- Improved test setup for source fetching with explicit configuration file
+
 ## 2025-12-24 v0.0.49
 
 - Updated `unix_socks` gem dependency from **~> 0.2** to **~> 0.3**

data/README.md

@@ -180,6 +180,8 @@ 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
+/input [pattern]                select and read content from a file (default: **/*)
+/context [pattern...]           collect context with glob patterns
 /output filename                save last response to filename
 /pipe command                   write last response to command's stdin
 /vim                            insert the last message into a vim server

data/Rakefile

@@ -28,6 +28,10 @@ GemHadar do
 
   readme      'README.md'
 
+  changelog do
+    filename 'CHANGES.md'
+  end
+
   required_ruby_version  '>= 3.2'
 
   executables << 'ollama_chat' << 'ollama_chat_send'
@@ -36,10 +40,6 @@ GemHadar do
     'static.yml' => {}
   )
 
-  changelog do
-    filename 'CHANGES.md'
-  end
-
   dependency             'excon',                 '~> 1.0'
   dependency             'ollama-ruby',           '~> 1.18'
   dependency             'documentrix',           '>= 0.0.4'
@@ -58,6 +58,7 @@ GemHadar do
   dependency             'bigdecimal',            '~> 3.1'
   dependency             'csv',                   '~> 3.0'
   dependency             'const_conf',            '~> 0.3'
+  dependency             'context_spook',         '~> 1.1'
   development_dependency 'all_images',            '~> 0.6'
   development_dependency 'rspec',                 '~> 3.2'
   development_dependency 'kramdown',              '~> 2.0'

data/docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   redis:
     container_name: redis
-    image: valkey/valkey:8.1.3-alpine
+    image: valkey/valkey:8.1.5-alpine
     restart: unless-stopped
     ports: [ "127.0.0.1:9736:6379" ]
     volumes:

data/lib/ollama_chat/chat.rb

@@ -15,6 +15,7 @@ require 'pdf/reader'
 require 'csv'
 require 'socket'
 require 'shellwords'
+require 'context_spook'
 
 # A chat client for interacting with Ollama models through a terminal
 # interface.
@@ -49,6 +50,7 @@ class OllamaChat::Chat
   include OllamaChat::ServerSocket
   include OllamaChat::KramdownANSI
   include OllamaChat::Conversation
+  include OllamaChat::InputContent
 
   # Initializes a new OllamaChat::Chat instance with the given command-line
   # arguments.
@@ -328,6 +330,14 @@ class OllamaChat::Chat
     when %r(^/web\s+(?:(\d+)\s+)?(.+))
       @parse_content = false
       web($1, $2)
+    when %r(^/input(?:\s+(.+))?$)
+      @parse_content = false
+      input($1) or :next
+    when %r(^/context(?:\s+(.+))?$)
+      arg = $1
+      arg and patterns = arg.scan(/(\S+)/).flatten
+      @parse_content = false
+      context_spook(patterns) or :next
     when %r(^/save\s+(.+)$)
       save_conversation($1)
       :next
@@ -749,12 +759,12 @@ class OllamaChat::Chat
   # The setup_cache method initializes and returns a Redis cache instance with
   # expiring keys if a Redis URL is configured.
   #
-  # @return [ Documentrix::Documents::RedisCache, nil ] the configured Redis
+  # @return [ OllamaChat::RedisCache, nil ] the configured Redis
   #   cache instance or nil if no URL is set.
   def setup_cache
     if url = config.redis.expiring.url?
       ex = config.redis.expiring.ex?.to_i
-      Documentrix::Documents::RedisCache.new(
+      OllamaChat::RedisCache.new(
         prefix: 'Expiring-',
         url:,
         ex:

data/lib/ollama_chat/information.rb

@@ -147,6 +147,8 @@ module OllamaChat::Information
       /links [clear]                  display (or clear) links used in the chat
       /save filename                  store conversation messages
       /load filename                  load conversation messages
+      /input [pattern]                select and read content from a file (default: **/*)
+      /context [pattern...]           collect context with glob patterns
       /output filename                save last response to filename
       /pipe command                   write last response to command's stdin
       /vim                            insert the last message into a vim server

data/lib/ollama_chat/input_content.rb

@@ -0,0 +1,91 @@
+# A module that provides input content processing functionality for OllamaChat.
+#
+# The InputContent module encapsulates methods for reading and returning
+# content from selected files, selecting files from a list of matching files,
+# and collecting project context using the context_spook library. It supports
+# interactive file selection and context collection for enhancing chat
+# interactions with local or remote content.
+module OllamaChat::InputContent
+  # The input method reads and returns the content of a selected file.
+  #
+  # This method searches for files matching the given pattern and presents them
+  # in an interactive chooser menu. If a file is selected, its content is read
+  # and returned. If the user chooses to exit or no file is selected, the
+  # method returns nil.
+  #
+  # @param pattern [ String ] the glob pattern to search for files (defaults to '**/*')
+  #
+  # @return [ String, nil ] the content of the selected file or nil if no file
+  #   was chosen
+  def input(pattern)
+    pattern ||= '**/*'
+    if filename = choose_filename(pattern)
+      File.read(filename)
+    end
+  end
+
+  # The choose_filename method selects a file from a list of matching files.
+  #
+  # This method searches for files matching the given glob pattern, presents
+  # them in an interactive chooser menu, and returns the selected filename. If
+  # the user chooses to exit or no file is selected, the method returns nil.
+  #
+  # @param pattern [ String ] the glob pattern to search for files (defaults to '**/*')
+  #
+  # @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.unshift('[EXIT]')
+    case chosen = OllamaChat::Utils::Chooser.choose(files)
+    when '[EXIT]', nil
+      STDOUT.puts "Exiting chooser."
+      return
+    else
+      chosen
+    end
+  end
+
+  # The context_spook method collects and returns project context using the
+  # context_spook library.
+  #
+  # This method generates structured project context that can be used to
+  # provide AI models with comprehensive information about the codebase. It
+  # supports both:
+  # - On-the-fly pattern matching for specific file patterns
+  # - Loading context from predefined definition files in ./.contexts/
+  #
+  # When patterns are provided, it collects files matching the glob patterns
+  # and generates context data including file contents, sizes, and metadata.
+  # When no patterns are provided, it loads the default context definition
+  # file.
+  #
+  # @param patterns [Array<String>, nil] Optional array of glob patterns to
+  #   filter files
+  # @return [String, nil] JSON string of context data or nil if no context
+  #   could be generated
+  #
+  # @example Collect context for Ruby files only
+  #   context_spook(['lib/**/*.rb'])
+  #
+  # @example Collect context for multiple patterns
+  #   context_spook(['lib/**/*.rb', 'spec/**/*.rb'])
+  #
+  # @example Load default context
+  #   context_spook(nil)
+  def context_spook(patterns)
+    if patterns
+      ContextSpook::generate_context(verbose: false) do |context|
+        context do
+          Dir.glob(patterns).each do |filename|
+            File.file?(filename) or next
+            file filename
+          end
+        end
+      end.to_json
+    else
+      if context_filename = choose_filename('.contexts/*.rb')
+        ContextSpook.generate_context(context_filename, verbose: false).to_json
+      end
+    end
+  end
+end

data/lib/ollama_chat/message_output.rb

@@ -78,10 +78,11 @@ module OllamaChat::MessageOutput
   # @return [ TrueClass ] returns true if the file was successfully written
   # @return [ nil ] returns nil if the user chose not to overwrite or if an error occurred
   def attempt_to_write_file(filename, message)
-    if !File.exist?(filename) ||
-        ask?(prompt: "File #{filename.inspect} already exists, overwrite? (y/n) ") =~ /\Ay/i
+    path = Pathname.new(filename.to_s).expand_path
+    if !path.exist? ||
+        ask?(prompt: "File #{path.to_s.inspect} already exists, overwrite? (y/n) ") =~ /\Ay/i
     then
-      File.open(filename, ?w) do |output|
+      File.open(path, ?w) do |output|
         output.write(message.content)
       end
     else

data/lib/ollama_chat/redis_cache.rb

@@ -0,0 +1,158 @@
+require 'redis'
+
+module OllamaChat
+  # A Redis-based cache implementation for OllamaChat
+  #
+  # This class provides a wrapper around Redis that offers a simple key-value
+  # caching interface with support for expiration times and namespace isolation.
+  # It's designed to be used as a cache backend for various components in the
+  # OllamaChat application.
+  #
+  # @example Basic usage
+  #   cache = OllamaChat::RedisCache.new(prefix: 'myapp-', url: 'redis://localhost:6379')
+  #   cache['key'] = 'value'
+  #   value = cache['key']
+  #   cache.delete('key')
+  #
+  # @example With expiration
+  #   cache = OllamaChat::RedisCache.new(prefix: 'expiring-', url: 'redis://localhost:6379', ex: 3600)
+  #   cache['key'] = 'value' # Automatically expires in 1 hour
+  #
+  # @example Iteration
+  #   cache.each do |key, value|
+  #     puts "#{key}: #{value}"
+  #   end
+  #
+  # @example Cache management
+  #   cache.clear # Remove all entries with this prefix
+  #   size = cache.size # Get number of entries
+  class RedisCache
+    include Enumerable
+
+    # Initializes a new RedisCache instance
+    #
+    # @param prefix [String] The prefix to use for all keys in this cache
+    # @param url [String, nil] The Redis connection URL (defaults to ENV['REDIS_URL'])
+    # @param ex [Integer, nil] Default expiration time in seconds
+    #
+    # @raise [ArgumentError] If no Redis URL is provided
+    def initialize(prefix:, url: ENV['REDIS_URL'], ex: nil)
+      @prefix = prefix
+      @url = url
+      @ex = ex
+      raise ArgumentError, 'require redis url' unless @url
+    end
+
+    # Returns the Redis connection instance
+    #
+    # This method lazily initializes the Redis connection to avoid
+    # establishing connections until they're actually needed.
+    #
+    # @return [Redis] The Redis client instance
+    def redis
+      @redis ||= Redis.new(url: @url)
+    end
+
+    # Retrieves a value from the cache by key
+    #
+    # @param key [String] The cache key to retrieve
+    # @return [String, nil] The cached value or nil if not found
+    def [](key)
+      value = redis.get(pre(key))
+      value
+    end
+
+    # Stores a value in the cache with the given key
+    #
+    # @param key [String] The cache key
+    # @param value [String] The value to cache
+    # @return [String] The cached value
+    def []=(key, value)
+      set(key, value)
+    end
+
+    # Stores a value in the cache with optional expiration
+    #
+    # @param key [String] The cache key
+    # @param value [String] The value to cache
+    # @param ex [Integer, nil] Expiration time in seconds (overrides default)
+    # @return [String] The cached value
+    def set(key, value, ex: nil)
+      ex ||= @ex
+      if !ex.nil? && ex < 1
+        redis.del(pre(key))
+      else
+        redis.set(pre(key), value, ex:)
+      end
+      value
+    end
+
+    # Gets the time-to-live for a key
+    #
+    # @param key [String] The cache key
+    # @return [Integer] The remaining time-to-live in seconds, or -1 if not found
+    def ttl(key)
+      redis.ttl(pre(key))
+    end
+
+    # Checks if a key exists in the cache
+    #
+    # @param key [String] The cache key to check
+    # @return [Boolean] true if the key exists, false otherwise
+    def key?(key)
+      !!redis.exists?(pre(key))
+    end
+
+    # Deletes a key from the cache
+    #
+    # @param key [String] The cache key to delete
+    # @return [Boolean] true if the key was deleted, false if it didn't exist
+    def delete(key)
+      redis.del(pre(key)) == 1
+    end
+
+    # Gets the number of entries in the cache
+    #
+    # @return [Integer] The number of entries
+    def size
+      s = 0
+      redis.scan_each(match: "#{@prefix}*") { |key| s += 1 }
+      s
+    end
+
+    # Clears all entries from the cache with this prefix
+    #
+    # @return [OllamaChat::RedisCache] Returns self for chaining
+    def clear
+      redis.scan_each(match: "#{@prefix}*") { |key| redis.del(key) }
+      self
+    end
+
+    # Iterates over all entries in the cache
+    #
+    # @yield [key, value] Yields each key-value pair
+    # @return [OllamaChat::RedisCache] Returns self for chaining
+    def each(&block)
+      redis.scan_each(match: "#{@prefix}*") { |key| block.(key, self[unpre(key)]) }
+      self
+    end
+
+    private
+
+    # Prepends the prefix to a key
+    #
+    # @param key [String] The key to prefix
+    # @return [String] The prefixed key
+    def pre(key)
+      [ @prefix, key ].join
+    end
+
+    # Removes the prefix from a key
+    #
+    # @param key [String] The prefixed key
+    # @return [String] The key without prefix
+    def unpre(key)
+      key.sub(/\A#@prefix/, '')
+    end
+  end
+end

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.49'
+  VERSION         = '0.0.51'
   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

@@ -15,6 +15,7 @@ require 'documentrix'
 require 'unix_socks'
 require 'ollama_chat/version'
 require 'ollama_chat/utils'
+require 'ollama_chat/redis_cache'
 require 'ollama_chat/message_format'
 require 'ollama_chat/ollama_chat_config'
 require 'ollama_chat/follow_chat'
@@ -35,5 +36,6 @@ require 'ollama_chat/history'
 require 'ollama_chat/server_socket'
 require 'ollama_chat/kramdown_ansi'
 require 'ollama_chat/conversation'
+require 'ollama_chat/input_content'
 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.49 ruby lib
+# stub: ollama_chat 0.0.51 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.49".freeze
+  s.version = "0.0.51".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,19 +12,19 @@ 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/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/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/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/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/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_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.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/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/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.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.16.2".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.16.3".freeze])
   s.add_development_dependency(%q<all_images>.freeze, ["~> 0.6".freeze])
   s.add_development_dependency(%q<rspec>.freeze, ["~> 3.2".freeze])
   s.add_development_dependency(%q<kramdown>.freeze, ["~> 2.0".freeze])
@@ -50,4 +50,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<bigdecimal>.freeze, ["~> 3.1".freeze])
   s.add_runtime_dependency(%q<csv>.freeze, ["~> 3.0".freeze])
   s.add_runtime_dependency(%q<const_conf>.freeze, ["~> 0.3".freeze])
+  s.add_runtime_dependency(%q<context_spook>.freeze, ["~> 1.1".freeze])
 end

data/spec/ollama_chat/chat_spec.rb

@@ -1,8 +1,12 @@
 require 'spec_helper'
 
 describe OllamaChat::Chat, protect_env: true do
+  use_default_config = -> a {
+    a << '-f' << 'lib/ollama_chat/ollama_chat_config/default_config.yml'
+  }
+
   let :argv do
-    %w[ -C test ]
+    use_default_config.(%w[ -C test ])
   end
 
   before do
@@ -94,7 +98,7 @@ describe OllamaChat::Chat, protect_env: true do
     end
 
     it 'returns :next when input is "/model"' do
-      expect(chat).to receive(:choose_model).with('', 'llama3.1')
+      expect(chat).to receive(:choose_model).and_return 'llama3.1'
       expect(chat.handle_input("/model")).to eq :next
     end
 
@@ -226,7 +230,7 @@ describe OllamaChat::Chat, protect_env: true do
     connect_to_ollama_server(instantiate: false)
 
     let :argv do
-      %w[ -C test -c ] << asset('conversation.json')
+      use_default_config.(%w[ -C test -c ] << asset('conversation.json'))
     end
 
     it 'dispays the last exchange of the converstation' do
@@ -243,7 +247,7 @@ describe OllamaChat::Chat, protect_env: true do
     context 'with MemoryCache' do
 
       let :argv do
-        %w[ -M ]
+        use_default_config.(%w[ -M ])
       end
 
       it 'can use MemoryCache' do
@@ -265,7 +269,7 @@ describe OllamaChat::Chat, protect_env: true do
     connect_to_ollama_server(instantiate: false)
 
       let :argv do
-        %w[ -C test -D ] << asset('example.html')
+        use_default_config.(%w[ -C test -D ] << asset('example.html'))
       end
 
       it 'Adds documents passed to app via -D option' do

data/spec/ollama_chat/message_output_spec.rb

@@ -17,10 +17,10 @@ describe OllamaChat::MessageOutput do
   end
 
   it 'pipe can write to command stdin' do
-    expect(STDERR).to receive(:puts).with(/No response available to output to pipe command "true"/)
-    expect(chat.pipe('true')).to be_nil
+    expect(STDERR).to receive(:puts).with(/No response available to output to pipe command ".*true.*"/)
+    expect(chat.pipe(`which true`)).to be_nil
     chat.instance_variable_get(:@messages).load_conversation(asset('conversation.json'))
-    expect(STDOUT).to receive(:puts).with(/Last response was piped to \"true\"./)
-    expect(chat.pipe('true')).to eq chat
+    expect(STDOUT).to receive(:puts).with(/Last response was piped to \".*true.*\"./)
+    expect(chat.pipe(`which true`)).to eq chat
   end
 end

data/spec/ollama_chat/redis_cache_spec.rb

@@ -0,0 +1,114 @@
+require 'spec_helper'
+
+describe OllamaChat::RedisCache do
+  let :prefix do
+    'test-'
+  end
+
+  let :cache do
+    described_class.new(prefix:, url: 'something').expose
+  end
+
+  it 'can be instantiated' do
+    expect(cache).to be_a described_class
+  end
+
+  it 'raises ArgumentError if url is missing' do
+    expect {
+      described_class.new prefix:, url: nil
+    }.to raise_error ArgumentError
+  end
+
+  context 'test redis interactions' do
+    let :redis do
+      double('Redis')
+    end
+
+    before do
+      allow_any_instance_of(described_class).to receive(:redis).and_return(redis)
+    end
+
+    it 'has Redis client' do
+      expect(cache.redis).to eq redis
+    end
+
+    it 'can get a key' do
+      key = 'foo'
+      expect(redis).to receive(:get).with(prefix + key).and_return 'some_value'
+      expect(cache[key]).to eq 'some_value'
+    end
+
+    it 'can set a value for a key' do
+      key, value = 'foo', 'some_value'
+      expect(redis).to receive(:set).with(prefix + key, value, ex: nil)
+      cache[key] = value
+    end
+
+    it 'can set a value for a key with ttl' do
+      cache = described_class.new prefix:, url: 'something', ex: 3_600
+      key, value = 'foo', 'some_value'
+      expect(redis).to receive(:set).with(prefix + key, value, ex: 3_600)
+      cache[key] = value
+      expect(redis).to receive(:ttl).with(prefix + key).and_return 3_600
+      expect(cache.ttl(key)).to eq 3_600
+    end
+
+    it 'can determine if key exists' do
+      key = 'foo'
+      expect(redis).to receive(:exists?).with(prefix + key).and_return(false, true)
+      expect(cache.key?('foo')).to eq false
+      expect(cache.key?('foo')).to eq true
+    end
+
+    it 'can delete' do
+      key = 'foo'
+      expect(redis).to receive(:del).with(prefix + key).and_return 1
+      expect(cache.delete(key)).to eq true
+      expect(redis).to receive(:del).with(prefix + key).and_return 0
+      expect(cache.delete(key)).to eq false
+    end
+
+    it 'can iterate over keys, values' do
+      key, value = 'foo', 'some_value'
+      expect(redis).to receive(:set).with(prefix + key, value, ex: nil)
+      cache[key] = value
+      expect(redis).to receive(:scan_each).with(match: "#{prefix}*").
+        and_yield("#{prefix}foo")
+      expect(redis).to receive(:get).with(prefix + key).and_return('some_value')
+      cache.each do |k, v|
+        expect(k).to eq prefix + key
+        expect(v).to eq value
+      end
+    end
+
+    it 'returns size' do
+      expect(redis).to receive(:scan_each).with(match: "#{prefix}*").
+        and_yield("#{prefix}foo").
+        and_yield("#{prefix}bar").
+        and_yield("#{prefix}baz")
+      expect(cache.size).to eq 3
+    end
+
+    it 'can clear' do
+      expect(redis).to receive(:scan_each).with(match: 'test-*').and_yield(
+        'test-foo'
+      )
+      expect(redis).to receive(:del).with('test-foo')
+      expect(cache.clear).to eq cache
+    end
+
+    it 'can iterate over keys under a prefix' do
+      expect(redis).to receive(:scan_each).with(match: 'test-*')
+      cache.to_a
+    end
+
+    it 'can compute prefix with pre' do
+      expect(cache.pre('foo')).to eq 'test-foo'
+    end
+
+    it 'can remove prefix with unpre' do
+      expect(cache.unpre('test-foo')).to eq 'foo'
+    end
+  end
+end
+

data/spec/ollama_chat/source_fetching_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 
 describe OllamaChat::SourceFetching do
   let :chat do
-    OllamaChat::Chat.new
+    OllamaChat::Chat.new(
+      argv: %w[ -f lib/ollama_chat/ollama_chat_config/default_config.yml ]
+    )
   end
 
   connect_to_ollama_server

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.49
+  version: 0.0.51
 platform: ruby
 authors:
 - Florian Frank
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.2
+        version: 2.16.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.2
+        version: 2.16.3
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
@@ -379,6 +379,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: context_spook
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: |
   The app provides a command-line interface (CLI) to an Ollama AI model,
   allowing users to engage in text-based conversations and generate
@@ -404,6 +418,7 @@ extra_rdoc_files:
 - lib/ollama_chat/follow_chat.rb
 - lib/ollama_chat/history.rb
 - lib/ollama_chat/information.rb
+- lib/ollama_chat/input_content.rb
 - lib/ollama_chat/kramdown_ansi.rb
 - lib/ollama_chat/message_format.rb
 - lib/ollama_chat/message_list.rb
@@ -411,6 +426,7 @@ extra_rdoc_files:
 - lib/ollama_chat/model_handling.rb
 - lib/ollama_chat/ollama_chat_config.rb
 - lib/ollama_chat/parsing.rb
+- lib/ollama_chat/redis_cache.rb
 - lib/ollama_chat/server_socket.rb
 - lib/ollama_chat/source_fetching.rb
 - lib/ollama_chat/switches.rb
@@ -443,6 +459,7 @@ files:
 - lib/ollama_chat/follow_chat.rb
 - lib/ollama_chat/history.rb
 - lib/ollama_chat/information.rb
+- lib/ollama_chat/input_content.rb
 - lib/ollama_chat/kramdown_ansi.rb
 - lib/ollama_chat/message_format.rb
 - lib/ollama_chat/message_list.rb
@@ -451,6 +468,7 @@ files:
 - lib/ollama_chat/ollama_chat_config.rb
 - lib/ollama_chat/ollama_chat_config/default_config.yml
 - lib/ollama_chat/parsing.rb
+- lib/ollama_chat/redis_cache.rb
 - lib/ollama_chat/server_socket.rb
 - lib/ollama_chat/source_fetching.rb
 - lib/ollama_chat/switches.rb
@@ -491,6 +509,7 @@ files:
 - spec/ollama_chat/message_output_spec.rb
 - spec/ollama_chat/model_handling_spec.rb
 - spec/ollama_chat/parsing_spec.rb
+- spec/ollama_chat/redis_cache_spec.rb
 - spec/ollama_chat/server_socket_spec.rb
 - spec/ollama_chat/source_fetching_spec.rb
 - spec/ollama_chat/switches_spec.rb
@@ -536,6 +555,7 @@ test_files:
 - spec/ollama_chat/message_output_spec.rb
 - spec/ollama_chat/model_handling_spec.rb
 - spec/ollama_chat/parsing_spec.rb
+- spec/ollama_chat/redis_cache_spec.rb
 - spec/ollama_chat/server_socket_spec.rb
 - spec/ollama_chat/source_fetching_spec.rb
 - spec/ollama_chat/switches_spec.rb