db-gui 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c47f16e87bb120e67c9ded08af1613226f997239310973d9c35f2cde6b7620ae
-  data.tar.gz: ea3c1ae5858376c27dd9817cedc213bf0fd16eb696e9a817e0efeb0af84a7ef7
+  metadata.gz: fa4ce5de9be304c9f5638048111e9571854f2dfc66feecfd0e37f8ba4261ae82
+  data.tar.gz: 5806bf4a1514e28cee22c5ea2b5716f8c1e0fa0ffec32ca0072f62daef06cc1a
 SHA512:
-  metadata.gz: 1f3ea785cfa0e94155628a7df1b278bd3b86840e50f009fa26401910958f6de524b1ebdd9713eada1ba9b6e4047fa9e529d06b2da1563576935491236e5aee31
-  data.tar.gz: c5bda179f9fef7c91bc82532ace7ca4b1ce17fd0bb426fb3ab37cd19cf296f6e98f8b57c6391e713c0092ae040bd2432976766a174e27c0895894005fe7489ef
+  metadata.gz: 4d1b50280d1e23630beb85e7c6fae71716b51b8024cce27f38b2ea1c2cf137cd5d1fa619cadf07fc76ec465faabe587abece721ec0643cee84450c21a53cc4f2
+  data.tar.gz: a70bb46bf0016aec98b5bea7cb702161987aefa79914e4eafd4f89978536943e3c530bc22a548a6625ebd3c16639f9cbbea0f5d8037b2c286cf7d7cdd407f4ba

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 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,6 +1,6 @@
-# DB GUI (Database Graphical User Interface) 0.0.1
+# DB GUI (Database Graphical User Interface) 0.0.2
 ## [<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.
@@ -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.2
 ```
 
 ## Usage

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

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
@@ -86,7 +88,7 @@ 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

data/app/db_gui/view/db_command_form.rb

@@ -13,12 +13,22 @@ 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, 60000) {
+              stretchy false
+              value <=> [db_config, :db_command_timeout]
+            }
           }
         }
       }

data/app/db_gui/view/db_command_result_table.rb

@@ -0,0 +1,40 @@
+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) {
+            db_command_result_lines = db_config.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_footer_match = count_footer.match(/^\((\d+) row/)
+              if count_footer_match
+                rows = db_command_result_lines[2..-2].map {|row| row.split('|').map(&:strip) }
+                table {
+                  headers.each do |header|
+                    text_column(header)
+                  end
+                  
+                  cell_rows rows
+                }
+              else
+                label('No data')
+              end
+            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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db-gui
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andy Maleh
@@ -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
@@ -120,5 +122,5 @@ requirements: []
 rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
-summary: Db Gui
+summary: DB GUI
 test_files: []