ollama_chat 0.0.55 → 0.0.57

data/spec/ollama_chat/think_control_spec.rb

@@ -2,153 +2,93 @@ require 'spec_helper'
 
 describe OllamaChat::ThinkControl do
   let :chat do
-    OllamaChat::Chat.new(
-      argv: %w[ -f lib/ollama_chat/ollama_chat_config/default_config.yml ]
-    )
+    OllamaChat::Chat.new(argv: chat_default_config)
   end
 
   connect_to_ollama_server
 
   describe '#think' do
-    it 'returns the current think mode state' do
+    it 'returns false when the think mode selector is off' do
+      chat.think_mode.selected = 'disabled'
       expect(chat.think).to be false
-      chat.instance_variable_set(:@think, true)
+    end
+
+    it 'returns true when the think mode selector is enabled' do
+      chat.think_mode.selected = 'enabled'
       expect(chat.think).to be true
-      chat.instance_variable_set(:@think, false)
-      expect(chat.think).to be false
-      chat.instance_variable_set(:@think, 'low')
+    end
+
+    it 'returns the selected value when it is not “enabled”' do
+      chat.think_mode.selected = 'low'
       expect(chat.think).to eq 'low'
     end
   end
 
   describe '#think?' do
-    it 'returns true when think mode is enabled (boolean true)' do
-      chat.instance_variable_set(:@think, true)
+    it 'returns true when the think mode selector is on' do
+      chat.think_mode.selected = 'enabled'
       expect(chat.think?).to be true
     end
 
-    it 'returns true when think mode is enabled (string value)' do
-      chat.instance_variable_set(:@think, 'high')
+    it 'returns true when the think mode selector is on but the value is a string' do
+      chat.think_mode.selected = 'high'
       expect(chat.think?).to be true
     end
 
-    it 'returns false when think mode is disabled (boolean false)' do
-      chat.instance_variable_set(:@think, false)
-      expect(chat.think?).to be false
-    end
-
-    it 'returns false when think mode is nil' do
-      chat.instance_variable_set(:@think, nil)
+    it 'returns false when the think mode selector is off' do
+      chat.think_mode.selected = 'disabled'
       expect(chat.think?).to be false
     end
   end
 
   describe '#think_mode' do
-    it 'returns "enabled" when think is true' do
-      chat.instance_variable_set(:@think, true)
-      expect(chat.think_mode).to eq 'enabled'
+    it 'exposes a StateSelector instance' do
+      expect(chat.think_mode).to be_a OllamaChat::StateSelectors::StateSelector
     end
 
-    it 'returns the think value when it is a string' do
-      chat.instance_variable_set(:@think, 'medium')
-      expect(chat.think_mode).to eq 'medium'
-    end
-
-    it 'returns "disabled" when think is false' do
-      chat.instance_variable_set(:@think, false)
-      expect(chat.think_mode).to eq 'disabled'
-    end
-
-    it 'returns "disabled" when think is nil' do
-      chat.instance_variable_set(:@think, nil)
-      expect(chat.think_mode).to eq 'disabled'
-    end
-  end
-
-  describe '#think_show' do
-    it 'displays the current think mode status' do
-      chat.instance_variable_set(:@think, true)
-      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1menabled\e\[0m\./)
-      chat.think_show
-    end
-
-    it 'displays the think mode level when set to string' do
-      chat.instance_variable_set(:@think, 'high')
-      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mhigh\e\[0m\./)
-      chat.think_show
-    end
-
-    it 'displays "disabled" when think is false' do
-      chat.instance_variable_set(:@think, false)
-      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mdisabled\e\[0m\./)
-      chat.think_show
-    end
-
-    it 'displays "disabled" when think is nil' do
-      chat.instance_variable_set(:@think, nil)
-      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mdisabled\e\[0m\./)
-      chat.think_show
+    it 'has the correct default selection (disabled)' do
+      expect(chat.think_mode.selected).to eq 'disabled'
     end
   end
 
   describe '#think_loud?' do
-    it 'returns false when think is disabled' do
-      chat.instance_variable_set(:@think, false)
+    it 'returns false when the think mode selector is off' do
+      chat.think_mode.selected = 'disabled'
       expect(chat.think_loud?).to be false
     end
 
-    it 'returns false when think_loud is off' do
-      chat.instance_variable_set(:@think, true)
+    it 'returns false when the think_loud switch is off' do
+      chat.think_mode.selected = 'enabled'
       allow(chat).to receive(:think_loud).and_return(double(on?: false))
       expect(chat.think_loud?).to be false
     end
 
