db-gui 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b93f7698476d8a7a0eed435d523590e3ba887a372ef56ace685f0fbb7eb66588
-  data.tar.gz: c3f889910e33eeafb5b3098d63ad47448a1a96a790f12fd2ed3be9e81e7e732a
+  metadata.gz: b070cff693f1d1416c8b30af8e004ef0c11832b498825f7cabbda62e15f553f6
+  data.tar.gz: 219ad78e67ea7a7fc9fcb10e26daadfe4f58ffd797a6eee6983492128b656c6c
 SHA512:
-  metadata.gz: 35c78168f441c66d2abdccf95a400cd3302c945dda9f95fb0848b7eaed0bb8f0f38e2a306561d7545d76e9ae0d4d622d333077f9e85eb3160839de0e77c6e738
-  data.tar.gz: 91dcb7804097dd4383132705da954ad74bed0ca8a9a2e9ca8d8b28f95dad1adbb63a6fa0a8bb32509b202c6bb6914aec647da8711707b08ffb5eb01e868b4e58
+  metadata.gz: 04ac2266301b0bfb854d698b82ccb5f29e0aff6d23d882140975a4234840b85c3fdd996c1c80c18d89c4473ee4055ebcf169bc51ae560b211cf083c9c6cd4c9a
+  data.tar.gz: 138346868157342145069c35d60b1773e21a86b8b503b615705387e2bc51fb245cfc2d51ba19c99c10ae3bf081c042131b1ed908af1e6fedc12460dc01638a8b

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.1.0
+
+- Save 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
+
+- Make SQL command entry a non_wrapping_multiline_entry
+
 ## 0.0.3
 
 - Show count of rows produced by a DB command result

data/README.md

@@ -1,8 +1,7 @@
-# DB GUI (Database Graphical User Interface) 0.0.3
+# DB GUI (Database Graphical User Interface) 0.1.0
 ## [<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)
 
-
 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 +12,7 @@ It currently supports PostgreSQL as a start, with the potential of supporting ma
 
 Run:
 ```
-gem install db-gui -v0.0.3
+gem install db-gui -v0.1.0
 ```
 
 ## Usage

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/app/db_gui/model/{db_config.rb → db.rb}

@@ -1,10 +1,14 @@
+require 'fileutils'
 require 'timeout'
 
 class DbGui
   module Model
-    # TODO consider renaming to DB connection
-    DbConfig = Struct.new(:host, :port, :dbname, :username, :password, keyword_init: true) do
-      FILE_DB_CONFIG = File.expand_path(File.join('~', '.db_gui'))
+    Db = Struct.new(:host, :port, :dbname, :username, :password, 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'))
       
       attr_accessor :connected
       alias connected? connected
@@ -17,7 +21,8 @@ class DbGui
         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?) }
+        load_db_command
+        connect if to_h.except(:password).none? {|value| value.nil? || (value.respond_to?(:empty?) && value.empty?) }
       end
       
       def toggle_connection
@@ -58,6 +63,7 @@ class DbGui
       
       def run_db_command
         run_io_command(db_command)
+        save_db_command
       end
       
       def db_command_result_count
@@ -86,18 +92,34 @@ class DbGui
       
       def save_db_config
         db_config_hash = to_h
-        db_config_file_content = YAML.dump(db_config_hash)
-        File.write(FILE_DB_CONFIG, db_config_file_content)
+        db_configs_array = [db_config_hash] # TODO in the future, support storing multiple DB configs
+        db_configs_file_content = YAML.dump(db_configs_array)
+        File.write(FILE_DB_CONFIGS, db_configs_file_content)
       end
       
       def load_db_config
-        db_config_file_content = File.read(FILE_DB_CONFIG)
-        db_config_hash = YAML.load(db_config_file_content)
+        db_configs_file_content = File.read(FILE_DB_CONFIGS)
+        db_configs_array = [YAML.load(db_configs_file_content)].flatten
+        db_config_hash = db_configs_array.first # TODO in the future, support loading multiple DB configs
         db_config_hash.each do |attribute, value|
           self.send("#{attribute}=", value)
         end
       rescue => e
-        puts "No database configuration is stored yet. #{e.message}"
+        puts "No database configurations stored yet. #{e.message}"
+      end
+      
+      def save_db_command
+        db_commands_array = [db_command] # TODO in the future, support storing multiple DB configs
+        db_commands_file_content = YAML.dump(db_commands_array)
+        File.write(FILE_DB_COMMANDS, db_commands_file_content)
+      end
+      
+      def load_db_command
+        db_commands_file_content = File.read(FILE_DB_COMMANDS)
+        db_commands_array = YAML.load(db_commands_file_content)
+        self.db_command = db_commands_array.first
+      rescue => e
+        puts "No database commands stored yet. #{e.message}"
       end
       
       def io_gets
@@ -110,24 +132,28 @@ class DbGui
       
       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]
+          @db_command_result_count_headers_rows = compute_db_command_result_count_headers_rows
           @last_db_command_result = db_command_result
         end
         @db_command_result_count_headers_rows
       end
+      
+      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"
+        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
+        [count, headers, rows]
+      end
     end
   end
 end

data/app/db_gui/view/db_command_form.rb

@@ -1,4 +1,4 @@
-require 'db_gui/model/db_config'
+require 'db_gui/model/db'
 
 class DbGui
   module View
@@ -7,12 +7,12 @@ class DbGui
       
       TIMEOUT_MAX_IN_MILLISECONDS = (ENV['TIMEOUT_MAX_IN_MILLISECONDS'] || 60*60*1000).to_i
       
-      option :db_config
+      option :db
       
       body {
         vertical_box {
-          entry {
-            text <=> [db_config, :db_command]
+          non_wrapping_multiline_entry {
+            text <=> [db, :db_command]
           }
           
           horizontal_box {
@@ -20,7 +20,7 @@ class DbGui
           
             button('Run') {
               on_clicked do
-                db_config.run_db_command
+                db.run_db_command
               end
             }
             
@@ -29,7 +29,7 @@ class DbGui
             }
             spinbox(0, TIMEOUT_MAX_IN_MILLISECONDS) {
               stretchy false
-              value <=> [db_config, :db_command_timeout]
+              value <=> [db, :db_command_timeout]
             }
             
             label('Row(s): ') {
@@ -37,7 +37,7 @@ class DbGui
             }
             label {
               stretchy false
-              text <= [db_config, :db_command_result_count, computed_by: :db_command_result, on_read: :to_s]
+              text <= [db, :db_command_result_count, computed_by: :db_command_result, on_read: :to_s]
             }
           }
         }

data/app/db_gui/view/db_command_result_table.rb

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

data/app/db_gui/view/db_config_form.rb

@@ -1,52 +1,52 @@
-require 'db_gui/model/db_config'
+require 'db_gui/model/db'
 
 class DbGui
   module View
     class DbConfigForm
       include Glimmer::LibUI::CustomControl
       
-      option :db_config
+      option :db
       
       body {
         vertical_box {
           form {
             entry {
               label 'Host:'
-              text <=> [db_config, :host]
-              enabled <= [db_config, :connected, on_read: :!]
+              text <=> [db, :host]
+              enabled <= [db, :connected, on_read: :!]
             }
             
             spinbox(0, 1_000_000) {
               label 'Port:'
-              value <=> [db_config, :port]
-              enabled <= [db_config, :connected, on_read: :!]
+              value <=> [db, :port]
+              enabled <= [db, :connected, on_read: :!]
             }
             
             entry {
               label 'Database Name:'
-              text <=> [db_config, :dbname]
-              enabled <= [db_config, :connected, on_read: :!]
+              text <=> [db, :dbname]
+              enabled <= [db, :connected, on_read: :!]
             }
             
             entry {
               label 'Username:'
-              text <=> [db_config, :username]
-              enabled <= [db_config, :connected, on_read: :!]
+              text <=> [db, :username]
+              enabled <= [db, :connected, on_read: :!]
             }
             
             password_entry {
               label 'Password:'
-              text <=> [db_config, :password]
-              enabled <= [db_config, :connected, on_read: :!]
+              text <=> [db, :password]
+              enabled <= [db, :connected, on_read: :!]
             }
           }
           
           button {
             stretchy false
-            text <= [db_config, :connected, on_read: -> (connected) { connected ? 'Disconnect (currently connected)' : 'Connect (currently disconnected)' }]
+            text <= [db, :connected, on_read: -> (connected) { connected ? 'Disconnect (currently connected)' : 'Connect (currently disconnected)' }]
               
             on_clicked do
-              db_config.toggle_connection
+              db.toggle_connection
             end
           }
         }

data/app/db_gui/view/db_gui_application.rb

@@ -1,4 +1,4 @@
-require 'db_gui/presenter/db_gui_presenter'
+require 'db_gui/model/db'
 
 require 'db_gui/view/db_config_form'
 require 'db_gui/view/db_command_form'
@@ -9,10 +9,10 @@ class DbGui
     class DbGuiApplication
       include Glimmer::LibUI::Application
     
-      attr_reader :presenter
+      attr_reader :db
           
       before_body do
-        @presenter = Presenter::DbGuiPresenter.new
+        @db = Model::Db.new
 #         menu_bar # TODO implement
       end
   
@@ -24,13 +24,13 @@ class DbGui
           margined true
          
           vertical_box {
-            db_config_form(db_config: presenter.db_config) {
+            db_config_form(db:) {
               stretchy false
             }
             
-            db_command_form(db_config: presenter.db_config)
+            db_command_form(db:)
             
-            db_command_result_table(db_config: presenter.db_config)
+            db_command_result_table(db:)
           }
         }
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-gui
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-18 00:00:00.000000000 Z
+date: 2025-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-libui
@@ -86,8 +86,7 @@ files:
 - VERSION
 - app/db-gui.rb
 - app/db_gui/launch.rb
-- app/db_gui/model/db_config.rb
-- app/db_gui/presenter/db_gui_presenter.rb
+- app/db_gui/model/db.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

data/app/db_gui/presenter/db_gui_presenter.rb

@@ -1,13 +0,0 @@
-require 'db_gui/model/db_config'
-
-class DbGui
-  module Presenter
-    class DbGuiPresenter
-      attr_reader :db_config
-      
-      def initialize
-        @db_config = Model::DbConfig.new
-      end
-    end
-  end
-end