gpterm 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc7687047e7d6b18c984706991d29e2b3fea168159c3688aac9c039b98f63974
-  data.tar.gz: 0ded9b23d8ca54f53b46639b3854b2f2cd5fd17521c417be045611be409f8140
+  metadata.gz: d489e9f7495f6e7c530508132b7ac59e555f52b7a7d8b6530994e734f9b7888f
+  data.tar.gz: 52fe28bdc566b32a1b1ff27087958f9a93cc13b98c25951861fc7060873b4cda
 SHA512:
-  metadata.gz: ecb6f33683c67a269e43f24cf13ba1022b22fb37b2e0b01955706dff1cc19bba36b13d32d51cd05d75450ec952d5e9a2c88caa6b699faf7ec1fcd82dd1610faa
-  data.tar.gz: de4343ac31ecd56c910f83ee6390996f88beabcaf3f4fd4e0dfbb3c0a3a79e4fda682f467b943f32436365ec0d572cb61cf8091d96c30b61253cefcbb57f493c
+  metadata.gz: 789c26d7500808de52244415474e8fcbabf9ef1aceb672cc45e68945dc91e36a768bfc52962ec77bcc05fe8b3c3bb87e0a677849785179b8d142b1b3d4be3064
+  data.tar.gz: 2c8ade2a694e7d9848c22c2e99129bbf8ec0932d7aa43b40770f5797f2a328a639a0523b9af0663fb723ee146192546afcb24d9985774a0b7d74018409b0218c

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.0
 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