kpm 0.7.2 → 0.8.0

data/lib/kpm/system_helpers/cpu_information.rb

@@ -1,72 +1,73 @@
+# frozen_string_literal: true
+
 module KPM
   module SystemProxy
-    module CpuInformation
-      class << self
-        def fetch
-          cpu_info = nil
-          if OS.windows?
-            cpu_info = fetch_windows
-          elsif OS.linux?
-            cpu_info = fetch_linux
-          elsif OS.mac?
-            cpu_info = fetch_mac
-          end
+    class CpuInformation
+      attr_reader :cpu_info, :labels
 
-          cpu_info
-        end
+      def initialize
+        @cpu_info = fetch
+        @labels = [{ label: :cpu_detail },
+                   { label: :value }]
+      end
+
+      private
 
-        def get_labels
-          labels = [{:label => :cpu_detail},
-                    {:label => :value}]
-          labels
+      def fetch
+        cpu_info = nil
+        if OS.windows?
+          cpu_info = fetch_windows
+        elsif OS.linux?
+          cpu_info = fetch_linux
+        elsif OS.mac?
+          cpu_info = fetch_mac
         end
 
-        private
-          def fetch_linux
-            cpu_data = `cat /proc/cpuinfo 2>&1`.gsub("\t",'')
-            cpu = get_hash(cpu_data)
-            cpu
-          end
+        cpu_info
+      end
 
-          def fetch_mac
-            cpu_data = `system_profiler SPHardwareDataType | grep -e "Processor" -e "Cores" -e "Cache" 2>&1`
-            cpu = get_hash(cpu_data)
-            cpu
-          end
+      def fetch_linux
+        cpu_data = `cat /proc/cpuinfo 2>&1`.gsub("\t", '')
+        build_hash(cpu_data)
+      end
 
-          def fetch_windows
-            cpu_name = `wmic cpu get Name`.split("\n\n")
-            cpu_caption = `wmic cpu get Caption`.split("\n\n")
-            cpu_max_clock_speed = `wmic cpu get MaxClockSpeed`.split("\n\n")
-            cpu_device_id = `wmic cpu get DeviceId`.split("\n\n")
-            cpu_status = `wmic cpu get Status`.split("\n\n")
+      def fetch_mac
+        cpu_data = `system_profiler SPHardwareDataType | grep -e "Processor" -e "Cores" -e "Cache" 2>&1`
+        build_hash(cpu_data)
+      end
 
-            cpu = Hash.new
-            cpu[cpu_name[0].to_s.strip] = {:cpu_detail => cpu_name[0].to_s.strip, :value => cpu_name[1].to_s.strip}
-            cpu[cpu_caption[0].to_s.strip] = {:cpu_detail => cpu_caption[0].to_s.strip, :value => cpu_caption[1].to_s.strip}
-            cpu[cpu_max_clock_speed[0].to_s.strip] = {:cpu_detail => cpu_max_clock_speed[0].to_s.strip, :value => cpu_max_clock_speed[1].to_s.strip}
-            cpu[cpu_device_id[0].to_s.strip] = {:cpu_detail => cpu_device_id[0].to_s.strip, :value => cpu_device_id[1].to_s.strip}
-            cpu[cpu_status[0].to_s.strip] = {:cpu_detail => cpu_status[0].to_s.strip, :value => cpu_status[1].to_s.strip}
+      def fetch_windows
+        cpu_name = `wmic cpu get Name`.split("\n\n")
+        cpu_caption = `wmic cpu get Caption`.split("\n\n")
+        cpu_max_clock_speed = `wmic cpu get MaxClockSpeed`.split("\n\n")
+        cpu_device_id = `wmic cpu get DeviceId`.split("\n\n")
+        cpu_status = `wmic cpu get Status`.split("\n\n")
 
-            cpu
-          end
+        cpu = {}
+        cpu[cpu_name[0].to_s.strip] = { cpu_detail: cpu_name[0].to_s.strip, value: cpu_name[1].to_s.strip }
+        cpu[cpu_caption[0].to_s.strip] = { cpu_detail: cpu_caption[0].to_s.strip, value: cpu_caption[1].to_s.strip }
+        cpu[cpu_max_clock_speed[0].to_s.strip] = { cpu_detail: cpu_max_clock_speed[0].to_s.strip, value: cpu_max_clock_speed[1].to_s.strip }
+        cpu[cpu_device_id[0].to_s.strip] = { cpu_detail: cpu_device_id[0].to_s.strip, value: cpu_device_id[1].to_s.strip }
+        cpu[cpu_status[0].to_s.strip] = { cpu_detail: cpu_status[0].to_s.strip, value: cpu_status[1].to_s.strip }
 
-          def get_hash(data)
-            cpu = Hash.new
+        cpu
+      end
 
-            unless data.nil?
-              data.split("\n").each do |info|
-                infos = info.split(':')
+      def build_hash(data)
+        cpu = {}
+        return cpu if data.nil?
 
-                unless infos[0].to_s.strip.eql?('flags')
-                  cpu[infos[0].to_s.strip] = {:cpu_detail => infos[0].to_s.strip, :value => infos[1].to_s.strip}
-                end
-              end
-            end
+        data.split("\n").each do |info|
+          infos = info.split(':')
 
-            cpu
-          end
+          key = infos[0].to_s.strip
+          next if key.empty? || key.eql?('flags')
+
+          cpu[key] = { cpu_detail: key, value: infos[1].to_s.strip }
         end
+
+        cpu
+      end
     end
   end
-end
+end

data/lib/kpm/system_helpers/disk_space_information.rb

@@ -1,84 +1,81 @@
+# frozen_string_literal: true
+
 module KPM
   module SystemProxy
-    module DiskSpaceInformation
-      class << self
-
-        def fetch
-          disk_space_info = nil
-          if OS.windows?
-            disk_space_info = fetch_windows
-          elsif OS.linux?
-            disk_space_info = fetch_linux_mac(5)
-          elsif OS.mac?
-            disk_space_info = fetch_linux_mac(8)
-          end
+    class DiskSpaceInformation
+      attr_reader :disk_space_info, :labels
+
+      def initialize
+        data_keys = []
+        @disk_space_info = fetch(data_keys)
+        @labels = []
+        data_keys.each { |key| @labels.push(label: key.gsub(' ', '_').to_sym) }
+      end
 
-          disk_space_info
-        end
+      private
 
-        def get_labels
-          labels = []
-          @@data_keys.each { |key| labels.push({:label => key.gsub(' ','_').to_sym})}
-          labels
+      def fetch(data_keys)
+        disk_space_info = nil
+        if OS.windows?
+          disk_space_info = fetch_windows(data_keys)
+        elsif OS.linux?
+          disk_space_info = fetch_linux_mac(5, data_keys)
+        elsif OS.mac?
+          disk_space_info = fetch_linux_mac(8, data_keys)
         end
 
-        private
-          def fetch_linux_mac(cols_count)
-            disk_space_info = `df 2>&1`
-            disk_space = get_hash(disk_space_info,cols_count,true)
-            disk_space
-          end
+        disk_space_info
+      end
 
-          def fetch_windows
-            disk_space_info = `wmic logicaldisk get size,freespace,caption 2>&1`
-            disk_space = get_hash(disk_space_info,3,false)
-            disk_space
-          end
+      def fetch_linux_mac(cols_count, data_keys)
+        disk_space_info = `df 2>&1`
+        build_hash(disk_space_info, cols_count, true, data_keys)
+      end
 
-          def get_hash(data, cols_count, merge_last_two_columns)
-            disk_space = Hash.new
+      def fetch_windows(data_keys)
+        disk_space_info = `wmic logicaldisk get size,freespace,caption 2>&1`
+        build_hash(disk_space_info, 3, false, data_keys)
+      end
 
-            unless data.nil?
+      def build_hash(data, cols_count, merge_last_two_columns, data_keys)
+        disk_space = {}
 
-              data_table = data.split("\n")
+        unless data.nil?
 
-              @@data_keys = data_table[0].split(' ')
+          data_table = data.split("\n")
 
-              if merge_last_two_columns
-                @@data_keys[@@data_keys.length - 2] = @@data_keys[@@data_keys.length - 2] + ' ' + @@data_keys[@@data_keys.length - 1]
-                @@data_keys.delete_at(@@data_keys.length - 1)
-              end
+          data_keys.concat(data_table[0].split(' '))
 
-              row_num = 0
-              data_table.each do |row|
-                cols = row.split(' ')
-                row_num += 1
-                unless cols[0].to_s.eql?(@@data_keys[0])
-                  key = 'DiskInfo_'+row_num.to_s
-                  disk_space[key] = Hash.new
-                  cols.each_index do |idx|
-                    if idx > cols_count
-                      break
-                    end
-
-                    value = cols[idx].to_s.strip
-                    if idx == cols_count && cols.length - 1 > idx
-                      for i in cols_count+1..cols.length
-                        value += ' ' + cols[i].to_s.strip
-                      end
-                    end
-
-                    disk_space[key][@@data_keys[idx].gsub(' ','_').to_sym] = value
-                  end
-                end
+          if merge_last_two_columns
+            data_keys[data_keys.length - 2] = data_keys[data_keys.length - 2] + ' ' + data_keys[data_keys.length - 1]
+            data_keys.delete_at(data_keys.length - 1)
+          end
 
+          row_num = 0
+          data_table.each do |row|
+            cols = row.split(' ')
+            row_num += 1
+            next if cols[0].to_s.eql?(data_keys[0])
+
+            key = 'DiskInfo_' + row_num.to_s
+            disk_space[key] = {}
+            cols.each_index do |idx|
+              break if idx > cols_count
+
+              value = cols[idx].to_s.strip
+              if idx == cols_count && cols.length - 1 > idx
+                (cols_count + 1..cols.length).each do |i|
+                  value += ' ' + cols[i].to_s.strip
+                end
               end
-            end
 
-            disk_space
+              disk_space[key][data_keys[idx].gsub(' ', '_').to_sym] = value
+            end
           end
+        end
 
+        disk_space
       end
     end
   end
-end
+end

data/lib/kpm/system_helpers/entropy_available.rb

@@ -1,52 +1,50 @@
+# frozen_string_literal: true
+
 module KPM
   module SystemProxy
-    module EntropyAvailable
-      class << self
-
-        def fetch
-          entropy_available = nil
-          if OS.windows?
-            entropy_available = fetch_windows
-          elsif OS.linux?
-            entropy_available = fetch_linux
-          elsif OS.mac?
-            entropy_available = fetch_mac
-          end
-
-          entropy_available
-        end
+    class EntropyAvailable
+      attr_reader :entropy_available, :labels
+
+      def initialize
+        @entropy_available = fetch
+        @labels = [{ label: :entropy },
+                   { label: :value }]
+      end
+
+      private
 
-        def get_labels
-          labels = [{:label => :entropy},
-                    {:label => :value}]
-          labels
+      def fetch
+        entropy_available = nil
+        if OS.windows?
+          entropy_available = fetch_windows
+        elsif OS.linux?
+          entropy_available = fetch_linux
+        elsif OS.mac?
+          entropy_available = fetch_mac
         end
 
-        private
-          def fetch_linux
-            entropy_available_data = `cat /proc/sys/kernel/random/entropy_avail 2>&1`.gsub("\n",'')
-            entropy_available = get_hash(entropy_available_data)
-            entropy_available
-          end
+        entropy_available
+      end
 
-          def fetch_mac
-            entropy_available = get_hash('-')
-            entropy_available
-          end
+      def fetch_linux
+        entropy_available_data = `cat /proc/sys/kernel/random/entropy_avail 2>&1`.gsub("\n", '')
+        build_hash(entropy_available_data)
+      end
 
-          def fetch_windows
-            entropy_available = get_hash('-')
-            entropy_available
-          end
+      def fetch_mac
+        build_hash('-')
+      end
 
-          def get_hash(data)
-            entropy_available = Hash.new
-            entropy_available['entropy_available'] = {:entropy => 'available', :value => data}
+      def fetch_windows
+        build_hash('-')
+      end
 
-            entropy_available
-          end
+      def build_hash(data)
+        entropy_available = {}
+        entropy_available['entropy_available'] = { entropy: 'available', value: data }
 
+        entropy_available
       end
     end
   end
-end
+end

data/lib/kpm/system_helpers/memory_information.rb

@@ -1,71 +1,72 @@
+# frozen_string_literal: true
+
 module KPM
   module SystemProxy
-    module MemoryInformation
-      class << self
+    class MemoryInformation
+      attr_reader :memory_info, :labels
 
-        def fetch
-          memory_info = nil
-          if OS.windows?
-            memory_info = fetch_windows
-          elsif OS.linux?
-            memory_info = fetch_linux
-          elsif OS.mac?
-            memory_info = fetch_mac
-          end
+      def initialize
+        @memory_info = fetch
+        @labels = [{ label: :memory_detail },
+                   { label: :value }]
+      end
 
-          memory_info
-        end
+      private
 
-        def get_labels
-          labels = [{:label => :memory_detail},
-                    {:label => :value}]
-          labels
+      def fetch
+        memory_info = nil
+        if OS.windows?
+          memory_info = fetch_windows
+        elsif OS.linux?
+          memory_info = fetch_linux
+        elsif OS.mac?
+          memory_info = fetch_mac
         end
 
-        private
-          def fetch_linux
-            mem_data = `cat /proc/meminfo 2>&1`.gsub("\t",'')
-            mem = get_hash(mem_data)
-            mem
-          end
+        memory_info
+      end
 
-          def fetch_mac
-            mem_data = `vm_stat 2>&1`.gsub(".",'')
-            mem = get_hash(mem_data)
+      def fetch_linux
+        mem_data = `cat /proc/meminfo 2>&1`.gsub("\t", '')
+        build_hash(mem_data)
+      end
 
-            mem.each_key do |key|
-              mem[key][:value] = ((mem[key][:value].to_i * 4096) / 1024 / 1024).to_s + 'MB'
-              mem[key][:memory_detail] = mem[key][:memory_detail].gsub('Pages','Memory')
-            end
+      def fetch_mac
+        mem_data = `vm_stat 2>&1`.gsub('.', '')
+        mem_total_data = `system_profiler SPHardwareDataType | grep "  Memory:" 2>&1`
+        build_hash_mac(mem_data, mem_total_data)
+      end
 
-            mem_total_data = `system_profiler SPHardwareDataType | grep "  Memory:" 2>&1`
-            mem_total = get_hash(mem_total_data)
+      def build_hash_mac(mem_data, mem_total_data)
+        mem = build_hash(mem_data)
 
-            mem = mem_total.merge(mem)
+        mem.each_key do |key|
+          mem[key][:value] = ((mem[key][:value].to_i * 4096) / 1024 / 1024).to_s + 'MB'
+          mem[key][:memory_detail] = mem[key][:memory_detail].gsub('Pages', 'Memory')
+        end
 
-            mem
-          end
+        mem_total = build_hash(mem_total_data)
 
-          def fetch_windows
-            mem_data = `systeminfo | findstr /C:"Total Physical Memory" /C:"Available Physical Memory"`
-            mem = get_hash(mem_data)
-            mem
-          end
+        mem_total.merge(mem)
+      end
 
-          def get_hash(data)
-            mem = Hash.new
+      def fetch_windows
+        mem_data = `systeminfo | findstr /C:"Total Physical Memory" /C:"Available Physical Memory"`
+        build_hash(mem_data)
+      end
 
-            unless data.nil?
-              data.split("\n").each do |info|
-                infos = info.split(':')
-                mem[infos[0].to_s.strip] = {:memory_detail => infos[0].to_s.strip, :value => infos[1].to_s.strip}
-              end
-            end
+      def build_hash(data)
+        mem = {}
+        return mem if data.nil?
 
-            mem
-          end
+        data.split("\n").each do |info|
+          infos = info.split(':')
+          key = infos[0].to_s.strip.gsub('"', '')
+          mem[key] = { memory_detail: key, value: infos[1].to_s.strip }
+        end
 
+        mem
       end
     end
   end
-end
+end