ollama_chat 0.0.36 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3549c1258a47d46e043e045573d51e41729cc8531ecb5c9746eceb385ff01b99
-  data.tar.gz: cda7120617c155a20326f9a8445207e4b74cbd7faf100ac194b30cdbe4524293
+  metadata.gz: 1702d897811e762ef2ba3b5018efcec7e55e01e96e14bbb56f09eb3be8d7d0a3
+  data.tar.gz: 0f27aa44e2574249ac90b4979a87afae0fc1b9f525643db523c7b392c7fad95a
 SHA512:
-  metadata.gz: 88d787dbb1e4e8aa9756b21c5e0a64ab01ab52fdb2ebf84f3f4df6aa65a8b0b4aa03c77c21384ce6e98f156c9dcc9cb711d83d5baf99504e41879f05cc877131
-  data.tar.gz: 55097e08afa04486918e5939062b71d729ec27c14fcc186078f11c631f5c7dba05d8fca6f39a1823abd521acdd6712c06e0f5812c548321cdb3449cae1351549
+  metadata.gz: b686679959f9662811104f7e12951106cfaca0d7a9820878bd6885548c3b16090da2d5f6473cb95df5387b30ece2f06eb2225bf78a76c1124cd2bb84f2f0a8f1
+  data.tar.gz: 1b26360782e6018faf976c248aef147dc6e4938618eb95db287ca2cc4a2248c8ca7ca7ce45586d780e7e14cdc5d66a80ac2546f7d77843507e3b5194a60cd07b

data/.utilsrc

@@ -59,7 +59,6 @@ code_indexer do
     tins
     unix_socks
     webmock
-    xdg
   ]
 
   paths {

data/CHANGES.md

@@ -1,5 +1,34 @@
 # Changes
 
+## 2025-11-11 v0.0.38
+
+- Added `ask?` method call to confirm overwriting existing files when saving
+  conversations
+- Modified `save_conversation` in `OllamaChat::Conversation` to prompt before
+  overwriting
+- Removed explicit file existence check from `MessageList#save_conversation`
+- Both `/save` and `/output` commands now support overwrite confirmation
+- Replace `write_file_unless_exist` method with `attempt_to_write_file`
+- Add user confirmation prompt before overwriting existing files
+- Update method documentation to reflect new overwrite behavior
+- Modify file writing logic to use `attempt_to_write_file` instead of direct
+  write
+- Update `output` method to check return value of `attempt_to_write_file`
+  before printing success message
+- Removed `xdg` gem from the list of dependencies in `code_indexer` block
+
+## 2025-10-31 v0.0.37
+
+- Refactored system prompt selection logic to use `case`/`when` statement
+  instead of `if`/`elsif` for improved readability
+- Maintained same functionality for regex pattern matching with `/\A\?(.+)\z/`
+  pattern
+- Handled special case with `?` argument to match any character with `/./` regex
+- Updated `amatch` dependency version constraint from `~> 0.4.1` to `~> 0.4` in
+  `Rakefile` and `ollama_chat.gemspec`
+- Updated `rubygems` version requirement from **3.6.9** to **3.7.2** in
+  `ollama_chat.gemspec`
+
 ## 2025-10-11 v0.0.36
 
 - Added `openssl-dev` package to apk packages in Dockerfile

data/README.md

@@ -35,7 +35,7 @@ The following environment variables can be used to configure behavior:
 - `PAGER` - Default pager for output
 - `REDIS_URL` - Redis connection URL for caching
 - `REDIS_EXPIRING_URL` - Redis connection URL for expiring data
-- `OLLAMA_CHAT_HISTORY` - Chat history filename (default: `~/.ollama_chat_history`)
+- `OLLAMA_CHAT_HISTORY` - Chat history filename (default: `$XDG_CACHE_HOME/ollama_chat/history.json`)
 - `OLLAMA_CHAT_DEBUG` - Debug mode toggle (1 = enabled)
 - `DIFF_TOOL` - Tool for diff operations (default: `vimdiff`)
 - `OLLAMA_SEARXNG_URL` - SearxNG search endpoint URL

data/Rakefile

@@ -49,7 +49,7 @@ GemHadar do
   dependency             'complex_config',        '~> 0.22', '>= 0.22.2'
   dependency             'tins',                  '~> 1.41'
   dependency             'search_ui',             '~> 0.0'
-  dependency             'amatch',                '~> 0.4.1'
+  dependency             'amatch',                '~> 0.4'
   dependency             'pdf-reader',            '~> 2.0'
   dependency             'csv',                   '~> 3.0'
   dependency             'const_conf',            '~> 0.3'

data/lib/ollama_chat/conversation.rb

@@ -24,6 +24,9 @@ module OllamaChat::Conversation
   # @example Save conversation with explicit filename
   #   chat.save_conversation('conversations/2023-10-15_my_session.json')
   def save_conversation(filename)
+    File.exist?(filename) &&
+      ask?(prompt: "File #{filename.inspect} already exists, overwrite? (y/n) ") !~ /\Ay/i and
+      return
     if messages.save_conversation(filename)
       STDOUT.puts "Saved conversation to #{filename.inspect}."
     else

data/lib/ollama_chat/dialog.rb

@@ -149,8 +149,11 @@ module OllamaChat::Dialog
   # @param system [ String ] the system prompt identifier or pattern to
   # search for
   def change_system_prompt(default, system: nil)
-    selector = if system =~ /\A\?(.+)\z/
+    selector = case system
+               when /\A\?(.+)\z/
                  Regexp.new($1)
+               when ??
+                 /./
                else
                  Regexp.new(system.to_s)
                end

data/lib/ollama_chat/env_config.rb

@@ -105,7 +105,7 @@ module OllamaChat
 
         HISTORY = set do
           description 'File to save the chat history in'
-          default     '~/.ollama_chat_history'
+          default     XDG_CACHE_HOME + 'history.json'
         end
       end
     end

data/lib/ollama_chat/message_list.rb

@@ -124,10 +124,6 @@ class OllamaChat::MessageList
   #
   # @return [ OllamaChat::MessageList ] self
   def save_conversation(filename)
-    if File.exist?(filename)
-      STDERR.puts "File #{filename.inspect} already exists. Choose another filename."
-      return
-    end
     File.open(filename, ?w) do |output|
       output.puts JSON(@messages)
     end

data/lib/ollama_chat/message_output.rb

@@ -43,18 +43,16 @@ module OllamaChat::MessageOutput
 
   # The output method writes the last assistant message to a file.
   #
-  # @param filename [ String ] the path to the file where the output should be written
+  # @param filename [ String ] the path to the file where the last assistant
+  # message should be written
   #
-  # @return [ Chat ] returns self on success, nil on failure
-  #
-  # @see write_file_unless_exist
-  #
-  # @note If no assistant message is available, an error message is printed to stderr.
+  # @return [ OllamaChat::Chat ] returns self
   def output(filename)
     if message = @messages.last and message.role == 'assistant'
       begin
-        write_file_unless_exist(filename, message)
-        STDOUT.puts "Last response was written to #{filename.inspect}."
+        if attempt_to_write_file(filename, message)
+          STDOUT.puts "Last response was written to #{filename.inspect}."
+        end
         self
       rescue => e
         STDERR.puts "Writing to #{filename.inspect}, caused #{e.class}: #{e}."
@@ -66,22 +64,29 @@ module OllamaChat::MessageOutput
 
   private
 
-  # The write_file_unless_exist method creates a new file with the specified
-  # message content, but only if a file with that name does not already exist.
+  # The attempt_to_write_file method handles writing content to a file with
+  # overwrite confirmation.
   #
-  # @param filename [ String ] the path of the file to be created
+  # This method checks if a file already exists and prompts the user for
+  # confirmation before overwriting it. If the user declines or if the file
+  # doesn't exist, the method returns early without writing. Otherwise, it
+  # opens the file in write mode and writes the message content to it.
+  #
+  # @param filename [ String ] the path to the file where the content should be written
   # @param message [ Ollama::Message ] the message object containing the content to write
   #
-  # @return [ TrueClass ] if the file was successfully created
-  # @return [ nil ] if the file already exists and was not created
-  def write_file_unless_exist(filename, message)
-    if File.exist?(filename)
-      STDERR.puts "File #{filename.inspect} already exists. Choose another filename."
+  # @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
+    then
+      File.open(filename, ?w) do |output|
+        output.write(message.content)
+      end
+    else
       return
     end
-    File.open(filename, ?w) do |output|
-      output.write(message.content)
-    end
     true
   end
 end

data/lib/ollama_chat/version.rb

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

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.36 ruby lib
+# stub: ollama_chat 0.0.38 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.36".freeze
+  s.version = "0.0.38".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   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 = "3.6.9".freeze
+  s.rubygems_version = "3.7.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]
 
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze, ">= 0.22.2".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.41".freeze])
   s.add_runtime_dependency(%q<search_ui>.freeze, ["~> 0.0".freeze])
-  s.add_runtime_dependency(%q<amatch>.freeze, ["~> 0.4.1".freeze])
+  s.add_runtime_dependency(%q<amatch>.freeze, ["~> 0.4".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])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.38
 platform: ruby
 authors:
 - Florian Frank
@@ -321,14 +321,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: pdf-reader
   requirement: !ruby/object:Gem::Requirement
@@ -512,7 +512,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A command-line interface (CLI) for interacting with an Ollama AI model.
 test_files: