datacenter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 639f19a32af94539eff49e4d60bb416ac5e5366b
-  data.tar.gz: f64487b04b2433088d96a99e56aedba41d0e5c33
+  metadata.gz: 0dd32253b277b657b34434c9ce9eef0eae0f5b89
+  data.tar.gz: eea49f8e1a6d5efcfe8d0d8692972e51ea81057d
 SHA512:
-  metadata.gz: b9e64261f9c76232c11b0fa84d2222dad389f1211d3d0bdca52299b57ef77118f3db648beb332d4b6b2059a33dca5c9d06028dfbe1ac648a68e84f2798263c88
-  data.tar.gz: 15eeae879c23dbfdd764e59ad7f42d8f5c26d859ad76f7ceced266a32f355fa6f43bfd754f50bfcad8b3d11a31b5598d306f2906154168f1fa1b31f3eea4da3e
+  metadata.gz: 3091059ea87e63c6f70f0c2048dcf2d5265d8e730bb56a142b2e5033b0756490fabefe1e5c3e7bf92dd1e730d463a388498085a8e421ce20bae01816b81a7489
+  data.tar.gz: 785dce16665ea7b28970025c8ffa99ef1290d5bd7f073b2c55ffd596a41e3fabaefd9eb52713d86a3f7b20f874d98464d166017c175192c7c2f8d41cfca9d5d4

data/lib/datacenter/cache.rb

@@ -7,30 +7,28 @@ module Datacenter
     end
 
     def fetch(key, &block)
-      set key, &block if !key?(key) || expired?(key)
+      set key, block.call if !data.key?(key) || expired?(key)
       get key
     end
 
     private
 
+    attr_reader :data, :expiration_time
+
     def get(key)
-      @data[key][:value]
+      data[key][:value]
     end
 
-    def set(key, &block)
-      @data[key] = {
-        value: block.call,
+    def set(key, value)
+      data[key] = {
+        value: value,
         fetched_at: Time.now
       }
     end
 
-    def key?(key)
-      @data.key? key
-    end
-
     def expired?(key)
-      return false unless @expiration_time
-      Time.now >= @data[key][:fetched_at] + @expiration_time
+      return false unless expiration_time
+      Time.now >= data[key][:fetched_at] + expiration_time
     end
 
   end

data/lib/datacenter/process.rb

@@ -13,14 +13,12 @@ module Datacenter
       :mem_usage
     ]
 
-    EXPIRATION_TIME = 2
-
     attr_reader :pid
 
     def initialize(pid, shell=nil)
       @pid = pid
       @shell = shell || Shell::Local.new
-      @cache = Cache.new EXPIRATION_TIME
+      @cache = Cache.new Datacenter.process_cache_expiration
     end
 
     ATTRIBUTES.each do |attribute|
@@ -45,9 +43,9 @@ module Datacenter
 
     def info
       @cache.fetch(:info) do
-        ps = shell.run('ps aux').scan(/.*#{pid}.*/)[0].split
+        status = Hash[proc_file(:status).split("\n").map{ |s| s.split(':').map(&:strip) }]
+        ps = shell.run("ps -p #{pid} -o user,pid,pcpu,%mem,vsize,rss,stat,command").split("\n")[1].split
         Hash.new.tap do |info|
-          status = Hash[proc_file(:status).split("\n").map{ |s| s.split(':').map(&:strip) }]
           info[:name] = status['Name']
           info[:user] = ps[0]
           info[:pid]  = ps[1]
@@ -55,8 +53,8 @@ module Datacenter
           info[:mem_usage] = ps[3].to_f
           info[:virtual_memory] = ps[4].to_i / 1024.0
           info[:memory] = ps[5].to_i / 1024.0
-          info[:status] = ps[7] 
-          info[:command] = ps[10..-1].reduce { |acum,e| "#{acum} #{e}" }
+          info[:status] = ps[6]
+          info[:command] = ps[7..-1].reduce { |acum,e| "#{acum} #{e}" }
         end
       end
     end

data/lib/datacenter/shell.rb

@@ -3,6 +3,7 @@ module Datacenter
 
     class Local
       def run(command)
+        Datacenter.logger.debug(self.class) { command }
         if RUBY_ENGINE == 'jruby'
           run_system command
         else
@@ -42,6 +43,7 @@ module Datacenter
       end
 
       def run(command)
+        Datacenter.logger.debug(self.class) { command }
         if @session
           @session.exec!(command).strip
         else
@@ -50,7 +52,7 @@ module Datacenter
       end
 
       def open
-        @session = Net::SSH.start *options unless @session
+        @session ||= Net::SSH.start *options
       end
 
       def close

data/lib/datacenter/version.rb

@@ -1,3 +1,3 @@
 module Datacenter
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/datacenter.rb

@@ -6,6 +6,7 @@ require 'logger'
 module Datacenter
   extend ClassConfig
   attr_config :logger, Logger.new('/dev/null')
+  attr_config :process_cache_expiration, 2
 end
 
 Dir.glob(File.expand_path('datacenter/*.rb', File.dirname(__FILE__))).sort.each { |f| require f }

data/spec/commands.yml

@@ -2,25 +2,23 @@
 
 "ps -p -22803 | grep -22803": ""
 
-"kill -s QUIT 22803": 'quit success'
+"kill -s QUIT 22803": "quit success"
 
-"kill -s KILL 22803": 'kill success'
+"kill -s KILL 22803": "kill success"
 
-"uname -i": x86_64
+"uname -i": "x86_64"
 
-"uname -r": 3.5.0-49-generic
+"uname -r": "3.5.0-49-generic"
 
-"uname -o": GNU/Linux
+"uname -o": "GNU/Linux"
 
 "lsb_release -i": "Distributor ID: Ubuntu"
 
 "lsb_release -r": "Release:  12.04"
 
-hostname: |
-  matias
+"hostname": "matias"
 
-nproc: |
-  2
+"nproc": "2"
 
 "df -lT": |
   Filesystem     Type     1K-blocks    Used Available Use% Mounted on
@@ -31,7 +29,7 @@ nproc: |
   none           tmpfs         5120       0      5120   0% /run/lock
   none           tmpfs      2019816     512   2019304   1% /run/shm
 
-ifconfig: |
+"ifconfig": |
   eth4      Link encap:Ethernet  HWaddr e0:cb:4e:c2:99:9d  
             inet addr:192.168.50.127  Bcast:192.168.50.255  Mask:255.255.255.0
             inet6 addr: fe80::e2cb:4eff:fec2:999d/64 Scope:Link
@@ -41,7 +39,7 @@ ifconfig: |
             collisions:0 txqueuelen:1000 
             RX bytes:110494415 (110.4 MB)  TX bytes:21453491 (21.4 MB)
 
-  lo        Link encap:Local Loopback  
+  lo        Link encap:Local Loopback
             inet addr:127.0.0.1  Mask:255.0.0.0
             inet6 addr: ::1/128 Scope:Host
             UP LOOPBACK RUNNING  MTU:16436  Metric:1
@@ -82,6 +80,15 @@ ifconfig: |
   siblings  : 2
   core id   : 0
 
+"ps aux": |
+  USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
+  root         1  0.0  0.0  24548  2460 ?        Ss   May15   0:00 /sbin/init
+  root         2  0.0  0.0      0     0 ?        S    May15   0:00 [kthreadd]
+  root         3  0.0  0.0      0     0 ?        S    May15   0:06 [ksoftirqd/0]
+  root         6  0.0  0.0      0     0 ?        S    May15   0:00 [migration/0]
+  root         7  0.0  0.0      0     0 ?        S    May15   0:00 [watchdog/0]
+  root         8  0.0  0.0      0     0 ?        S    May15   0:00 [migration/1]
+  matias   22803 11.9  0.8 513268 33792 ?        Sl   09:43  52:47 gnome-system-monitor
 
 "ps aux --sort -rss | head -n 11": |
   USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
@@ -117,19 +124,13 @@ ifconfig: |
   matias   23542  0.0  0.2  34216 11408 pts/0    Ss   10:24   0:01 -bash
   matias   22903  0.0  0.2  34164 11360 pts/1    Ss   09:46   0:00 -bash
 
-"ps aux": |
-  USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
-  root         1  0.0  0.0  24548  2460 ?        Ss   May15   0:00 /sbin/init
-  root         2  0.0  0.0      0     0 ?        S    May15   0:00 [kthreadd]
-  root         3  0.0  0.0      0     0 ?        S    May15   0:06 [ksoftirqd/0]
-  root         6  0.0  0.0      0     0 ?        S    May15   0:00 [migration/0]
-  root         7  0.0  0.0      0     0 ?        S    May15   0:00 [watchdog/0]
-  root         8  0.0  0.0      0     0 ?        S    May15   0:00 [migration/1] 
-  matias   22803 11.9  0.8 513268 33792 ?        Sl   09:43  52:47 gnome-system-monitor
-
-ps aux | grep "gnome-system-monitor" | grep -v grep: |
+"ps aux | grep \"gnome-system-monitor\" | grep -v grep": |
   matias   22803  7.2  0.8 597980 34948 ?        Sl   May21 136:34 gnome-system-monitor
 
+"ps -p 22803 -o user,pid,pcpu,%mem,vsize,rss,stat,command": |
+  USER       PID %CPU %MEM    VSZ   RSS STAT COMMAND
+  matias   22803 11.9  0.8 513268 33792 Sl   gnome-system-monitor
+
 "cat /proc/22803/status": |
   Name: gnome-system-mo
   State:  S (sleeping)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacenter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Manage and monitor servers and processes