ollama_chat 0.0.33 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f2ffa19191743f1d9b41bfb72893dba9ca6e1e26836ed4c553a52b1c13f29ca
-  data.tar.gz: 83bc423d7f4daf9cda26a69c05858a300957c82cc74071285ee05c4afc734281
+  metadata.gz: a0c32096e0846e22b31ec8e27fa8aa20087ac0d88cb421c9e697d17e61bfad0b
+  data.tar.gz: 9b828f24b207fbea21c5b9a2a13c572c5f45765cf6b88b6a4624ec923bc5f109
 SHA512:
-  metadata.gz: 9064c4a0b0ada0f57b2fca76c1665296f60607ec284a93f9e172aa83e6c36876a025caaec37dc84aa95ca1ad00e29a19bd93e93046bd8b07d21d54c31cfa5d7e
-  data.tar.gz: 37f74dfca1c4bee0946f56136d00b098303b69fe735bd84f9e3a6d1bb3f6ff59c4d1f03be9de7b451714b4909ece0a769cf9931c46b7c89d87bf0c3b53ebc98e
+  metadata.gz: 4a351e48b81cca88fde7299da6bab2f9e4fdcc10ce98b3af1cc8d7733dd58675bb5b7fe75896ad369169e33e7c91d858ff85ad69406e019845eaaa6d8c6d4614
+  data.tar.gz: 9951320316b3fcd7c804dfdd18a2540f5b56399c131677f29aa011995b25877346e83d550ab222e1b67f8bf92f5828bbd510bda5aed4df5dcfb9e1f92995a41d

data/CHANGES.md

@@ -1,5 +1,41 @@
 # Changes
 
+## 2025-09-18 v0.0.35
+
+- Replaced ad-hoc ENV handling with `const_conf` gem for structured
+  configuration management
+- Bumped required Ruby version from **3.1** to **3.2**
+- Added `const_conf (~> 0.3)` as a runtime dependency
+- Introduced `OllamaChat::EnvConfig` module to centralize environment variables
+- Updated `OllamaChat::Chat`, `OllamaChat::FollowChat`, and related classes to
+  use the new configuration system
+- Replaced direct ENV access with `EnvConfig::OLLAMA::URL`,
+  `EnvConfig::PAGER?`, etc.
+- Refactored default configuration values in YAML files to use `const_conf`
+  constants
+- Removed legacy debug flag handling and simplified `debug` method
+  implementation
+- Updated test suite to use `const_conf_as` helper and removed old ENV stubbing
+  logic
+- Adjusted gemspec to include new files and dependencies, updated required Ruby
+  version
+- Updated regex pattern to match only escaped spaces in file paths
+
+## 2025-09-17 v0.0.34
+
+- Modified `-d` flag semantics to use working directory instead of runtime
+  directory for socket path derivation
+- Updated `send_to_server_socket` and `create_socket_server` methods to accept
+  `working_dir` parameter
+- Changed argument parsing in `ollama_chat_send` binary to utilize
+  `working_dir` instead of `runtime_dir`
+- Updated documentation and help text to reflect new `-d` option semantics
+- Added tests covering new `working_dir` functionality with default fallback to
+  current directory
+- Maintained backward compatibility by preserving existing `runtime_dir`
+  behavior when specified
+- Modified method signatures to support both old and new parameter styles
+
 ## 2025-09-15 v0.0.33
 
 - Enhanced `CONTENT_REGEXP` to support escaped spaces in file paths using

data/README.md

