richat 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b76efa6dcbdfe7a9f2184c7823b6c0292a6ce8b35ed44378679c06b0c847503
-  data.tar.gz: cda10863c00442ecd0a5c24c5758251bcfa1bb04b84f623843c2b6df30d1ead5
+  metadata.gz: bb3631228142f53230643f479f14be326d6e091ed32d803bd45753e81ffd2d83
+  data.tar.gz: 59ee64555d89887ca356dfe520dae3b8a8f816eb72b86be87058e9d5c4b4f63c
 SHA512:
-  metadata.gz: 3251caa055e0e5e60b9cac6981e81b52c083eebf06c5c5a4d4e2f115171f4445ed79142694ef514c1f067aed13276f0e03230f85896e8fce425804abb2cbbd16
-  data.tar.gz: '04008b119d99774c298f20f3d631a938221be60951df86e8e1c0eb6630060f3762561cfc62798f6cfa65746465c1b704febf63f1834dda82da248679d5adc6ea'
+  metadata.gz: 36d03a95e5283bf1ce16ec01e115bede4251e48bd4edfc1298bfeb06b397535f2928ccbcb770efd54d46f1824165611316118025f47ebf7f2080c46ad476c294
+  data.tar.gz: 904a8173b63e955b60d48fba52c53186dfcea006c4f361ec0bb739bc6773179628f018811843c32730db2e75ccc7eeb23b19d1c78ae9332952fd60ca571faf1e

data/lib/richat/command.rb

@@ -9,48 +9,66 @@ 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
+          @pid = Process.spawn(cmd)
+          Process.wait(@pid)
         end
+
+        NEXT_CODE
       end
 
       def handle_exit
-        puts "Bye"
+        kill_process
+        puts "Bye!"
         EXIT_CODE
       end
 
+      def kill_process
+        return if @pid.nil?
+        if Gem.win_platform?
+          system("taskkill /F /PID #{@pid}")
+        else
+          begin
+            Process.kill("TERM", @pid)
+          rescue
+            nil
+          end
+        end
+        @pid = nil
+      end
+
       def handle_config
         puts "\e[32mConfiguration file path is #{File.expand_path("~/.richat/config.json")}\e[0m"
         puts JSON.pretty_generate(Config.get_config)

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
@@ -90,7 +86,21 @@ module Richat
 
           puts
         end
-      rescue SignalException, Exception => e
+      rescue Interrupt
+        if sys_cmd_mode
+          Command.kill_process
+          retry
+        else
+          Command.handle_exit
+        end
+      rescue SystemCallError => e
+        puts e.message
+        if sys_cmd_mode
+          retry
+        else
+          Command.handle_exit
+        end
+      rescue Exception => e
         puts e.message
         Command.handle_exit
       end
@@ -98,9 +108,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.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: richat
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - fzdp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-09 00:00:00.000000000 Z
+date: 2023-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday