db-gui 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c47f16e87bb120e67c9ded08af1613226f997239310973d9c35f2cde6b7620ae
-  data.tar.gz: ea3c1ae5858376c27dd9817cedc213bf0fd16eb696e9a817e0efeb0af84a7ef7
+  metadata.gz: b93f7698476d8a7a0eed435d523590e3ba887a372ef56ace685f0fbb7eb66588
+  data.tar.gz: c3f889910e33eeafb5b3098d63ad47448a1a96a790f12fd2ed3be9e81e7e732a
 SHA512:
-  metadata.gz: 1f3ea785cfa0e94155628a7df1b278bd3b86840e50f009fa26401910958f6de524b1ebdd9713eada1ba9b6e4047fa9e529d06b2da1563576935491236e5aee31
-  data.tar.gz: c5bda179f9fef7c91bc82532ace7ca4b1ce17fd0bb426fb3ab37cd19cf296f6e98f8b57c6391e713c0092ae040bd2432976766a174e27c0895894005fe7489ef
+  metadata.gz: 35c78168f441c66d2abdccf95a400cd3302c945dda9f95fb0848b7eaed0bb8f0f38e2a306561d7545d76e9ae0d4d622d333077f9e85eb3160839de0e77c6e738
+  data.tar.gz: 91dcb7804097dd4383132705da954ad74bed0ca8a9a2e9ca8d8b28f95dad1adbb63a6fa0a8bb32509b202c6bb6914aec647da8711707b08ffb5eb01e868b4e58

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 0.0.3
+
+- Show count of rows produced by a DB command result
+- Terminate DB commands (SQL statements) with a semi-colon for convenience if they did not have a semi-colon already (to avoid having them fail)
+- Increase max timeout to 60*60*1000 (1 hour)
+
+## 0.0.2
+
+- Support displaying DB command results in a table instead of a non_wrapping_multiline_entry
+- Ensure connecting to DB disables DB configuration fields
+- Make DB command timeout configurable via Timeout field (in milliseconds)
+- Make DB command timeout configurable via ENV var DB_COMMAND_TIMEOUT_IN_MILLISECONDS (default is 300 milliseconds)
+
 ## 0.0.1
 
 - DB GUI for PostgreSQL database with support for running SQL queries and seeing their result as text

data/README.md

@@ -1,9 +1,9 @@
-# DB GUI (Database Graphical User Interface) 0.0.1
+# DB GUI (Database Graphical User Interface) 0.0.3
 ## [<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/glimmer_snake.svg)](http://badge.fury.io/rb/glimmer_snake)
