greenhat 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba6197971082cb194c319fd71d5353d6be2329445c6808cabed9b764a9ab74c7
-  data.tar.gz: c319e5bbf5dd591a70ca1195d20dd0fd79c7642fde4b95f45c4f88da9f153c5f
+  metadata.gz: a519d68faaec2994665e8c6e442923578d6a0f165a2213f3a5ef0e7e45b65903
+  data.tar.gz: 1a9f905cf1d9f8738a1658f932b5d14d8ef9964a0bb2360a5438460330e868d1
 SHA512:
-  metadata.gz: fb274b40665cebb795104e7eef72f968928e916a811146811b7607c4d048950291c540ac8d8eec3f1fe74acdb91a15e1acbd52c8d2bb69ce612c8e6f313bdde7
-  data.tar.gz: 849ce3aa1d387ac0294b86b3bf75b3451eff3278bd229c2b43c960228c689425aa6ee7bbc9a7a1b26d100e072da537a88ad286e888bda76a219f0cd1341d4b7f
+  metadata.gz: 6e9f31443fdb9917069831fc89e39b97f198c3b298bb06b2331dc0788d2f7ca31e4ce65b1f69e0a89e82d6788e810fe0d344a5cb2c74b30aa53d3b7577442f96
+  data.tar.gz: 3534f35919122f6b01aaa1570429faf852dc4c91c3e170a55e693cc84207fa391cfb7ad2c85af4cca46a0d83adcbbfaa24ecf1db52bcfa76d08bf38d8c42ad83

data/README.md

@@ -12,6 +12,8 @@ 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`)
+
 ## Installation
 
 ```
@@ -38,7 +40,7 @@ bundle exec rake
 - Update CHANGELOG
 - Increment `version.rb`
 - Create MR
-- Merge to Master
+- Merge to `main`
 
 ```
 # Build and Push
@@ -46,6 +48,12 @@ bundle exec rake build
 gem push pkg/greenhat-1.x.x.gem
 ```
 
+## Dev Troubleshooting
+
+```
+docker run -it -v ${PWD}:/app ruby:3.1.4 bash
+```
+
 ## Contributing
 
 Bug reports and merge requests are welcome on GitLab at https://gitlab.com/gitlab-com/support/toolbox/greenhat. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/greenhat/accessors/gitlab.rb

@@ -73,7 +73,7 @@ module GreenHat
         end
       end
 
-      table.render(:unicode, padding: [0, 1, 0, 1], indent: indent)
+      table.render(:unicode, padding: [0, 1, 0, 1], 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: flags).render
+      ShellHelper.show GreenHat::Paper.new(data: output, flags:).render
     end
 
     def self.find_things(files = [])

data/lib/greenhat/archive.rb

@@ -24,9 +24,9 @@ module GreenHat
       list = Find.find(path).reject { |x| File.directory?(x) || File.symlink?(x) }
 
       # Ignore Empty Files
-      list.reject! { |x| File.size(x).zero? }
+      list.reject! { |x| File.empty?(x) }
 
-      archive = Archive.new(name: archive_path, path: path)
+      archive = Archive.new(name: archive_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: file)
+        thing = archive.things_create(file:)
         thing.setup
         # end
       end

data/lib/greenhat/cli.rb

@@ -8,7 +8,7 @@ module GreenHat
       value ||= '' # Empty Start
 
       loop do
-        line = reader.read_line(readline_notch, value: value)
+        line = reader.read_line(readline_notch, 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: dictionary).correct(cmd)
+      all = DidYouMean::SpellChecker.new(dictionary:).correct(cmd)
 
       if all.empty?
         puts [

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: args, files: files, raw: raw, flags: flags)
+      report_runner(args:, files:, raw:, 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: headers, list: list }
+    { headers:, 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: unit, status: status }
+      { unit:, 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: header, rows: rows)
+      table = TTY::Table.new(header:, 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: flags).render
+            output.push GreenHat::Paper.new(data: x, flags:).render
           end
         else
-          output.push GreenHat::Paper.new(data: value, flags: flags).render
+          output.push GreenHat::Paper.new(data: value, flags:).render
         end
       end
 

data/lib/greenhat/reports/reports/errors.rb

@@ -26,7 +26,9 @@ entries = [
     stats: 'exception.class,exception.message,status' },
   { header: 'Gitaly', base: 'gitaly/current --level=error --truncate=99', stats: 'error' },
   { header: 'Praefect', base: 'praefect/current --level=error --truncate=99', stats: 'error' },
-  { header: 'Pages', base: 'gitlab-pages/current --level=error', stats: 'error' }
+  { header: 'Pages', base: 'gitlab-pages/current --level=error', stats: 'error' },
+  { header: 'Geo', base: 'gitlab-rails/geo.log --severity=error', stats: 'message' },
+  { header: 'Elasticsearch', base: 'gitlab-rails/elasticsearch.log --severity=error', stats: 'message' }
 ]
 
 # Filter Logic

data/lib/greenhat/reports/reports/full.rb

@@ -159,3 +159,13 @@ query_if_exists('gitlab-pages/current --level=error') do |data|
   color = data.count.zero? ? :green : :red
   indent("#{ljust('Pages:', 14, :magenta)} #{data.count.to_s.pastel(color)}", 4)
 end
+
+query_if_exists 'gitlab-rails/geo.log --severity=error' do |data|
+  color = data.count.zero? ? :green : :red
+  indent("#{ljust('Geo:', 14, :magenta)} #{data.count.to_s.pastel(color)}", 4)
+end
+
+query_if_exists 'gitlab-rails/elasticsearch.log --severity=error' do |data|
+  color = data.count.zero? ? :green : :red
+  indent("#{ljust('Elasticsearch:', 14, :magenta)} #{data.count.to_s.pastel(color)}", 4)
+end

data/lib/greenhat/reports/reports/production_log_duration.rb

@@ -15,6 +15,7 @@ fields = %w[
   db_replica_duration_s
   external_http_duration_s
   redis_cache_duration_s
+  queue_duration_s
   redis_shared_state_duration_s
 ]
 

data/lib/greenhat/reports/shell_helper.rb

@@ -4,14 +4,25 @@ module GreenHat
     module Reports
       # Make Running more consistent
       def self.run(file:, args:, flags:, raw_args:)
-        report = GreenHat::Reports::Builder.new(file: file, args: args, flags: flags, raw_args: raw_args)
-        output = Archive.all.map do |archive|
+        report = GreenHat::Reports::Builder.new(file:, args:, flags:, raw_args:)
+
+        # Fuzzy Match Archive Names
+        archives = Archive.all
+        if flags[:archive] && !flags[:archive].empty?
+          archives.select! do |a|
+            flags[:archive].any? do |x|
+              a.name.include? x.to_s
+            end
+          end
+        end
+
+        output = archives.map do |archive|
           runner = GreenHat::Reports::Runner.new(
-            archive: archive,
+            archive:,
             store: report.store.clone,
-            flags: flags,
-            args: args,
-            raw_args: raw_args
+            flags:,
+            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: flags,
-          args: args
+          flags:,
+          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: bang,
-          logic: logic
+          bang:,
+          logic:
         }
       end
     end

data/lib/greenhat/shell/field_helper.rb

@@ -21,7 +21,7 @@ module GreenHat
     def self.filter_flags(word)
       if word.blank?
         puts 'Filter Options:'.pastel(:bright_blue)
-        puts ShellHelper.field_table(filter_opts, 6)
+        puts ShellHelper.field_table(filter_opts)
         puts
 
         return []

data/lib/greenhat/shell/filter_help.rb

@@ -201,7 +201,8 @@ module GreenHat
           table_style: [
             '--table_style'.pastel(:green),
             '  Renderer used for formatted output. basic, ascii, or unicode(default)',
-            '  Ex: log filter --table_style=base'
+            '  Without any params this will result in basic',
+            '  Ex: log filter --table_style=basic'
           ],
 
           truncate: [

data/lib/greenhat/shell/log.rb

@@ -218,7 +218,7 @@ module GreenHat
 
         # Skip and Print Total if set
         if flags[:fields]
-          ShellHelper.fields_print(results)
+          ShellHelper.fields_print(files)
           return true
         end
 

data/lib/greenhat/shell/query.rb

@@ -25,10 +25,13 @@ module GreenHat
       files.reject(&:blank?).map do |file|
         src = file.archive&.friendly_name || file&.name
         file.data.map do |entry|
+          # Some entries are nil?
+          next if entry.nil?
+
           bit = entry.clone
           bit[:src] = src
           bit
-        end
+        end.compact
       end
     end
 
@@ -164,6 +167,9 @@ module GreenHat
       process_transform(flags[:transform], results) if flags.key? :transform
 
       results.select! do |row|
+        # Skip Integers?
+        # next if row.is_a? Integer
+
         args.send(flags.logic || :all?) do |arg|
           filter_row_key(row, arg, flags)
         end
@@ -185,7 +191,7 @@ module GreenHat
       results = filter_except(results, flags[:except]) if flags.key?(:except)
 
       # Remove Blank from either slice or except
-      results.reject!(&:empty?)
+      results.reject!(&:blank?)
 
       # Sort / Reverse by default
       if flags.key?(:sort)
@@ -372,7 +378,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,
@@ -494,7 +500,7 @@ module GreenHat
         match
       end
     rescue StandardError => e
-      LogBot.fatal('[Query] Filter Row Failure', message: e.message, backtrace: e.backtrace.first, row: row)
+      LogBot.fatal('[Query] Filter Row Failure', message: e.message, backtrace: e.backtrace.first, row:)
       false
     end
 

data/lib/greenhat/shell/reports.rb

@@ -8,6 +8,15 @@ require 'greenhat/reports/shell_helper'
 module GreenHat
   # CLI Helper
   module Shell
+    # Make `report` a default top layer command
+    def self.report(_raw = ['default'])
+      # Move
+      Cli.move_shell Shell::Reports
+
+      # Run
+      Reports.default ['full']
+    end
+
     # Logs
     module Reports
       def self.auto_complete(_list, word)
@@ -48,7 +57,7 @@ module GreenHat
 
         run_list.each do |file|
           raw_args = list.reject { |x| file.include? x }
-          GreenHat::ShellHelper::Reports.run(file: file, args: args, flags: flags, raw_args: raw_args)
+          GreenHat::ShellHelper::Reports.run(file:, args:, flags:, 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: flags)
+        Paper.new(data: x, flags:)
       end
     end
 
@@ -244,50 +244,31 @@ module GreenHat
       [output]
     end
 
-    # TODO: Clean up -- Verify these aren't needed
-    # Hash Iteration
-    # def self.total_count_hash(results, flags)
-    #   results.flat_map do |k, values|
-    #     [k, total_count_array(values, flags)]
-    #   end
-    # end
+    # Table Printer Helper
+    def self.fields_print(files)
+      fields = ShellHelper.find_things(files).map(&:fields).flatten.uniq
 
-    # List Calculation
-    # def self.total_count_array(results, flags)
-    #   # Option to only return the count
-    #   return results.count if flags[:total] == 'simple'
+      # truncate = (TTY::Screen.width - columns) / columns
+      # fields.map! { |f| f[0..truncate] }
+      puts ShellHelper.field_table(fields)
 
-    #   output = {}
-    #   output[:total] = results.count
-    #   output[:duration] = Query.calculate_duration(results)
+      # ShellHelper.fields_print(files)
+    end
 
-    #   # Sort / Get first and Last
-    #   list = results.select(&:time).map(&:time)
-    #   unless list.blank?
-    #     output[:start] = list.first
-    #     output[:end] = list.last
-    #   end
+    # 5 Columns cause issues with resizing
+    def self.field_table(list, columns: 4)
+      return nil if list.empty?
 
-    #   # Hide empty results
-    #   output.reject! { |_k, v| v.blank? }
+      # Split list into groups based on columns
+      groups = list.each_slice((list.size / columns.to_f).ceil).to_a
 
-    #   render_table(output, flags)
-    # end
+      # Max Width for Table
+      truncate = (TTY::Screen.width - groups.count) / groups.count
 
-    # Table Printer Helper
-    def self.fields_print(results)
-      results.each do |k, v|
-        puts k
-        puts field_table(v.map(&:keys).flatten.uniq.sort)
-        puts
+      # Process Truncation
+      groups.each do |group|
+        group.map! { |f| f[0..truncate]&.to_sym }
       end
-    end
-
-    def self.field_table(list, columns = 4)
-      return nil if list.empty?
-
-      # Keep Alphabetical Sort
-      groups = list.each_slice((list.size / columns.to_f).round).to_a
 
       table = TTY::Table.new do |t|
         loop do
@@ -297,7 +278,7 @@ module GreenHat
         end
       end
 
-      table.render(:unicode, padding: [0, 1, 0, 1])
+      table.render(:unicode, padding: [0, 1, 0, 1], resize: false)
     end
 
     # Unified Files Interface

data/lib/greenhat/shell.rb

@@ -59,11 +59,11 @@ module GreenHat
       file_list = Dir['/var/log/gitlab/*/current'] + Dir['/var/log/gitlab/*/*.log']
 
       file_list.each do |file|
-        next if File.size(file).zero?
+        next if File.empty?(file)
 
         puts "- Loading #{file.pastel(:green)}"
 
-        archive.things_create(file: file).setup
+        archive.things_create(file:).setup
       end
     end
 

data/lib/greenhat/thing/file_types.rb

@@ -920,6 +920,12 @@ module GreenHat
             /vmstat/
           ]
         },
+        'date' => {
+          format: :raw,
+          pattern: [
+            /date/
+          ]
+        },
         'gitlab-kas/config' => {
           format: :raw,
           pattern: [
@@ -962,6 +968,12 @@ module GreenHat
             /rpm_verify/
           ]
         },
+        'gitlab_system_status' => {
+          format: :raw,
+          pattern: [
+            /gitlab_system_status/
+          ]
+        },
         'gitlab-rails/application.log' => {
           format: :raw,
           pattern: [
@@ -989,6 +1001,13 @@ module GreenHat
             %r{sidekiq/perf.data}
           ]
         },
+        'gitlab-rails/geo.log' => {
+          format: :json,
+          log: true,
+          pattern: [
+            %r{gitlab-rails/geo.log}
+          ]
+        },
 
         # ======================================================================
         # KubeSoS TODO Section
@@ -1014,6 +1033,10 @@ module GreenHat
         'kubesos' => {
           format: :raw,
           pattern: [
+            /license_info/,
+            %r{etc/sshd_config},
+            /btmp_size/,
+            /user_uid/,
             /all_values.yaml/,
             %r{webservice.log/sidekiq_client.log},
             /chart-version/,

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

@@ -8,19 +8,26 @@ module GreenHat
     # Primarily for gitlab-rails/api_json.log
     def format_api_json
       self.result = raw.map do |row|
+        # Seeing regular edge cases where there is random new non-json
+        # at the beginning of a log / Attempt to save first entry
+        if row[0] != '{'
+          # Nothing to Escape Parse
+          next unless row.include?('{')
+
+          row = "{#{row.split('{', 2).last}"
+        end
+
         result = Oj.load row
 
         # Parsing Time
         format_time(result)
 
-        # flatten_hash(result).sort.to_h
         result
       rescue StandardError => e
         # TODO: Background Logger?
-        e.message
-        LogBot.warn('JSON Parse', e.message)
+        LogBot.warn('[API JSON] JSON Parse', "#{e.message}: #{row.inspect}")
         next
-      end
+      end.compact
 
       :ok
     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: method, path: path, protocol: protocol, status: status, bytes: bytes)
+          result.merge!(method:, path:, protocol:, status:, 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

@@ -14,6 +14,9 @@ module GreenHat
           { message: row }
         end
 
+        # Skip bad results
+        next if result.nil?
+
         # Parsing Time / Recusrive is really slow
         format_time(result)
 
@@ -47,6 +50,9 @@ module GreenHat
 
     # Loop through potential fields and parse as needed
     def format_time(result)
+      # Don't format integers
+      # return if result.is_a? Integer
+
       format_time_fields.each do |field|
         result[field] = format_time_parse(result[field]) if result.key?(field)
       rescue StandardError => e

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

@@ -7,11 +7,7 @@ module GreenHat
     # ==========================================================================
     def format_json_shell
       self.result = raw.map do |row|
-        result = begin
-          Oj.load row
-        rescue EncodingError
-          json_shellwords_fallback row
-        end
+        result = format_json_row(row)
 
         # Parsing Time
         format_time(result)
@@ -25,6 +21,17 @@ module GreenHat
       :ok
     end
 
+    # Simplify Map Loop / Short Circuit for weird entries
+    def format_json_row(row)
+      return { message: row } if row[0] != '{' && !row.include?('{')
+
+      begin
+        Oj.load row
+      rescue EncodingError
+        json_shellwords_fallback row
+      end
+    end
+
     def json_shellwords_fallback(row)
       result = Shellwords.split(row).each_with_object({}) do |x, h|
         key, value = x.split('=')

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

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

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

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

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

@@ -23,11 +23,11 @@ module GreenHat
 
       entry = {
         time: format_time_parse("#{month} #{day} #{time}"),
-        device: device,
-        service: service,
-        message: message,
-        pid: pid,
-        row: row # Insert full row for different timestamp formats
+        device:,
+        service:,
+        message:,
+        pid:,
+        row: # Insert full row for different timestamp formats
       }
 
       # Remove Empty Keys

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

@@ -22,10 +22,10 @@ module GreenHat
 
       {
         time: format_time_parse("#{month} #{day} #{time}"),
-        device: device,
-        service: service,
-        message: message,
-        pid: pid
+        device:,
+        service:,
+        message:,
+        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

@@ -34,7 +34,7 @@ module GreenHat
     end
 
     def self.add(name, type)
-      files[name] = { type: type, time: expire }
+      files[name] = { type:, time: expire }
 
       write
     end

data/lib/greenhat/thing/info_format.rb

@@ -103,7 +103,7 @@ module GreenHat
           obj[headers[i]] = v
         end
       end
-      { headers: headers, list: list }
+      { headers:, 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: unit, status: status }
+        { unit:, status: }
       end
       all.reject! { |x| x[:unit].nil? }
       all.sort_by(&:unit)

data/lib/greenhat/thing/kind.rb

@@ -44,7 +44,11 @@ module GreenHat
     end
 
     def check_oj_parse?(first_line)
-      Oj.load(first_line)
+      result = Oj.load(first_line)
+
+      # Extra Validation (Oj is being more generous than we want)
+      return false if result.is_a? Integer
+
       true
     rescue StandardError
       false

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: title)
+      @spinner.update(title:)
 
       # Don't Auto spin when debug output is happening
       @spinner.auto_spin unless ENV['DEBUG']

data/lib/greenhat/version.rb

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

data/lib/greenhat/web/faststats.rb

@@ -29,7 +29,7 @@ module WebHelpers
 
     # Handle Short Results
     top = results.dig(kind, :stats).sort_by { |_k, v| v[:duration] }
-    top = top.size >= 10 ? top[-10..] : top
+    top = top[-10..] if top.size >= 10
 
     top.to_h.map do |k, v|
       count_perc = percent(v[:count], count)

data/lib/greenhat/web/helpers.rb

@@ -150,7 +150,7 @@ module WebHelpers
       data = default_index.clone
       data.transform_values! { |_y| [] } # Ensure Uniq
       list[stack] = {
-        name: stack, data: data
+        name: stack, data:
       }
     end
 

metadata

@@ -1,101 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: greenhat
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Davin Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-03 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: amazing_print
+  name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.14'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: actionview
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -109,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: amazing_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: chartkick
   requirement: !ruby/object:Gem::Requirement
@@ -609,14 +539,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.5
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: GitLab SOS Tool