sys-proctable 1.0.0-universal-darwin → 1.1.0-universal-darwin

data/test/test_sys_proctable_darwin.rb

@@ -7,252 +7,99 @@
 require 'test-unit'
 require 'sys/proctable'
 require 'test/test_sys_proctable_all'
-include Sys
 
 class TC_ProcTable_Darwin < Test::Unit::TestCase
   def self.startup
-    @@fields = %w/
-      pid ppid pgid ruid rgid euid egid groups svuid svgid
-      comm state pctcpu oncpu tnum
-      tdev wmesg rtime priority usrpri nice cmdline exe environ starttime
-      maxrss ixrss idrss isrss minflt majflt nswap inblock oublock
-      msgsnd msgrcv nsignals nvcsw nivcsw utime stime
-    /
+    @@fields = %w[
+      flags status xstatus pid ppid uid gid ruid rgid svuid svgid rfu1 comm
+      name nfiles pgid pjobc tdev tpgid nice start_tvsec start_tvusec
+      virtual_size resident_size total_user total_system threads_user
+      threads_system policy faults pageins cow_faults messages_sent
+      messages_received syscalls_mach syscalls_unix csw threadnum numrunning
+      priority cmdline exe environ
+    ]
 
     @@pid = fork do
       exec('env', '-i', 'A=B', 'Z=', 'sleep', '60')
     end
+
     sleep 1 # wait to make sure env is replaced by sleep
   end
 
   def setup
-    @ptable = ProcTable.ps.find{ |ptable| ptable.pid == @@pid }
+    @ptable = Sys::ProcTable.ps(@@pid)
   end
 
-  def test_fields
-    assert_respond_to(ProcTable, :fields)
-    assert_kind_of(Array, ProcTable.fields)
-    assert_equal(@@fields, ProcTable.fields)
+  test "fields basic functionality" do
+    assert_respond_to(Sys::ProcTable, :fields)
+    assert_kind_of(Array, Sys::ProcTable.fields)
+    assert_equal(@@fields, Sys::ProcTable.fields)
   end
 
-  def test_pid
+  test "pid struct member is defined and returns expected value" do
     assert_respond_to(@ptable, :pid)
     assert_kind_of(Fixnum, @ptable.pid)
     assert_equal(@ptable.pid, @@pid)
   end
 
-  def test_ppid
+  test "ppid struct member is defined and returns expected value" do
     assert_respond_to(@ptable, :ppid)
     assert_kind_of(Fixnum, @ptable.ppid)
     assert_equal(Process.pid, @ptable.ppid)
   end
 
-  def test_pgid
+  test "pgid struct member is defined and returns expected value" do
     assert_respond_to(@ptable, :pgid)
     assert_kind_of(Fixnum, @ptable.pgid)
     assert_equal(Process.getpgrp, @ptable.pgid)
   end
 
-  def test_ruid
+  test "ruid struct member is defined and returns expected value" do
     assert_respond_to(@ptable, :ruid)
     assert_kind_of(Fixnum, @ptable.ruid)
     assert_equal(Process.uid, @ptable.ruid)
   end
 
-  def test_rgid
+  test "rgid struct member is defined and returns expected value" do
     assert_respond_to(@ptable, :rgid)
     assert_kind_of(Fixnum, @ptable.rgid)
     assert_equal(Process.gid, @ptable.rgid)
   end
 
-  def test_euid
-    assert_respond_to(@ptable, :euid)
-    assert_kind_of(Fixnum, @ptable.euid)
-    assert_equal(Process.euid, @ptable.euid)
-  end
-
-  def test_egid
-    assert_respond_to(@ptable, :egid)
-    assert_kind_of(Fixnum, @ptable.egid)
-    assert_equal(Process.egid, @ptable.egid)
-  end
-
-  def test_groups
-    assert_respond_to(@ptable, :groups)
-    assert_kind_of(Array, @ptable.groups)
-    assert_equal(Process.groups, @ptable.groups)
-  end
-
-  def test_svuid
+  test "svuid struct member is defined and returns expected value" do
     assert_respond_to(@ptable, :svuid)
     assert_kind_of(Fixnum, @ptable.svuid)
     assert_equal(Process.uid, @ptable.svuid) # not valid for all processes
   end
 
-  def test_svgid
+  test "svgid struct member is defined and returns expected value" do
     assert_respond_to(@ptable, :svgid)
     assert_kind_of(Fixnum, @ptable.svgid)
     assert_equal(Process.gid, @ptable.svgid) # not valid for all processes
   end
 
