ollama_chat 0.0.40 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd56f9c3db76f0f261f6e75863e8c26276d3271cffdc7f1053e6a447922459bb
-  data.tar.gz: 3d8330fecf97e96fb63a9e6efaff6c34849c98ef0508bcf06385940701f1418d
+  metadata.gz: b1136200c7d140c7f9509710887e6e0c490336046306a7447ef61dc11f523622
+  data.tar.gz: d9275c4b1b86ba2ac94e7a4d6956c87899481abd34d1471e6d77be7c21ef810b
 SHA512:
-  metadata.gz: a7733d610b5962b9636a4fa2e4e38307923295dde7e11dddd7ae9063469cdbad19aefaec8b4775ab81ca4444a4c79f874c861fc16676d67b501dccff5a673736
-  data.tar.gz: 2b668abbc41bb56afc4590fff58f54fd66aa927a8ffc2761d3e9bdaff4e3bc20bbf8ec04d9ed7fb2fa47e3e31463e77e6dc6bca69a6f8188f15f691cd76ca986
+  metadata.gz: 8dee06aacfff1af99076ae81d509f913a61f539071553f6f86af96b3ee0fb3d1c63f39307d85525ff0f14a382ef44bc35132e7930b10589f062b6a40973cc8e3
+  data.tar.gz: b0388f8ac5e679f3ffec9e28008a4f9558d2b09c3c73ebedd58b6821fb6cca62dd25aa16712c29ff36c5117cfbd77bf55f5c48b2412993aa70e650fae1326217

data/CHANGES.md

@@ -1,5 +1,25 @@
 # Changes
 
+## 2025-12-03 v0.0.42
+
+- Updated `ollama-ruby` gem dependency from version **1.7** to **1.14**
+- Fixed JSON serialization issues with image data in Ollama messages
+- Ensured proper base64 encoding and formatting of image URLs
+- Added spec for `display_config` method in `OllamaChat::Information` module
+- Replaced explicit `my_pager` variable with `OllamaChat::EnvConfig::PAGER?` lookup
+- Enabled users to customize pager behavior through environment configuration
+- Updated `lib/ollama_chat/ollama_chat_config/default_config.yml` to prevent shell expansion in voice list command
+- Changed `say -v ?` to `say -v '?'` to prevent shell expansion and potential hanging issues
+
+## 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

data/Rakefile

@@ -37,7 +37,7 @@ GemHadar do
   )
 
   dependency             'excon',                 '~> 1.0'
-  dependency             'ollama-ruby',           '~> 1.7'
+  dependency             'ollama-ruby',           '~> 1.14'
   dependency             'documentrix',           '~> 0.0', '>= 0.0.2'
   dependency             'unix_socks',            '~> 0.1'
   dependency             'rss',                   '~> 0.3'

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
@@ -512,7 +513,7 @@ class OllamaChat::Chat
     rendered = config.to_s
     Kramdown::ANSI::Pager.pager(
       lines: rendered.count(?\n),
-      command: my_pager
+      command:
     ) do |output|
       output.puts rendered
     end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -37,7 +37,7 @@ system_prompts:
 voice:
   enabled: false
   default: Samantha
-  list: <%= `say -v ? 2>/dev/null`.lines.map { |l| l.force_encoding('ASCII-8BIT'); l[/^(.+?)\s+[a-z]{2}_[a-zA-Z0-9]{2,}/, 1] }.uniq.sort.to_s %>
+  list: <%= `say -v '?' 2>/dev/null`.lines.map { |l| l.force_encoding('ASCII-8BIT'); l[/^(.+?)\s+[a-z]{2}_[a-zA-Z0-9]{2,}/, 1] }.uniq.sort.to_s %>
 markdown: true
 stream: true
 document_policy: importing
@@ -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.40'
+  VERSION         = '0.0.42'
   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

@@ -17,11 +17,14 @@ class OllamaChat::Vim
   # @param server_name [String, nil] The name of the Vim server to connect to.
   #   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)
+  def initialize(server_name, clientserver: nil)
     server_name.full? or server_name = self.class.default_server_name
-    @server_name = server_name
+    @server_name  = server_name
+    @clientserver = clientserver || 'socket'
   end
 
   # The default_server_name method generates a standardized server name
@@ -57,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
 
@@ -68,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.40 ruby lib
+# stub: ollama_chat 0.0.42 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.40".freeze
+  s.version = "0.0.42".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<context_spook>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
-  s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.7".freeze])
+  s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.14".freeze])
   s.add_runtime_dependency(%q<documentrix>.freeze, ["~> 0.0".freeze, ">= 0.0.2".freeze])
   s.add_runtime_dependency(%q<unix_socks>.freeze, ["~> 0.1".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])

data/spec/ollama_chat/information_spec.rb

@@ -29,6 +29,14 @@ describe OllamaChat::Information do
     expect(chat.info).to be_nil
   end
 
+  it 'can display display_config' do
+    const_conf_as(
+      'OllamaChat::EnvConfig::PAGER' => 'cat'
+    )
+    expect(chat.config).to receive(:to_s).and_return('test configuration')
+    expect { chat.send(:display_config) }.not_to raise_error
+  end
+
   it 'can show display_chat_help' do
     expect(STDOUT).to receive(:puts).with(%r(/info.*show information))
     expect(chat.display_chat_help).to be_nil

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.40
+  version: 0.0.42
 platform: ruby
 authors:
 - Florian Frank
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: documentrix
   requirement: !ruby/object:Gem::Requirement