ollama_chat 0.0.39 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1889968881db471ab1e18058241170ca20b6b0c4933b5f230796b61100d3fc65
-  data.tar.gz: 9c62ba5958195194cdb562d041d62785304928eab15849e4cb562a3e3fbb9e60
+  metadata.gz: 16c8e58cb6a7d268d4473262095f974045d683d44225e39861ce363c412f224b
+  data.tar.gz: 8205ee4aa5b7eb1c1493d4d3990a122dfbd05c978c2b8b316d21457c92003920
 SHA512:
-  metadata.gz: e02db941ef17c62a5dc8107fc189ea3fe13f20ba4936d22245f3f732e84bf9c697b98a33372300d0f3270aff4e0d7cbb93971d3c4d8a0cdeb246e308b27ef631
-  data.tar.gz: 31e70f4b3b9c4cd2ab990f41b4642818de01127b3c5ad700172a9a030cca86e27189287c4a4fbdbf6eeb46f5546cf77da847f1f331d14ea83f9e242673312c92
+  metadata.gz: f46f9beaee69da2fa7d3a2801d7f9abf51204018756503b785dcac5afcb54e8c6f5ccd36cc71e4a4aba8a4f2fd159c20c064b7cc1ad41afef685356f93646082
+  data.tar.gz: 36ff245dbcbaa5f58297b3db76884eb779076a641bb79eca2997dce674a91832695fdf8ffaa8891f1e20e20af6fc48d045e2c58c5cc71555421319c47ea88d80

data/CHANGES.md

@@ -1,5 +1,22 @@
 # Changes
 
+## 2025-11-20 v0.0.41
+
+- Fixed message output specification and removed duplicate expectation
+- Added `clientserver` configuration option to `vim` section in `default_config.yml`
+- Updated `OllamaChat::Vim` to accept `clientserver:` keyword argument in `initialize`
+- Modified `insert` and `col` methods in `vim.rb` to use `--clientserver` flag
+- Passed `clientserver` from `chat.rb` when creating `OllamaChat::Vim` instance
+- Set default `clientserver` value to **socket**
+
+## 2025-11-20 v0.0.40
+
+- Improved Vim server name generation to ensure uniqueness by replacing
+  `Pathname.pwd.to_s.upcase` with `File.basename` and `Digest::MD5.hexdigest`
+- Modified `default_server_name` method to create server names in the format
+  `MYAPP-3F2B4D8A` instead of just `MYAPP`
+- Enhanced documentation for `OllamaChat::Vim#initialize` and `OllamaChat::Vim.default_server_name` methods
+
 ## 2025-11-14 v0.0.39
 
 - Updated `tins` dependency version from `~> 1.41` to `~> 1.47` in `Rakefile` and `ollama_chat.gemspec`

data/lib/ollama_chat/chat.rb

@@ -340,7 +340,8 @@ class OllamaChat::Chat
       :next
     when %r(^/vim(?:\s+(.+))?$)
       if message = messages.last
-        OllamaChat::Vim.new($1).insert message.content
+        clientserver = config.vim?&.clientserver
+        OllamaChat::Vim.new($1, clientserver:).insert message.content
       else
         STDERR.puts "Warning: No message found to insert into Vim"
       end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -78,3 +78,5 @@ web_search:
       url: 'https://www.duckduckgo.com/html/?q=%{query}'
     searxng:
       url: <%= OllamaChat::EnvConfig::OLLAMA::SEARXNG_URL %>
+vim:
+  clientserver: socket

data/lib/ollama_chat/version.rb

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

data/lib/ollama_chat/vim.rb

@@ -1,5 +1,4 @@
 require 'tempfile'
-require 'pathname'
 
 # A class that provides functionality for inserting text into Vim buffers via
 # remote communication.
@@ -11,23 +10,41 @@ class OllamaChat::Vim
   # Initializes a new Vim server connection
   #
   # Creates a new OllamaChat::Vim instance for interacting with a specific Vim
-  # server. If no server name is provided, it defaults to using the current
-  # working directory as the server identifier.
+  # server. If no server name is provided, it derives a standardized server
+  # name based on the current working directory using the default_server_name
+  # method.
   #
   # @param server_name [String, nil] The name of the Vim server to connect to.
-  #  If nil or empty, defaults to the current working directory path in
-  #  uppercase
-  def initialize(server_name)
-    server_name.full? or server_name = default_server_name
-    @server_name = server_name
+  #   If nil or empty, defaults to a server name derived from the current working
+  #   directory using {default_server_name}
+  # @param clientserver [String] The clientserver protocol to use, defaults to 'socket'
+  #
+  # @return [OllamaChat::Vim] A new Vim instance configured with the specified
+  #   server name
+  def initialize(server_name, clientserver: nil)
+    server_name.full? or server_name = self.class.default_server_name
+    @server_name  = server_name
+    @clientserver = clientserver || 'socket'
   end
 
-  # The default server name is derived from the current working directory It
-  # converts the absolute path to uppercase for consistent identification This
-  # approach ensures each working directory gets a unique server identifier The
-  # server name format makes it easy to distinguish different Vim sessions
-  def default_server_name
-    Pathname.pwd.to_s.upcase
+  # The default_server_name method generates a standardized server name
+  # based on a given name or the current working directory.
+  #
+  # This method creates a unique server identifier by combining the basename
+  # of the provided name (or current working directory) with a truncated
+  # MD5 hash digest of the full path. The resulting name is converted to
+  # uppercase for consistent formatting.
+  #
+  # @param name [ String ] the base name to use for server identification
+  #   defaults to the current working directory
+  #
+  # @return [ String ] a formatted server name suitable for use with Vim
+  #   server connections
+  def self.default_server_name(name = Dir.pwd)
+    prefix = File.basename(name)
+    suffix = Digest::MD5.hexdigest(name)[0, 8]
+    name = [ prefix, suffix ] * ?-
+    name.upcase
   end
 
   # Inserts text at the current cursor position in Vim
@@ -43,7 +60,7 @@ class OllamaChat::Vim
     Tempfile.open do |tmp|
       tmp.write(text)
       tmp.flush
-      system %{vim --servername "#@server_name" --remote-send "<ESC>:r #{tmp.path}<CR>"}
+      system %{vim --clientserver "#@clientserver" --servername "#@server_name" --remote-send "<ESC>:r #{tmp.path}<CR>"}
     end
   end
 
@@ -54,6 +71,6 @@ class OllamaChat::Vim
   # the result of `col('.')`, which represents the current column number (1-indexed)
   # of the cursor position.
   def col
-    `vim --servername "#@server_name" --remote-expr "col('.')"`.chomp.to_i
+    `vim --clientserver "#@clientserver" --servername "#@server_name" --remote-expr "col('.')"`.chomp.to_i
   end
 end

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.39 ruby lib
+# stub: ollama_chat 0.0.41 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.39".freeze
+  s.version = "0.0.41".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/spec/ollama_chat/message_list_spec.rb

@@ -66,7 +66,6 @@ describe OllamaChat::MessageList do
 
   it 'can save conversations' do
     expect(list.save_conversation('tmp/test-conversation.json')).to eq list
-    expect(list.save_conversation('tmp/test-conversation.json')).to be_nil
   ensure
     FileUtils.rm_f 'tmp/test-conversation.json'
   end

data/spec/ollama_chat/message_output_spec.rb

@@ -11,7 +11,7 @@ describe OllamaChat::MessageOutput do
     expect(STDERR).to receive(:puts).with(/No response available to write to "foo.txt"/)
     expect(chat.output('foo.txt')).to be_nil
     chat.instance_variable_get(:@messages).load_conversation(asset('conversation.json'))
-    expect(chat).to receive(:write_file_unless_exist).and_return true
+    expect(chat).to receive(:attempt_to_write_file).and_return true
     expect(STDOUT).to receive(:puts).with(/Last response was written to \"foo.txt\"./)
     expect(chat.output('foo.txt')).to eq chat
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.41
 platform: ruby
 authors:
 - Florian Frank