Fixing os-name constant & a bunch of other nifty fixes and tweaks (#123)

* Fixing os-name constant

* Many small fixes and adjustments.

* Zeds dead baby, zeds dead

* Fix the name of the test

* Fixing the flakey test

* kick build

* Hopefully fixing the test

* Updating docs for version 3.1.3

* Hoping to explain test failures oni CI

* Bypasssing the test if $CI is defined

.bash_safe_source

@@ -7,7 +7,15 @@
 set +e
 
 function is-debug() {
-  [[ $((DEBUG + BASHMATIC_DEBUG + BASHMATIC_PATH_DEBUG)) -gt 0 ]]
+  export DEBUG=${DEBUG:-0}
+  export BASHMATIC_DEBUG=${BASHMATIC_DEBUG:-0}
+  export BASHMATIC_PATH_DEBUG=${BASHMATIC_PATH_DEBUG:-0}
+  local sum=$(( DEBUG + BASHMATIC_DEBUG + BASHMATIC_PATH_DEBUG ))
+  if [[ ${sum} -gt 0 ]]; then
+    return 0
+  else
+    return 1
+  fi
 }
 
 function debug-info() {

.db.active.sql

@@ -1,10 +1,11 @@
 -- vim: ft=sql
-select pid,
-       rpad(coalesce(datname, 'DB'), 20) as dbname,
-       rpad(coalesce(application_name, 'app'), 7) as app,
-       rpad(coalesce(backend_type, 'bcknd'), 15) as backand_type,
-       to_char((now() + interval '0.0001 sec' - query_start)::interval, 'HH24:MM:SS.ms') as duration,
-       rpad(regexp_replace(query, E'[\\n\\r +]+', ' ', 'g'), QUERY_WIDTH) as Query
+-- /* db.top.active.queries */
+select
+  pid,
+  rpad(coalesce(application_name, 'app'), 7) as app,
+  rpad(coalesce(state, 'state'), 7) as state,
+  to_char((now() + interval '0.0001 sec' - query_start)::interval, 'HH24:MM:SS.ms') as duration,
+  rpad(regexp_replace(query, E'[\\n\\r +]+', ' ', 'g'), QUERY_WIDTH) as Query
 from pg_stat_activity
-where state != 'idle'
-order by duration desc
+where state not like '%QUERY_FILTER_OUT%' and query not like '%db.top.active.queries%'
+order by duration desc;

.github/workflows/tests.yml

@@ -24,8 +24,17 @@ jobs:
       uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
       with:
         ruby-version: '3.1'
+    - name: Source
+      env:
+        TERM: xterm-256color
+        MIN_WIDTH: 80
+      run: |
+        source init.sh;
+        printf "date.now.with-time.and.zone: [%s]\n" "$(date.now.with-time.and.zone)";
+        printf "                  date zone: [%s]\n" "$(date '+%z')";
     - name: Test
       env:
         TERM: xterm-256color
         MIN_WIDTH: 80
+        CI: true
       run: bin/specs

.gitignore

@@ -3,11 +3,17 @@
 .bats-*
 .bundle
 .bundle/
+.dccache
+.developer-warned
 .envrc.local
 .fonts/
+.history
 .idea/
+.last-loaded
 .last-rebase
+.rubocop
 .ruby-version
+.vscode/*.log
 /test/tmp/
 /test/version_tmp/
 /tmp/
@@ -18,17 +24,3 @@ libexec/
 share/
 shellcheck.log
 test/all.bats
-**/.DS_Store
-.envrc.local
-.fonts/
-*.pdf.reduced
-.bundle/
-doc/USAGE.adoc
-.developer-warned
-.history
-.vscode/*.log
-.ruby-version
-.last-loaded
-.developer-warned
-.dccache
-.rubocop

.version

@@ -1 +1 @@
-3.1.1
+3.1.3

README.adoc

@@ -1,7 +1,7 @@
 [separator=—]
 = Bashmatic® — BASH-based DSL helpers for humans, sysadmins, and fun.
 // vim: ft=asciidoc
-:author: Version v3.1.0
+:author: Version v3.1.3
 :doctype: book
 :source-highlighter: rouge
 :rouge-style: base16.monokai

bin/.db

@@ -4,19 +4,22 @@
 │                                                                                                          │DESCRIPTION:     Performs one of many supported actions against PostgreSQL
 ├──────────────────────────────────────────────────────────────────────────────────────────────────────────┤
 │                                                                                                          │FLAGS:          
-│                                                                                                          │    -q / --quiet       Suppress the colorful header messages
-│                                                                                                          │    -v / --verbose     Show additional output
-│                                                                                                          │    -n / --dry-run     Only print commands, but do not run them
+│                                                                                                          │    -q / --quiet         Suppress the colorful header messages
+│                                                                                                          │    -v / --verbose       Show additional output
+│                                                                                                          │    -n / --dry-run       Only print commands, but do not run them
 ├──────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│                                                                                                          │GLOBAL FLAGS:       
-│                                                                                                          │    -C / --commands    List all sub-commands to the db script
-│                                                                                                          │    -c / --connectons  List all available database connections
-│                                                                                                          │    -e / --examples    Show script usage examples
-│                                                                                                          │    -h / --help        Show this help screen
-│                                                                                                          │                        
+│                                                                                                          │GLOBAL FLAGS:         
+│                                                                                                          │    -w / --width WIDTH   Use specified screen width instead of automatic.
+│                                                                                                          │    -f / --filter REGEX  Defaults to 'idle', but can be set
+│                                                                                                          │                         to remove some active queries from the view.
+│                                                                                                          │    -C / --commands      List all sub-commands to the db script
+│                                                                                                          │    -c / --connections   List all available database connections
+│                                                                                                          │    -e / --examples      Show script usage examples
+│                                                                                                          │    -h / --help          Show this help screen
+│                                                                                                          │                          
 ├──────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│                                                                                                          │SUMMARY:            
-│                                                                                                          │                       This tool uses a list of database connections defined in the
-│                                                                                                          │                       YAML file that must be installed at: ~/.db/database.yml
-│                                                                                                          │                        
+│                                                                                                          │SUMMARY:              
+│                                                                                                          │                         This tool uses a list of database connections defined in the
+│                                                                                                          │                         YAML file that must be installed at: ~/.db/database.yml
+│                                                                                                          │                          
 └──────────────────────────────────────────────────────────────────────────────────────────────────────────┘

bin/bashmatic-install

@@ -303,7 +303,6 @@ function .install.darwin-requirements() {
 # Ensure OS-specific reqquirements are satisfied
 #——————————————————————————————————————————————————————————————————————————————————————
 function .install.os-requirements() {
-  export BASHMATIC_OS="$(uname -s | tr '[:upper:]' '[:lower:]')"
 
   case ${BASHMATIC_OS} in
   darwin)

bin/install-direnv

@@ -28,7 +28,7 @@ function direnv.install() {
   printf " — NO."
   not-ok:
 
-  export BASHMATIC_OS="$(uname -s | tr '[:upper:]' '[:lower:]')"
+  export BASHMATIC_OS="${BASHMATIC_OS_NAME}"
 
   if [[ ${BASHMATIC_OS} == darwin ]]; then
     command -v brew>/dev/null || brew.install

conf/.psqlrc

@@ -1,7 +1,8 @@
 -- vim: set filetsype=sql
 -- don't output commands as we run them
 -- set how to output numbers (this turns on thousdand separators)
-\set PSQLRC_VERSION '(v0.1.1)'
+\set PSQLRC_VERSION  '1.0.1'
+\set PSQLRC_RELEASED 'Thu Dec 15 18:36:30 PST 2022'
 \set QUIET 1
 \encoding unicode
 \timing 0
@@ -22,16 +23,18 @@
 -- Verbose error reports.
 \set VERBOSITY verbose
 \echo '┌───────────────────────────────────────────────────────────────────────────┐'
-\echo '│ PostgreSQL PSQL Prompt & Shortcuts ' :PSQLRC_VERSION '                             │'
-\echo '│ © 2016-2022 All Rights Reserved @kigster, MIT License 🌎  https://kig.re/ │'
+\echo '│ PostgreSQL PSQL Macros, Version v' :PSQLRC_VERSION ' (' :PSQLRC_RELEASED ') │'
+\echo '│ © 2015-2023 All Rights Reserved @kigster, MIT License 🌎  https://kig.re/  │'
 \echo '│                                                                           │'
 \echo '│ To switch between wide and narrow result views, type \\x<ENTER>            │'
 \echo '└───────────────────────────────────────────────────────────────────────────┘'
 \echo
 \pset border 0
 \pset tuples_only 1
 SELECT '    PostgreSQL Server Version: ' || regexp_replace(version(), 'PostgreSQL ([\d.]+) .*', '\1', 'g') as pg_version;
-\echo '    To load and view macros, type :macros<ENTER> (or :m for short)'
+\echo '┌───────────────────────────────────────────────────────────────────────────┐'
+\echo '│ 💡   To load and view macros, type :macros<ENTER> (or :m for short)        │'
+\echo '└───────────────────────────────────────────────────────────────────────────┘'
 \echo
 
 \pset border 3
@@ -49,5 +52,3 @@ SET search_path TO public,extensions;
 -- New Prompt, more compact, and works with back editing using readlines
 \set PROMPT1 '%[%033[0;30;33m%]%[%033[0;43;30m%] %`date "+%H:%M:%S%p"`  %033[0;30;33m%]%033[0;43;37m%]%[%033[0;0;0m%]━%[%033[0;30;32m%]%033[0;42;30m%] %n@%M:%> %033[0;32m%%[%033[3;30;96m%]━%[%033[3;30;106m%]% %[%033[3;30;106m%]%/%x %033[0;96m%   %[%033[0m%]\n     ❯ '
 \set PROMPT2 '%[%033[0;30;33m%] ⤷ %l%[%033[0m% ❯ '
-\set PROMPT1 '%[%033[6;30;33m%]%[%033[0;43;30m%] %`date "+%H:%M:%S%p"`  %[%033[%6;30;33m%]%[%033[%0;0;0m%]━%[%033[%3;5;35m%]%[%033[5;32;34m%] %n@%M:%> %[%033[3;30;44m%]━━━%[%033[3;34;81m%]% %[%033[3;30;106m%] %/%x %[%033[%0m%]\n ❯ '
-