ollama_chat 0.0.111 → 0.0.112

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54b2bf70b7f843ad09b5de5f0881bf810ec78a08c79c5e1cd93d86aa75b68696
-  data.tar.gz: 33e475ea5e115609e02ba6b92cdf6a9b1b1dc6eccbfde6978fc80623daa3040b
+  metadata.gz: 7e680260fa6eb6e0fb4c81629a962bffba24af8824a3fe6851bf4084e5bd3172
+  data.tar.gz: 5c615c09ff36858276befde7029956941d8ee275b6da8b5bcffbe00099102d39
 SHA512:
-  metadata.gz: e7dad8f668a54b9c1e89937a445894eeb9872e1541d54dfc36fcf136d5c759bde7e0c21c9b818ce2e8ffa3bd7274163ada6b18553590dc812f3e89bdae839a27
-  data.tar.gz: 8bbd695f1eacc33c6928f8a382acdb8ed68b57348a0ce5199a9203bd7070df59f71a7a37e2862297c6c7dbc12e0d00aa9c46ef90f6392fc7579b87c8de438b7d
+  metadata.gz: 3707cb40694f7dc16cc011e4e57ca73ee282809de7ee4fad0bff69f06749a11444354310f82c9ffc475ff3ace01e054d19dc94b0d71ea849e6db21bfdf56e97b
+  data.tar.gz: c878bc0af562cf7519469345bb5c800b7382b5b523fa72d5bba6fe2da2d6bebc25e4657068fc02001222f45a1aaea7163ff0e6e28bbe190c0193b47f7f2ac67d

data/CHANGES.md

@@ -1,5 +1,17 @@
 # Changes
 
+## 2026-08-25 v0.0.112
+
+*   Added a `diff` subcommand to the `/config` command, including updated
+    regexp, completion, and help text.
+*   Extracted a `diff_config` method in `OllamaChat::ConfigHandling` that
+    resolves `OC::DIFF_TOOL` and launches a diff against
+    `@ollama_chat_config.filename` and
+    `@ollama_chat_config.default_config_path`.
+*   Simplified `fix_config` to delegate the diff invocation to `diff_config`.
+*   Added `#diff_config` specs covering both the missing-diff-tool path (STDERR
+    + `nil`) and the successful `system` invocation.
+
 ## 2026-08-25 v0.0.111
 
 ### Added

data/lib/ollama_chat/commands.rb

@@ -62,11 +62,11 @@ module OllamaChat::Commands
 
   command(
     name: :config,
-    regexp: %r(^/config(?:\s+(edit|reload))?$),
-    complete: [ 'config', %w[ edit reload ] ],
+    regexp: %r(^/config(?:\s+(edit|reload|diff))?$),
+    complete: [ 'config', %w[ edit reload diff ] ],
     optional: true,
     help: <<~EOT
-      \u2699\uFE0F View, edit, or reload configuration
+      \u2699\uFE0F View, edit, diff, or reload configuration
     EOT
   ) do |subcommand|
     case subcommand
@@ -74,9 +74,12 @@ module OllamaChat::Commands
       edit_config
     when 'reload'
       reload_config
+    when 'diff'
+      diff_config
     else
       display_config
     end
+
     :next
   end
 

data/lib/ollama_chat/config_handling.rb

@@ -44,6 +44,22 @@ module OllamaChat::ConfigHandling
     end
   end
 
+  # Opens a diff tool to compare the current config file with the
+  # default config, allowing the user to visually inspect differences.
+  #
+  # @return [Boolean, nil] the result of +system+ if a diff tool was
+  #   found, or +nil+ if no diff tool is configured.
+  def diff_config
+    diff_tool = OC::DIFF_TOOL? or
+      return STDERR.puts 'No diff tool configured (OC::DIFF_TOOL).'
+    cmd = [
+      diff_tool,
+      @ollama_chat_config.filename,
+      @ollama_chat_config.default_config_path,
+    ].map(&:to_s)
+    system(*cmd)
+  end
+
   # The fix_config method handles configuration file errors by informing the
   # user about the exception and prompting them to fix it. It then executes a
   # diff tool to compare the current config file with the default one.
@@ -52,9 +68,9 @@ module OllamaChat::ConfigHandling
   # @param exception [Exception] the exception that occurred while reading
   #   the config file
   def fix_config(exception)
-    STDOUT.puts "When reading the config file, a #{exception.class} "\
+    STDOUT.puts "When reading the config file, a #{exception.class} " \
       "exception was caught: #{exception.message.inspect}"
-    unless diff_tool = OC::DIFF_TOOL?
+    unless OC::DIFF_TOOL?
       exit 1
     end
     if confirm?(
@@ -62,18 +78,14 @@ module OllamaChat::ConfigHandling
         yes: /\Ay/i
       )
     then
-      cmd = [
-        diff_tool,
-        @ollama_chat_config.filename,
-        @ollama_chat_config.default_config_path,
-      ].map(&:to_s)
-      system(*cmd)
+      diff_config
       exit 0
     else
       exit 1
     end
   end
 
+
   # Adjusts the command-line argument array to ensure the current session is
   # explicitly reloaded by injecting the `-l <session_id>` flag.
   #

data/lib/ollama_chat/version.rb

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

@@ -110,6 +110,36 @@ describe OllamaChat::ConfigHandling do
     end
   end
 
+  describe '#diff_config' do
+    context 'without a diff tool' do
+      before do
+        expect(OC).to receive(:DIFF_TOOL?).and_return(nil)
+      end
+
+      it 'prints an error to STDERR and returns nil' do
+        expect(STDERR).to receive(:puts).with(/No diff tool configured/)
+        expect(chat.diff_config).to be_nil
+      end
+    end
+
+    context 'with a diff tool' do
+      before { const_conf_as('OC::DIFF_TOOL' => 'vimdiff') }
+
+      it 'launches the diff tool with config and default paths' do
+        expect(chat.instance_variable_get(:@ollama_chat_config))
+          .to receive(:filename).and_return('/cfg.yml')
+          .ordered
+        expect(chat.instance_variable_get(:@ollama_chat_config))
+          .to receive(:default_config_path).and_return('/default.yml')
+          .ordered
+        expect(chat).to receive(:system)
+          .with('vimdiff', '/cfg.yml', '/default.yml')
+          .and_return(true)
+        expect(chat.diff_config).to be true
+      end
+    end
+  end
+
   describe '#edit_config' do
     it 'edits the config and restarts on confirmation' do
       expect(chat).to receive(:edit_file).and_return(true)

metadata

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