+[![Gem Version](https://badge.fury.io/rb/db-gui.svg)](http://badge.fury.io/rb/db-gui)
 
 
-This is a database graphical user interface that enables interaction with relational SQL database data.
+This is an early alpha database graphical user interface that enables interaction with a relational SQL database.
 
 It currently supports PostgreSQL as a start, with the potential of supporting many other databases in the future.
 
@@ -13,7 +13,7 @@ It currently supports PostgreSQL as a start, with the potential of supporting ma
 
 Run:
 ```
-gem install db-gui -v0.0.1
+gem install db-gui -v0.0.3
 ```
 
 ## Usage
@@ -23,20 +23,9 @@ Run:
 dbui
 ```
 
-Or run alias:
-```
-db-ui
-```
+Or, run one of the aliases: `db-ui` / `dbgui` / `db-gui`
 
-Or run alias:
-```
-dbgui
-```
-
-Or run alias:
-```
-db-gui
-```
+Note that it stores the last connection details under `~/.db_gui`, and will auto-connect using that configuration on startup for extra convenience (in the future, there is the potential to support multiple connection configurations).
 
 ## Change Log
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/app/db_gui/model/db_config.rb

@@ -10,10 +10,12 @@ class DbGui
       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
         connect if to_a.none? {|value| value.nil? || (value.respond_to?(:empty?) && value.empty?) }
       end
@@ -43,6 +45,8 @@ class DbGui
       end
       
       def run_io_command(command)
+        command = command.strip
+        command = "#{command};" unless command.end_with?(';')
         @io_command_try ||= 0
         @io_command_try += 1
         io.puts(command)
@@ -56,6 +60,18 @@ class DbGui
         run_io_command(db_command)
       end
       
+      def db_command_result_count
+        db_command_result_count_headers_rows[0]
+      end
+      
+      def db_command_result_headers
+        db_command_result_count_headers_rows[1]
+      end
+      
+      def db_command_result_rows
+        db_command_result_count_headers_rows[2]
+      end
+      
       private
       
       def read_io_into_db_command_result
@@ -86,11 +102,32 @@ class DbGui
       
       def io_gets
         # TODO figure out a way of knowing the end of input without timing out
-        Timeout.timeout(3) { io.gets }
+        Timeout.timeout(db_command_timeout/1000.0) { io.gets }
       rescue
         @io = nil
         nil
       end
+      
+      def db_command_result_count_headers_rows
+        if @db_command_result_count_headers_rows.nil? || db_command_result != @last_db_command_result
+          count = 0
+          headers = rows = []
+          db_command_result_lines = db_command_result.lines
+          db_command_result_lines.pop if db_command_result_lines.last == "\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/)
+            if count_match
+              count = count_match[1].to_i
+              rows = db_command_result_lines[2..-2].map {|row| row.split('|').map(&:strip) }
+            end
+          end
+          @db_command_result_count_headers_rows = [count, headers, rows]
+          @last_db_command_result = db_command_result
+        end
+        @db_command_result_count_headers_rows
+      end
     end
   end
 end

data/app/db_gui/view/db_command_form.rb

@@ -5,6 +5,8 @@ class DbGui
     class DbCommandForm
       include Glimmer::LibUI::CustomControl
       
+      TIMEOUT_MAX_IN_MILLISECONDS = (ENV['TIMEOUT_MAX_IN_MILLISECONDS'] || 60*60*1000).to_i
+      
       option :db_config
       
       body {
@@ -13,12 +15,30 @@ class DbGui
             text <=> [db_config, :db_command]
           }
           
-          button('Run') {
+          horizontal_box {
             stretchy false
-              
-            on_clicked do
-              db_config.run_db_command
-            end
+          
+            button('Run') {
+              on_clicked do
+                db_config.run_db_command
+              end
+            }
+            
+            label('Timeout (msec): ') {
+              stretchy false
+            }
+            spinbox(0, TIMEOUT_MAX_IN_MILLISECONDS) {
+              stretchy false
+              value <=> [db_config, :db_command_timeout]
+            }
+            
+            label('Row(s): ') {
+              stretchy false
+            }
+            label {
+              stretchy false
+              text <= [db_config, :db_command_result_count, computed_by: :db_command_result, on_read: :to_s]
+            }
           }
         }
       }

data/app/db_gui/view/db_command_result_table.rb

@@ -0,0 +1,30 @@
+require 'db_gui/model/db_config'
+
+class DbGui
+  module View
+    class DbCommandResultTable
+      include Glimmer::LibUI::CustomControl
+      
+      option :db_config
+      
+      body {
+        vertical_box {
+          content(db_config, :db_command_result) {
+            if db_config.db_command_result_count > 0
+              table {
+                db_config.db_command_result_headers.each do |header|
+                  text_column(header)
+                end
+                
+                cell_rows db_config.db_command_result_rows
+              }
+            else
+              label('No data')
+            end
+          }
+        }
+      }
+    end
+  end
+end
+            

data/app/db_gui/view/db_config_form.rb

@@ -13,26 +13,31 @@ class DbGui
             entry {
               label 'Host:'
               text <=> [db_config, :host]
+              enabled <= [db_config, :connected, on_read: :!]
             }
             
             spinbox(0, 1_000_000) {
               label 'Port:'
               value <=> [db_config, :port]
+              enabled <= [db_config, :connected, on_read: :!]
             }
             
             entry {
               label 'Database Name:'
               text <=> [db_config, :dbname]
+              enabled <= [db_config, :connected, on_read: :!]
             }
             
             entry {
               label 'Username:'
               text <=> [db_config, :username]
+              enabled <= [db_config, :connected, on_read: :!]
             }
             
             password_entry {
               label 'Password:'
               text <=> [db_config, :password]
+              enabled <= [db_config, :connected, on_read: :!]
             }
           }
           

data/app/db_gui/view/db_gui_application.rb

@@ -2,6 +2,7 @@ require 'db_gui/presenter/db_gui_presenter'
 
 require 'db_gui/view/db_config_form'
 require 'db_gui/view/db_command_form'
+require 'db_gui/view/db_command_result_table'
 
 class DbGui
   module View
@@ -29,9 +30,7 @@ class DbGui
             
             db_command_form(db_config: presenter.db_config)
             
-            non_wrapping_multiline_entry {
-              text <=> [presenter.db_config, :db_command_result, on_write: ->(value) {presenter.db_config.db_command_result}]
-            }
+            db_command_result_table(db_config: presenter.db_config)
           }
         }
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-gui
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-28 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-libui
@@ -66,7 +66,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Db Gui
+description: DB GUI (Database Graphical User Interface) - Enables Interaction with
+  Relational SQL Databases
 email: andy.am@gmail.com
 executables:
 - db-gui
@@ -88,6 +89,7 @@ files:
 - app/db_gui/model/db_config.rb
 - app/db_gui/presenter/db_gui_presenter.rb
 - app/db_gui/view/db_command_form.rb
+- app/db_gui/view/db_command_result_table.rb
 - app/db_gui/view/db_config_form.rb
 - app/db_gui/view/db_gui_application.rb
 - bin/db-gui
@@ -117,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
-summary: Db Gui
+summary: DB GUI
 test_files: []