-  def test_comm
+  test "comm struct member is defined and returns expected value" do
     assert_respond_to(@ptable, :comm)
     assert_kind_of(String, @ptable.comm)
     assert_equal('sleep', @ptable.comm)
   end
 
-  def test_state
-    assert_respond_to(@ptable, :state)
-    assert_kind_of(String, @ptable.state)
-    assert_true(%w/idle run sleep stop zombie unknown/.include?(@ptable.state))
-  end
-
-  def test_pctcpu
-    assert_respond_to(@ptable, :pctcpu)
-    assert_kind_of(Float, @ptable.pctcpu)
-  end
-
-  def test_oncpu
-    assert_respond_to(@ptable, :oncpu)
-    omit("oncpu always nil for now")
-  end
-
-  def test_tnum
-    assert_respond_to(@ptable, :tnum)
-    #assert_kind_of(Fixnum, @ptable.tnum)
-  end
-
-  def test_tdev
-    assert_respond_to(@ptable, :tdev)
-    #assert_kind_of(String, @ptable.tdev)
-  end
-
-  def test_wmesg
-    assert_respond_to(@ptable, :wmesg)
-    assert_kind_of(String, @ptable.wmesg)
-  end
-
-  def test_rtime
-    assert_respond_to(@ptable, :rtime)
-    assert_kind_of(Fixnum, @ptable.rtime)
-  end
-
-  def test_priority
-    assert_respond_to(@ptable, :priority)
-    assert_kind_of(Fixnum, @ptable.priority)
-  end
-
-  def test_usrpri
-    assert_respond_to(@ptable, :usrpri)
-    assert_kind_of(Fixnum, @ptable.usrpri)
-  end
-
-  def test_nice
-    assert_respond_to(@ptable, :nice)
-    assert_kind_of(Fixnum, @ptable.nice)
-  end
-
-  def test_cmdline
+  test "cmdline struct member is defined and returns expected value" do
     assert_respond_to(@ptable, :cmdline)
     assert_kind_of(String, @ptable.cmdline)
     assert_equal('sleep 60', @ptable.cmdline)
   end
 
-  def test_exe
+  test "exe struct member is defined and returns expected value" do
     assert_respond_to(@ptable, :exe)
     assert_kind_of(String, @ptable.exe)
     assert_equal(`which sleep`.chomp, @ptable.exe)
   end
 
-  def test_environ
+  test "environ struct member is defined and returns expected value" do
     assert_respond_to(@ptable, :environ)
     assert_kind_of(Hash, @ptable.environ)
-    assert_equal({'A' => 'B', 'Z' => ''}, @ptable.environ)
-  end
-
-  def test_starttime
-    assert_respond_to(@ptable, :starttime)
-    assert_kind_of(Time, @ptable.starttime)
-  end
-
-  def test_maxrss
-    assert_respond_to(@ptable, :maxrss)
-    assert_true([NilClass, Fixnum].include?(@ptable.maxrss.class))
-  end
-
-  def test_ixrss
-    assert_respond_to(@ptable, :ixrss)
-    assert_true([NilClass, Fixnum].include?(@ptable.ixrss.class))
-  end
-
-  def test_idrss
-    assert_respond_to(@ptable, :idrss)
-    assert_true([NilClass, Fixnum].include?(@ptable.idrss.class))
-  end
-
-  def test_isrss
-    assert_respond_to(@ptable, :isrss)
-    assert_true([NilClass, Fixnum].include?(@ptable.isrss.class))
-  end
-
-  def test_minflt
-    assert_respond_to(@ptable, :minflt)
-    assert_true([NilClass, Fixnum].include?(@ptable.minflt.class))
-  end
-
-  def test_majflt
-    assert_respond_to(@ptable, :majflt)
-    assert_true([NilClass, Fixnum].include?(@ptable.majflt.class))
-  end
-
-  def test_nswap
-    assert_respond_to(@ptable, :nswap)
-    assert_true([NilClass, Fixnum].include?(@ptable.nswap.class))
-  end
-
-  def test_inblock
-    assert_respond_to(@ptable, :inblock)
-    assert_true([NilClass, Fixnum].include?(@ptable.inblock.class))
-  end
-
-  def test_oublock
-    assert_respond_to(@ptable, :oublock)
-    assert_true([NilClass, Fixnum].include?(@ptable.oublock.class))
-  end
-
-  def test_msgsnd
-    assert_respond_to(@ptable, :msgsnd)
-    assert_true([NilClass, Fixnum].include?(@ptable.msgsnd.class))
-  end
-
-  def test_msgrcv
-    assert_respond_to(@ptable, :msgrcv)
-    assert_true([NilClass, Fixnum].include?(@ptable.msgrcv.class))
-  end
-
-  def test_nsignals
-    assert_respond_to(@ptable, :nsignals)
-    assert_true([NilClass, Fixnum].include?(@ptable.nsignals.class))
-  end
-
-  def test_nvcsw
-    assert_respond_to(@ptable, :nvcsw)
-    assert_true([NilClass, Fixnum].include?(@ptable.nvcsw.class))
-  end
-
-  def test_nivcsw
-    assert_respond_to(@ptable, :nivcsw)
-    assert_true([NilClass, Fixnum].include?(@ptable.nivcsw.class))
-  end
-
-  def test_utime
-    assert_respond_to(@ptable, :utime)
-    assert_true([NilClass, Fixnum].include?(@ptable.utime.class))
-  end
-
-  def test_stime
-    assert_respond_to(@ptable, :stime)
-    assert_true([NilClass, Fixnum].include?(@ptable.stime.class))
+    assert_equal({'A' => 'B', 'Z' => nil}, @ptable.environ)
   end
 
   def teardown
@@ -261,7 +108,6 @@ class TC_ProcTable_Darwin < Test::Unit::TestCase
 
   def self.shutdown
     @@fields = nil
-
     Process.kill('TERM', @@pid)
   end
 end

data/test/test_sys_top.rb

@@ -2,45 +2,64 @@
 # test_sys_top.rb
 #
 # Test suite for the sys-top library that is included with this distribution.
+#
+# Tests omitted on OSX until I figure out how to get pctcpu information.
 ##############################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'sys/top'
 
 class TC_Top < Test::Unit::TestCase
   include Sys
 
-  def test_version
+  def setup
+    @osx = RbConfig::CONFIG['host_os'] =~ /darwin/i
+  end
+
+  test "top version" do
     assert_equal('1.0.4', Top::VERSION)
   end
 
-  def test_top_basic
+  test "top basic functionality" do
     assert_respond_to(Top, :top)
+  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
 
-  def test_top
+  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
 
-  def test_top_with_size
+  test "top with size argument returns expected result" do
+    omit_if(@osx)
     assert_equal(5, Top.top(5).length)
   end
 
-  def test_top_with_size_and_sort_by_field
+  test "top with size and sort_by argument returns expected result" do
+    omit_if(@osx)
     assert_equal(5, Top.top(5, :cmdline).length)
   end
 
-  def test_top_return_type
+  test "top returns an array" do
+    omit_if(@osx)
     assert_kind_of(Array, Top.top)
   end
 
-  def test_top_expected_errors
+  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.0.0
+  version: 1.1.0
 platform: universal-darwin
 authors:
 - Daniel J. Berger
@@ -30,7 +30,7 @@ cert_chain:
   EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
   tGSHgAmcLlkdGgan182qsE/4kKM=
   -----END CERTIFICATE-----
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -60,6 +60,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       The sys-proctable library provides an interface for gathering information
       about processes on your system, i.e. the process table. Most major
@@ -68,14 +82,12 @@ description: |2
       platforms.
 email: djberg96@gmail.com
 executables: []
-extensions:
-- ext/darwin/extconf.rb
+extensions: []
 extra_rdoc_files:
 - CHANGES
 - README
 - MANIFEST
 - doc/top.txt
-- ext/darwin/sys/proctable.c
 files:
 - CHANGES
 - MANIFEST
@@ -89,15 +101,16 @@ files:
 - lib/sys/top.rb
 - sys-proctable.gemspec
 - test/test_sys_proctable_all.rb
-- ext/darwin/sys/proctable.c
+- lib/darwin/sys/proctable.rb
 homepage: http://github.com/djberg96/sys-proctable
 licenses:
-- Artistic 2.0
+- Apache 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
+- lib/darwin
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -110,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: An interface for providing process table information

data/ext/darwin/extconf.rb

@@ -1,4 +0,0 @@
-require 'mkmf'
-
-have_type('rb_pid_t', 'ruby.h')
-create_makefile('sys/proctable', 'sys')