sys-proctable 1.1.3-universal-darwin → 1.1.4-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd8e82720ca56a50796eb33752337040883362b
-  data.tar.gz: 69fc3907db8e483c51966d8ce05673f32977efb5
+  metadata.gz: ab19802eaa8c764de655146264c9d60804c993ab
+  data.tar.gz: 1acdf47db24542fe7be5da187462563d9fac9da5
 SHA512:
-  metadata.gz: 2788c6041c9e827c964e60bca3b430e5aa2bdc9c9e1818afeaf432ef2fd1b56cc4ec983d53b2785ff1f0127ba1d4c20132333227dfe371385706dee3059074aa
-  data.tar.gz: e54b332bac07cefd020b6a6434124158b19686d3d47ab8f3b0be305e266db4c8dabe5d0ca28015af6fff7b0e76b9ab084a4eb3233b823d6bab05ce7b19cf7d8a
+  metadata.gz: a9b7db449e6936a73125a72d7cf530c2047abe4d4b1d7aec4853f343afd70ef06b05bb354278a9c8b0ac1808c2b5bc35825ca495a79a95ca26bc78e909900693
+  data.tar.gz: 9be1631fe872ebc1d918f8e2fce9028fd246f6cd9d446b5fcec3c6cae0ed250b3c5a60aa5ecd9aff923c12b5a8f3f9913670d1a748a88d6ea2d1b37da48045f5

data/CHANGES

@@ -1,3 +1,8 @@
+== 1.1.4 - 30-Mar-2017
+* Fixed a potential issue where OSX could return a struct with invalid data.
+* Set the default field to :pid for OSX when using Sys::Top.
+* Fixed a duplicate test warning for OSX.
+
 == 1.1.3 - 28-Sep-2016
 * Fixed an issue on OSX where the value returned for argc is invalid.
 

data/Rakefile

@@ -207,8 +207,8 @@ namespace :gem do
 
   desc 'Push all gems for each supported OS'
   task :push_all do
-    Dir["pkg/*"].each{ |dir|
-      p dir
+    Dir["pkg/**/*.gem"].each{ |file|
+      sh "gem push #{file}"
     }
   end
 

data/lib/darwin/sys/proctable.rb

@@ -175,7 +175,9 @@ module Sys
         next unless pid == lpid if pid
         info = ProcTaskAllInfo.new
 
-        if proc_pidinfo(lpid, PROC_PIDTASKALLINFO, 0, info, info.size) <= 0
+        nb = proc_pidinfo(lpid, PROC_PIDTASKALLINFO, 0, info, info.size)
+
+        if nb <= 0
           if [Errno::EPERM::Errno, Errno::ESRCH::Errno].include?(FFI.errno)
             next # Either we don't have permission, or the pid no longer exists
           else
@@ -183,6 +185,9 @@ module Sys
           end
         end
 
+        # Avoid potentially invalid data
+        next if nb != info.size
+
         struct = ProcTableStruct.new
 
         # Pass by reference

data/lib/sys/proctable/version.rb

@@ -1,6 +1,6 @@
 module Sys
   class ProcTable
     # The version of the sys-proctable library
-    VERSION = '1.1.3'.freeze
+    VERSION = '1.1.4'.freeze
   end
 end

data/lib/sys/top.rb

@@ -7,21 +7,22 @@ module Sys
   class Top
 
     # The version of the sys-top library
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'.freeze
 
     # Returns an array of Struct::ProcTableStruct elements containing up
     # to +num+ elements, sorted by +field+. The default number of elements
     # is 10, while the default field is 'pctcpu'.
     #
-    # Exception: the default sort field is 'pid' on AIX and Windows.
+    # Exception: the default sort field is 'pid' on AIX, Darwin and Windows.
     #
     def self.top(num=10, field='pctcpu')
       field = field.to_s if field.is_a?(Symbol)
 
       aix = RbConfig::CONFIG['host_os'] =~ /aix/i
+      darwin = RbConfig::CONFIG['host_os'] =~ /darwin/i
 
       # Sort by pid on Windows and AIX by default
-      if (File::ALT_SEPARATOR || aix) && field == 'pctcpu'
+      if (File::ALT_SEPARATOR || aix || darwin) && field == 'pctcpu'
         field = 'pid'
       end
 

data/sys-proctable.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-proctable'
-  spec.version    = '1.1.3'
+  spec.version    = '1.1.4'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache 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
 
   test "version is set to expected value" do
-    assert_equal('1.1.3', ProcTable::VERSION)
+    assert_equal('1.1.4', ProcTable::VERSION)
   end
 
   test "fields basic functionality" do

data/test/test_sys_proctable_darwin.rb

@@ -24,7 +24,7 @@ class TC_ProcTable_Darwin < Test::Unit::TestCase
     end
 
     @@pid2 = fork do
-      exec('php', '-d setting=true', '-d directory=/usr/bin', '-R', '\'sleep(120);\'')
+      exec('ruby', '-Ilib', '-e', 'sleep \'120\'.to_i', '--', 'foo bar')
     end
 
     sleep 1 # wait to make sure env is replaced by sleep
@@ -95,10 +95,10 @@ class TC_ProcTable_Darwin < Test::Unit::TestCase
     assert_equal('sleep 60', @ptable.cmdline)
   end
 
-  test "cmdline struct member is defined and returns expected value" do
+  test "cmdline struct member is defined and returns expected string with arguments" do
     assert_respond_to(@ptable2, :cmdline)
     assert_kind_of(String, @ptable2.cmdline)
-    assert_equal('php -d setting=true -d directory=/usr/bin -R \'sleep(120);\'', @ptable2.cmdline)
+    assert_equal('ruby -Ilib -e sleep \'120\'.to_i -- foo bar', @ptable2.cmdline)
   end
 
   test "exe struct member is defined and returns expected value" do

data/test/test_sys_top.rb

@@ -11,12 +11,8 @@ require 'sys/top'
 class TC_Top < Test::Unit::TestCase
   include Sys
 
-  def setup
-    @osx = RbConfig::CONFIG['host_os'] =~ /darwin/i
-  end
-
   test "top version" do
-    assert_equal('1.0.4', Top::VERSION)
+    assert_equal('1.0.5', Top::VERSION)
   end
 
   test "top basic functionality" do
@@ -24,42 +20,32 @@ class TC_Top < Test::Unit::TestCase
   end
 
   test "top works with no arguments" do
-    omit_if(@osx)
     assert_nothing_raised{ Top.top }
   end
 
   test "top accepts optional arguments" do
-    omit_if(@osx)
     assert_nothing_raised{ Top.top(5) }
     assert_nothing_raised{ Top.top(5, 'cmdline') }
   end
 
   test "top with no arguments returns expected results" do
-    omit_if(@osx)
     assert_equal(10, Top.top.length)
     assert_kind_of(Struct::ProcTableStruct, Top.top.first)
   end
 
   test "top with size argument returns expected result" do
-    omit_if(@osx)
     assert_equal(5, Top.top(5).length)
   end
 
   test "top with size and sort_by argument returns expected result" do
-    omit_if(@osx)
     assert_equal(5, Top.top(5, :cmdline).length)
   end
 
   test "top returns an array" do
-    omit_if(@osx)
     assert_kind_of(Array, Top.top)
   end
 
   test "top accepts a maximum of two arguments" do
     assert_raises(ArgumentError){ Top.top(1, 'foo', 2) }
   end
-
-  def teardown
-    @osx = nil
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys-proctable
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: universal-darwin
 authors:
 - Daniel J. Berger
@@ -30,7 +30,7 @@ cert_chain:
   A943I/wqE6xbYQpHxkndWo5uLDUbZh+XxG+fhZKpeqLIqHaFuU6wdO5odt32kB/B
   nCjVswaVYlu1U2iLPCqE+MrjmTA=
   -----END CERTIFICATE-----
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: An interface for providing process table information