greenhat 0.7.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a519d68faaec2994665e8c6e442923578d6a0f165a2213f3a5ef0e7e45b65903
-  data.tar.gz: 1a9f905cf1d9f8738a1658f932b5d14d8ef9964a0bb2360a5438460330e868d1
+  metadata.gz: 9e82009def6948189e79cbb259088c57da5e1f22aa50e5c47a560a76e2a16e9e
+  data.tar.gz: 31fe1dbb0ec0d740e962942f6d4c511b8c5facebee16411e6daa0d93c1272d47
 SHA512:
-  metadata.gz: 6e9f31443fdb9917069831fc89e39b97f198c3b298bb06b2331dc0788d2f7ca31e4ce65b1f69e0a89e82d6788e810fe0d344a5cb2c74b30aa53d3b7577442f96
-  data.tar.gz: 3534f35919122f6b01aaa1570429faf852dc4c91c3e170a55e693cc84207fa391cfb7ad2c85af4cca46a0d83adcbbfaa24ecf1db52bcfa76d08bf38d8c42ad83
+  metadata.gz: 1719579efd5c3accf5fe402c5b57e51c7613a530bc715f0e71e88e6a8dac7ac05cb965e4d0351dcd8a0fe38aefe4f16dbf76c4692fe93cff40aa325c38a72a10
+  data.tar.gz: d953dec24128e963a38b58949214d76b5ae32ee0a0f01f47997201ff07a24219f2b8911e06121022d76235ccf5105766cbacb39f3402d796484ef0e24799d42e

data/README.md

@@ -12,7 +12,7 @@ Experimental SOS and Log Parser for GitLab
 
 `apt-get install libarchive-tools`
 
-Ruby 3.0 or later, including the headers (such as package `ruby-dev`)
+Ruby 3.1 or later, including the headers (such as package `ruby-dev`)
 
 ## Installation
 
@@ -29,6 +29,8 @@ greenhat production_json.log
 >> help # the program is self-documented through the builtin help command
 ```
 
+[Watch an introductory tutorial](https://www.youtube.com/watch?v=xyVQiKFgeP4) (recorded March 5, 2024, with Green Hat v0.7.3) 
+
 ## Testing
 
 ```

data/lib/greenhat/accessors/gitlab.rb

@@ -73,7 +73,7 @@ module GreenHat
         end
       end
 
-      table.render(:unicode, padding: [0, 1, 0, 1], indent:)
+      table.render(:unicode, padding: [0, 1, 0, 1], indent: indent)
     end
     # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
 

data/lib/greenhat/accessors/grep.rb

@@ -49,7 +49,7 @@ module GreenHat
         return
       end
 
-      ShellHelper.show GreenHat::Paper.new(data: output, flags:).render
+      ShellHelper.show GreenHat::Paper.new(data: output, flags: flags).render
     end
 
     def self.find_things(files = [])

data/lib/greenhat/archive.rb

@@ -26,7 +26,7 @@ module GreenHat
       # Ignore Empty Files
       list.reject! { |x| File.empty?(x) }
 
-      archive = Archive.new(name: archive_path, path:)
+      archive = Archive.new(name: archive_path, path: path)
       archive.save
 
       list.each do |file|
@@ -34,7 +34,7 @@ module GreenHat
         next if missing_command(file)
 
         # Thread.new do
-        thing = archive.things_create(file:)
+        thing = archive.things_create(file: file)
         thing.setup
         # end
       end
@@ -50,23 +50,29 @@ module GreenHat
 
     # Handle Different Types of Archives
     def self.unpack(archive_path, path)
+      decompressed_successfully = false
+
       case File.extname archive_path
-      when '.tgz'
-        base_path = archive_path.gsub(File.basename(archive_path), '')
-        `bsdtar -xzf "#{archive_path}" -C #{base_path}`
-        FileUtils.rm(archive_path)
-      when '.tar'
+      when '.tgz', '.tar'
         base_path = archive_path.gsub(File.basename(archive_path), '')
         `bsdtar -xf "#{archive_path}" -C #{base_path}`
-        FileUtils.rm(archive_path)
+
+        decompressed_successfully = $CHILD_STATUS.success?
+        FileUtils.rm(archive_path) if decompressed_successfully
       when '.gz'
         `gzip -d "#{archive_path}"`
+
+        decompressed_successfully = $CHILD_STATUS.success?
       when '.zip'
         base_path = archive_path.gsub(File.basename(archive_path), '')
         `unzip -o -d "#{base_path}" #{archive_path}`
-        FileUtils.rm(archive_path)
+
+        decompressed_successfully = $CHILD_STATUS.success?
+        FileUtils.rm(archive_path) if decompressed_successfully
       when '.bz2'
         `bzip2 -d #{archive_path}`
+
+        decompressed_successfully = $CHILD_STATUS.success?
       when '.s'
         # Find Original Directory, Split Path, Rename to .gz
         base_path = archive_path.gsub(File.basename(archive_path), '')
@@ -74,6 +80,15 @@ module GreenHat
       else
         FileUtils.cp(archive_path, "#{path}/#{archive_path}")
       end
+
+      # if the archive is corrupt and doesn't uncompress properly, greenhat will keep looping on it endlessly,
+      #  trying to decompress it. let's rename it on failure so it stops trying, but the SE can still try and
+      #  extract it themselves.
+      return if decompressed_successfully
+
+      puts "#{'Decompress failed'.pastel(:red)}: #{archive_path.pastel(:green)}"
+      puts 'Renaming file so we can continue.'.pastel(:yellow)
+      FileUtils.mv(archive_path, "#{archive_path}.broken")
     end
 
     def self.archive?(file_name)

data/lib/greenhat/cli.rb

@@ -8,7 +8,7 @@ module GreenHat
       value ||= '' # Empty Start
 
       loop do
-        line = reader.read_line(readline_notch, value:)
+        line = reader.read_line(readline_notch, value: value)
         value = '' # Remove Afterwards
 
         if reader.breaker
@@ -169,7 +169,7 @@ module GreenHat
     def self.did_you_mean
       dictionary = current_methods + current_submodules + cmd_list
 
-      all = DidYouMean::SpellChecker.new(dictionary:).correct(cmd)
+      all = DidYouMean::SpellChecker.new(dictionary: dictionary).correct(cmd)
 
       if all.empty?
         puts [
@@ -403,8 +403,8 @@ module GreenHat
     def self.suppress_output
       original_stderr = $stderr.clone
       original_stdout = $stdout.clone
-      $stderr.reopen(File.new('/dev/null', 'w'))
-      $stdout.reopen(File.new('/dev/null', 'w'))
+      $stderr.reopen(File.new(File::NULL, 'w'))
+      $stdout.reopen(File.new(File::NULL, 'w'))
       yield
     ensure
       $stdout.reopen(original_stdout)

data/lib/greenhat/entrypoint.rb

@@ -12,7 +12,7 @@ module GreenHat
       load_files files
       Cli.run_command(args) if args.any? { |arg| Cli.run_command?(arg) }
 
-      report_runner(args:, files:, raw:, flags:)
+      report_runner(args: args, files: files, raw: raw, flags: flags)
       post_args(flags)
       post_setup(flags)
 

data/lib/greenhat/host.rb

@@ -152,7 +152,7 @@ class Host < Teron
         obj[headers[i]] = v
       end
     end
-    { headers:, list: }
+    { headers: headers, list: list }
   end
 
   def systemctl_unit_files
@@ -161,7 +161,7 @@ class Host < Teron
 
     all = file.raw[1..-2].map do |x|
       unit, status = x.split
-      { unit:, status: }
+      { unit: unit, status: status }
     end
 
     all.reject! { |x| x[:unit].nil? }

data/lib/greenhat/paper/paper_helper.rb

@@ -105,7 +105,7 @@ module GreenHat
     # --------------------------------------------------------------------------
     def render_array_table(entry)
       header, rows = entry
-      table = TTY::Table.new(header:, rows:)
+      table = TTY::Table.new(header: header, rows: rows)
 
       LogBot.debug('Rendering Entries') if ENV['DEBUG']
       self.output = table.render(table_style, padding: [0, 1, 0, 1], multiline: true) do |renderer|

data/lib/greenhat/reports/internal_methods.rb

@@ -125,10 +125,10 @@ module GreenHat
       def show(value)
         if value.instance_of?(Array)
           value.each do |x|
-            output.push GreenHat::Paper.new(data: x, flags:).render
+            output.push GreenHat::Paper.new(data: x, flags: flags).render
           end
         else
-          output.push GreenHat::Paper.new(data: value, flags:).render
+          output.push GreenHat::Paper.new(data: value, flags: flags).render
         end
       end
 

data/lib/greenhat/reports/shell_helper.rb

@@ -4,7 +4,7 @@ module GreenHat
     module Reports
       # Make Running more consistent
       def self.run(file:, args:, flags:, raw_args:)
-        report = GreenHat::Reports::Builder.new(file:, args:, flags:, raw_args:)
+        report = GreenHat::Reports::Builder.new(file: file, args: args, flags: flags, raw_args: raw_args)
 
         # Fuzzy Match Archive Names
         archives = Archive.all
@@ -18,11 +18,11 @@ module GreenHat
 
         output = archives.map do |archive|
           runner = GreenHat::Reports::Runner.new(
-            archive:,
+            archive: archive,
             store: report.store.clone,
-            flags:,
-            args:,
-            raw_args:
+            flags: flags,
+            args: args,
+            raw_args: raw_args
           )
 
           runner.run!

data/lib/greenhat/reports.rb

@@ -31,10 +31,10 @@ module GreenHat
 
       output = Archive.all.map do |archive|
         runner = GreenHat::Reports::Runner.new(
-          archive:,
+          archive: archive,
           store: store.clone,
-          flags:,
-          args:
+          flags: flags,
+          args: args
         )
 
         runner.run!

data/lib/greenhat/shell/args.rb

@@ -120,10 +120,10 @@ module GreenHat
         field = field.to_sym
 
         {
-          field:,
+          field: field,
           value: arg_normalize(field, value),
-          bang:,
-          logic:
+          bang: bang,
+          logic: logic
         }
       end
     end

data/lib/greenhat/shell/faststats.rb

@@ -3,7 +3,7 @@ module GreenHat
   module Shell
     # Logs
     module Faststats
-      # rubocop:disable Metrics/MethodLength)
+      # rubocop:disable Metrics/MethodLength
       def self.help
         puts "\u2500".pastel(:cyan) * 25
         puts "Gimme #{'Performance Stats'.pastel(:yellow)}"
@@ -65,7 +65,7 @@ module GreenHat
         puts '    errors gitaly/current'
         puts '    errors gitaly/current --no-border'
       end
-      # rubocop:enable Metrics/MethodLength)
+      # rubocop:enable Metrics/MethodLength
 
       def self.faststats_installation
         puts "#{'Unable to find'.pastel(:red)} #{'fast-stats'.pastel(:blue)}"

data/lib/greenhat/shell/query.rb

@@ -242,8 +242,6 @@ module GreenHat
       index
     rescue StandardError => e
       LogBot.fatal('Index Error', e.message)
-    ensure
-      {}
     end
 
     # Limit / Ensure Exists and Valid Number
@@ -378,7 +376,7 @@ module GreenHat
         l95 = l95.round(flags.round) if flags.round
 
         {
-          key:,
+          key: key,
           '99' => l99,
           '95' => l95,
           mean: flags.round ? values.mean.round(flags.round) : values.mean,
@@ -500,7 +498,7 @@ module GreenHat
         match
       end
     rescue StandardError => e
-      LogBot.fatal('[Query] Filter Row Failure', message: e.message, backtrace: e.backtrace.first, row:)
+      LogBot.fatal('[Query] Filter Row Failure', message: e.message, backtrace: e.backtrace.first, row: row)
       false
     end
 

data/lib/greenhat/shell/reports.rb

@@ -57,7 +57,7 @@ module GreenHat
 
         run_list.each do |file|
           raw_args = list.reject { |x| file.include? x }
-          GreenHat::ShellHelper::Reports.run(file:, args:, flags:, raw_args:)
+          GreenHat::ShellHelper::Reports.run(file: file, args: args, flags: flags, raw_args: raw_args)
         end
       end
     end

data/lib/greenhat/shell/shell_helper.rb

@@ -85,7 +85,7 @@ module GreenHat
     # Collect Class Objects for output
     def self.create_ledger(data, flags)
       data.map do |x|
-        Paper.new(data: x, flags:)
+        Paper.new(data: x, flags: flags)
       end
     end
 

data/lib/greenhat/shell.rb

@@ -63,7 +63,7 @@ module GreenHat
 
         puts "- Loading #{file.pastel(:green)}"
 
-        archive.things_create(file:).setup
+        archive.things_create(file: file).setup
       end
     end
 

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

@@ -34,7 +34,7 @@ module GreenHat
 
     def flatten_hash(param, prefix = nil)
       param.each_pair.reduce({}) do |a, (k, v)|
-        v.is_a?(Hash) ? a.merge(flatten_hash(v, "#{prefix}#{k}.")) : a.merge("#{prefix}#{k}".to_sym => v)
+        v.is_a?(Hash) ? a.merge(flatten_hash(v, "#{prefix}#{k}.")) : a.merge("#{prefix}#{k}": v)
       end
     end
 

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

@@ -31,7 +31,7 @@ module GreenHat
           # Breakout
           method, path, protocol, status, bytes = request.gsub('"', '').split(' ', 5)
 
-          result.merge!(method:, path:, protocol:, status:, bytes:)
+          result.merge!(method: method, path: path, protocol: protocol, status: status, bytes: bytes)
 
         else
           result[:msg] = msg

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

@@ -10,7 +10,7 @@ module GreenHat
           status, service, pid_uptime = entry.split(': ')
 
           {
-            status:,
+            status: status,
             name: service,
             pid_uptime: pid_uptime.chomp
           }

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

@@ -16,9 +16,9 @@ module GreenHat
 
         level, _a, _b, msg = output.split(' ', 4)
         {
-          time:,
+          time: time,
           i: level_abrv,
-          level:,
+          level: level,
           message: msg
         }
       rescue StandardError => e

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

@@ -37,7 +37,7 @@ module GreenHat
     def format_json_traverse(result)
       format_time(result)
 
-      result.each do |_key, value|
+      result.each_value do |value|
         next unless value.instance_of? Hash
 
         format_json_traverse(value)

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

@@ -18,16 +18,16 @@ module GreenHat
 
         {
           remote_addr: ip,
-          remote_user:,
-          method:,
-          path:,
-          status:,
-          bytes:,
-          http_version:,
-          http_referer:,
-          http_user_agent:,
-          gzip_ratio:,
-          time:
+          remote_user: remote_user,
+          method: method,
+          path: path,
+          status: status,
+          bytes: bytes,
+          http_version: http_version,
+          http_referer: http_referer,
+          http_user_agent: http_user_agent,
+          gzip_ratio: gzip_ratio,
+          time: time
         }
 
         # Fall back for malformed logs

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

@@ -21,16 +21,16 @@ module GreenHat
 
         {
           remote_addr: ip,
-          remote_user:,
-          method:,
-          path:,
-          status:,
-          bytes:,
-          http_version:,
-          http_referer:,
-          http_user_agent:,
-          gzip_ratio:,
-          time:
+          remote_user: remote_user,
+          method: method,
+          path: path,
+          status: status,
+          bytes: bytes,
+          http_version: http_version,
+          http_referer: http_referer,
+          http_user_agent: http_user_agent,
+          gzip_ratio: gzip_ratio,
+          time: time
         }
       rescue StandardError => e
         LogBot.warn('NGINX Parse', e.message)

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

@@ -19,15 +19,17 @@ module GreenHat
     def process_runner_log_row(row)
       month, day, time, device, service, message = row.split(' ', 6)
       service&.gsub!(':', '')
+      # rubocop:disable Style/SafeNavigationChainLength
       pid = service&.match(/\[(.*?)\]/)&.captures&.first
+      # rubocop:enable Style/SafeNavigationChainLength
 
       entry = {
         time: format_time_parse("#{month} #{day} #{time}"),
-        device:,
-        service:,
-        message:,
-        pid:,
-        row: # Insert full row for different timestamp formats
+        device: device,
+        service: service,
+        message: message,
+        pid: pid,
+        row: row # Insert full row for different timestamp formats
       }
 
       # Remove Empty Keys
@@ -54,9 +56,9 @@ module GreenHat
         # Don't overwrite stuff
         case key
         when 'time'
-          entry["#{key}-msg".to_sym] = format_time_parse value
+          entry[:"#{key}-msg"] = format_time_parse value
         when 'message', :message
-          entry["#{key}-msg".to_sym] = value
+          entry[:"#{key}-msg"] = value
         else
           entry[key.to_sym] = value
         end

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

@@ -22,10 +22,10 @@ module GreenHat
 
       {
         time: format_time_parse("#{month} #{day} #{time}"),
-        device:,
-        service:,
-        message:,
-        pid:
+        device: device,
+        service: service,
+        message: message,
+        pid: pid
       }
 
     # Return everything incase of error

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

@@ -14,7 +14,7 @@ module GreenHat
         result =  begin
           Oj.load msg
         rescue StandardError
-          { msg: }
+          { msg: msg }
         end
 
         result.time = time

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

@@ -11,7 +11,7 @@ module GreenHat
 
         {
           time: Time.parse(time),
-          msg:
+          msg: msg
         }
       end
     end

data/lib/greenhat/thing/history.rb

@@ -16,8 +16,6 @@ module GreenHat
       else
         {}
       end
-    ensure
-      {}
     end
 
     def self.file
@@ -34,7 +32,7 @@ module GreenHat
     end
 
     def self.add(name, type)
-      files[name] = { type:, time: expire }
+      files[name] = { type: type, time: expire }
 
       write
     end

data/lib/greenhat/thing/info_format.rb

@@ -3,7 +3,7 @@ module GreenHat
   module InfoFormat
     # Is this something that can be formatted by info?
     def info?
-      methods.include? "format_#{path}".to_sym
+      methods.include? :"format_#{path}"
     end
 
     # Handle Info Formatting
@@ -103,7 +103,7 @@ module GreenHat
           obj[headers[i]] = v
         end
       end
-      { headers:, list: }
+      { headers: headers, list: list }
     end
 
     def manifest_json_format
@@ -150,7 +150,7 @@ module GreenHat
 
       all = info.systemctl_unit_files[1..-2].map do |x|
         unit, status = x.split
-        { unit:, status: }
+        { unit: unit, status: status }
       end
       all.reject! { |x| x[:unit].nil? }
       all.sort_by(&:unit)

data/lib/greenhat/thing/spinner.rb

@@ -9,7 +9,7 @@ module GreenHat
       @spinner = TTY::Spinner.new(
         "#{time.pastel(:bright_black)} - [:spinner] :title", hide_cursor: true, success_mark: '✔'.pastel(:green)
       )
-      @spinner.update(title:)
+      @spinner.update(title: title)
 
       # Don't Auto spin when debug output is happening
       @spinner.auto_spin unless ENV['DEBUG']

data/lib/greenhat/thing.rb

@@ -118,7 +118,7 @@ class Thing < Teron
 
   # Helper Formatter Method
   def formatter
-    "format_#{kind}".to_sym
+    :"format_#{kind}"
   end
 
   def process(quiet = false)

data/lib/greenhat/version.rb

@@ -1,3 +1,3 @@
 module GreenHat
-  VERSION = '0.7.4'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/lib/greenhat/web/helpers.rb

@@ -22,8 +22,6 @@ module WebHelpers
     index
   rescue StandardError => e
     LogBot.fatal('Index Error', e.message)
-  ensure
-    {}
   end
 
   # Without Grouping Just total count
@@ -94,7 +92,7 @@ module WebHelpers
     end
 
     # Transform / Calculate
-    list.each do |_k, v|
+    list.each_value do |v|
       v.data.transform_values! do |l|
         l.empty? ? 0 : l.sum
       end
@@ -122,7 +120,7 @@ module WebHelpers
     end
 
     # Transform / Calculate
-    list.each do |_k, v|
+    list.each_value do |v|
       v.data.transform_values! do |l|
         l.empty? ? 0 : (l.sum / l.size.to_f) # .round(1)
       end
@@ -149,9 +147,7 @@ module WebHelpers
     stacks.each do |stack|
       data = default_index.clone
       data.transform_values! { |_y| [] } # Ensure Uniq
-      list[stack] = {
-        name: stack, data:
-      }
+      list[stack] = {        name: stack, data: data }
     end
 
     # Collect Stack Data
@@ -164,7 +160,7 @@ module WebHelpers
     end
 
     # Transform / Calculate
-    list.each do |_k, v|
+    list.each_value do |v|
       v.data.transform_values! do |l|
         l.empty? ? 0 : (l.sum / l.size.to_f)
       end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: greenhat
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Davin Walker
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2025-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -66,20 +65,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: did_you_mean
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -531,7 +544,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -546,8 +558,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: GitLab SOS Tool
 test_files: []