-    it 'returns true when both think and think_loud are enabled' do
-      chat.instance_variable_set(:@think, true)
+    it 'returns true when both the think mode selector and think_loud switch are on' do
+      chat.think_mode.selected = 'enabled'
       allow(chat).to receive(:think_loud).and_return(double(on?: true))
       expect(chat.think_loud?).to be true
     end
   end
 
-  describe '#choose_think_mode' do
-    it 'can select "off" mode' do
-      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('off')
-      chat.choose_think_mode
-      expect(chat.think).to be false
+  describe '#think_mode.show' do
+    it 'prints the current think mode in bold' do
+      chat.think_mode.selected = 'high'
+      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mhigh\e\[0m/)
+      chat.think_mode.show
     end
 
-    it 'can select "on" mode' do
-      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('on')
-      chat.choose_think_mode
-      expect(chat.think).to be true
+    it 'prints “disabled” when the selector is off' do
+      chat.think_mode.selected = 'disabled'
+      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mdisabled\e\[0m/)
+      chat.think_mode.show
     end
+  end
 
-    it 'can select "low" mode' do
+  describe '#think_mode.choose' do
+    it 'updates the selector based on the user choice' do
       expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('low')
-      chat.choose_think_mode
-      expect(chat.think).to eq 'low'
-    end
-
-    it 'can select "medium" mode' do
-      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('medium')
-      chat.choose_think_mode
-      expect(chat.think).to eq 'medium'
-    end
-
-    it 'can select "high" mode' do
-      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('high')
-      chat.choose_think_mode
-      expect(chat.think).to eq 'high'
-    end
-
-    it 'can exit selection' do
-      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('[EXIT]')
-      expect { chat.choose_think_mode }.not_to change { chat.think }
-    end
-
-    it 'can handle nil selection' do
-      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return(nil)
-      expect { chat.choose_think_mode }.not_to change { chat.think }
+      chat.think_mode.choose
+      expect(chat.think_mode.selected).to eq 'low'
     end
   end
 end

data/spec/ollama_chat/web_searching_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OllamaChat::WebSearching do
   let :chat do
-    OllamaChat::Chat.new
+    OllamaChat::Chat.new(argv: chat_default_config)
   end
 
   connect_to_ollama_server

data/spec/spec_helper.rb

@@ -86,6 +86,10 @@ module AssetHelpers
   end
 end
 
+def chat_default_config(a = [])
+  a + %w[ -f lib/ollama_chat/ollama_chat_config/default_config.yml ]
+end
+
 # A module that provides functionality for stubbing Ollama server responses.
 #
 # The StubOllamaServer module enables developers to simulate Ollama API

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.55
+  version: 0.0.57
 platform: ruby
 authors:
 - Florian Frank
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.3
+        version: 2.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.3
+        version: 2.17.0
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
@@ -385,14 +385,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
 description: |
   The app provides a command-line interface (CLI) to an Ollama AI model,
   allowing users to engage in text-based conversations and generate
@@ -430,6 +430,7 @@ extra_rdoc_files:
 - lib/ollama_chat/redis_cache.rb
 - lib/ollama_chat/server_socket.rb
 - lib/ollama_chat/source_fetching.rb
+- lib/ollama_chat/state_selectors.rb
 - lib/ollama_chat/switches.rb
 - lib/ollama_chat/think_control.rb
 - lib/ollama_chat/utils.rb
@@ -473,6 +474,7 @@ files:
 - lib/ollama_chat/redis_cache.rb
 - lib/ollama_chat/server_socket.rb
 - lib/ollama_chat/source_fetching.rb
+- lib/ollama_chat/state_selectors.rb
 - lib/ollama_chat/switches.rb
 - lib/ollama_chat/think_control.rb
 - lib/ollama_chat/utils.rb
@@ -516,6 +518,7 @@ files:
 - spec/ollama_chat/redis_cache_spec.rb
 - spec/ollama_chat/server_socket_spec.rb
 - spec/ollama_chat/source_fetching_spec.rb
+- spec/ollama_chat/state_selectors_spec.rb
 - spec/ollama_chat/switches_spec.rb
 - spec/ollama_chat/think_control_spec.rb
 - spec/ollama_chat/utils/cache_fetcher_spec.rb
@@ -547,7 +550,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A command-line interface (CLI) for interacting with an Ollama AI model.
 test_files:
@@ -566,6 +569,7 @@ test_files:
 - spec/ollama_chat/redis_cache_spec.rb
 - spec/ollama_chat/server_socket_spec.rb
 - spec/ollama_chat/source_fetching_spec.rb
+- spec/ollama_chat/state_selectors_spec.rb
 - spec/ollama_chat/switches_spec.rb
 - spec/ollama_chat/think_control_spec.rb
 - spec/ollama_chat/utils/cache_fetcher_spec.rb