ollama_chat 0.0.32 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb31e7c6931a74314a918fa3f94838bccb89e2c7abd81c04632132998ed22f4b
-  data.tar.gz: e75bd24632b7c7ef65e1d316802db5a919a7c4e401941e1b080e15bfea208618
+  metadata.gz: 1285d76eebf4b0382986bb3bcf9d3d3df08bbf95e2d8b7fd5bf82c60baf82e79
+  data.tar.gz: '0384dce9df4bbb3ebe371dedb09fb8ef8697950f8b0b2e3960038e93fc0a67b6'
 SHA512:
-  metadata.gz: 6c722b060b9e8c3e4e2de8cb3eca4656a75cc4eb063cc710350b27529d5b4449f58b75cf0f19cf6842019e0fe261ef0eda6af09e8ed8428458d01d2824315c3c
-  data.tar.gz: 28c6966b8e3d663935f8cc5ddfe572df73c3d8471bb51168734c98641099c983e59859b44f576d3e92b80ca2277633d9ce7d00ac37cd464c087cf77104942368
+  metadata.gz: d161dba8d86bdd135395b4b5949dd721544b4bdb475904cb2642733762c5aee00a0176399048582b304aa02140aa9317f2c7a78cae0df8082b4776d146105ebb
+  data.tar.gz: ac519d43fb532ac993fe396c9afbdd71e65fef7fd4ac42b4be9f04067ae6df684b8cbd0574d409ebe3388ce9d5603abbbc725a2ae323ce8725200efab3f8f539

data/CHANGES.md

@@ -1,5 +1,29 @@
 # Changes
 
+## 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
+  `(?:\\\ |\\|[^\\ ]+)`
+- Modified `SourceFetching` module to properly unescape spaces with `gsub('\ ',
+  ' ')`
+- Added new test case `can parse file path with escaped spaces` to verify
+  functionality
+
 ## 2025-09-15 v0.0.32
 
 - Fixed file path parsing for escaped spaces and URI handling

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/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/parsing.rb

@@ -200,7 +200,7 @@ module OllamaChat::Parsing
     |                                      # OR
     "((?:\.\.|[~.]?)/(?:\\"|\\|[^"\\]+)+)" # Quoted file path with escaped " quotes
     |                                      # OR
-    (\S*\/\S+)                             # File path with at least one forward slash
+    ((?:\.\.|[~.]?)/(?:\\\ |\\|[^\\ ]+)+)  # File path with escaped spaces
   }x
   private_constant :CONTENT_REGEXP
 
@@ -237,6 +237,7 @@ module OllamaChat::Parsing
         check_exist = true
         source      = file
       when file
+        file = file.gsub('\ ', ' ')
         file =~ %r(\A[~./]) or file.prepend('./')
         check_exist = true
         source      = file

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

@@ -76,7 +76,7 @@ module OllamaChat::SourceFetching
       filename = File.expand_path(filename)
       check_exist && !File.exist?(filename) and return
       fetch_source_as_filename(filename, &block)
-    when  %r{\A((?:\.\.|[~.]?)/(?:\\ |\\|[^\\]+)*)}
+    when  %r{\A((?:\.\.|[~.]?)/(?:\\ |\\|[^\\]+)+)}
       filename = $1
       filename = filename.gsub('\ ', ' ')
       filename = File.expand_path(filename)

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.32'
+  VERSION         = '0.0.34'
   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.32 ruby lib
+# stub: ollama_chat 0.0.34 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.32".freeze
+  s.version = "0.0.34".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/parsing_spec.rb

@@ -222,6 +222,22 @@ EOT
       FileUtils.rm_f file_path
     end
 
+    it 'can parse file path with escaped spaces' do
+      file_path = Pathname.pwd.join('spec/assets/example with .html')
+      FileUtils.cp 'spec/assets/example_with_quote.html', file_path
+      quoted_file_path = file_path.to_s.gsub(' ', '\\ ')
+      content, = chat.parse_content(%{see #{quoted_file_path}}, [])
+      expect(content).to include(<<~EOT)
+        Imported "#{file_path}":
+
+        # My First Heading
+
+        My first paragraph.
+      EOT
+    ensure
+      FileUtils.rm_f file_path
+    end
+
     it 'can add images' do
       images = []
       expect(chat).to receive(:add_image).

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

metadata

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