mool 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: 3b461e0aedab1998e9c0442875e2099805d2463f
-  data.tar.gz: c63a8eb327e217acadcbb4bb8b02a4be99790361
 SHA512: 
-  metadata.gz: 71261616439867bc8d6f45c6f6068576e4e04f6cea3bc15cb3427c052302c829e2eafd34cf4dd072fce3652859f0ac43b60604c839bf4c4a837a741a471c79d4
-  data.tar.gz: c0edc7c72bbf5c11d1fa02f002dea11c82580cb5b3eb2aa21b3f9f9bf862c7be64e7a3f2f3df44bf5bf5d2635b1e5864501774835dfc3f806a72a21c44869d79
+  data.tar.gz: e07dd657246723cdea9f2e264f99a30c9aad65f5c783c855e3400f64ccdae36eb948754f4e432fdee4f52e42f665db983ca371ebe4f71982c8a591ad5c57cbfb
+  metadata.gz: 68792e1d1e4f631f2e4058eeb1e2102e45e0b4ed0cf8ebafde94709623260c48e8fc7be610e4d53ea4d6861f989e60d97c67ec208d67c13d210dfd0ca2b6753a
+SHA1: 
+  data.tar.gz: 471d44dad63f429c3572b0fa516fcb39863fe745
+  metadata.gz: 7657dcd7d6041995180a5ce735414dad643a57c1

data/README.md

@@ -313,50 +313,23 @@ In this case we have only one messure, but exists especial cases, where the patt
           @pattern="urxvt">
 ```
 ### Disk
-It's possible to get disk, partition or virtual device information using dev name **MAJOR:MINOR** ("**8:2**"), device name **sda**, **sda1** or virtual device such as "**lvm-sda2**" or "**md0**".
+It's possible to get disk, partition or virtual device information using dev name **sda**, **sda1** or virtual device such as or "**md-0**". You can check `cat /proc/partitions`.
 ```ruby
-    >> Mool::Disk.new("8:0")
-       #<Mool::Disk:0x7fdc6e283f00 @logical_name="sda",
-                                   @total_block=500107862016.0,
-                                   @devtype="disk",
-                                   @mount_point="/boot",
-                                   @swap=false,
-                                   @minor="0",
-                                   @devname="sda",
-                                   @block_free=0.0,
-                                   @path="/sys/dev/block/8:0",
-                                   @major="8",
-                                   @file_system="ext4",
-                                   @unity="Bytes",
-                                   @block_used=0.0>
-    >> Mool::Disk.new("sda1")
-       #<Mool::Disk:0x7fdc6e266a40 @logical_name="sda1",
-                                   @total_block=262144000.0,
-                                   @devtype="partition",
-                                   @mount_point="/boot",
-                                   @swap=false,
-                                   @minor="1",
-                                   @devname="sda1",
-                                   @block_free=59062784.0,
-                                   @path="/sys/dev/block/8:1",
-                                   @major="8",
-                                   @file_system="ext4",
-                                   @unity="Bytes",
-                                   @block_used=57123840.0>
-    >> Mool::Disk.new("sdblvm-homelvm")
-       #<Mool::Disk:0x7fdc6e248658 @logical_name="sdblvm-homelvm",
-                                   @total_block=445602856960.0,
-                                   @devtype="disk",
-                                   @mount_point="/boot",
-                                   @swap=false,
-                                   @minor="3",
-                                   @devname="dm-3",
-                                   @block_free=187429210112.0,
-                                   @path="/sys/dev/block/252:3",
-                                   @major="252",
-                                   @file_system="btrfs",
-                                   @unity="Bytes",
-                                   @block_used=34269296640.0>
+    >> Mool::Disk.new("sda")
+    => #<Mool::Disk:0x000056407745c5a0
+       @block_free=0.0,
+       @block_used=0.0,
+       @devname="sda",
+       @devtype="disk",
+       @free_size=0.0,
+       @logical_name="sda",
+       @major="8",
+       @minor="0",
+       @path="/sys/block/sda",
+       @total_block=0.0,
+       @total_size=0.0,
+       @unity="Bytes",
+       @used_size=0.0>
 ```
 It's possible get all partition if the object is `@devtype="disk"`, such as:
 ```ruby
@@ -370,7 +343,7 @@ It's possible get all partition if the object is `@devtype="disk"`, such as:
                                       @minor="1",
                                       @devname="sda1",
                                       @block_free=59062784.0,
-                                      @path="/sys/dev/block/8:1",
+                                      @path="/sys/block/sda/sda1",
                                       @major="8",
                                       @file_system="ext4",
                                       @unity="Bytes",
@@ -382,7 +355,7 @@ It's possible get all partition if the object is `@devtype="disk"`, such as:
                                       @minor="2",
                                       @devname="sda2",
                                       @block_free=0.0,
-                                      @path="/sys/dev/block/8:2",
+                                      @path="/sys/block/sda/sda2",
                                       @major="8",
                                       @file_system="cgroup",
                                       @unity="Bytes",
@@ -394,7 +367,7 @@ It's possible get all partition if the object is `@devtype="disk"`, such as:
                                       @minor="3",
                                       @devname="sda3",
                                       @block_free=0.0,
-                                      @path="/sys/dev/block/8:3",
+                                      @path="/sys/block/sda/sda3",
                                       @major="8",
                                       @file_system=nil,
                                       @unity="Bytes",
@@ -413,7 +386,7 @@ Otherwise it's possible too get the slaves. The slaves are virtual devices for e
                                         @minor="0",
                                         @devname="dm-0",
                                         @block_free=9739984896.0,
-                                        @path="/sys/dev/block/252:0",
+                                        @path="/sys/block/sda/sda3/holders/dm-0",
                                         @major="252",
                                         @file_system="ext4",
                                         @unity="Bytes",
@@ -426,7 +399,7 @@ Otherwise it's possible too get the slaves. The slaves are virtual devices for e
                                         @minor="1",
                                         @devname="dm-1",
                                         @block_free=1926668288.0,
-                                        @path="/sys/dev/block/252:1",
+                                        @path="/sys/block/sda/sda3/holders/dm-1",
                                         @major="252",
                                         @file_system="ext4",
                                         @unity="Bytes",
@@ -439,7 +412,7 @@ Otherwise it's possible too get the slaves. The slaves are virtual devices for e
                                         @minor="2",
                                         @devname="dm-2",
                                         @block_free=5497151488.0,
-                                        @path="/sys/dev/block/252:2",
+                                        @path="/sys/block/sda/sda3/holders/dm-2",
                                         @major="252",
                                         @file_system="ext4",
                                         @unity="Bytes",
@@ -452,7 +425,7 @@ Otherwise it's possible too get the slaves. The slaves are virtual devices for e
                                         @minor="3",
                                         @devname="dm-3",
                                         @block_free=187430152192.0,
-                                        @path="/sys/dev/block/252:3",
+                                        @path="/sys/block/sda/sda3/holders/dm-3",
                                         @major="252",
                                         @file_system="btrfs",
                                         @unity="Bytes",
@@ -461,131 +434,15 @@ Otherwise it's possible too get the slaves. The slaves are virtual devices for e
 ```
 
 Other way is get all disk with yours parititons and slaves.
+
 ```ruby
     >> Mool::Disk.all
-       - !ruby/object:MoolDisk
-         block_free: 0.0
-         block_used: 0.0
-         devname: sda
-         evtype: disk
-         file_system: ext4
-         logical_name: sda
-         major: "8"
-         minor: "0"
-         mount_point: /boot
-         swap: false
-         total_block: 500107862016.0
-         unity: Bytes
-         partitions:
-         - !ruby/object:MoolDisk
-           block_free: 59062784.0
-           block_used: 57123840.0
-           devname: sda1
-           devtype: partition
-           file_system: ext4
-           logical_name: sda1
-           major: "8"
-           minor: "1"
-           mount_point: /boot
-           partitions: []
-           path: /sys/dev/block/8:1
-           slaves: []
-           swap: false
-           total_block: 262144000.0
-           unity: Bytes
-         - !ruby/object:MoolDisk
-           block_free: 0.0
-           block_used: 0.0
-           devname: sda2
-           devtype: partition
-           file_system: cgroup
-           logical_name: sda2
-           major: "8"
-           minor: "2"
-           partitions: []
-           path: /sys/dev/block/8:2
-           slaves: []
-           swap: true
-           total_block: 1073741824.0
-           unity: Bytes
-         - !ruby/object:MoolDisk
-           block_free:	0.0
-           block_used:	0.0
-           devname: sda3
-           devtype: partition
-           file_system:
-           logical_name: sda3
-           major: "8"
-           minor: "3"
-           partitions: []
-           path: /sys/dev/block/8:3
-           slaves:
-           - !ruby/object:MoolDisk
-             block_free: 9739984896.0
-             block_used: 5232629760.0
-             devname: dm-0
-             devtype: disk
-             file_system: ext4
-             logical_name: sdblvm-rootlvm
-             major: "252"
-             minor: "0"
-             path: /sys/dev/block/252:0
-             swap: false
-             total_block: 32212254720.0
-             unity: Bytes
-           - !ruby/object:MoolDisk
-             block_free: 1926668288.0
-             block_used: 4227072.0
-             devname: dm-1
-             devtype: disk
-             file_system: ext4
-             logical_name: sdblvm-tmplvm
-             major: "252"
-             minor: "1"
-             mount_point: /boot
-             path: /sys/dev/block/252:1
-             swap: false
-             total_block: 4294967296.0
-             unity: Bytes
-           - !ruby/object:MoolDisk
-             block_free: 5497149440.0
-             block_used: 1951401984.0
-             devname: dm-2
-             devtype: disk
-             file_system: ext4
-             logical_name: sdblvm-varlvm
-             major: "252"
-             minor: "2"
-             mount_point: /boot
-             path: /sys/dev/block/252:2
-             swap: false
-             total_block: 16106127360.0
-             unity: Bytes
-           - !ruby/object:MoolDisk
-             block_free: 187430135808.0
-             block_used: 34268346368.0
-             devname: dm-3
-             devtype: disk
-             file_system: btrfs
-             logical_name: sdblvm-homelvm
-             major: "252"
-             minor: "3"
-             mount_point: /boot
-             path: /sys/dev/block/252:3
-             swap: false
-             total_block: 445602856960.0
-             unity: Bytes
-             swap: false
-             total_block: 498770927616.0
-             unity: Bytes
-             path: /sys/dev/block/8:0
-             slaves: []
 ```
 
 Swap partition:
 
 ```ruby
-    >> MoolDisk.swap
+    >> Mool::Disk.swap
        #<Mool::Disk:0x7f711644d890 @file_system="cgroup",
                                    @unity="Bytes",
                                    @block_used=0.0,
@@ -593,7 +450,7 @@ Swap partition:
                                    @total_block=1073741824.0,
                                    @minor="2",
                                    @devtype="partition",
-                                   @path="/sys/dev/block/8:2",
+                                   @path="/sys/block/sda/sda2",
                                    @swap=true,
                                    @major="8",
                                    @ devname="sda2",

data/lib/mool/command.rb

@@ -1,90 +1,88 @@
 module Mool
   module Command
 
-    def self.cpuinfo_command
+    # CPU COMMANDS
+    def self.cpuinfo
       File.read('/proc/cpuinfo')
     end
 
-    def self.mpstat_command
+    def self.mpstat
       File.read('|mpstat -P ALL 1 1')
     end
 
-    def self.df_command
-      `POSIXLY_CORRECT=512 df`
-    end
-
-    def self.dev_name_command(dev_entry)
-      File.read("#{dev_entry}/dev")
+    # DISK COMMANDS
+    def self.logical_name(path)
+      File.read("#{path}/dm/name") rescue nil
     end
 
-    def self.mount_command
+    def self.mount
       File.read('/proc/mounts')
     end
 
-    def self.file_system_command
+    def self.file_system
       Dir.glob('/sys/fs/**/*')
     end
 
-    def self.logical_name_command(path)
-      File.exist?("#{path}/dm/name") ? File.read("#{path}/dm/name").chomp : nil
-    end
-
-    def self.uevent_command(path)
+    def self.uevent(path)
       File.read("#{path}/uevent")
     end
 
-    def self.swap_command(lname = nil)
+    def self.swap(lname = nil)
       result = File.read('/proc/swaps')
       lname.present? ? result[/#{lname} /] : result
     end
 
-    def self.capacity_partition_command(path)
-      File.read("#{path}/size")
+    def self.df
+      `POSIXLY_CORRECT=512 df`
     end
 
-    def self.partitions_command(path, devname)
-      Dir.glob("#{path}/#{devname}*")
+    def self.partitions(devname)
+      Dir.glob("/sys/block/#{devname}/#{devname}*")
     end
 
-    def self.dev_block_command
-      Dir.glob('/sys/dev/block/*')
+    def self.holders(path)
+      Dir.glob("#{path}/holders/*").uniq
     end
 
-    def self.real_path_block_command(entry)
-      `readlink -f #{entry}`.chomp
+    def self.all_partitions
+      File.read('/proc/partitions')
     end
 
-    def self.real_path_command_exist?(real_path)
-      File.exist?("#{real_path}/partition")
+    def self.root_block_device?(devname)
+      File.exist?("/sys/block/#{devname}") &&
+        !Dir.glob("/sys/block/#{devname}/slaves/*").present?
     end
 
-    def self.slaves_command(real_path)
-      Dir.glob("#{real_path}/slaves/*")
-    end
+    # def self.capacity_partition_command(path)
+    #   File.read("#{path}/size")
+    # end
 
-    def self.meminfo_command
+    # MEMORY COMMANDS
+    def self.meminfo
       File.read('/proc/meminfo')
     end
 
-    def self.ps_command
+    # PROCESS COMMANDS
+    def self.ps
       # `ps --no-headers -o pid,user,pcpu,pmem,rss,priority,time,stat,nice,args -A`
       `ps --no-headers -o ruser,user,rgroup,group,pid,ppid,pgid,pcpu,vsz,nice,etime,time,tty,comm,args=HEADER -A`
     end
 
-    def self.top_command
+    def self.top
       `top -c -b -n1`
     end
 
-    def self.uname_command
+    # SYSTEM COMMANDS
+    def self.uname
       `uname -r`.chomp
     end
 
-    def self.uptime_command
-      `cat /proc/uptime`.chomp
+    def self.loadavg
+      File.read('/proc/loadavg').chomp
     end
 
-    def self.loadavg_command
-      File.read('/proc/loadavg').chomp
+    def self.uptime
+      `cat /proc/uptime`.chomp
     end
   end
 end

data/lib/mool/cpu.rb

@@ -52,7 +52,7 @@ module Mool
     def self.cpuinfo
       cpu_info = {}
 
-      mpstat = Mool::Command.mpstat_command.split("\n\n")[2].split("\n").map do |i|
+      mpstat = Mool::Command.mpstat.split("\n\n")[2].split("\n").map do |i|
         i.gsub(/^\S+:/, '').strip.split(/\s+/)
       end
 
@@ -66,8 +66,8 @@ module Mool
         cpu_info.merge!(core_name => res)
       end
 
-      Mool::Command.cpuinfo_command.gsub(/([^\n])\n([^\n])/,
-                                         '\1 \2').scan(/processor\t*: (\d+).*model name\t*: (.*) stepping.*cpu cores\t*: (\d+)/).each do |v|
+      Mool::Command.cpuinfo.gsub(/([^\n])\n([^\n])/,
+                                 '\1 \2').scan(/processor\t*: (\d+).*model name\t*: (.*) stepping.*cpu cores\t*: (\d+)/).each do |v|
         cpu_info[v[0]]['model_name'] = v[1]
         cpu_info[v[0]]['cpu_cores'] = v[2]
       end
@@ -76,7 +76,7 @@ module Mool
     end
 
     def self.processors
-      Mool::Command.cpuinfo_command.scan(/processor\t*: (\d+)/).flatten + ['all']
+      Mool::Command.cpuinfo.scan(/processor\t*: (\d+)/).flatten + ['all']
     end
 
     def self.all

data/lib/mool/disk.rb

@@ -16,42 +16,38 @@ module Mool
                   :total_block,
                   :block_used,
                   :block_free,
+                  :logical_name,
                   :partitions,
                   :slaves,
                   :unity
 
-    def initialize(dev_name)
-      @path = nil
+    def initialize(devname, path = nil)
+      @unity = Mool::BYTES
+      @devname = devname
 
-      Mool::Command.dev_block_command.each do |entry|
-        logical_name = Mool::Command.logical_name_command(entry)
-        next unless Mool::Command.dev_name_command(entry).include?(dev_name) ||
-                    Mool::Command.uevent_command(entry).include?(dev_name) ||
-                    (logical_name.present? && logical_name.include?(dev_name))
-        @path = entry
-        break
-      end
+      @path = if path.nil?
+                Mool::Disk.proc_partitions_hash(@devname)[:path]
+              else
+                path
+              end
 
-      raise "Does't exist #{dev_name}!" if @path.nil?
+      raise "Does't exist #{devname} on #{@path}" if @path.nil? || @devname.nil?
+      lname = Mool::Command.logical_name(@path)
+      @logical_name = lname.blank? ? @devname : lname
       read_uevent
-      logical_name
-      swap
       capacity
-      @unity = Mool::BYTES
-      mounting_point
-      file_system
     end
 
     def mounting_point
       @mount_point = nil
-      Mool::Command.mount_command.include?(@logical_name) &&
-        @mount_point ||= Mool::Command.mount_command.scan(
-        /#{@logical_name} (\S+)/
+      Mool::Command.mount.include?(@devname) &&
+        @mount_point ||= Mool::Command.mount.scan(
+        /#{@devname} (\S+)/
       ).flatten.first
     end
 
     def file_system
-      files = Mool::Command.file_system_command.select do |a|
+      files = Mool::Command.file_system.select do |a|
         a.include?(@devname)
       end
 
@@ -59,45 +55,38 @@ module Mool
         @file_system ||= files.first.split('/')[3]
     end
 
-    def logical_name
-      lname = Mool::Command.logical_name_command(@path)
-      @logical_name = lname.present? ? lname : @devname
-    end
-
     def read_uevent
       @major,
       @minor,
       @devname,
       @devtype =
-      Mool::Command.uevent_command(@path).split("\n").map do |result|
+      Mool::Command.uevent(@path).split("\n").map do |result|
         result.split('=').last
       end
-      # Mool::Command.uevent_command(@path).scan(
-      #   /.*=(\d+)\n.*=(\d+)\n.*=(\S+)\n.*=(\w+)\n/
-      # ).flatten
     end
 
     def dev
       @major + @minor
     end
 
-    def is_disk?
+    def disk?
       @devtype == 'disk'
     end
 
-    def is_partition?
+    def partition?
       @devtype == 'partition'
     end
 
     def swap
-      @swap ||= Mool::Command.swap_command(@logical_name).present?
+      @swap ||= Mool::Command.swap(@devname).present?
     end
 
     def capacity
       return if defined?(@total_block) && defined?(@block_used) && defined?(@block_free)
-      result = Mool::Command.df_command.scan(
+      result = Mool::Command.df.scan(
         /(#{@logical_name}|#{@devname})\s+(\d+)\s+(\d+)\s+(\d+)\s+(\S+)/
       ).flatten
+
       # @total_block = Mool::Command.capacity_partition_command(@path).chomp.to_f
       @total_block = result[1].to_f
       @total_size = result[1].to_f * Mool::BLOCK_SIZE
@@ -110,26 +99,23 @@ module Mool
     end
 
     def partitions
-      return @partitions if defined? @partitions
-      return [] unless is_disk?
-
-      @partitions = Mool::Command.partitions_command(
-        @path,
-        @devname
-      ).map do |part|
-        Mool::Disk.new(part.split('/').last)
+      return @cache_partitions if defined? @cache_partitions
+      return [] unless disk?
+
+      paths = Mool::Command.partitions(@devname)
+
+      @cache_partitions = paths.map do |path|
+        Mool::Disk.new(path.split('/').last, path)
       end
     end
 
     def slaves
-      return @slaves if defined? @slaves
+      return @cache_slaves if defined? @cache_slaves
 
-      blocks = Mool::Command.dev_block_command.select do |entry|
-        File.directory?("#{entry}/slaves/#{@devname}")
-      end
+      slaves = Mool::Command.holders(@path)
 
-      @slaves = blocks.map do |slave|
-        Mool::Disk.new(slave.split('/').last)
+      @cache_slaves = slaves.map do |slave_devname|
+        Mool::Disk.new(slave_devname, @path + "/holders/#{slave_devname}")
       end
     end
 
@@ -173,21 +159,116 @@ module Mool
                     Mool::GBYTES)
     end
 
+    def self.swap
+      result = Mool::Command.swap.scan(%r{/.*\n\/dev\/(\S+)/}).flatten.first
+      Mool::Disk.new(result) unless result.nil?
+    end
+
+    def self.find_slaves(path, all_partitions)
+      slaves = Mool::Command.holders(path)
+
+      result = {}
+
+      slaves.each do |slave|
+        all_partitions.each do |partition|
+          devname = partition[3]
+          next unless slave.include?(devname)
+          all_partitions.delete(partition)
+          result[devname] = { path: path + "/holders/#{slave}" }
+        end
+      end
+
+      result
+    end
+
+    def self.find_partitions(disk, all_partitions)
+      parts = Mool::Command.partitions(disk)
+
+      result = {}
+
+      parts.each do |part|
+        all_partitions.each do |partition|
+          devname = partition[3]
+          next unless part.include?(devname)
+          all_partitions.delete(partition)
+          result[devname] = {
+            path: part,
+            slaves: find_slaves(part, all_partitions)
+          }
+        end
+      end
+
+      result
+    end
+
+    def self.find_especific_devname(obj, key)
+      if obj.respond_to?(:key?) && obj.key?(key)
+        obj[key]
+      elsif obj.respond_to?(:each)
+        r = nil
+        obj.find { |*a| r = find_especific_devname(a.last, key) }
+        r
+      end
+    end
+
+    def self.proc_partitions_hash(especific_devname = nil)
+      all_partitions = Mool::Command.all_partitions.scan(/(\d+)\s+(\d+)\s+(\d+)\s+(\S+)/)
+      hash_disks = {}
+
+      all_partitions.each do |partition|
+        if partition[3].include?('ram') || partition[3].include?('sr')
+          all_partitions.delete(partition)
+          next
+        end
+        devname = partition[3]
+        path = "/sys/block/#{devname}"
+        next unless Mool::Command.root_block_device?(devname)
+        all_partitions.delete(partition)
+        hash_disks[devname] = {
+          path: path,
+          partitions: find_partitions(devname, all_partitions),
+          slaves: find_slaves(path, all_partitions)
+        }
+      end
+
+      return hash_disks if especific_devname.nil?
+      find_especific_devname(hash_disks, especific_devname)
+    end
+
     def self.all
       disks = []
 
-      Mool::Command.dev_block_command.each do |entry|
-        real_path = Mool::Command.real_path_block_command(entry)
-        next unless !real_path.include?('virtual') &&
-                    !real_path.include?('/sr') &&
-                    !Mool::Command.real_path_command_exist?(real_path) &&
-                    Mool::Command.slaves_command(real_path).empty?
+      proc_partitions_hash.each do |disk_name, disk_opts|
+        all_partitions = []
+        disk = Mool::Disk.new(disk_name, disk_opts[:path])
 
-        disks << Mool::Disk.new(entry.split('/').last)
-      end
+        disk_opts[:partitions].map do |partition_name, partition_opts|
+          partition = Mool::Disk.new(
+            partition_name,
+            partition_opts[:path]
+          )
+
+          all_partitions << partition
+
+          partition.slaves = partition_opts[:slaves].map do |slave_name, slave_opts|
+            Mool::Disk.new(
+              slave_name,
+              slave_opts[:path]
+            )
+          end
+        end
 
-      disks.each { |disk| disk.partitions.each { |part| part.partitions && part.slaves }}
-      disks.each { |disk| disk.slaves.each { |part| part.partitions && part.slaves }}
+        disk.partitions = all_partitions
+
+        disk.slaves = disk_opts[:slaves].map do |slave_name, slave_opts|
+          Mool::Disk.new(
+            slave_name,
+            slave_opts[:path]
+          )
+        end
+
+        disks << disk
+      end
 
       disks.each do |disk|
         disk.partitions.each do |partition|
@@ -210,20 +291,5 @@ module Mool
 
       disks
     end
-
-    def self.swap
-      result = Mool::Command.swap_command.scan(%r{/.*\n\/dev\/(\S+)/}).flatten.first
-      Mool::Disk.new(result) unless result.nil?
-    end
-
-    def self.all_usable
-      result = Mool::Disk.all
-      result.each do |disk|
-        result += (disk.partitions +
-                   disk.slaves +
-                   (disk.partitions + disk.slaves).collect { |p| p.partitions + p.slaves }.flatten)
-      end
-      result.reject(&:blank?).select { |d| (d.partitions + d.slaves).blank? }
-    end
   end
 end

data/lib/mool/memory.rb

@@ -4,7 +4,7 @@ module Mool
     attr_accessor :unity, :mem_used
 
     def initialize
-      Mool::Command.meminfo_command.scan(/(\S+):\s+(\d+)/).each do |meminfo|
+      Mool::Command.meminfo.scan(/(\S+):\s+(\d+)/).each do |meminfo|
         var = meminfo[0].tr('(', '_').tr(')', '').underscore
         instance_variable_set(
           "@#{var}",

data/lib/mool/process.rb

@@ -76,8 +76,8 @@ module Mool
     end
 
     def self.services_status(services)
-      command_ps = Mool::Command.ps_command
-      command_top = Mool::Command.top_command
+      command_ps = Mool::Command.ps
+      command_top = Mool::Command.top
 
       result = {}
 

data/lib/mool/system.rb

@@ -13,8 +13,8 @@ module Mool
                   :uptime_second
 
     def initialize
-      @kernel = Mool::Command.uname_command
-      load_avg = Mool::Command.loadavg_command.split(' ')
+      @kernel = Mool::Command.uname
+      load_avg = Mool::Command.loadavg.split(' ')
       @current_loadavg          = load_avg[0].to_f
       @last_5min_loadavg        = load_avg[1].to_f
       @last_15min_loadavg       = load_avg[2].to_f
@@ -23,7 +23,7 @@ module Mool
       # Number of kernel scheduling entities that currently exist on the system
       @total_thread_entities    = load_avg[3].split('/').last.to_i
       @last_pid_process_created = load_avg[4].to_i
-      time = Mool::Command.uptime_command.split(' ').first.to_f
+      time = Mool::Command.uptime.split(' ').first.to_f
       mm, ss = time.divmod(60)
       hh, mm = mm.divmod(60)
       dd, hh = hh.divmod(24)

data/lib/mool/version.rb

@@ -1,3 +1,3 @@
 module Mool
-  VERSION = "3.0.5"
+  VERSION = "3.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mool
 version: !ruby/object:Gem::Version 
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors: 
 - g.edera
@@ -9,7 +9,7 @@ autorequire:
 bindir: exe
 cert_chain: []
 
-date: 2018-04-04 00:00:00 Z
+date: 2018-04-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler