richat 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b76efa6dcbdfe7a9f2184c7823b6c0292a6ce8b35ed44378679c06b0c847503
-  data.tar.gz: cda10863c00442ecd0a5c24c5758251bcfa1bb04b84f623843c2b6df30d1ead5
+  metadata.gz: 956a007844ac17a49095d8a202f0c776b6b00937f090484c5f46a266e71b6fb8
+  data.tar.gz: 41627a82833e4b75dea99ad96e2e6be6f92f6795b20ee89675d80e048777919b
 SHA512:
-  metadata.gz: 3251caa055e0e5e60b9cac6981e81b52c083eebf06c5c5a4d4e2f115171f4445ed79142694ef514c1f067aed13276f0e03230f85896e8fce425804abb2cbbd16
-  data.tar.gz: '04008b119d99774c298f20f3d631a938221be60951df86e8e1c0eb6630060f3762561cfc62798f6cfa65746465c1b704febf63f1834dda82da248679d5adc6ea'
+  metadata.gz: 1fb5a56058312251ff31bc8331424440b856156b1cfa6403ee428c363a872cb0a8635bb9d86a16e0aef65737da0fd8973167f49eaa720bb7604f3e7fe9081903
+  data.tar.gz: ed83c9c9c93bd6c065d46f62664e355454b677f8cac01d5018774c418b7f5f231db335f2e66c9c6cb16c28829b30ae886f5c3b63240e32f612bd8ac709c9adc7

data/lib/richat/command.rb

@@ -9,41 +9,43 @@ module Richat
     class << self
       attr_reader :prompt, :prompt_id
 
-      def call(user_input, sys_cmd_mode=false)
+      def call(user_input, sys_cmd_mode)
         user_input = user_input.strip
-        return handle_system_command(user_input, sys_cmd_mode) if user_input.start_with?(*Config.get("sys_cmd", "activate_keywords"))
-        return handle_exit if Config.get("shell", "exit_keywords").include?(user_input)
-        return unless user_input.start_with?("/")
-        if user_input == "/help"
-          handle_help
-        elsif user_input == "/config"
-          handle_config
-        elsif user_input =~ /^\/prompt\s*/
-          if user_input == "/prompt"
-            handle_prompt
-          else
-            handle_choose_prompt(user_input.split(" ").last)
+
+        if sys_cmd_mode
+          return SYS_CHAT_CODE if Config.get("sys_cmd", "deactivate_keywords").include?(user_input)
+          handle_system_command(user_input)
+        else
+          return SYS_CMD_CODE if Config.get("sys_cmd", "activate_keywords").include?(user_input)
+          return handle_exit if Config.get("shell", "exit_keywords").include?(user_input)
+          return unless user_input.start_with?("/")
+          if user_input == "/help"
+            handle_help
+          elsif user_input == "/config"
+            handle_config
+          elsif user_input =~ /^\/prompt\s*/
+            if user_input == "/prompt"
+              handle_prompt
+            else
+              handle_choose_prompt(user_input.split(" ").last)
+            end
           end
         end
       end
 
-      def handle_system_command(user_input, sys_cmd_mode)
-        Config.get("sys_cmd", "activate_keywords").each do |sub_str|
-          if user_input.start_with?(sub_str)
-            cmd = user_input[sub_str.length..-1].strip
-            return SYS_CHAT_CODE if Config.get("sys_cmd", "deactivate_keywords").include?(cmd) && sys_cmd_mode
-            if (match = /^cd\s?(.*)$/.match(cmd))
-              Dir.chdir(File.expand_path(match[1].empty? ? "~" : match[1]))
-            else
-              system(cmd)
-            end
-            if sys_cmd_mode
-              return NEXT_CODE
-            else
-              return SYS_CMD_CODE, sub_str
-            end
+      def handle_system_command(cmd)
+        if (match = /^cd\s?(.*)$/.match(cmd))
+          fp = File.expand_path(match[1].empty? ? "~" : match[1])
+          begin
+            Dir.chdir(fp)
+          rescue
+            puts "cd: no such file or directory: #{fp}"
           end
+        else
+          system(cmd)
         end
+
+        NEXT_CODE
       end
 
       def handle_exit

data/lib/richat/shell.rb

@@ -34,20 +34,17 @@ module Richat
 
       Command.print_welcome if Config.get("shell", "show_welcome_info")
       sys_cmd_mode = false
-      current_cmd_prefix = nil
 
       begin
-        while (user_content = Readline.readline(shell_prompt(sys_cmd_mode, current_cmd_prefix), true))
+        while (user_content = Readline.readline(shell_prompt(sys_cmd_mode), true))
           if user_content.empty?
             Readline::HISTORY&.pop
             next
           end
 
-          user_content = current_cmd_prefix + user_content if sys_cmd_mode
           File.open(history_path, 'a') { |f| f.puts(user_content) } if enable_full_completion
 
-          code, _ = Command.call(user_content, sys_cmd_mode)
-          if code
+          if (code = Command.call(user_content, sys_cmd_mode))
             if code == Command::NEXT_CODE
               next
             elsif code == Command::EXIT_CODE
@@ -57,7 +54,6 @@ module Richat
               next
             elsif code == Command::SYS_CMD_CODE
               sys_cmd_mode = true
-              current_cmd_prefix = _
               next
             elsif code == Command::SYS_CHAT_CODE
               sys_cmd_mode = false
@@ -98,9 +94,9 @@ module Richat
 
     private
 
-    def shell_prompt(sys_cmd_mode, current_cmd_prefix)
+    def shell_prompt(sys_cmd_mode)
       if sys_cmd_mode
-        "\e[32m#{Command.prompt_id&.+" "}\e[0m\e[33m>>\e[0m \e[32m#{current_cmd_prefix}\e[0m"
+        "\e[32m#{Command.prompt_id&.+" "}\e[0m\e[33m>>\e[0m \e[32m$ \e[0m"
       else
         "\e[32m#{Command.prompt_id&.+" "}\e[0m\e[33m>> \e[0m"
       end

data/lib/richat/version.rb

@@ -1,3 +1,3 @@
 module Richat
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: richat
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - fzdp
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Richat is a command-line ChatGPT tool