mool 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  data.tar.gz: 83945122ab24e7570389494da0c0bb08edc9b539491abceb5e323d4bcdbe3778ed906e36386057cb8d5ef67ef59d60ad350df9003347049157dfea14e41dd146
-  metadata.gz: 82afc99c49a49973608bb159f3ca1a18f1b413508bec179865b25bce6ccb3401b85fb13ec52160c43cb8550bb4de4480bceadfb62d28d7d1329a63e2b3fa3be9
-SHA1: 
-  data.tar.gz: ac1de01482a2aee4316ab061c0a7f34c8647d5ad
-  metadata.gz: 1d753d3999e131e0c44b335b618fc6f7d81d431c
+---
+SHA1:
+  metadata.gz: 4c3812464b6a61004cb50688f19270a955bbe0f3
+  data.tar.gz: e7f68f5ee541f334c461b85b9bf229f5fb9d3d1c
+SHA512:
+  metadata.gz: 465d925aa31816cc4996bfe07666a0791796c49ab211cc414aebbc89896d20f0cf1ff961d8c4535cd4bda1e83626dc21091d37d31e68d6b1932f8a15aeb3dd7a
+  data.tar.gz: '071799903439ad9539a1a8ed1644c15f98649bec02f3bac4d1228df9f2d994eed58cf01964b39fb4f12d04f5c4396a30f5a962c9787e3f334ab90f580b230717'

data/lib/mool/base.rb

@@ -0,0 +1,10 @@
+module Mool
+  class Base
+    def attrs
+      Hash[instance_variables.collect do |attr|
+             [attr.to_s.delete(':@').to_sym,
+              instance_variable_get(attr)]
+           end]
+    end
+  end
+end

data/lib/mool/command.rb

@@ -13,6 +13,10 @@ module Mool
       `df`
     end
 
+    def self.dev_name_command(dev_entry)
+      File.read("#{dev_entry}/dev")
+    end
+
     def self.mount_command
       File.read('/proc/mounts')
     end

data/lib/mool/cpu.rb

@@ -1,20 +1,20 @@
 module Mool
-  class Cpu
-    attr_reader :cpu_name,
-                :id,
-                :model_name,
-                :cores,
-                :usr,
-                :nice,
-                :sys,
-                :iowait,
-                :irq,
-                :soft,
-                :steal,
-                :guest,
-                :gnice,
-                :idle,
-                :total
+  class Cpu < Mool::Base
+    attr_accessor :cpu_name,
+                  :id,
+                  :model_name,
+                  :cores,
+                  :usr,
+                  :nice,
+                  :sys,
+                  :iowait,
+                  :irq,
+                  :soft,
+                  :steal,
+                  :guest,
+                  :gnice,
+                  :idle,
+                  :total
 
     # ["all", "1", "2"]
     def initialize(process_number, opt={})

data/lib/mool/disk.rb

@@ -1,5 +1,5 @@
 module Mool
-  class Disk
+  class Disk < Mool::Base
     attr_accessor :path,
                   :major,
                   :minor,
@@ -17,13 +17,16 @@ module Mool
                   :unity
 
     def initialize(dev_name)
-      paths = Mool::Command.dev_block_command.select do |entry|
-        Mool::Disk.dev_name_command(entry).include?(dev_name) ||
-          Mool::Disk.uevent_command(entry).include?(dev_name) ||
-          Mool::Disk.logical_name_command(entry)
-      end
+      @path = nil
 
-      @path = paths.first
+      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
 
       raise "Does't exist #{dev_name}!" if @path.nil?
       read_uevent
@@ -60,9 +63,13 @@ module Mool
       @major,
       @minor,
       @devname,
-      @devtype = Mool::Command.uevent_command(@path).scan(
-        /.*=(\d+)\n.*=(\d+)\n.*=(\S+)\n.*=(\w+)\n/
-      ).flatten
+      @devtype =
+      Mool::Command.uevent_command(@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
@@ -95,11 +102,12 @@ module Mool
     def partitions
       return @partitions if defined? @partitions
       return unless is_disk?
+
       @partitions = Mool::Command.partitions_command(
         @path,
         @devname
       ).map do |part|
-        MoolDisk.new(part.split('/').last)
+        Mool::Disk.new(part.split('/').last)
       end
     end
 
@@ -110,7 +118,7 @@ module Mool
       end
 
       @slaves = blocks.map do |slave|
-        MoolDisk.new(slave.split('/').last)
+        Mool::Disk.new(slave.split('/').last)
       end
     end
 
@@ -163,6 +171,7 @@ module Mool
                     !real_path.include?('/sr') &&
                     !Mool::Command.real_path_command_exist?(real_path) &&
                     Mool::Command.slaves_command(real_path).empty?
+
         disks << Mool::Disk.new(entry.split('/').last)
       end
 
@@ -177,7 +186,7 @@ module Mool
     end
 
     def self.all_usable
-      result = MoolDisk.all
+      result = Mool::Disk.all
       result.each do |disk|
         result += (disk.partitions +
                    disk.slaves +

data/lib/mool/memory.rb

@@ -1,5 +1,5 @@
 module Mool
-  class Memory
+  class Memory < Mool::Base
 
     attr_accessor :unity, :mem_used
 

data/lib/mool/process.rb

@@ -1,6 +1,6 @@
 module Mool
-  class Process
-    attr_reader :messures, :pattern
+  class Process < Mool::Base
+    attr_accessor :messures, :pattern
 
     STATUS_PROCESS = {
       'D' => :uninterruptible_sleep,
@@ -9,7 +9,7 @@ module Mool
       'T' => :stopped_by_job_control_signal,
       't' => :stopped_by_debugger_during_trace,
       'Z' => :zombie
-    }
+    }.freeze
 
     def initialize(name, pattern, opt = {})
       if name.class != String || pattern.class != String

data/lib/mool/system.rb

@@ -1,16 +1,16 @@
 module Mool
-  class System
-    attr_reader :kernel,
-                :current_loadavg,
-                :last_5min_loadavg,
-                :last_15min_loadavg,
-                :thread_entities_exec,
-                :total_thread_entities,
-                :last_pid_process_created,
-                :uptime_day,
-                :uptime_hour,
-                :uptime_minute,
-                :uptime_second
+  class System < Mool::Base
+    attr_accessor :kernel,
+                  :current_loadavg,
+                  :last_5min_loadavg,
+                  :last_15min_loadavg,
+                  :thread_entities_exec,
+                  :total_thread_entities,
+                  :last_pid_process_created,
+                  :uptime_day,
+                  :uptime_hour,
+                  :uptime_minute,
+                  :uptime_second
 
     def initialize
       @kernel = Mool::Command.uname_command

data/lib/mool/version.rb

@@ -1,3 +1,3 @@
 module Mool
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/lib/mool.rb

@@ -1,4 +1,5 @@
-%w[command
+%w[base
+   command
    cpu
    disk
    memory

metadata

@@ -1,57 +1,65 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mool
-version: !ruby/object:Gem::Version 
-  version: 3.0.1
+version: !ruby/object:Gem::Version
+  version: 3.0.2
 platform: ruby
-authors: 
+authors:
 - g.edera
 autorequire: 
 bindir: exe
 cert_chain: []
-
-date: 2018-03-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2018-03-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.16"
+  requirement: !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
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "10.0"
+  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'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "5.0"
+  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'
   type: :development
-  version_requirements: *id003
-description: "Get operative system information: Disk, Memory, Cpu, Load-average, Processes."
-email: 
+  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:
 - gab.edera@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -61,6 +69,7 @@ files:
 - lib/locales/en.mool.yml
 - lib/locales/es.mool.yml
 - lib/mool.rb
+- lib/mool/base.rb
 - lib/mool/command.rb
 - lib/mool/cpu.rb
 - lib/mool/disk.rb
@@ -70,30 +79,28 @@ 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: 
-  - &id004 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id004
+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'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Get operative system information (Linux).
 test_files: []
-