sys-proctable 0.9.4-universal-linux → 0.9.5-universal-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b95b8b54ca67965be1441a8fa1785779d795a61
-  data.tar.gz: 2bf4bb6d874bb7b8445fff5e9f837b8b90a7ad1c
+  metadata.gz: 99bb7edbbd342331c80b1f70d99ec18c31adbadf
+  data.tar.gz: 90d82ed00cbdc63a9b28660314ef89f4eef2995f
 SHA512:
-  metadata.gz: 980dd9158df1c7584c87e4709ce088e4d13051cca08f97a32f93ada464f642a59d35018b969b4de9a2325bcb93f89e9513734bf8dbbd887e407fd9a17e62aa53
-  data.tar.gz: beb7199ebc95301a9f29d944e0cb06782192940b37a6ef5e2d671bf98255d2069b498ae5a95b7a9450458677e2945e885b7a2144bb2cd5d57f3009205286d8cd
+  metadata.gz: 56a5e9be9e450baff6d52ed8354ad963b62b30a6d06e23388bded5264188428443f24c3a7589b862926a621ee9cb162d56316e66a642feba4467571779d3ae6a
+  data.tar.gz: 78b4fbf16b223897686c2e9cfb9091d1ab125e011d7bba91a9f9d5ac8fca89b112ecad7a71d377ec6736b0f80619d894d3a918208f59d71c1acc8c2e2a58f8a9

data/CHANGES

@@ -1,3 +1,9 @@
+== 0.9.5 - 10-Feb-2015
+* Significant cleanup and memory reduction of the OSX code. Thanks go
+  to Ivan (toy) for the patches.
+* Skip over /proc/<file>/status if unreadable on Linux. Thanks go to Jianjun
+  Mao for the patch.
+
 == 0.9.4 - 4-Mar-2014
 * Added support for AIX 5.3 or later courtesy of Rick Ohnemus.
 * The Solaris version now uses FFI structs instead of a packed array.

data/Rakefile

@@ -174,6 +174,8 @@ namespace :gem do
          spec.files += ['lib/windows/sys/proctable.rb']
          spec.test_files << 'test/test_sys_proctable_windows.rb'
     end
+
+    spec.test_files << 'test/test_sys_top.rb'
  
     # https://github.com/rubygems/rubygems/issues/147
     spec.original_platform = spec.platform

data/lib/linux/sys/proctable.rb

@@ -11,7 +11,7 @@ module Sys
     private_class_method :new
 
     # The version of the sys-proctable library
-    VERSION = '0.9.4'
+    VERSION = '0.9.5'
 
     private
 
@@ -211,17 +211,21 @@ module Sys
         struct.policy      = stat[40].to_i
 
         # Get /proc/<pid>/status information (name, uid, euid, gid, egid)
-        IO.foreach("/proc/#{file}/status") do |line|
-          case line
-            when /Name:\s*?(\w+)/
-              struct.name = $1
-            when /Uid:\s*?(\d+)\s*?(\d+)/
-              struct.uid  = $1.to_i
-              struct.euid = $2.to_i
-            when /Gid:\s*?(\d+)\s*?(\d+)/
-              struct.gid  = $1.to_i
-              struct.egid = $2.to_i
+        begin
+          IO.foreach("/proc/#{file}/status") do |line|
+            case line
+              when /Name:\s*?(\w+)/
+                struct.name = $1
+              when /Uid:\s*?(\d+)\s*?(\d+)/
+                struct.uid  = $1.to_i
+                struct.euid = $2.to_i
+              when /Gid:\s*?(\d+)\s*?(\d+)/
+                struct.gid  = $1.to_i
+                struct.egid = $2.to_i
+            end
           end
+        rescue Errno::ESRCH, Errno::ENOENT
+          next
         end
 
         # If cmdline is empty use comm instead

data/sys-proctable.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-proctable'
-  spec.version    = '0.9.4'
+  spec.version    = '0.9.5'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Artistic 2.0' 
   spec.email      = 'djberg96@gmail.com'

data/test/test_sys_proctable_all.rb

@@ -19,7 +19,7 @@ class TC_ProcTable_All < Test::Unit::TestCase
   end
 
   def test_version
-    assert_equal('0.9.4', ProcTable::VERSION)
+    assert_equal('0.9.5', ProcTable::VERSION)
   end
 
   def test_fields
@@ -71,6 +71,12 @@ class TC_ProcTable_All < Test::Unit::TestCase
     assert_kind_of(StandardError, Sys::ProcTable::Error.new)
   end
 
+  def test_from_thread
+    Thread.new do
+      Sys::ProcTable.ps
+    end.value
+  end
+
   def teardown
     @pid  = nil
   end

data/test/test_sys_proctable_linux.rb

@@ -42,7 +42,7 @@ class TC_ProcTable_Linux < Test::Unit::TestCase
 
   def test_exe
     assert_respond_to(@ptable, :exe)
-    assert_kind_of(String, @ptable.exe)
+    assert_kind_of([NilClass, String], @ptable.exe)
   end
 
   def test_fd
@@ -52,7 +52,7 @@ class TC_ProcTable_Linux < Test::Unit::TestCase
 
   def test_root
     assert_respond_to(@ptable, :root)
-    assert_kind_of(String, @ptable.root)
+    assert_kind_of([NilClass, String], @ptable.root)
   end
 
   def test_pid
@@ -97,7 +97,7 @@ class TC_ProcTable_Linux < Test::Unit::TestCase
 
   def test_flags
     assert_respond_to(@ptable, :flags)
-    assert_kind_of(Fixnum, @ptable.flags)
+    assert_kind_of(Numeric, @ptable.flags)
   end
 
   def test_minflt
@@ -212,7 +212,7 @@ class TC_ProcTable_Linux < Test::Unit::TestCase
 
   def test_sigignore
     assert_respond_to(@ptable, :sigignore)
-    assert_kind_of(Fixnum, @ptable.sigignore)
+    assert_kind_of(Numeric, @ptable.sigignore)
   end
 
   def test_sigcatch
@@ -227,17 +227,17 @@ class TC_ProcTable_Linux < Test::Unit::TestCase
 
   def test_nswap
     assert_respond_to(@ptable, :nswap)
-    assert_kind_of(Fixnum, @ptable.nswap)
+    assert_kind_of(Numeric, @ptable.nswap)
   end
 
   def test_cnswap
     assert_respond_to(@ptable, :cnswap)
-    assert_kind_of(Fixnum, @ptable.cnswap)
+    assert_kind_of(Numeric, @ptable.cnswap)
   end
 
   def test_exit_signal
     assert_respond_to(@ptable, :exit_signal)
-    assert_kind_of(Fixnum, @ptable.exit_signal)
+    assert_kind_of(Numeric, @ptable.exit_signal)
   end
 
   def test_processor

data/test/test_sys_top.rb

@@ -0,0 +1,46 @@
+##############################################################################
+# test_sys_top.rb
+#
+# Test suite for the sys-top library that is included with this distribution.
+##############################################################################
+require 'rubygems'
+gem 'test-unit'
+
+require 'test/unit'
+require 'sys/top'
+
+class TC_Top < Test::Unit::TestCase
+  include Sys
+
+  def test_version
+    assert_equal('1.0.4', Top::VERSION)
+  end
+
+  def test_top_basic
+    assert_respond_to(Top, :top)
+    assert_nothing_raised{ Top.top }
+    assert_nothing_raised{ Top.top(5) }
+    assert_nothing_raised{ Top.top(5, 'cmdline') }
+  end
+
+  def test_top
+    assert_equal(10, Top.top.length)
+    assert_kind_of(Struct::ProcTableStruct, Top.top.first)
+  end
+
+  def test_top_with_size
+    assert_equal(5, Top.top(5).length)
+  end
+
+  def test_top_with_size_and_sort_by_field
+    assert_equal(5, Top.top(5, :cmdline).length)
+  end
+
+  def test_top_return_type
+    assert_kind_of(Array, Top.top)
+  end
+
+  def test_top_expected_errors
+    assert_raises(ArgumentError){ Top.top(1, 'foo', 2) }
+  end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: sys-proctable
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: universal-linux
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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: |2
@@ -65,6 +65,7 @@ files:
 - sys-proctable.gemspec
 - test/test_sys_proctable_all.rb
 - test/test_sys_proctable_linux.rb
+- test/test_sys_top.rb
 homepage: http://www.rubyforge.org/projects/sysutils
 licenses:
 - Artistic 2.0
@@ -76,20 +77,21 @@ require_paths:
 - lib/linux
 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: sysutils
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An interface for providing process table information
 test_files:
 - test/test_sys_proctable_all.rb
 - test/test_sys_proctable_linux.rb
+- test/test_sys_top.rb