greenhat 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e82009def6948189e79cbb259088c57da5e1f22aa50e5c47a560a76e2a16e9e
-  data.tar.gz: 31fe1dbb0ec0d740e962942f6d4c511b8c5facebee16411e6daa0d93c1272d47
+  metadata.gz: 0107064d86f7742b834d46b40d19cf8de0a8ec0d37445c0a514d778b7faef7dd
+  data.tar.gz: 9a980031e5c392d1801901a67433a8999d6ed72ed468d0f444a4d37a794f6cf0
 SHA512:
-  metadata.gz: 1719579efd5c3accf5fe402c5b57e51c7613a530bc715f0e71e88e6a8dac7ac05cb965e4d0351dcd8a0fe38aefe4f16dbf76c4692fe93cff40aa325c38a72a10
-  data.tar.gz: d953dec24128e963a38b58949214d76b5ae32ee0a0f01f47997201ff07a24219f2b8911e06121022d76235ccf5105766cbacb39f3402d796484ef0e24799d42e
+  metadata.gz: 260b3a5f31f732c33a20812be19264108d3691f44329d44665bbb7d032256cd58c3616177c098eefc8f7abdf402fc10b88e513ab56a9e59acc22539cab6d4437
+  data.tar.gz: e6dd3c2ddcaef6d3644fbd14425cda9caa0a3281a2949fdde185a9b3e37c07db5bad977346e3b01112cd653f77462efae81ff2fba7a615d87bf7b149d3ceb97d

data/lib/greenhat/archive.rb

@@ -48,32 +48,42 @@ module GreenHat
     end
     # rubocop:enable Style/SymbolProc
 
+    # 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.
+    def self.unpack_cmd(run_me, archive_path)
+      stdout, stderr, status = Open3.capture3(run_me)
+
+      if status.success?
+        # No Doubling Up
+        FileUtils.rm_f(archive_path)
+        return
+      end
+      # Simplified Logging
+      base_name = File.basename(archive_path)
+
+      LogBot.warn('Archive', "Unable to decompress #{base_name.pastel(:green)}, moving to #{base_name}.broken")
+      LogBot.warn('Archive', "STDOUT: #{stdout.pastel(:red)}")
+      LogBot.warn('Archive', "STDERR: #{stderr.pastel(:red)}")
+      FileUtils.mv(archive_path, "#{archive_path}.broken")
+    end
+
     # Handle Different Types of Archives
     def self.unpack(archive_path, path)
-      decompressed_successfully = false
-
       case File.extname archive_path
       when '.tgz', '.tar'
         base_path = archive_path.gsub(File.basename(archive_path), '')
-        `bsdtar -xf "#{archive_path}" -C #{base_path}`
-
-        decompressed_successfully = $CHILD_STATUS.success?
-        FileUtils.rm(archive_path) if decompressed_successfully
+        unpack_cmd("bsdtar -xf #{archive_path} -C #{base_path}", archive_path)
       when '.gz'
-        `gzip -d "#{archive_path}"`
-
-        decompressed_successfully = $CHILD_STATUS.success?
+        unpack_cmd("gzip -d #{archive_path}", archive_path)
       when '.zip'
         base_path = archive_path.gsub(File.basename(archive_path), '')
-        `unzip -o -d "#{base_path}" #{archive_path}`
+        unpack_cmd("unzip -o -d #{base_path} #{archive_path}", 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?
+        unpack_cmd("bzip2 -d #{archive_path}", archive_path)
       when '.s'
+        # LogBot.info('Archive', file: archive_path, message: 'Rename .s files')
         # Find Original Directory, Split Path, Rename to .gz
         base_path = archive_path.gsub(File.basename(archive_path), '')
         FileUtils.mv(archive_path, "#{base_path}/#{File.basename(archive_path, '.s')}.gz")
@@ -81,14 +91,12 @@ module GreenHat
         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
+    # Safety Exception Handling to Prevent Endless looping
+    rescue StandardError => e
+      LogBot.fatal('Archive', file: archive_path, message: e.message, backtrace: e.backtrace.first)
 
-      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")
+      # Safety no looping
+      FileUtils.rm_f(archive_path)
     end
 
     def self.archive?(file_name)

data/lib/greenhat/thing/file_types.rb

@@ -24,6 +24,36 @@ module GreenHat
             %r{gitlab/gitlab.rb}
           ]
         },
+        'gitaly_check' => {
+          format: :raw,
+          pattern: [
+            /gitaly_check/
+          ]
+        },
+        'gitaly_internal_api_check' => {
+          format: :raw,
+          pattern: [
+            /gitaly_internal_api_check/
+          ]
+        },
+        'lsblk' => {
+          format: :raw,
+          pattern: [
+            /lsblk/
+          ]
+        },
+        'zoekt_info' => {
+          format: :raw,
+          pattern: [
+            /zoekt_info/
+          ]
+        },
+        'systemd_detect_virt' => {
+          format: :raw,
+          pattern: [
+            /systemd_detect_virt/
+          ]
+        },
         'cpuinfo' => {
           format: :raw,
           pattern: [

data/lib/greenhat/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: greenhat
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Davin Walker
 bindir: bin
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2025-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview