proc_parser 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 895cd908217e2c6fd498e81d70f39cd965e9af8b
-  data.tar.gz: fc934cdf6cd6c8d21921725b99f67bed37a900f8
+  metadata.gz: b09b59c528fac6ea7f22e7b26e7820b2a442e06f
+  data.tar.gz: da49854cb36185da614f59ec94591f070d6e1ff0
 SHA512:
-  metadata.gz: df7cba287a8906c150bb67e4b2672526710463a16cd5211f8bdf510154bec450612509713a39a4dc3890a86e35b22079c1c443e55575781521a69d8f4f7e1866
-  data.tar.gz: caeb40c5615e1813602f4bb3f98d24819d3bfd1ec667f0c5d12d50ed579764cfacbc512970731d3ccb96f35301cf43d2b4ef246d37f3ef53b22d63bd8fefb1a4
+  metadata.gz: c1a196fdf8d8604b4a7191c2d5ef418da6793dba01a317b256f4c8244f44a33a5af3584322fd8e245725cc9218747cf08a4ea331f83131ab7f772a475099d5e8
+  data.tar.gz: d77b7c009fefb38071a98db04803d1c3e73a3a3859e512ccd735fa30fe82f7e4f93ae31e7b823f068930ab01e4131ebca85474a97b1ad2f8f7bddc53a15d951f

data/README.md

@@ -4,8 +4,8 @@ proc_parser provides a Ruby wrapper for /proc data such as those contained in
 /proc/mem_info, /proc/stat and /proc/loadavg.
 
 Interested in support of more proc files? Contributions are welcome! You can
-either create an [issue](https://github.com/EtienneM/mem_info/issues) or
-propose a [pull request](https://github.com/EtienneM/mem_info/pulls).
+either create an [issue](https://github.com/EtienneM/proc_parser/issues) or
+propose a [pull request](https://github.com/EtienneM/proc_parser/pulls).
 
 Wondering the meaning of some fields? Read the manual with [`man 5
 proc`](https://linux.die.net/man/5/proc).

data/lib/proc_parser/cpu_stat.rb

@@ -42,28 +42,35 @@ module ProcParser
     end
 
     #
-    ## Get the current CPU usage in percentage. It's a global percentage normalized on the number of
-    # CPU.
+    # The next values (idletime, non_idletime and totaltime) are computed based on the following
+    # information:
     #
-    # The CPU usage is actually everything but the idle time of the CPU.
+    # - https://stackoverflow.com/a/23376195/1351436
+    # - `htop` source code: https://github.com/hishamhm/htop/blob/e0209da88faf3b390d71ff174065abd407abfdfd/ProcessList.c#L947
+    # - man 5 proc
     #
-    # cf. `htop` source code: https://github.com/hishamhm/htop/blob/e0209da88faf3b390d71ff174065abd407abfdfd/ProcessList.c#L947
-    # cf. man 5 proc
-    # cf. https://stackoverflow.com/a/23376195/1351436
+    # Computing the percentage usage is done with the following algorithm:
+    # totald = Total - PrevTotal
+    # idled = Idle - PrevIdle
+    # CPU_Percentage = (totald - idled)/totald
     #
-    def percentage_usage
+    # With the Prev* variables fetched earlier than the current values.
+    def idletime
+      return @idle + @iowait
+    end
+
+    def non_idletime
       # Guest time is already accounted in user time
       user = @user - @guest
       nice = @nice - @guest_nice
 
-      idlealltime = @idle + @iowait
       systemalltime = @system + @irq + @softirq
       virtalltime = @guest + @guest_nice
-      non_idlealltime = user + nice + systemalltime + @steal + virtalltime
-
-      total = idlealltime + non_idlealltime
+      return user + nice + systemalltime + @steal + virtalltime
+    end
 
-      return non_idlealltime / total.to_f
+    def totaltime
+      return idletime + non_idletime
     end
   end
 end

data/lib/proc_parser/version.rb

@@ -1,3 +1,3 @@
 module ProcParser
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/proc_parser.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 12.1'
   spec.add_development_dependency 'rspec', '~> 3.6'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry', '~> 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proc_parser
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Étienne Michon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,14 +56,14 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: |-