gpterm 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc7687047e7d6b18c984706991d29e2b3fea168159c3688aac9c039b98f63974
-  data.tar.gz: 0ded9b23d8ca54f53b46639b3854b2f2cd5fd17521c417be045611be409f8140
+  metadata.gz: e77a65025792f307da8e9cbc3d152c805ac99693ec166aefb34daf33e03342a1
+  data.tar.gz: a60503f8eccdb64bce12bbc04190b9f56607d3ee55dcbfbfe9ac270162fdf97b
 SHA512:
-  metadata.gz: ecb6f33683c67a269e43f24cf13ba1022b22fb37b2e0b01955706dff1cc19bba36b13d32d51cd05d75450ec952d5e9a2c88caa6b699faf7ec1fcd82dd1610faa
-  data.tar.gz: de4343ac31ecd56c910f83ee6390996f88beabcaf3f4fd4e0dfbb3c0a3a79e4fda682f467b943f32436365ec0d572cb61cf8091d96c30b61253cefcbb57f493c
+  metadata.gz: edccfb30f83becb981042ee7c533fc4ad3754fac9fc6a9dd70d2b51fa7055abe1c09ee52fb814612c16dc0926fa72be53cfba563a76c9b00cef3bd202ec986e1
+  data.tar.gz: acde43696b1afc0f762d6b34a5a6a6fdde5e150a849f269e1b9fc8abf68c17dea4f6e6cbbb90146c10240cfa3d95765e31d18830c61c114e6b667624632c90c0

data/lib/client.rb

@@ -21,6 +21,8 @@ class Client
 
       You have the ability to run any command that this system can run, and you can read the output of those commands.
 
+      However, any command which would ordinarily change the directory, such as cd, will not change the location of the directory in which you are running. To execute a command in a different directory, you must chain the cd command with the command you want to run, like so: `cd /path/to/directory && command`.
+
       The user is trying to accomplish a task using the terminal, but they are not sure how to do it.
     PROMPT
 

data/lib/gpterm.rb

@@ -1,9 +1,17 @@
 require 'optparse'
 require 'colorize'
+require 'open3'
 
 require_relative 'config'
 require_relative 'client'
 
+# The colours work like this:
+# - Output from STDOUT or STDERR is default
+# - For the final command, if STDERR is there and the exit code is non-zero, it's red
+# - Statements from this app are magenta
+# - Questions from this app are yellow
+# - Messages from the OpenAI API are blue
+
 class GPTerm
   def initialize
     @config = load_config
@@ -25,6 +33,11 @@ class GPTerm
 
   private
 
+  def execute_command(command)
+    stdout, stderr, status = Open3.capture3(command)
+    [stdout, stderr, status.exitstatus]
+  end
+
   def start_prompt(prompt)
     message = @client.first_prompt(prompt)
 
@@ -49,8 +62,10 @@ class GPTerm
       puts 'Running command...'
       output = `#{message}`
 
-      puts 'Output:'
-      puts output
+      if @config[:verbose]
+        puts 'Output:'
+        puts output
+      end
     end
 
     output = offer_more_information(output)
@@ -84,10 +99,21 @@ class GPTerm
       exit
     end
 
-    output = `#{message}`
+    commands = message.split("\n")
 
-    puts 'Output:'
-    puts output
+    commands.each do |command|
+      stdout, stderr, exit_status = execute_command(command)
+      if exit_status != 0
+        puts "#{command} failed with the following output:".colorize(:red)
+        puts "#{stderr.gsub(/^/, "  ")}".colorize(:red) if stderr.length > 0
+        puts "  Exit status: #{exit_status}".colorize(:red)
+        exit
+      end
+      puts stdout if stdout.length > 0
+      # I'm doing this here because git for some reason always returns the output of a push to stderr,
+      # even if it's successful. I don't want to show the output of a successful push as an error.
+      puts stderr if stderr.length > 0
+    end
   end
 
   def load_config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gpterm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dan Hough
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-17 00:00:00.000000000 Z
+date: 2024-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai