db-gui 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a78c9674da527b498d11f7147b066c48d4b9de25f4ad3bffc6d3c7f908e7380
-  data.tar.gz: 7d8c82fae0cdc343a6ef2dae98a0b820cd73fa9c6c4c128f60d1ecc751429a0a
+  metadata.gz: 75e15d34f7435b0c8d0d66b67cc8138b7935c88dad827a9ed2cc3575e9a83b00
+  data.tar.gz: 7f19a38c51c2e91423e7c95d7aa631410208f3a9134e6e011c916b827949e6ba
 SHA512:
-  metadata.gz: '021209590135c5c94cea318db98b73362c944909d5da2e168544a8524c357f4382baef9776205575459fd0f32f26ec4b86be6de943ec9f04ab0a534574b103d8'
-  data.tar.gz: 5596987aded997443eff090340dcf0b407c335e84cf2194194ec30101493d96a0b662b61fb51cae55b67a493f17d443c171dd63cc37fdd2ceb8f14c6fad0c453
+  metadata.gz: ef5768eb5582be26fb0d2c3089c33bc6d905982981978361713ec764134952d0a0abb246494a6a5c17fe1cd27cff176acb3a719e0e547b5e28e59e6b43e4f4aa
+  data.tar.gz: a77221ceb7131f2c0d14b28e1ec3465f740f9c678e0e9936579766019efd9abca519ba0132c609f1a2acbe116ddbc49270df5008c67c1a061335bfbe53d0a39a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.4.0
+
+- Remember all DB commands in a history dropdown
+- Remove currently selected DB command from DB command history dropdown
+- Clear DB command history dropdown
+
 ## 0.3.0
 
 - Support the ability to save/load multiple databases (DB configs)

data/README.md

@@ -1,4 +1,4 @@
-# DB GUI (Database Graphical User Interface) 0.3.0
+# DB GUI (Database Graphical User Interface) 0.4.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)
 
@@ -8,11 +8,15 @@ It currently supports PostgreSQL as a start, with the potential of supporting ma
 
 ![db gui](/screenshots/db-gui-mac.png)
 
+![db gui](/screenshots/db-gui-mac-disconnected.png)
+
+![db gui](/screenshots/db-gui-mac-multiple-db-configs.png)
+
 ## Setup
 
 Run:
 ```
-gem install db-gui -v0.3.0
+gem install db-gui -v0.4.0
 ```
 
 ## Usage
@@ -26,6 +30,8 @@ Or, run one of the aliases: `db-ui` / `dbgui` / `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).
 
+It remembers DB command history in a dropdown above the DB command text area.
+
 ### Menu Items
 
 **Edit -> Copy Table**

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/app/db_gui/model/db.rb

@@ -10,17 +10,19 @@ class DbGui
       REGEX_ROW_COUNT = /^\((\d+) row/
       ERROR_PREFIX = 'ERROR:'
       NEW_LINE = OS.windows? ? "\r\n" : "\n"
+      DB_COMMAND_TIMEOUT_DEFAULT = 300
       
       attr_accessor :deleteable
       alias deleteable? deleteable
       attr_accessor :connected
       alias connected? connected
       attr_accessor :db_command_result
+      attr_accessor :db_commands
       attr_accessor :db_command
       attr_accessor :db_command_result_selection
     
       def initialize
-        load_db_command
+        load_db_commands
         reset
         to_h.keys.each do |attribute|
           Glimmer::DataBinding::Observer.proc do |value|
@@ -37,8 +39,17 @@ class DbGui
         self.username = nil
         self.password = nil
         self.db_command_result = ''
-        self.db_command_timeout ||= ENV.fetch('DB_COMMAND_TIMEOUT_IN_MILLISECONDS', 300).to_i
+        self.db_command_timeout ||= ENV.fetch('DB_COMMAND_TIMEOUT_IN_MILLISECONDS', DB_COMMAND_TIMEOUT_DEFAULT).to_i
         self.db_command_result_selection = 0
+        self.db_commands ||= ['']
+        self.db_command ||= ''
+      end
+      
+      def db_commands
+        if @db_commands == []
+          @db_commands = ['']
+        end
+        @db_commands
       end
       
       def new?
@@ -98,8 +109,23 @@ class DbGui
       end
       
       def run_db_command
+        reset_db_command_timeout
         run_io_command(db_command)
-        save_db_command
+        save_db_commands
+      end
+      
+      def clear_db_commands
+        self.db_commands = ['']
+        self.db_command = ''
+        save_db_commands(add_current: false)
+      end
+      
+      def remove_db_command
+        current_db_command = db_command
+        self.db_commands = self.db_commands - [current_db_command.to_s.strip]
+        self.db_command = ''
+        self.db_command = self.db_commands.last || ''
+        save_db_commands(add_current: false)
       end
       
       def db_command_result_count
@@ -182,16 +208,30 @@ class DbGui
         @line = nil
       end
       
-      def save_db_command
-        db_commands_array = [db_command] # TODO in the future, support storing multiple DB commands
-        db_commands_file_content = YAML.dump(db_commands_array)
+      def reset_db_command_timeout
+        self.db_command_timeout = DB_COMMAND_TIMEOUT_DEFAULT
+      end
+      
+      def save_db_commands(add_current: true)
+        return if db_command_result_error?
+        new_command = db_command.to_s.strip
+        self.db_commands ||= []
+        db_command_exists_in_db_commands = db_commands.find { |command| new_command == command.to_s.strip }
+        if add_current && !db_command_exists_in_db_commands
+          new_db_commands = db_commands + [new_command]
+          self.db_commands = new_db_commands.reject { |command| command.to_s.strip.empty? }
+        end
+        self.db_command = ''
+        self.db_command = new_command
+        db_commands_file_content = YAML.dump(db_command:, db_commands:)
         File.write(FILE_DB_COMMANDS, db_commands_file_content)
       end
       
-      def load_db_command
+      def load_db_commands
         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
+        db_commands_config = YAML.load(db_commands_file_content)
+        self.db_commands = db_commands_config[:db_commands]
+        self.db_command = db_commands_config[:db_command]
       rescue => e
         puts "No database commands stored yet. #{e.message}"
       end

data/app/db_gui/view/db_command_form.rb

@@ -11,19 +11,40 @@ class DbGui
       
       body {
         vertical_box {
+          horizontal_box {
+            stretchy false
+            combobox {
+              items <= [db_presenter, 'selected_db.db_commands']
+              selected_item <=> [db_presenter, 'selected_db.db_command']
+              enabled <= [db_presenter, 'selected_db.db_commands', on_read: -> (value) { value != [''] }]
+            }
+            button('Remove') {
+              stretchy false
+              on_clicked do
+                db_presenter.selected_db.remove_db_command
+              end
+            }
+            button('Clear') {
+              stretchy false
+              on_clicked do
+                db_presenter.selected_db.clear_db_commands
+              end
+            }
+          }
           non_wrapping_multiline_entry {
             text <=> [db_presenter, 'selected_db.db_command']
           }
-          
           horizontal_box {
             stretchy false
           
             button('Run') {
+              enabled <= [db_presenter, 'selected_db.db_command', on_read: -> (command) { !command.to_s.strip.empty? }]
+              
               on_clicked do
                 db_presenter.selected_db.run_db_command
               end
             }
-            
+                        
             label('Timeout (msec): ') {
               stretchy false
             }
@@ -32,7 +53,7 @@ class DbGui
               value <=> [db_presenter, 'selected_db.db_command_timeout', on_read: :to_i]
             }
             
-            label('Row(s): ') {
+            label('Rows: ') {
               stretchy false
             }
             label {

data/app/db_gui/view/db_config_form.rb

@@ -10,7 +10,7 @@ class DbGui
       body {
         vertical_box {
           form {
-            combobox { |me|
+            combobox {
               label 'Selected Config:'
               items <= [db_presenter, :dbs, on_read: ->(dbs) { dbs.map(&:name) }]
               selected_item <=> [db_presenter, :selected_db_name]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db-gui
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Andy Maleh