@@ -228,6 +228,16 @@ The `ollama_chat_send` command now supports additional parameters to enhance fun
   $ echo "Visit https://example.com for more info" | ollama_chat_send -p
   ```
 
+- **Working Directory (`-d`)**: Specifies the working directory used to derive
+  the Unix socket file path. When the ollama chat configuration is set to use a
+  working directory dependent socket (via `working_dir_dependent_socket: true`),
+  this option determines the base path for socket naming. If not specified, the
+  current working directory is assumed.
+
+  ```bash
+  $ echo "Hello world" | ollama_chat_send -d /tmp/my_working_dir -r
+  ```
+
 - **Runtime Directory (`-d`)**: Specifies the directory where the Unix socket
   file of `ollama_chat` was created, if you want to send to a specific
   `ollama_chat`.

data/Rakefile

@@ -29,7 +29,7 @@ GemHadar do
 
   readme      'README.md'
 
-  required_ruby_version  '~> 3.1'
+  required_ruby_version  '~> 3.2'
 
   executables << 'ollama_chat' << 'ollama_chat_send'
 
@@ -50,6 +50,7 @@ GemHadar do
   dependency             'amatch',                '~> 0.4.1'
   dependency             'pdf-reader',            '~> 2.0'
   dependency             'csv',                   '~> 3.0'
+  dependency             'const_conf',            '~> 0.3'
   development_dependency 'all_images',            '~> 0.6'
   development_dependency 'rspec',                 '~> 3.2'
   development_dependency 'kramdown',              '~> 2.0'

data/bin/ollama_chat_send

@@ -4,9 +4,15 @@ require 'ollama_chat'
 require 'tins/go'
 include Tins::GO
 
-
 opts = go 'f:d:rtph', ARGV
 
+# Displays the usage information for the ollama_chat_send command.
+#
+# This method outputs a formatted help message that describes the available
+# options and usage of the ollama_chat_send command, including details about
+# sending input to a running Ollama Chat client.
+#
+# @param rc [ Integer ] the exit code to use when exiting the program
 def usage(rc = 0)
   puts <<~EOT
     Usage: #{File.basename($0)} [OPTIONS]
@@ -16,7 +22,7 @@ def usage(rc = 0)
       -t         Send input as terminal input including commands, e. g. /import
       -p         Send input with source parsing enabled (defaults to disabled)
       -f CONFIG  file to read
-      -d DIR     the runtime directory to look for the socket file
+      -d DIR     the working directory to derive the socket file from
       -h         Show this help message
 
     Send data to a running Ollame Chat client via standard input.
@@ -36,8 +42,8 @@ begin
     STDIN.read,
     type:,
     config:,
-    runtime_dir: opts[?d],
-    parse: !!opts[?p]
+    working_dir: opts[?d],
+    parse:       !!opts[?p]
   )
   type == :socket_input_with_response and puts response.content
 rescue => e

data/lib/ollama_chat/chat.rb

@@ -84,13 +84,13 @@ class OllamaChat::Chat
     @ollama_chat_config = OllamaChat::OllamaChatConfig.new(@opts[?f])
     self.config         = @ollama_chat_config.config
     setup_switches(config)
-    base_url         = @opts[?u] || config.url
+    base_url         = @opts[?u] || OllamaChat::EnvConfig::OLLAMA::URL
     @ollama          = Ollama::Client.new(
       connect_timeout: config.timeouts.connect_timeout?,
       read_timeout:    config.timeouts.read_timeout?,
       write_timeout:   config.timeouts.write_timeout?,
       base_url:        base_url,
-      debug:           config.debug,
+      debug:           ,
       user_agent:
     )
     if server_version.version < '0.9.0'.version
@@ -124,6 +124,13 @@ class OllamaChat::Chat
     fix_config(e)
   end
 
+  # The debug method accesses the debug configuration setting.
+  #
+  # @return [TrueClass, FalseClass] the current debug mode status
+  def debug
+    OllamaChat::EnvConfig::OLLAMA::CHAT::DEBUG
+  end
+
   # The ollama reader returns the Ollama API client instance.
   #
   # @return [Ollama::Client] the configured Ollama API client
@@ -497,11 +504,7 @@ class OllamaChat::Chat
   # and available system commands, then uses Kramdown::ANSI::Pager to show the
   # formatted configuration output.
   def display_config
-    default_pager = ENV['PAGER'].full?
-    if fallback_pager = `which less`.chomp.full? || `which more`.chomp.full?
-      fallback_pager << ' -r'
-    end
-    my_pager = default_pager || fallback_pager
+    command  = OllamaChat::EnvConfig::PAGER?
     rendered = config.to_s
     Kramdown::ANSI::Pager.pager(
       lines: rendered.count(?\n),
@@ -610,7 +613,7 @@ class OllamaChat::Chat
                  end
           [ link, ?# + record.tags.first ]
         }.uniq.map { |l, t| hyperlink(l, t) }.join(' ')
-        config.debug and jj messages.to_ary
+        debug and jj messages.to_ary
       end
 
       case type
@@ -660,7 +663,7 @@ class OllamaChat::Chat
         collection:        ,
         cache:             configure_cache,
         redis_url:         config.redis.documents.url?,
-        debug:             config.debug
+        debug:
       )
 
       document_list = @opts[?D].to_a
@@ -750,9 +753,12 @@ class OllamaChat::Chat
     save_conversation('backup.json')
     STDOUT.puts "When reading the config file, a #{exception.class} "\
       "exception was caught: #{exception.message.inspect}"
+    unless diff_tool = OllamaChat::EnvConfig::DIFF_TOOL?
+      exit 1
+    end
     if ask?(prompt: 'Do you want to fix the config? (y/n) ') =~ /\Ay/i
       system Shellwords.join([
-        @ollama_chat_config.diff_tool,
+        diff_tool,
         @ollama_chat_config.filename,
         @ollama_chat_config.default_config_path,
       ])

data/lib/ollama_chat/dialog.rb

@@ -58,7 +58,15 @@ module OllamaChat::Dialog
         cli_model || current_model
       end
   ensure
-    STDOUT.puts green { "Connecting to #{model}@#{ollama.base_url} now…" }
+    connect_message(model, ollama.base_url)
+  end
+
+  # The connect_message method displays a connection status message.
+  #
+  # @param model [String] the model name to connect to
+  # @param base_url [String] the base URL of the connection
+  def connect_message(model, base_url)
+    STDOUT.puts green { "Connecting to #{model}@#{base_url} now…" }
   end
 
   # The ask? method prompts the user with a question and returns their input.

data/lib/ollama_chat/env_config.rb

@@ -0,0 +1,100 @@
+require 'const_conf'
+
+module OllamaChat
+  module EnvConfig
+    include ConstConf
+
+    description 'Environment config for OllamaChat'
+    prefix ''
+
+    PAGER = set do
+      description 'Pager command to use in case terminal lines are exceeded by output'
+
+      default do
+        if fallback_pager = `which less`.full?(:chomp) || `which more`.full?(:chomp)
+          fallback_pager << ' -r'
+        end
+      end
+    end
+
+    DIFF_TOOL = set do
+      description 'Diff tool to apply changes with'
+
+      default do
+        if  diff = `which vimdiff`.full?(:chomp)
+          diff
+        else
+          warn 'Need a diff tool configured via env var "DIFF_TOOL"'
+        end
+      end
+    end
+
+    KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES = set do
+      description 'Styles to use for kramdown-ansi markdown'
+
+      default ENV['KRAMDOWN_ANSI_STYLES'].full?
+    end
+
+    module OLLAMA
+      description 'Ollama Configuration'
+      prefix 'OLLAMA'
+
+      HOST = set do
+        description 'Ollama "host" to connect to'
+        default     'localhost:11434'
+      end
+
+      URL = set do
+        description 'Ollama base URL to connect to'
+        default     { 'http://%s' % OllamaChat::EnvConfig::OLLAMA::HOST }
+        sensitive   true
+      end
+
+      SEARXNG_URL = set do
+        description 'URL for the SearXNG service for searches'
+        default     'http://localhost:8088/search?q=%{query}&language=en&format=json'
+        sensitive   true
+      end
+
+      REDIS_URL = set do
+        description 'Redis URL for documents'
+        default     { ENV['REDIS_URL'].full?  }
+        sensitive   true
+      end
+
+      REDIS_EXPIRING_URL = set do
+        description 'Redis URL for caching'
+        default     { EnvConfig::OLLAMA::REDIS_URL? || ENV['REDIS_URL'].full? }
+        sensitive   true
+      end
+
+      module CHAT
+        description 'OllamaChat Configuration'
+
+        DEBUG = set do
+          description 'Enable debugging for chat client'
+          decode { it.to_i == 1 }
+          default 0
+        end
+
+        MODEL = set do
+          description 'Default model to use for the chat'
+          default 'llama3.1'
+        end
+
+        SYSTEM = set do
+          description 'Default system prompt'
+        end
+
+        COLLECTION = set do
+          description 'Default collection for embeddings'
+        end
+
+        HISTORY = set do
+          description 'File to save the chat history in'
+          default     '~/.ollama_chat_history'
+        end
+      end
+    end
+  end
+end

data/lib/ollama_chat/follow_chat.rb

@@ -174,6 +174,6 @@ class OllamaChat::FollowChat
   #
   # @param response [ Object ] the response object to be outputted
   def debug_output(response)
-    OllamaChat::Chat.config.debug and jj response
+    @chat.debug and jj response
   end
 end

data/lib/ollama_chat/history.rb

@@ -26,7 +26,7 @@ module OllamaChat::History
   # @return [String] the absolute file path to the chat history file as
   # specified in the configuration
   def chat_history_filename
-    File.expand_path(config.chat_history_filename)
+    File.expand_path(OllamaChat::EnvConfig::OLLAMA::CHAT::HISTORY)
   end
 
   # The init_chat_history method initializes the chat session by loading

data/lib/ollama_chat/kramdown_ansi.rb

@@ -18,8 +18,8 @@ module OllamaChat::KramdownANSI
   # @return [ Hash ] a hash of ANSI styles configured either from environment
   # variables or using default settings
   def configure_kramdown_ansi_styles
-    if env_var = %w[ KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES KRAMDOWN_ANSI_STYLES ].find { ENV.key?(_1) }
-      Kramdown::ANSI::Styles.from_env_var(env_var).ansi_styles
+    if json = OllamaChat::EnvConfig::KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES?
+      Kramdown::ANSI::Styles.from_json(json).ansi_styles
     else
       Kramdown::ANSI::Styles.new.ansi_styles
     end

data/lib/ollama_chat/message_list.rb

@@ -312,11 +312,7 @@ class OllamaChat::MessageList
   # '-r' flag for proper handling of raw control characters when a fallback
   # pager is used.
   def determine_pager_command
-    default_pager = ENV['PAGER'].full?
-    if fallback_pager = `which less`.chomp.full? || `which more`.chomp.full?
-      fallback_pager << ' -r'
-    end
-    default_pager || fallback_pager
+    OllamaChat::EnvConfig::PAGER?
   end
 
   # The use_pager method wraps the given block with a pager context.

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -1,8 +1,7 @@
 ---
-url: <%= ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST') %>
 proxy: null # http://localhost:8080
 model:
-  name: <%= ENV.fetch('OLLAMA_CHAT_MODEL', 'llama3.1') %>
+  name: <%= OllamaChat::EnvConfig::OLLAMA::CHAT::MODEL %>
   options:
     num_ctx: 8192
 timeouts:
@@ -33,7 +32,7 @@ prompts:
     %{results}
   location: You are at %{location_name}, %{location_decimal_degrees}, on %{localtime}, preferring %{units}
 system_prompts:
-  default: <%= ENV.fetch('OLLAMA_CHAT_SYSTEM', 'null') %>
+  default: <%= OllamaChat::EnvConfig::OLLAMA::CHAT::SYSTEM || 'null' %>
   assistant: You are a helpful assistant.
 voice:
   enabled: false
@@ -54,7 +53,7 @@ embedding:
     prompt: 'Represent this sentence for searching relevant passages: %s'
   batch_size: 10
   database_filename: null # ':memory:'
-  collection: <%= ENV['OLLAMA_CHAT_COLLECTION'] %>
+  collection: <%= OllamaChat::EnvConfig::OLLAMA::CHAT::COLLECTION %>
   found_texts_size: 4096
   found_texts_count: 10
   splitter:
@@ -63,13 +62,11 @@ embedding:
 cache: Documentrix::Documents::SQLiteCache
 redis:
   documents:
-    url: <%= ENV.fetch('REDIS_URL', 'null') %>
+    url: <%= OllamaChat::EnvConfig::OLLAMA::REDIS_URL %>
   expiring:
-    url: <%= ENV.fetch('REDIS_EXPIRING_URL', 'null') %>
+    url: <%= OllamaChat::EnvConfig::OLLAMA::REDIS_EXPIRING_URL %>
     ex: 86400
-chat_history_filename: <%= ENV.fetch('OLLAMA_CHAT_HISTORY', '~/.ollama_chat_history') %>
 working_dir_dependent_socket: true
-debug: <%= ENV['OLLAMA_CHAT_DEBUG'].to_i == 1 ? true : false %>
 request_headers:
   Accept: 'text/*,application/*,image/*'
 ssl_no_verify: []
@@ -80,4 +77,4 @@ web_search:
     duckduckgo:
       url: 'https://www.duckduckgo.com/html/?q=%{query}'
     searxng:
-      url: <%= ENV.fetch('OLLAMA_SEARXNG_URL', 'http://localhost:8088/search?q=%{query}&language=en&format=json') %>
+      url: <%= OllamaChat::EnvConfig::OLLAMA::SEARXNG_URL %>

data/lib/ollama_chat/ollama_chat_config.rb

@@ -112,6 +112,6 @@ class OllamaChat::OllamaChatConfig
   #
   # @return [ String ] the command name of the diff tool to be used
   def diff_tool
-    ENV.fetch('DIFF_TOOL', 'vimdiff')
+    OllamaChat::EnvConfig::DIFF_TOOL?
   end
 end

data/lib/ollama_chat/parsing.rb

@@ -200,7 +200,7 @@ module OllamaChat::Parsing
     |                                      # OR
     "((?:\.\.|[~.]?)/(?:\\"|\\|[^"\\]+)+)" # Quoted file path with escaped " quotes
     |                                      # OR
-    ((?:\.\.|[~.]?)/(?:\\\ |\\|[^\\ ]+)+)  # File path with escaped spaces
+    ((?:\.\.|[~.]?)/(?:\\\ |\\|[^\\\s]+)+) # File path with escaped spaces
   }x
   private_constant :CONTENT_REGEXP
 

data/lib/ollama_chat/server_socket.rb

@@ -38,12 +38,13 @@ module OllamaChat::ServerSocket
     # @param config [ ComplexConfig::Settings ] the configuration object containing server settings
     # @param type [ Symbol ] the type of message transmission, defaults to :socket_input
     # @param runtime_dir [ String ] pathname to runtime_dir of socket file
+    # @param working_dir [ String ] pathname to working_dir used for deriving socket file
     # @param parse [ TrueClass, FalseClass ] whether to parse the response, defaults to false
     #
     # @return [ UnixSocks::Message, nil ] the response from transmit_with_response if type
     # is :socket_input_with_response, otherwise nil
-    def send_to_server_socket(content, config:, type: :socket_input, runtime_dir: nil, parse: false)
-      server  = create_socket_server(config:, runtime_dir:)
+    def send_to_server_socket(content, config:, type: :socket_input, runtime_dir: nil, working_dir: nil, parse: false)
+      server  = create_socket_server(config:, runtime_dir:, working_dir:)
       message = { content:, type:, parse: }
       if type.to_sym == :socket_input_with_response
         server.transmit_with_response(message)
@@ -65,15 +66,18 @@ module OllamaChat::ServerSocket
     #
     # @param config [ComplexConfig::Settings] the configuration object
     # containing server settings
+    # @param runtime_dir [ String ] pathname to runtime_dir of socket file
+    # @param working_dir [ String ] pathname to working_dir used for deriving socket file
     #
     # @return [UnixSocks::Server] a configured Unix domain socket server
     # instance ready to receive messages
-    def create_socket_server(config:, runtime_dir: nil)
+    def create_socket_server(config:, runtime_dir: nil, working_dir: nil)
+      working_dir ||= Dir.pwd
       if runtime_dir
         return UnixSocks::Server.new(socket_name: 'ollama_chat.sock', runtime_dir:)
       end
       if config.working_dir_dependent_socket
-        path   = File.expand_path(Dir.pwd)
+        path   = File.expand_path(working_dir)
         digest = Digest::MD5.hexdigest(path)
         UnixSocks::Server.new(socket_name: "ollama_chat-#{digest}.sock")
       else

data/lib/ollama_chat/source_fetching.rb

@@ -65,7 +65,7 @@ module OllamaChat::SourceFetching
         source,
         headers:      config.request_headers?.to_h,
         cache:        @cache,
-        debug:        config.debug,
+        debug:        ,
         http_options: http_options(OllamaChat::Utils::Fetcher.normalize_url(source))
       ) do |tmp|
         block.(tmp)

data/lib/ollama_chat/version.rb

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

data/lib/ollama_chat/web_searching.rb

@@ -58,7 +58,7 @@ module OllamaChat::WebSearching
     OllamaChat::Utils::Fetcher.get(
       url,
       headers: config.request_headers?.to_h,
-      debug:   config.debug
+      debug:
     ) do |tmp|
       data = JSON.parse(tmp.read, object_class: JSON::GenericObject)
       data.results.first(n).map(&:url)
@@ -79,7 +79,7 @@ module OllamaChat::WebSearching
     OllamaChat::Utils::Fetcher.get(
       url,
       headers: config.request_headers?.to_h,
-      debug:   config.debug
+      debug:
     ) do |tmp|
       result = []
       doc = Nokogiri::HTML(tmp)

data/lib/ollama_chat.rb

@@ -34,4 +34,5 @@ require 'ollama_chat/history'
 require 'ollama_chat/server_socket'
 require 'ollama_chat/kramdown_ansi'
 require 'ollama_chat/conversation'
+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.33 ruby lib
+# stub: ollama_chat 0.0.35 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.33".freeze
+  s.version = "0.0.35".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,12 +12,12 @@ 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/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/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/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/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/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/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/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.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.1".freeze)
+  s.required_ruby_version = Gem::Requirement.new("~> 3.2".freeze)
   s.rubygems_version = "3.6.9".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]
@@ -49,4 +49,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<amatch>.freeze, ["~> 0.4.1".freeze])
   s.add_runtime_dependency(%q<pdf-reader>.freeze, ["~> 2.0".freeze])
   s.add_runtime_dependency(%q<csv>.freeze, ["~> 3.0".freeze])
+  s.add_runtime_dependency(%q<const_conf>.freeze, ["~> 0.3".freeze])
 end

data/spec/ollama_chat/follow_chat_spec.rb

@@ -8,7 +8,7 @@ describe OllamaChat::FollowChat do
   end
 
   let :chat do
-    double('Chat', markdown: double(on?: false), think: double(on?: false))
+    double('Chat', markdown: double(on?: false), think: double(on?: false), debug: false)
   end
 
   let :follow_chat do
@@ -19,10 +19,6 @@ describe OllamaChat::FollowChat do
     double('output', :sync= => true)
   end
 
-  before do
-    allow(OllamaChat::Chat).to receive(:config).and_return(double(debug: false))
-  end
-
   it 'has .call' do
     expect(follow_chat).to receive(:call).with(:foo)
     follow_chat.call(:foo)

data/spec/ollama_chat/kramdown_ansi_spec.rb

@@ -7,21 +7,21 @@ describe OllamaChat::KramdownANSI do
 
   describe '#configure_kramdown_ansi_styles', protect_env: true do
     it 'can be configured via env var' do
-      ENV['KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES'] = '{}'
-      ENV.delete('KRAMDOWN_ANSI_STYLES')
-
+      const_conf_as(
+        'OllamaChat::EnvConfig::KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES' => '{"foo":"bar"}'
+      )
       styles = { bold: '1' }
-      expect(Kramdown::ANSI::Styles).to receive(:from_env_var).
-        with('KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES').
+      expect(Kramdown::ANSI::Styles).to receive(:from_json).
+        with('{"foo":"bar"}').
         and_return(double(ansi_styles: styles))
 
       expect(chat.configure_kramdown_ansi_styles).to eq(styles)
     end
 
     it 'has a default configuration' do
-      ENV.delete('KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES')
-      ENV.delete('KRAMDOWN_ANSI_STYLES')
-
+      const_conf_as(
+        'OllamaChat::EnvConfig::KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES' => nil
+      )
       expect(chat.configure_kramdown_ansi_styles).to be_a(Hash)
     end
   end

data/spec/ollama_chat/server_socket_spec.rb

@@ -13,7 +13,7 @@ describe OllamaChat::ServerSocket do
 
       before do
         expect(OllamaChat::ServerSocket).to receive(:create_socket_server).
-          with(config: config, runtime_dir: nil).and_return(server)
+          with(config: config, runtime_dir: nil, working_dir: nil).and_return(server)
       end
 
       context 'with default parameters' do
@@ -50,7 +50,8 @@ describe OllamaChat::ServerSocket do
           message = { content: 'test', type: :socket_input_with_response, parse: false }
           response = double('Response')
 
-          expect(server).to receive(:transmit_with_response).with(message).and_return(response)
+          expect(server).to receive(:transmit_with_response).with(message).
+            and_return(response)
 
           result = OllamaChat::ServerSocket.send_to_server_socket(
             'test',
@@ -68,7 +69,8 @@ describe OllamaChat::ServerSocket do
           message = { content: 'test', type: :socket_input_with_response, parse: true }
           response = double('Response')
 
-          expect(server).to receive(:transmit_with_response).with(message).and_return(response)
+          expect(server).to receive(:transmit_with_response).with(message).
+            and_return(response)
 
           result = OllamaChat::ServerSocket.send_to_server_socket(
             'test',
@@ -82,10 +84,32 @@ describe OllamaChat::ServerSocket do
       end
     end
 
+    context 'with working_dir' do
+      before do
+        expect(OllamaChat::ServerSocket).to receive(:create_socket_server).
+          with(config: config, runtime_dir: nil, working_dir: 'foo/path').
+          and_return(server)
+      end
+
+      context 'with working_dir parameter' do
+        it 'uses correct parameter' do
+          message = { content: 'test', type: :socket_input, parse: false }
+          expect(server).to receive(:transmit).with(message).and_return(nil)
+
+          result = OllamaChat::ServerSocket.send_to_server_socket(
+            'test', config: config, working_dir: 'foo/path'
+          )
+
+          expect(result).to be_nil
+        end
+      end
+    end
+
     context 'with runtime_dir parameter' do
       before do
         expect(OllamaChat::ServerSocket).to receive(:create_socket_server).
-          with(config: config, runtime_dir: '/foo/bar').and_return(server)
+          with(config: config, runtime_dir: '/foo/bar', working_dir: nil).
+          and_return(server)
       end
 
       it 'uses correct defaults' do
@@ -94,7 +118,9 @@ describe OllamaChat::ServerSocket do
         expect(server).to receive(:transmit).with(message).and_return(nil)
 
 
-        result = OllamaChat::ServerSocket.send_to_server_socket('test', config: config, runtime_dir: '/foo/bar')
+        result = OllamaChat::ServerSocket.send_to_server_socket(
+          'test', config: config, runtime_dir: '/foo/bar'
+        )
 
         expect(result).to be_nil
       end

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ rescue LoadError
 end
 require 'webmock/rspec'
 WebMock.disable_net_connect!
+require 'const_conf/spec'
 require 'ollama_chat'
 
 ComplexConfig::Provider.deep_freeze = false
@@ -108,6 +109,7 @@ module StubOllamaServer
         to_return(status: 200, body: asset_json('api_show.json'))
       stub_request(:get, %r(/api/version\z)).
         to_return(status: 200, body: asset_json('api_version.json'))
+      allow_any_instance_of(OllamaChat::Chat).to receive(:connect_message)
       instantiate and chat
     end
   end
@@ -145,12 +147,10 @@ RSpec.configure do |config|
   config.include AssetHelpers
   config.extend StubOllamaServer
 
-  config.around(&ProtectEnvVars.apply)
-  config.before(:each) do
-    ENV['OLLAMA_HOST'] = 'localhost:11434'
-  end
-
   config.before(:suite) do
     infobar.show = nil
   end
+
+  config.around(&ProtectEnvVars.apply)
+  config.include(ConstConf::ConstConfHelper)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.35
 platform: ruby
 authors:
 - Florian Frank
@@ -371,6 +371,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: const_conf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: |
   The app provides a command-line interface (CLI) to an Ollama AI model,
   allowing users to engage in text-based conversations and generate
@@ -392,6 +406,7 @@ extra_rdoc_files:
 - lib/ollama_chat/conversation.rb
 - lib/ollama_chat/dialog.rb
 - lib/ollama_chat/document_cache.rb
+- lib/ollama_chat/env_config.rb
 - lib/ollama_chat/follow_chat.rb
 - lib/ollama_chat/history.rb
 - lib/ollama_chat/information.rb
@@ -429,6 +444,7 @@ files:
 - lib/ollama_chat/conversation.rb
 - lib/ollama_chat/dialog.rb
 - lib/ollama_chat/document_cache.rb
+- lib/ollama_chat/env_config.rb
 - lib/ollama_chat/follow_chat.rb
 - lib/ollama_chat/history.rb
 - lib/ollama_chat/information.rb
@@ -503,7 +519,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="