mool 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 9295f700cae5807201956c95bb52d2eb7bc6ab08
-  data.tar.gz: bfd04e0f598e3c3633b9b24c1c7d2640ffe0ec01
-SHA512:
-  metadata.gz: 92f5b5228a1ce6f17d4b5e56602c9a44f363d033baca541b82f4dff876d99ae53f39324e4434180ed0ce6c96a4cb62387cc84bbe3c33fafe60636f3f36c8cb58
-  data.tar.gz: aa199535a5a1779253051220d8a415d1a742b8c1d15277580e867af655a0d5c19852878a30f599ba81e49d4601c348c9d26e7c64e89f3dce5638090cbcb24d97
+--- 
+SHA512: 
+  data.tar.gz: 07ff4c8a4b049899c63d5b69b5a2003191daae26be016d20bd15099fe6709decf235035b68405d92ad1b7e6a3f098e08b9e704c13e81cc4c34dbd84ba5a0e836
+  metadata.gz: f9c76443f9f84d2aa5f32f874ffab89f8948bd57e21d4b3d50bb23148c772134b9c7b65b366b4988d557aa422f8f69397d21ebe233ce73e837d68c01805df97f
+SHA1: 
+  data.tar.gz: 668b7d3e2c182767a145970cd38ff1894a1eb55b
+  metadata.gz: e4a8dba4cee2e87cb154eb99106e459f73044880

data/lib/mool/command.rb

@@ -10,7 +10,7 @@ module Mool
     end
 
     def self.df_command
-      `df`
+      `POSIXLY_CORRECT=512 df`
     end
 
     def self.dev_name_command(dev_entry)

data/lib/mool/disk.rb

@@ -6,6 +6,10 @@ module Mool
                   :devname,
                   :devtype,
                   :size,
+                  :total_size,
+                  :percentage_used,
+                  :used_size,
+                  :free_size,
                   :swap,
                   :mount_point,
                   :file_system,
@@ -39,6 +43,7 @@ module Mool
     end
 
     def mounting_point
+      @mount_point = nil
       Mool::Command.mount_command.include?(@logical_name) &&
         @mount_point ||= Mool::Command.mount_command.scan(
         /#{@logical_name} (\S+)/
@@ -93,10 +98,15 @@ module Mool
       result = Mool::Command.df_command.scan(
         /(#{@logical_name}|#{@devname})\s+(\d+)\s+(\d+)\s+(\d+)\s+(\S+)/
       ).flatten
-      @total_block = Mool::Command.capacity_partition_command(@path).chomp.to_f *
-                     Mool::BLOCK_SIZE
-      @block_used  = result[2].to_f * Mool::BLOCK_SIZE
-      @block_free  = @total_block - @block_used
+      # @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
+      @block_used  = result[2].to_f
+      @block_free  = result[3].to_f
+      @used_size = result[2].to_f * Mool::BLOCK_SIZE
+      @free_size = result[3].to_f * Mool::BLOCK_SIZE
+      return if result.empty?
+      @percentage_used = result[4].delete('%')
     end
 
     def partitions
@@ -178,6 +188,26 @@ module Mool
 
       disks.each { |disk| disk.partitions.each { |part| part.partitions && part.slaves }}
       disks.each { |disk| disk.slaves.each { |part| part.partitions && part.slaves }}
+
+      disks.each do |disk|
+        disk.partitions.each do |partition|
+          partition.slaves.each do |slave|
+            partition.total_size += slave.total_size
+            partition.used_size += slave.used_size
+            partition.free_size += slave.free_size
+            partition.block_free += slave.block_free
+            partition.block_used += slave.block_used
+            partition.total_block += slave.total_block
+          end
+          disk.total_size += partition.total_size
+          disk.used_size += partition.used_size
+          disk.free_size += partition.free_size
+          disk.block_free += partition.block_free
+          disk.block_used += partition.block_used
+          disk.total_block += partition.total_block
+        end
+      end
+
       disks
     end
 

data/lib/mool/version.rb

@@ -1,3 +1,3 @@
 module Mool
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

metadata

@@ -1,65 +1,57 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mool
-version: !ruby/object:Gem::Version
-  version: 3.0.3
+version: !ruby/object:Gem::Version 
+  version: 3.0.4
 platform: ruby
-authors:
+authors: 
 - g.edera
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2018-04-03 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.16"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "10.0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: minitest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-description: 'Get operative system information: Disk, Memory, Cpu, Load-average, Processes.'
-email:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "5.0"
+  type: :development
+  version_requirements: *id003
+description: "Get operative system information: Disk, Memory, Cpu, Load-average, Processes."
+email: 
 - gab.edera@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
+
+files: 
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -79,28 +71,30 @@ files:
 - lib/mool/version.rb
 - mool.gemspec
 homepage: https://github.com/gedera/mool
-licenses:
+licenses: 
 - MIT
-metadata:
+metadata: 
   allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id004 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id004
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Get operative system information (Linux).
 test_files: []
+