greenhat 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c055abc7397135be9ca07e7965fc88d67f1d7d16099a5cc5db1977986490361
-  data.tar.gz: 2e2f66a3bbc5bdc84e8b5bef9abfa28706f48841f25c7e642fe352c063745e22
+  metadata.gz: 6ff63bc1345ac9a27d3fa6263fc3a68e9c851aa30f2b3bf58cdee484ce142cbb
+  data.tar.gz: a150c0d19b954883ef2372280b78a89606a5e9039944b794289c9541c3548ed3
 SHA512:
-  metadata.gz: d9fcd1274e4887fa332a053185ea1049e5db2f3d449714542a31084234326d48623e95e0fb8678b6cb67b20b636ec04c82db1555ff43aac09f158d6df4fc7dc0
-  data.tar.gz: c6fe018479b7cc90f2e70b411761fe5e3b8da5d4237064e3bb450399f966cf00a0302adc433ebf39fad57565ca11efbd95fbd0601a15f2989bc1c6455029a4e8
+  metadata.gz: 7011298d19ac200f7ea4bd10686642ac30911cbd509eb7dd0152a29b88f4dedd942803fdbd4198a9374e868d060cdf7f3458860c407210d0aa4e5a3e812d63e9
+  data.tar.gz: 8a7cdc716bd4c7f6edddfae2488593f2ec17908203218df57d542057753973528262ff96d1b9986b7c02ec4a08f33a740e0ba162e32752c75725c2c2a60affb5

data/lib/greenhat/accessors/memory.rb

@@ -6,7 +6,7 @@ module GreenHat
     end
 
     def self.percentage(used, total)
-      return 0 if used.to_i.zero?
+      return 0 if used.to_i.zero? || total.to_i.zero?
 
       # Show at least one bar if below 1%
       [1, ((used.to_i / total.to_f).round(1) * 100).round].max

data/lib/greenhat/shell/markdown.rb

@@ -127,8 +127,11 @@ module GreenHat
       output << exception_errors if exceptions_log
       output << gitaly_errors if gitaly_log
 
-      # Keep Alphabetical Sort
-      groups = output.each_slice((output.size / 3.to_f).round).to_a
+      # Keep Alphabetical Sort / Allow for only one
+      slice_size = (output.size / 3.to_f).round
+      slice_size = 1 unless slice_size.positive?
+
+      groups = output.each_slice(slice_size).to_a
 
       table = TTY::Table.new do |t|
         loop do
@@ -285,21 +288,6 @@ module GreenHat
       ].join
     end
 
-    # def memory_perc
-    #   total = ShellHelper.human_size_to_number(meminfo.data['MemTotal'])
-    #   free = ShellHelper.human_size_to_number(meminfo.data['MemFree'])
-    #   used = percent((total - free), total)
-
-    #   [
-    #     title('Usage'),
-    #     '  ['.pastel(:bright_black),
-    #     '='.pastel(:green) * (used / 2),
-    #     ' ' * (50 - used / 2),
-    #     ']'.pastel(:bright_black),
-    #     " #{100 - percent(free, total)}%".pastel(:green) # Inverse
-    #   ].join
-    # end
-
     def memory_free
       free = free_m.data.find { |x| x.kind == 'Mem' }
 

data/lib/greenhat/shell/report.rb

@@ -306,6 +306,7 @@ module GreenHat
       ].join
     end
 
+    # rubocop:disable Metrics/MethodLength
     def memory_free
       free = free_m.data.find { |x| x.kind == 'Mem' }
 
@@ -313,22 +314,39 @@ module GreenHat
 
       formatted_mem = free_m.data.map { |x| GreenHat::Memory.memory_row x }
 
-      [
-        title('Total', :cyan, 14),
-        number_to_human_size(free.total.to_i * 1024**2),
-        "\n",
-        title('Used', :yellow, 14),
-        number_to_human_size(free.used.to_i * 1024**2),
-        "\n",
-        title('Free', :blue, 14),
-        number_to_human_size(free.free.to_i * 1024**2),
-        "\n",
-        title('Available', :green, 14),
-        number_to_human_size(free.available.to_i * 1024**2),
-        "\n\n",
-        formatted_mem.map { |x| x.prepend ' ' * 2 }.join("\n")
-      ].join
+      output = []
+      unless free.total.blank?
+        output << title('Total', :cyan, 14)
+        output << number_to_human_size(free.total.to_i * 1024**2)
+        output << "\n"
+      end
+
+      unless free.total.blank?
+        output << title('Used', :yellow, 14)
+        output << number_to_human_size(free.used.to_i * 1024**2)
+        output << "\n"
+      end
+
+      unless free.total.blank?
+        output << title('Free', :blue, 14)
+        output << number_to_human_size(free.free.to_i * 1024**2)
+        output << "\n"
+      end
+
+      unless free.total.blank?
+        output << title('Available', :green, 14)
+        output << number_to_human_size(free.available.to_i * 1024**2)
+        output << "\n"
+      end
+
+      output << "\n"
+      output << formatted_mem.map { |x| x.prepend ' ' * 2 }.join("\n")
+
+      output.join
+    rescue StandardError => e
+      LogBot.fatal('Memory', message: e.message, backtrace: e.backtrace.first)
     end
+    # rubocop:enable Metrics/MethodLength
 
     def disks
       # GreenHat::Disk.df({archive: []})

data/lib/greenhat/thing/file_types.rb

@@ -94,6 +94,12 @@ module GreenHat
             /getenforce/
           ]
         },
+        'geo-logcursor/current' => {
+          format: :raw,
+          pattern: [
+            %r{geo-logcursor/current}
+          ]
+        },
         'gitaly/current' => {
           format: :json_shell,
           log: true,

data/lib/greenhat/version.rb

@@ -1,3 +1,3 @@
 module GreenHat
-  VERSION = '0.3.4'.freeze
+  VERSION = '0.3.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greenhat
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Davin Walker