ollama_chat 0.0.44 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0c9a525754d546b6d7cd0fa88e20c4767bd1dae51313d1f2c2409c06762f4b0
-  data.tar.gz: fc9ddde83495908f965c9225246b6668b01c40fe7391fb83c54beb3ce46321d2
+  metadata.gz: b9f63c6b67a53a96d1a683468527231720dc8fbbec6444738929adf5b4fe50f1
+  data.tar.gz: 669c4fb147e896ef7f972211a9cd581b77d2483107bea6abad5fc2fc6ed11c10
 SHA512:
-  metadata.gz: 97dc5c42b59b3f0d7abf50a0647ff3a3c79681e88e4e9b61c37f706fadc450731ed0240795362e6a061f07ada56502934f5992e796c602b01c27f3b20e6c575f
-  data.tar.gz: 34c1f4dded9b54155b407913290354707cb63104b3ea126ca438a245d03458ee868962068f85398954cf6be0ff17f826bdc627985168817d55642cb231732459
+  metadata.gz: bfa974f86bb5ca85bb162a74900541c705009162128d8d973bff812c9aa13b17a6e08813334e97bbf26d43b4276659f06cbf85752f4e2c092bbfcffd2b71e50e
+  data.tar.gz: b80314b671e7dff65b9477dbab61bb429a9ad34e34869ed34cfe723aa58cc3020f2df7720c832806228304c062075f6d71c0d59783c3017a1eab665c1ed44836

data/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2025-12-10 v0.0.45
+
+- Enhanced `OllamaChat::FollowChat` class output formatting
+- Made `display_formatted_terminal_output` method accept optional output parameter
+- Improved handling of chomping content and thinking text to prevent trailing whitespace
+- Properly routed markdown vs non-markdown output through correct display methods
+- Added extra blank line before evaluation statistics for better visual separation
+- Updated bundle command to include --all flag
+
 ## 2025-12-10 v0.0.44
 
 - Fixed `stream` option in `spec/ollama_chat/follow_chat_spec.rb` from `on?

data/Rakefile

@@ -28,7 +28,7 @@ GemHadar do
 
   readme      'README.md'
 
-  required_ruby_version  '~> 3.2'
+  required_ruby_version  '>= 3.2'
 
   executables << 'ollama_chat' << 'ollama_chat_send'
 
@@ -37,9 +37,9 @@ GemHadar do
   )
 
   dependency             'excon',                 '~> 1.0'
-  dependency             'ollama-ruby',           '~> 1.16'
-  dependency             'documentrix',           '~> 0.0', '>= 0.0.2'
-  dependency             'unix_socks',            '~> 0.1'
+  dependency             'ollama-ruby',           '~> 1.18'
+  dependency             'documentrix',           '>= 0.0.4'
+  dependency             'unix_socks',            '~> 0.2'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'
   dependency             'redis',                 '~> 5.0'
@@ -47,10 +47,11 @@ GemHadar do
   dependency             'reverse_markdown',      '~> 3.0'
   dependency             'kramdown-ansi',         '~> 0.3'
   dependency             'complex_config',        '~> 0.22', '>= 0.22.2'
-  dependency             'tins',                  '~> 1.47'
+  dependency             'tins',                  '~> 1.51'
   dependency             'search_ui',             '~> 0.0'
   dependency             'amatch',                '~> 0.4'
   dependency             'pdf-reader',            '~> 2.0'
+  dependency             'bigdecimal',            '~> 3.1'
   dependency             'csv',                   '~> 3.0'
   dependency             'const_conf',            '~> 0.3'
   development_dependency 'all_images',            '~> 0.6'

data/lib/ollama_chat/follow_chat.rb

@@ -161,7 +161,7 @@ class OllamaChat::FollowChat
       content = talk_annotate { content }
       @chat.think? and thinking = think_annotate { thinking }
     end
-    return content, thinking
+    return content&.chomp, thinking&.chomp
   end
 
   # The last_message_with_user method constructs a formatted message array by
@@ -183,8 +183,9 @@ class OllamaChat::FollowChat
   # move home commands. The method takes into account whether markdown and
   # thinking modes are enabled to determine how to process and display the
   # content.
-  def display_formatted_terminal_output
-    @output.print(*([ clear_screen, move_home, *last_message_with_user ].compact))
+  def display_formatted_terminal_output(output = nil)
+    output ||= @output
+    output.print(*([ clear_screen, move_home, *last_message_with_user ].compact))
   end
 
   # The display_output method shows the last message in the conversation.
@@ -197,7 +198,11 @@ class OllamaChat::FollowChat
   #   performed.
   def display_output
     @messages.use_pager do |output|
-      output.print(*last_message_with_user)
+      if @chat.markdown.on?
+        display_formatted_terminal_output(output)
+      else
+        output.print(*last_message_with_user)
+      end
     end
   end
 
@@ -233,7 +238,7 @@ class OllamaChat::FollowChat
   # @param response [ Object ] the response object containing evaluation data
   def output_eval_stats(response)
     response.done or return
-    @output.puts "", eval_stats(response)
+    @output.puts "", "", eval_stats(response)
   end
 
   # The debug_output method conditionally outputs the response object using jj

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.44'
+  VERSION         = '0.0.46'
   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.44 ruby lib
+# stub: ollama_chat 0.0.46 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.44".freeze
+  s.version = "0.0.46".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -17,14 +17,14 @@ Gem::Specification.new do |s|
   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.2".freeze)
-  s.rubygems_version = "3.7.2".freeze
+  s.required_ruby_version = Gem::Requirement.new(">= 3.2".freeze)
+  s.rubygems_version = "4.0.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]
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 2.8".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 2.10".freeze])
   s.add_development_dependency(%q<all_images>.freeze, ["~> 0.6".freeze])
   s.add_development_dependency(%q<rspec>.freeze, ["~> 3.2".freeze])
   s.add_development_dependency(%q<kramdown>.freeze, ["~> 2.0".freeze])
@@ -33,9 +33,9 @@ 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.16".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<ollama-ruby>.freeze, ["~> 1.18".freeze])
+  s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.0.4".freeze])
+  s.add_runtime_dependency(%q<unix_socks>.freeze, ["~> 0.2".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])
   s.add_runtime_dependency(%q<redis>.freeze, ["~> 5.0".freeze])
@@ -43,10 +43,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<reverse_markdown>.freeze, ["~> 3.0".freeze])
   s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze, ">= 0.22.2".freeze])
-  s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.47".freeze])
+  s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.51".freeze])
   s.add_runtime_dependency(%q<search_ui>.freeze, ["~> 0.0".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<bigdecimal>.freeze, ["~> 3.1".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

@@ -43,7 +43,7 @@ describe OllamaChat::FollowChat do
       prompt_eval_count:    7,
       load_duration:        33.45,
     )
-    expect(output).to receive(:puts).with("", /eval_duration/)
+    expect(output).to receive(:puts).with("", "", /eval_duration/)
     follow_chat.call(response)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.46
 platform: ruby
 authors:
 - Florian Frank
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
@@ -141,48 +141,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: documentrix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: unix_socks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rss
   requirement: !ruby/object:Gem::Requirement
@@ -293,14 +287,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.47'
+        version: '1.51'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.47'
+        version: '1.51'
 - !ruby/object:Gem::Dependency
   name: search_ui
   requirement: !ruby/object:Gem::Requirement
@@ -343,6 +337,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -505,7 +513,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -514,7 +522,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.2
 specification_version: 4
 summary: A command-line interface (CLI) for interacting with an Ollama AI model.
 test_files: