pgdexter 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4245b0c02667e411a915ef4c19ef472925048180d5882bc7b63b90037cb9d45
-  data.tar.gz: '0887ae99de87c186c1bfc52edbdbb59546df61de93bfbccd0974dff5c15b80f0'
+  metadata.gz: 3940bf892014f2337cc5cd95c85b66f245b3725ad7ce84397c4eb4f9e3751c3c
+  data.tar.gz: b8fc834cda0161c8ef0b44853c14f5f608c00f373e6a95481321e45611d2d5b4
 SHA512:
-  metadata.gz: 45ec7b462d925c2e5aa313734d1109b59e65e743c28e3471ef604d430037949675c615ab9004b98f8b055b0a575cdc169470d89e64694ef39cdd2bee60674548
-  data.tar.gz: 8d33afbd03ba250ae7dd4dfe6c1947e8860fece0925b58a098fb7a54f6f8fe76aaa3bc93f663b10282ef1a9b3bb2c059ac26014f9a3cff3798ece22dbb8d62be
+  metadata.gz: 463430e69b2a1f08ca411db0a4938c7243839e78f81db72455d508ff1e9de1a752889bff8a3e42486cf4859042065b0847f0b6c0216c80c9b9a36a10cf360753
+  data.tar.gz: d31949fc719e863aa56672fd807141dfbeb521d2ce2525ca551109e09840115c3091e7130cc47617a6b836ff31853dbf12a1bb9fb4dea492b17cbf7c9bfd5c8e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.8 (2020-08-17)
+
+- Colorize output
+- Fixed error when unable to parse view definitions
+
 ## 0.3.7 (2020-07-10)
 
 - Fixed help output

data/README.md

@@ -146,10 +146,10 @@ dexter --interval 60 # seconds
 
 ## Examples
 
-Ubuntu with PostgreSQL 9.6
+Ubuntu with PostgreSQL 12
 
 ```sh
-tail -F -n +1 /var/log/postgresql/postgresql-9.6-main.log | sudo -u postgres dexter dbname
+tail -F -n +1 /var/log/postgresql/postgresql-12-main.log | sudo -u postgres dexter dbname
 ```
 
 Homebrew on Mac

data/lib/dexter/client.rb

@@ -1,13 +1,14 @@
 module Dexter
   class Client
+    extend Logging
     include Logging
 
     attr_reader :arguments, :options
 
     def self.start
       Dexter::Client.new(ARGV).perform
-    rescue Dexter::Abort => e
-      abort e.message
+    rescue Dexter::Abort, PG::UndefinedFile => e
+      abort colorize(e.message.strip, :red)
     end
 
     def initialize(args)
@@ -78,11 +79,11 @@ module Dexter
 
       # TODO don't use global var
       $log_level = options[:log_level].to_s.downcase
-      abort "Unknown log level" unless ["error", "info", "debug", "debug2", "debug3"].include?($log_level)
+      raise Dexter::Abort, "Unknown log level" unless ["error", "info", "debug", "debug2", "debug3"].include?($log_level)
 
       [arguments, options]
     rescue Slop::Error => e
-      abort e.message
+      raise Dexter::Abort, e.message
     end
   end
 end

data/lib/dexter/csv_log_parser.rb

@@ -16,7 +16,7 @@ module Dexter
         end
       end
     rescue CSV::MalformedCSVError => e
-      abort "ERROR: #{e.message}"
+      raise Dexter::Abort, "ERROR: #{e.message}"
     end
   end
 end

data/lib/dexter/indexer.rb

@@ -123,9 +123,9 @@ module Dexter
       begin
         execute("CREATE EXTENSION IF NOT EXISTS hypopg")
       rescue PG::UndefinedFile
-        abort "Install HypoPG first: https://github.com/ankane/dexter#installation"
+        raise Dexter::Abort, "Install HypoPG first: https://github.com/ankane/dexter#installation"
       rescue PG::InsufficientPrivilege
-        abort "Use a superuser to run: CREATE EXTENSION hypopg"
+        raise Dexter::Abort, "Use a superuser to run: CREATE EXTENSION hypopg"
       end
     end
 
@@ -421,7 +421,7 @@ module Dexter
       # print summary
       if new_indexes.any?
         new_indexes.each do |index|
-          log "Index found: #{index[:table]} (#{index[:columns].join(", ")})"
+          log colorize("Index found: #{index[:table]} (#{index[:columns].join(", ")})", :green)
         end
       else
         log "No new indexes found"
@@ -515,7 +515,7 @@ module Dexter
         PG::Connection.new(config)
       end
     rescue PG::ConnectionBad => e
-      abort e.message
+      raise Dexter::Abort, e.message
     end
 
     def execute(query, pretty: true)
@@ -527,7 +527,7 @@ module Dexter
       # as an extra defense against SQL-injection attacks.
       # https://www.postgresql.org/docs/current/static/libpq-exec.html
       query = squish(query) if pretty
-      log "SQL: #{query}" if @log_sql
+      log colorize("[sql] #{query}", :cyan) if @log_sql
 
       @mutex.synchronize do
         conn.exec_params(query, []).to_a
@@ -596,7 +596,13 @@ module Dexter
 
       view_tables = {}
       result.each do |row|
-        view_tables[row["table_name"]] = PgQuery.parse(row["definition"]).tables
+        begin
+          view_tables[row["table_name"]] = PgQuery.parse(row["definition"]).tables
+        rescue PgQuery::ParseError
+          if @log_level.start_with?("debug")
+            log colorize("ERROR: Cannot parse view definition: #{row["table_name"]}", :red)
+          end
+        end
       end
 
       view_tables

data/lib/dexter/logging.rb

@@ -1,11 +1,26 @@
 module Dexter
   module Logging
+    COLOR_CODES = {
+      red: 31,
+      green: 32,
+      yellow: 33,
+      cyan: 36
+    }
+
+    def output
+      $stdout
+    end
+
     def log(message = "")
-      puts message unless $log_level == "error"
+      output.puts(message) unless $log_level == "error"
     end
 
-    def abort(message)
-      raise Dexter::Abort, message
+    def colorize(message, color)
+      if output.tty?
+        "\e[#{COLOR_CODES[color]}m#{message}\e[0m"
+      else
+        message
+      end
     end
   end
 end

data/lib/dexter/processor.rb

@@ -37,7 +37,7 @@ module Dexter
             begin
               process_queries
             rescue PG::ServerError => e
-              log "ERROR: #{e.class.name}: #{e.message}"
+              log colorize("ERROR: #{e.class.name}: #{e.message}", :red)
             end
             sleep(@interval)
           end
@@ -47,7 +47,7 @@ module Dexter
       begin
         @log_parser.perform
       rescue Errno::ENOENT => e
-        abort "ERROR: #{e.message}"
+        raise Dexter::Abort, "ERROR: #{e.message}"
       end
 
       process_queries

data/lib/dexter/version.rb

@@ -1,3 +1,3 @@
 module Dexter
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgdexter
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop