datacenter 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf9e6023877cc1a608033a323719d016c78c0ee4
-  data.tar.gz: 9039da364e1b6514c5314495b70cb5aed94d67cb
+  metadata.gz: 00e4f1db48d930b517c89d8a48f716109e49ac1d
+  data.tar.gz: cefbf9313f800f8988d5d6b0f6239c24d2c6b8c6
 SHA512:
-  metadata.gz: a69725f3ead19ae06730bbdc9045c0b7f395b5e3dfbf2f70eabe8e4473ab94d4c39bc8a124d8938522098e479672472e238a78a6d97b103470936e7a0f621c3a
-  data.tar.gz: dcb60ea81aad847f4ca853d8106d88b0ce44dc191d533473becded4e905d2685ed06fa9a4759136c790f0b7fb51e32c3b019ebb1ac6191f6fad0a6a24867abd1
+  metadata.gz: 2fceb78d5755b96ac6762a6d531a125383507a5f138c2b6edaddbdad2c84800615b55e90232bf626d0bebe7854c709f56d7d3d3fc7e73e6851f59f4a3b56ccb4
+  data.tar.gz: 5904e2beab150fc7552d78fb8f06c3c327f3a2d5cdec823c35b969261fc5855cf3e2cccae866d6fa53b4ac9be1389fb4239a97dbad2a5ac8c55e6a3c2e472e9f

data/datacenter.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'net-ssh'
+  spec.add_dependency 'net-ssh', '~> 2.9.2'
   spec.add_dependency 'class_config'
   
   spec.add_development_dependency 'bundler', '~> 1.3'

data/lib/datacenter/process.rb

@@ -19,6 +19,7 @@ module Datacenter
       @pid = pid
       @shell = shell || Shell::Local.new
       @cache = Cache.new Datacenter.process_cache_expiration
+      @mutex = Mutex.new
     end
 
     ATTRIBUTES.each do |attribute|
@@ -42,19 +43,21 @@ module Datacenter
     attr_reader :shell
 
     def info
-      @cache.fetch(:info) do
-        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|
-          info[:name] = status['Name']
-          info[:user] = ps[0]
-          info[:pid]  = ps[1]
-          info[:cpu_usage] = ps[2].to_f
-          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[6]
-          info[:command] = ps[7..-1].reduce { |acum,e| "#{acum} #{e}" }
+      @mutex.synchronize do
+        @cache.fetch(:info) do
+          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|
+            info[:name] = status['Name']
+            info[:user] = ps[0]
+            info[:pid]  = ps[1]
+            info[:cpu_usage] = ps[2].to_f
+            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[6]
+            info[:command] = ps[7..-1].reduce { |acum,e| "#{acum} #{e}" }
+          end
         end
       end
     end

data/lib/datacenter/shell.rb

@@ -2,6 +2,11 @@ module Datacenter
   module Shell
 
     class Local
+
+      def initialize
+        @mutex = Mutex.new
+      end
+
       def run(command)
         Datacenter.logger.debug(self.class) { command }
         if RUBY_ENGINE == 'jruby'
@@ -19,19 +24,23 @@ module Datacenter
       end
 
       def run_system(command)
-        $stdout = StringIO.new
-        $stderr = StringIO.new
+        @mutex.synchronize do
+          begin
+            $stdout = StringIO.new
+            $stderr = StringIO.new
 
-        system command
+            system command
 
-        [$stdout, $stderr].map do |io| 
-          io.rewind
-          io.readlines.join.force_encoding('UTF-8')
-        end.join.strip
+            [$stdout, $stderr].map do |io| 
+              io.rewind
+              io.readlines.join.force_encoding('UTF-8')
+            end.join.strip
 
-      ensure
-        $stdout = STDOUT
-        $stderr = STDERR
+          ensure
+            $stdout = STDOUT
+            $stderr = STDERR
+          end
+        end
       end
     end
 

data/lib/datacenter/version.rb

@@ -1,3 +1,3 @@
 module Datacenter
-  VERSION = '0.2.2'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: datacenter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.2
 - !ruby/object:Gem::Dependency
   name: class_config
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Manage and monitor servers and processes