greenhat 0.2.0 → 0.3.0

data/lib/greenhat/shell.rb

@@ -2,7 +2,9 @@ module GreenHat
   # Root Level Shell
   module Shell
     def self.pry
+      # rubocop:disable Lint/Debugger
       binding.pry
+      # rubocop:enable Lint/Debugger
     end
 
     def self.df
@@ -34,7 +36,7 @@ module GreenHat
       file_list.each do |file|
         next if File.size(file).zero?
 
-        puts "- Loading #{file.colorize(:green)}"
+        puts "- Loading #{file.pastel(:green)}"
 
         archive.things_create(file: file).setup
       end
@@ -42,14 +44,26 @@ module GreenHat
 
     def self.debug
       ENV['DEBUG'] = if ENV['DEBUG']
-                       puts "Debug #{'Off'.colorize(:red)}"
+                       puts "GreenHat Debug Logging #{'Off'.pastel(:red)}"
                        nil
                      else
-                       puts "Debug #{'On'.colorize(:green)}"
+                       puts "GreenHat Debug Logging #{'On'.pastel(:green)}"
                        'true'
                      end
     end
 
+    def self.quiet
+      Cli.quiet!
+
+      if Cli.quiet
+        puts "GreenHat Quiet Logging #{'Off'.pastel(:red)}"
+        nil
+      else
+        puts "GreenHat Quiet Logging #{'On'.pastel(:green)}"
+        'true'
+      end
+    end
+
     def self.uptime
       Shell::Cat.default ['uptime']
     end
@@ -68,21 +82,21 @@ module GreenHat
 
     def self.history
       Settings.cmd_history_clean.each_with_index do |line, i|
-        puts "#{i.to_s.ljust(3).colorize(:magenta)} #{line}"
+        puts "#{i.to_s.ljust(3).pastel(:magenta)} #{line}"
       end
     end
 
     def self.ls
-      GreenHat::Cli.help
+      GreenHat::Cli.help(false)
     end
 
     def self.ll
-      GreenHat::Cli.help
+      GreenHat::Cli.help(false)
     end
 
-    def self.about
-      puts "#{'GreenHat'.colorize(:green)}: #{GreenHat::VERSION.colorize(:blue)}"
-      puts ' - https://gitlab.com/gitlab-com/support/toolbox/greenhat'.colorize(:cyan)
+    def self.version
+      puts "#{'GreenHat'.pastel(:green)}: #{GreenHat::VERSION.pastel(:blue)}"
+      puts ' - https://gitlab.com/gitlab-com/support/toolbox/greenhat'.pastel(:cyan)
     end
   end
 end

data/lib/greenhat/thing/file_types.rb

@@ -43,6 +43,13 @@ module GreenHat
             /dmesg/
           ]
         },
+        'repmgrd/current' => {
+          format: :bracket_log,
+          log: true,
+          pattern: [
+            %r{repmgrd/current}
+          ]
+        },
         'log/syslog' => {
           format: :syslog,
           log: true,
@@ -95,6 +102,13 @@ module GreenHat
             %r{consul/current}
           ]
         },
+        'sentinel/current' => {
+          format: :time_space,
+          log: true,
+          pattern: [
+            %r{sentinel/current}
+          ]
+        },
         'consul/failover_pgbouncer.log' => {
           format: :raw,
           log: true,
@@ -470,7 +484,12 @@ module GreenHat
             %r{redis/config},
             %r{redis-exporter/config},
             %r{registry/config},
-            %r{sidekiq/config}
+            %r{sidekiq/config},
+            %r{pgbouncer/config},
+            %r{pgbouncer-exporter/config},
+            %r{repmgrd/config},
+            %r{sentinel/config},
+            %r{consul/config}
           ]
         },
         'redis/current' => {

data/lib/greenhat/thing/formatters/json_shellwords.rb

@@ -18,9 +18,6 @@ module GreenHat
 
         result.sort.to_h
       rescue StandardError => e
-        binding.pry
-        # TODO: Background Logger?
-        e.message
         LogBot.warn('JSON Parse', e.message)
         next
       end

data/lib/greenhat/thing/helpers.rb

@@ -5,10 +5,10 @@ module GreenHat
     # Console Helper
     def inspect
       [
-        'Thing'.colorize(:light_black),
-        kind&.to_s&.colorize(:blue),
-        type&.colorize(:light_yellow),
-        name&.colorize(:cyan)
+        'Thing'.pastel(:bright_black),
+        kind&.to_s&.pastel(:blue),
+        type&.pastel(:bright_yellow),
+        name&.pastel(:cyan)
       ].compact.join(' ')
     end
 

data/lib/greenhat/thing/kind.rb

@@ -52,7 +52,9 @@ module GreenHat
 
     # rubocop:disable Style/SymbolProc
     def prompt_for_kind
+      # rubocop:disable Lint/Debugger
       binding.pry if ENV['DEBUG']
+      # rubocop:enable Lint/Debugger
 
       # Default to everything
       prompt_list = types.clone
@@ -61,13 +63,18 @@ module GreenHat
       json = check_oj_parse?(first_line)
 
       if json
+        if Settings.assume_json?
+          self.type = 'json'
+          return true
+        end
+
         prompt_list.select! do |_k, v|
           v.to_s.include? 'json'
         end
       end
 
-      puts "Unable to determine file type for #{name.colorize(:yellow)}"
-      puts "Use '#{'json'.colorize(:cyan)}' or '#{'raw'.colorize(:cyan)}' if there are no matches (see file_types.rb)"
+      puts "Unable to determine file type for #{name.pastel(:yellow)}"
+      puts "Use '#{'json'.pastel(:cyan)}' or '#{'raw'.pastel(:cyan)}' if there are no matches (see file_types.rb)"
 
       option = prompt.select('Wat is this?', prompt_list.keys.sort_by(&:length), filter: true)
 

data/lib/greenhat/thing/spinner.rb

@@ -7,7 +7,7 @@ module GreenHat
 
       @spin_time = Time.now
       @spinner = TTY::Spinner.new(
-        "#{time.colorize(:light_black)} - [:spinner] :title", hide_cursor: true, success_mark: '✔'.colorize(:green)
+        "#{time.pastel(:bright_black)} - [:spinner] :title", hide_cursor: true, success_mark: '✔'.pastel(:green)
       )
       @spinner.update(title: title)
 
@@ -25,7 +25,7 @@ module GreenHat
       title_update = if spin_end.blank?
                        title
                      else
-                       "#{title} (#{spin_end.colorize(:blue)})"
+                       "#{title} (#{spin_end.pastel(:blue)})"
                      end
 
       @spinner.update(title: title_update)
@@ -33,7 +33,7 @@ module GreenHat
     end
 
     def time
-      Time.now.strftime('%I:%M:%S').colorize(:light_black)
+      Time.now.strftime('%I:%M:%S').pastel(:bright_black)
     end
 
     # Replace TimeDifference with https://stackoverflow.com/a/4136485/1678507

data/lib/greenhat/thing.rb

@@ -28,7 +28,7 @@ class Thing < Teron
   field :raw_result # Flag for reading raw data
 
   def friendly_name
-    "#{archive.friendly_name.colorize(:blue)} #{name.colorize(:green)} #{id.colorize(:black)}"
+    "#{archive.friendly_name.pastel(:blue)} #{name.pastel(:green)}"
   end
 
   def setup
@@ -66,7 +66,7 @@ class Thing < Teron
   end
 
   def raw_read
-    spin_start("Read  #{name.colorize(:blue)} #{size.colorize(:light_black)}")
+    spin_start("Read  #{name.pastel(:blue)} #{size.pastel(:bright_black)}")
     self.raw_result = File.read(file).split("\n")
   rescue StandardError => e
     LogBot.fatal('Raw Read', message: e.message, backtrace: e.backtrace.first)
@@ -103,7 +103,7 @@ class Thing < Teron
     raw_read if raw_result.nil?
 
     if methods.include? formatter
-      spin_start("Parse #{name.colorize(:blue)} #{kind.to_s.colorize(:light_black)} ")
+      spin_start("Parse #{name.pastel(:blue)} #{kind.to_s.pastel(:bright_black)} ")
       begin
         send(formatter)
       rescue StandardError => e

data/lib/greenhat/tty/columns.rb

@@ -28,6 +28,10 @@ module TTY
           # THE SHIM! Strings that are too large fail to render correctly to do an empty result
           # Set the maximum table width to half the screen size. Can't be full size due to the table headers
           LogBot.debug('TTY Column Width') if ENV['DEBUG']
+
+          # TODO: Check Empty Results
+          return [0] if table.data.empty?
+
           extract_widths(table.data).map { |x| x >= TTY::Screen.width ? (TTY::Screen.width * 3 / 4) : x }
 
         else

data/lib/greenhat/version.rb

@@ -1,3 +1,3 @@
 module GreenHat
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/greenhat.rb

@@ -1,27 +1,27 @@
 #!/usr/bin/env ruby
 
 require 'action_view'
+require 'active_support'
+require 'active_support/core_ext'
+require 'amazing_print'
 require 'benchmark'
+require 'dotenv'
 require 'find'
-require 'tty-prompt'
-require 'tty-spinner'
-require 'tty-table'
-require 'tty-pager'
-require 'tty-cursor'
-require 'tty-reader'
 require 'hash_dot'
 require 'oj'
-require 'slim'
-require 'active_support'
-require 'active_support/core_ext'
+require 'pastel'
 require 'pry'
-require 'amazing_print'
-require 'colorize'
+require 'require_all'
 require 'semantic'
+require 'slim'
+require 'tty-cursor'
+require 'tty-pager'
 require 'tty-progressbar'
-require 'require_all'
+require 'tty-prompt'
+require 'tty-reader'
+require 'tty-spinner'
+require 'tty-table'
 require 'warning'
-require 'dotenv'
 
 # Custom Gem
 require 'teron'
@@ -49,6 +49,7 @@ require 'greenhat/archive'
 require 'greenhat/host'
 require 'greenhat/logbot'
 require 'greenhat/settings'
+require 'greenhat/color'
 
 # Formatters - Loads Required Files Automatically
 require 'greenhat/thing/super_log'
@@ -65,7 +66,6 @@ require 'greenhat/thing'
 require 'greenhat/shell'
 
 # TODO: Confirm
-# require 'greenhat/thing/log_format'
 # require 'greenhat/host'
 # require 'greenhat/web'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greenhat
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Davin Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -53,49 +53,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.14'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: actionview
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
-  type: :runtime
+        version: '1.12'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: did_you_mean
   requirement: !ruby/object:Gem::Requirement
@@ -386,6 +386,7 @@ files:
 - bin/greenhat
 - lib/greenhat.rb
 - lib/greenhat/accessors/disk.rb
+- lib/greenhat/accessors/gitlab.rb
 - lib/greenhat/accessors/logs/production.rb
 - lib/greenhat/accessors/logs/sidekiq.rb
 - lib/greenhat/accessors/memory.rb
@@ -393,25 +394,28 @@ files:
 - lib/greenhat/accessors/process.rb
 - lib/greenhat/archive.rb
 - lib/greenhat/cli.rb
+- lib/greenhat/color.rb
 - lib/greenhat/host.rb
 - lib/greenhat/logbot.rb
 - lib/greenhat/pry_helpers.rb
 - lib/greenhat/settings.rb
 - lib/greenhat/shell.rb
+- lib/greenhat/shell/args.rb
 - lib/greenhat/shell/cat.rb
 - lib/greenhat/shell/color_string.rb
 - lib/greenhat/shell/disk.rb
 - lib/greenhat/shell/faststats.rb
-- lib/greenhat/shell/filter.rb
+- lib/greenhat/shell/filter_help.rb
 - lib/greenhat/shell/gitlab.rb
 - lib/greenhat/shell/help.rb
-- lib/greenhat/shell/helper.rb
+- lib/greenhat/shell/list.rb
 - lib/greenhat/shell/log.rb
 - lib/greenhat/shell/memory.rb
 - lib/greenhat/shell/network.rb
 - lib/greenhat/shell/page.rb
 - lib/greenhat/shell/process.rb
 - lib/greenhat/shell/report.rb
+- lib/greenhat/shell/shell_helper.rb
 - lib/greenhat/thing.rb
 - lib/greenhat/thing/file_types.rb
 - lib/greenhat/thing/formatters/api_json.rb