db-gui 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b070cff693f1d1416c8b30af8e004ef0c11832b498825f7cabbda62e15f553f6
-  data.tar.gz: 219ad78e67ea7a7fc9fcb10e26daadfe4f58ffd797a6eee6983492128b656c6c
+  metadata.gz: 32291b6eecdc2752f695361d340e0f00c6e32bfb9b9d57821bbfafe884a6adbf
+  data.tar.gz: c0e66b0a2362651790810c50166c27a75e44fe1da68df13c10019a43f3db22f0
 SHA512:
-  metadata.gz: 04ac2266301b0bfb854d698b82ccb5f29e0aff6d23d882140975a4234840b85c3fdd996c1c80c18d89c4473ee4055ebcf169bc51ae560b211cf083c9c6cd4c9a
-  data.tar.gz: 138346868157342145069c35d60b1773e21a86b8b503b615705387e2bc51fb245cfc2d51ba19c99c10ae3bf081c042131b1ed908af1e6fedc12460dc01638a8b
+  metadata.gz: 99f98299b9d09171625237220c2c0d2d687bcfbd703c3e6c9e46fa5bc67308b68bfa5d9637fac2e5940b0e05c83ddfe0a52ca2156dcbfb03e41203d775ca506e
+  data.tar.gz: 1d280fbf96dc8efd81054d36808218f3cd21c2eff8a63f2a6575dd815de6e05d94c6e388f80ec146b657c9e93f283f8f11bb9f19868b514f0160b6f9d9c21cb2

data/CHANGELOG.md

@@ -1,8 +1,14 @@
 # Change Log
 
+## 0.1.1
+
+- Automatically extend DB command timeout after timing out by retrying 6 times (7 times total) with exponential timeout increases
+- Avoid DB command timeout if DB result row count is received
+- Show error when DB command fails
+
 ## 0.1.0
 
-- Save last DB command
+- Remember last DB command
 - Move saved configuration from ~/.db_gui as a file to ~/.db_gui as a directory with multiple files underneath: ~/.db_gui/.db_configs & ~/.db_gui/.db_commands
 
 ## 0.0.4

data/README.md

@@ -1,4 +1,4 @@
-# DB GUI (Database Graphical User Interface) 0.1.0
+# DB GUI (Database Graphical User Interface) 0.1.1
 ## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer DSL for LibUI Application](https://github.com/AndyObtiva/glimmer-dsl-libui)
 [![Gem Version](https://badge.fury.io/rb/db-gui.svg)](http://badge.fury.io/rb/db-gui)
 
@@ -12,7 +12,7 @@ It currently supports PostgreSQL as a start, with the potential of supporting ma
 
 Run:
 ```
-gem install db-gui -v0.1.0
+gem install db-gui -v0.1.1
 ```
 
 ## Usage

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/app/db_gui/model/db.rb

@@ -3,25 +3,27 @@ require 'timeout'
 
 class DbGui
   module Model
-    Db = Struct.new(:host, :port, :dbname, :username, :password, keyword_init: true) do
+    Db = Struct.new(:host, :port, :dbname, :username, :password, :db_command_timeout, keyword_init: true) do
       DIR_DB_GUI = File.expand_path(File.join('~', '.db_gui'))
       FileUtils.rm(DIR_DB_GUI) if File.file?(DIR_DB_GUI)
       FileUtils.mkdir_p(DIR_DB_GUI)
       FILE_DB_CONFIGS = File.expand_path(File.join(DIR_DB_GUI, '.db_configs'))
       FILE_DB_COMMANDS = File.expand_path(File.join(DIR_DB_GUI, '.db_commands'))
+      COUNT_RETRIES = ENV.fetch('DB_COMMAND_COUNT_RETRIES', 7)
+      REGEX_ROW_COUNT = /^\((\d+) row/
+      ERROR_PREFIX = 'ERROR:'
       
       attr_accessor :connected
       alias connected? connected
       attr_accessor :db_command_result
       attr_accessor :db_command
-      attr_accessor :db_command_timeout
     
       def initialize
-        self.port = 5432 # PostgreSQL default port
-        self.db_command_result = ''
-        self.db_command_timeout = (ENV['DB_COMMAND_TIMEOUT_IN_MILLISECONDS'] || 300).to_i
         load_db_config
         load_db_command
+        self.port ||= 5432 # PostgreSQL default port
+        self.db_command_result = ''
+        self.db_command_timeout ||= ENV.fetch('DB_COMMAND_TIMEOUT_IN_MILLISECONDS', 300).to_i
         connect if to_h.except(:password).none? {|value| value.nil? || (value.respond_to?(:empty?) && value.empty?) }
       end
       
@@ -46,7 +48,8 @@ class DbGui
       end
       
       def io
-        @io ||= IO.popen("PGPASSWORD=\"#{password}\" psql --host=#{host} --port=#{port} --username=#{username} --dbname=#{dbname}", 'r+')
+        db_connection_command = "PGPASSWORD=\"#{password}\" psql --host=#{host} --port=#{port} --username=#{username} --dbname=#{dbname}"
+        @io ||= IO.popen(db_connection_command, 'r+', err: [:child, :out])
       end
       
       def run_io_command(command)
@@ -56,13 +59,22 @@ class DbGui
         @io_command_try += 1
         io.puts(command)
         read_io_into_db_command_result
-      rescue Errno::EPIPE => e
+        @io_command_try = nil
+      rescue Timeout::Error, Errno::EPIPE => e
+        puts e.message
         @io = nil
-        run_io_command(command) unless @io_command_try > 1
+        if @io_command_try > COUNT_RETRIES
+          @io_command_try = nil
+        else
+          self.db_command_timeout *= 2
+          puts "Retrying DB Command...  {try: #{@io_command_try + 1}, db_command_timeout: #{db_command_timeout}}"
+          run_io_command(command) unless db_command_result_error?
+        end
       end
       
       def run_db_command
         run_io_command(db_command)
+        save_db_config
         save_db_command
       end
       
@@ -78,16 +90,26 @@ class DbGui
         db_command_result_count_headers_rows[2]
       end
       
+      def db_command_result_error?
+        db_command_result.to_s.strip.start_with?(ERROR_PREFIX)
+      end
+      
       private
       
       def read_io_into_db_command_result
-        self.db_command_result = ''
-        while (line = io_gets)
-          result = line.to_s
-          self.db_command_result += result
+        self.db_command_result = read_db_command_result = ''
+        while (!(@line.to_s.match(REGEX_ROW_COUNT) || @line.to_s.strip == "^") && (@line = io_gets))
+          read_db_command_result += @line.to_s
         end
-      rescue Errno::EPIPE => e
-        @io = nil
+        self.db_command_result = read_db_command_result
+      rescue
+        if read_db_command_result.to_s.strip.start_with?(ERROR_PREFIX)
+          self.db_command_result = read_db_command_result
+        else
+          raise
+        end
+      ensure
+        @line = nil
       end
       
       def save_db_config
@@ -123,11 +145,10 @@ class DbGui
       end
       
       def io_gets
-        # TODO figure out a way of knowing the end of input without timing out
         Timeout.timeout(db_command_timeout/1000.0) { io.gets }
       rescue
         @io = nil
-        nil
+        raise
       end
       
       def db_command_result_count_headers_rows
@@ -141,12 +162,11 @@ class DbGui
       def compute_db_command_result_count_headers_rows
         count = 0
         headers = rows = []
-        db_command_result_lines = db_command_result.lines
-        db_command_result_lines.pop if db_command_result_lines.last == "\n"
+        db_command_result_lines = db_command_result.lines.reject { |line| line == "\n" }
         if db_command_result_lines.any?
           headers = db_command_result_lines.first.split('|').map(&:strip)
           count_footer = db_command_result_lines.last
-          count_match = count_footer.match(/^\((\d+) row/)
+          count_match = count_footer.match(REGEX_ROW_COUNT)
           if count_match
             count = count_match[1].to_i
             rows = db_command_result_lines[2..-2].map {|row| row.split('|').map(&:strip) }

data/app/db_gui/view/db_command_form.rb

@@ -29,7 +29,7 @@ class DbGui
             }
             spinbox(0, TIMEOUT_MAX_IN_MILLISECONDS) {
               stretchy false
-              value <=> [db, :db_command_timeout]
+              value <=> [db, :db_command_timeout, on_read: :to_i]
             }
             
             label('Row(s): ') {

data/app/db_gui/view/db_command_result_table.rb

@@ -10,7 +10,9 @@ class DbGui
       body {
         vertical_box {
           content(db, :db_command_result) {
-            if db.db_command_result_count > 0
+            if db.db_command_result_error?
+              label(db.db_command_result)
+            elsif db.db_command_result_count > 0
               table {
                 db.db_command_result_headers.each do |header|
                   text_column(header)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-gui
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-23 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-libui