proc-wait3 1.6.0 → 1.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c48dfef5da3932850a5edfd6fc5dc1ccb710ede6
+  data.tar.gz: f861c07250bef10b844fb787839066659916cfc9
+SHA512:
+  metadata.gz: 79bb2aec93d32d8cbd1d22030e9fe8f684f38faacf3c0cb2ce79e4d3c30a710c863cbb017cfcfe94922612bbc6548c81c3f817683e50a8d0b44112328644653c
+  data.tar.gz: 55e6b2168f84b5115ab428264efeefb87cb1d0e1f301c6040af13fe8595f4b1f82fbfa9392f63180df0f5c0aec4cc26bc2f158d0936bbb2daeb497f5644cc58f

data/CHANGES

@@ -1,3 +1,12 @@
+== 1.7.0 - 6-Apr-2014
+* The wait3 and wait4 methods no longer set $? to a custom struct. The builtin
+  variable is still set, but if you need the custom Struct::ProcStat information
+  then use the $last_status global instead, or just use the return value. This
+  was changed thanks to an issue pointed out by Michael Lee Squires where
+  subsequent system calls no longer set $? properly.
+* Some build warning fixes for BSD platforms.
+* Some test updates for BSD and Solaris.
+
 == 1.6.0 - 28-Aug-2011
 * Removed the getrlimit and setrlimit methods. Ruby has supported these methods
   since Ruby 1.8.5, so I think it's time to finally dump them.

data/README

@@ -1,7 +1,6 @@
 = Description
   Adds the wait3, wait4, waitid, pause, sigsend, and getrusage methods to
-  the Process module. For Ruby 1.8.4 or earlier, it also adds the getrlimit
-  and setrlimit methods.
+  the Process module.
 
 = Installation
   gem install proc-wait3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'fileutils'
 require 'rbconfig'
-include Config
+include RbConfig
 
 CLEAN.include(
   '**/*.gem',               # Gem files
@@ -20,7 +20,7 @@ task :build => [:clean] do |t|
   Dir.chdir('ext') do
     ruby 'extconf.rb'
     sh 'make'
-    FileUtils.mv 'wait3.' + Config::CONFIG['DLEXT'], 'proc'
+    FileUtils.mv 'wait3.' + RbConfig::CONFIG['DLEXT'], 'proc'
   end
 end
 
@@ -28,7 +28,12 @@ namespace :gem do
   desc "Create the proc-wait3 gem"
   task :create => [:clean] do
     spec = eval(IO.read('proc-wait3.gemspec'))
-    Gem::Builder.new(spec).build
+    if Gem::VERSION < "2.0"
+      Gem::Builder.new(spec).build
+    else
+      require 'rubygems/package'
+      Gem::Package.build(spec)
+    end
   end
 
   desc "Install the proc-wait3 gem"

data/doc/wait3.txt

@@ -1,7 +1,6 @@
 == Description
    Adds the wait3, wait4, waitid, pause, sigsend, and getrusage methods to
-   the Process module.  For Ruby 1.8.4 or earlier, it also adds the getrlimit
-   and setrlimit methods.
+   the Process module.
 
 == Synopsis
    require 'proc/wait3'
@@ -33,12 +32,14 @@ Proc.wait3(flags=0)
    Delays its caller until a signal is received or one of its child processes
    terminates or stops due to tracing.
 
-   The return value is a ProcStat structure. The special global $? is also
-   set. Raises a SystemError if there are no child processes.
+   The return value is a ProcStat structure and sets the $last_status global
+   variable. The special global $? is also set. Raises a SystemError if there
+   are no child processes.
 
 Proc.wait4(pid, flags=0)
    Waits for the given child process to exit. Returns a ProcStat structure.
-   Also sets the $? special global variable.
+   The $last_status global variable is set. Also sets the $? special global
+   variable.
    
 Proc.waitid(id_type, id_num=nil, options=nil)
    Suspends the calling process until one of its children changes state,
@@ -72,16 +73,6 @@ Proc.waitid(id_type, id_num=nil, options=nil)
 
    Not supported on all platforms.
 
-== Ruby 1.8.4 or earlier.
-Process.getrlimit(resource) => [cur_limit, max_limit]
-   Returns a two element array consisting of the hard and soft limit
-   for the current process for the given +resource+.  The array consists of
-   either numeric values or the word "infinite".
-   
-Process.setrlimit(resource, current, max=nil) => nil
-   Sets the resource limit for +resource+ to +current+ for the soft limit and
-   +max+ for the hard limit, or to +current+ if +max+ is nil.
-
 == Constants
 === Standard
 Process::WAIT3_VERSION
@@ -179,14 +170,14 @@ Process::RLIM_SAVED_MAX
    struct.
 
 == Known Bugs
-   None that I'm aware of. Please log any bugs on the RubyForge project
-   page at http://www.rubyforge.org/projects/shards.
+   None that I'm aware of. Please log any bugs on the Github project
+   page at https://github.com/djberg96/proc-wait3.
 
 == License
    Artistic 2.0
 
 == Copyright
-   (C) 2003-2009 Daniel J. Berger
+   (C) 2003-2014 Daniel J. Berger
    All Rights Reserved.
 
 == Warranty

data/ext/extconf.rb

@@ -44,6 +44,7 @@ have_func('strlcpy')
 # wait4, waitid, etc, are optional (HPUX, et al)
 have_func('wait4')
 have_func('waitid')
+have_func('sigset')
 have_func('sigsend')
 have_func('getrusage')
 have_func('getdtablesize')
@@ -64,7 +65,20 @@ have_struct_member('struct siginfo', 'si_stime', 'signal.h')
 
 have_const('P_CID', 'signal.h')
 have_const('P_GID', 'signal.h')
-have_const('P_MYID', 'signal.h')
+have_const('P_MYID', 'signal.hclass PasswdStruct < FFI::Struct
+      layout(
+        :pw_name, :string,
+        :pw_passwd, :string,
+        :pw_uid, :uint,
+        :pw_gid, :uint,
+        :pw_change, :ulong,
+        :pw_class, :string,
+        :pw_gecos, :string,
+        :pw_dir, :string,
+        :pw_shell, :string,
+        :pw_expire, :ulong
+      )
+    end')
 have_const('P_SID', 'signal.h')
 have_const('P_UID', 'signal.h')
 

data/ext/proc/wait3.c

@@ -9,7 +9,7 @@
 #include <sys/wait.h>
 #endif
 
-#ifdef HAVE_WAITID
+#if defined(HAVE_WAITID) || defined(HAVE_SIGSET)
 #include <signal.h>
 #endif
 
@@ -65,10 +65,10 @@ static VALUE pst_wifstopped(int status)
  */
 static VALUE pst_wifsignaled(int status)
 {
-   if (WIFSIGNALED(status))
-	   return Qtrue;
-   else
-      return Qfalse;
+  if (WIFSIGNALED(status))
+	  return Qtrue;
+  else
+    return Qfalse;
 }
 
 /*
@@ -77,10 +77,10 @@ static VALUE pst_wifsignaled(int status)
  */
 static VALUE pst_wifexited(int status)
 {
-   if (WIFEXITED(status))
-      return Qtrue;
-   else
-      return Qfalse;
+  if (WIFEXITED(status))
+    return Qtrue;
+  else
+    return Qfalse;
 }
 
 /*
@@ -89,9 +89,10 @@ static VALUE pst_wifexited(int status)
  */
 static VALUE pst_success_p(int status)
 {
-   if (!WIFEXITED(status))
-      return Qnil;
-   return WEXITSTATUS(status) == EXIT_SUCCESS ? Qtrue : Qfalse;
+  if (!WIFEXITED(status))
+    return Qnil;
+
+  return WEXITSTATUS(status) == EXIT_SUCCESS ? Qtrue : Qfalse;
 }
 
 /*
@@ -101,12 +102,12 @@ static VALUE pst_success_p(int status)
 static VALUE pst_wcoredump(int status)
 {
 #ifdef WCOREDUMP
-   if (WCOREDUMP(status))
-      return Qtrue;
-   else
-      return Qfalse;
+  if (WCOREDUMP(status))
+    return Qtrue;
+  else
+    return Qfalse;
 #else
-   return Qfalse;
+  return Qfalse;
 #endif
 }
 
@@ -116,9 +117,10 @@ static VALUE pst_wcoredump(int status)
  */
 static VALUE pst_wexitstatus(int status)
 {
-   if (WIFEXITED(status))
-      return INT2NUM(WEXITSTATUS(status));
-   return Qnil;
+  if (WIFEXITED(status))
+    return INT2NUM(WEXITSTATUS(status));
+
+  return Qnil;
 }
 
 /*
@@ -127,9 +129,10 @@ static VALUE pst_wexitstatus(int status)
  */
 static VALUE pst_wtermsig(int status)
 {
-   if (WIFSIGNALED(status))
-      return INT2NUM(WTERMSIG(status));
-   return Qnil;
+  if (WIFSIGNALED(status))
+    return INT2NUM(WTERMSIG(status));
+
+  return Qnil;
 }
 
 /*
@@ -138,9 +141,10 @@ static VALUE pst_wtermsig(int status)
  */
 static VALUE pst_wstopsig(int status)
 {
-   if(WIFSTOPPED(status))
-      return INT2NUM(WSTOPSIG(status));
-   return Qnil;
+  if(WIFSTOPPED(status))
+    return INT2NUM(WSTOPSIG(status));
+
+  return Qnil;
 }
 
 /*
@@ -200,6 +204,10 @@ static VALUE proc_wait3(int argc, VALUE *argv, VALUE mod){
          pst_wtermsig(status),
          pst_wstopsig(status)
       );
+
+      rb_last_status_set(status, pid);
+      OBJ_FREEZE(v_last_status);
+
       return v_last_status;
    }
    else{
@@ -268,6 +276,10 @@ static VALUE proc_wait4(int argc, VALUE *argv, VALUE mod){
          pst_wtermsig(status),
          pst_wstopsig(status)
       );
+
+      rb_last_status_set(status, pid);
+      OBJ_FREEZE(v_last_status);
+
       return v_last_status;
    }
    else{
@@ -670,36 +682,36 @@ static void sigproc(int signum){ /* Do nothing */ }
  *      Any non-system process whose effective user ID is equal to +id+.
  */
 static VALUE proc_sigsend(int argc, VALUE* argv, VALUE mod){
-   VALUE v_type, v_pid, v_signal;
-   idtype_t idtype;
-   id_t id;
-   int sig = 0; /* 0 is our default signal (i.e. no signal) */
+  VALUE v_type, v_pid, v_signal;
+  idtype_t idtype;
+  id_t id;
+  int sig = 0; /* 0 is our default signal (i.e. no signal) */
 
-   rb_scan_args(argc, argv, "21", &v_type, &v_pid, &v_signal);
+  rb_scan_args(argc, argv, "21", &v_type, &v_pid, &v_signal);
 
-   idtype = NUM2INT(v_type);
-   id = NUM2INT(v_pid);
+  idtype = NUM2INT(v_type);
+  id = NUM2INT(v_pid);
 
-   if(!NIL_P(v_signal)){
-      if(TYPE(v_signal) == T_FIXNUM){
-         sig = FIX2INT(v_signal);
-      }
-      else{
-         char signame[SIG2STR_MAX];
-         unsigned int max = SIG2STR_MAX;
+  if(!NIL_P(v_signal)){
+    if(TYPE(v_signal) == T_FIXNUM){
+      sig = FIX2INT(v_signal);
+    }
+    else{
+      char signame[SIG2STR_MAX];
+      unsigned int max = SIG2STR_MAX;
 
-         if(strlcpy(signame, StringValuePtr(v_signal), max) >= max)
-            rb_raise(rb_eArgError, "string too large");
+      if(strlcpy(signame, StringValuePtr(v_signal), max) >= max)
+        rb_raise(rb_eArgError, "string too large");
 
-         if(str2sig(signame,&sig) != 0)
-            rb_sys_fail("str2sig");
-      }
-   }
+      if(str2sig(signame,&sig) != 0)
+        rb_sys_fail("str2sig");
+    }
+  }
 
-   if(sigsend(idtype,id,sig) != 0)
-      rb_sys_fail("sigsend");
+  if(sigsend(idtype,id,sig) != 0)
+    rb_sys_fail("sigsend");
 
-   return Qnil;
+  return Qnil;
 }
 #endif
 
@@ -709,8 +721,8 @@ static VALUE proc_sigsend(int argc, VALUE* argv, VALUE mod){
  *    Process.getrusage(children=false)
  *
  * Returns comprehensive process resource usage information in the form of a
- * RUsage struct.  By default, this will return information for the current
- * process.  If +children+ is set to true, it will return information for
+ * RUsage struct. By default, this will return information for the current
+ * process. If +children+ is set to true, it will return information for
  * terminated and waited for children of the current process.
  *
  * The RUsage struct contains the following members:
@@ -735,36 +747,36 @@ static VALUE proc_sigsend(int argc, VALUE* argv, VALUE mod){
  * Note that not all members contain meaningful values on all platforms.
  */
 static VALUE proc_getrusage(int argc, VALUE* argv, VALUE mod){
-   VALUE v_children = Qfalse;
-   struct rusage r;
-   int who = RUSAGE_SELF;
-
-   rb_scan_args(argc, argv, "01", &v_children);
-
-   if(RTEST(v_children))
-      who = RUSAGE_CHILDREN;
-
-   if(getrusage(who,&r) == -1)
-      rb_sys_fail("getrusage");
-
-   return rb_struct_new(v_usage_struct,
-      rb_float_new((double)r.ru_utime.tv_sec+(double)r.ru_utime.tv_usec/1e6),
-      rb_float_new((double)r.ru_stime.tv_sec+(double)r.ru_stime.tv_usec/1e6),
-      LONG2NUM(r.ru_maxrss),
-      LONG2NUM(r.ru_ixrss),
-      LONG2NUM(r.ru_idrss),
-      LONG2NUM(r.ru_isrss),
-      LONG2NUM(r.ru_minflt),
-      LONG2NUM(r.ru_majflt),
-      LONG2NUM(r.ru_nswap),
-      LONG2NUM(r.ru_inblock),
-      LONG2NUM(r.ru_oublock),
-      LONG2NUM(r.ru_msgsnd),
-      LONG2NUM(r.ru_msgrcv),
-      LONG2NUM(r.ru_nsignals),
-      LONG2NUM(r.ru_nvcsw),
-      LONG2NUM(r.ru_nivcsw)
-   );
+  VALUE v_children = Qfalse;
+  struct rusage r;
+  int who = RUSAGE_SELF;
+
+  rb_scan_args(argc, argv, "01", &v_children);
+
+  if(RTEST(v_children))
+    who = RUSAGE_CHILDREN;
+
+  if(getrusage(who,&r) == -1)
+    rb_sys_fail("getrusage");
+
+  return rb_struct_new(v_usage_struct,
+    rb_float_new((double)r.ru_utime.tv_sec+(double)r.ru_utime.tv_usec/1e6),
+    rb_float_new((double)r.ru_stime.tv_sec+(double)r.ru_stime.tv_usec/1e6),
+    LONG2NUM(r.ru_maxrss),
+    LONG2NUM(r.ru_ixrss),
+    LONG2NUM(r.ru_idrss),
+    LONG2NUM(r.ru_isrss),
+    LONG2NUM(r.ru_minflt),
+    LONG2NUM(r.ru_majflt),
+    LONG2NUM(r.ru_nswap),
+    LONG2NUM(r.ru_inblock),
+    LONG2NUM(r.ru_oublock),
+    LONG2NUM(r.ru_msgsnd),
+    LONG2NUM(r.ru_msgrcv),
+    LONG2NUM(r.ru_nsignals),
+    LONG2NUM(r.ru_nvcsw),
+    LONG2NUM(r.ru_nivcsw)
+  );
 }
 #endif
 
@@ -778,7 +790,7 @@ static VALUE proc_getrusage(int argc, VALUE* argv, VALUE mod){
  * as the resource identifier.
 */
 static VALUE proc_getdtablesize(VALUE mod){
-   return INT2FIX(getdtablesize());
+  return INT2FIX(getdtablesize());
 }
 #endif
 
@@ -949,9 +961,9 @@ void Init_wait3()
   rb_define_const(rb_mProcess, "P_PROJID", INT2FIX(P_PROJID));
 #endif
 
-  /* 1.6.0: The version of the proc-wait3 library */
-  rb_define_const(rb_mProcess, "WAIT3_VERSION", rb_str_new2("1.6.0"));
+  /* 1.7.0: The version of the proc-wait3 library */
+  rb_define_const(rb_mProcess, "WAIT3_VERSION", rb_str_new2("1.7.0"));
 
   /* Define this last in our Init_wait3 function */
-  rb_define_readonly_variable("$?", &v_last_status);
+  rb_define_readonly_variable("$last_status", &v_last_status);
 }

data/proc-wait3.gemspec

@@ -2,21 +2,20 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'proc-wait3'
-  spec.version    = '1.6.0'
+  spec.version    = '1.7.0'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'
-  spec.homepage   = 'http://www.rubyforge.org/projects/shards'
-  spec.platform   = Gem::Platform::RUBY
+  spec.homepage   = 'https://github.com/djberg96/proc-wait3'
   spec.summary    = 'Adds wait3, wait4 and other methods to the Process module'
   spec.test_file  = 'test/test_proc_wait3.rb'
   spec.extensions = ['ext/extconf.rb']
   spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
 
-  spec.rubyforge_project = 'shards'
   spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST', 'ext/proc/wait3.c']
 
-  spec.add_development_dependency('test-unit', '>= 2.1.0')
+  spec.add_development_dependency('test-unit')
+  spec.add_development_dependency('rake')
 
   spec.description = <<-EOF
     The proc-wait3 library adds the wait3, wait4, waitid, pause, sigsend,

data/test/test_proc_wait3.rb

@@ -4,21 +4,17 @@
 # Test suite for the Ruby proc-wait3 package. You should run this
 # via the 'test' rake task.
 ##################################################################
-require 'rubygems'
-gem 'test-unit'
-
 require 'proc/wait3'
-require 'test/unit'
+require 'test-unit'
 require 'rbconfig'
 
-class TC_Proc_Wait3 < Test::Unit::TestCase  
+class TC_Proc_Wait3 < Test::Unit::TestCase
   def self.startup
-    @@solaris = Config::CONFIG['host_os'] =~ /sunos|solaris/i
-    @@darwin  = Config::CONFIG['host_os'] =~ /darwin|osx/i
-    @@hpux    = Config::CONFIG['host_os'] =~ /hpux/i
-    @@linux   = Config::CONFIG['host_os'] =~ /linux/i
-    @@freebsd = Config::CONFIG['host_os'] =~ /bsd/i
-    @@old_ruby = RUBY_VERSION.split('.').last.to_i < 5
+    @@solaris = RbConfig::CONFIG['host_os'] =~ /sunos|solaris/i
+    @@darwin  = RbConfig::CONFIG['host_os'] =~ /darwin|osx/i
+    @@hpux    = RbConfig::CONFIG['host_os'] =~ /hpux/i
+    @@linux   = RbConfig::CONFIG['host_os'] =~ /linux/i
+    @@freebsd = RbConfig::CONFIG['host_os'] =~ /bsd/i
   end
 
   def setup
@@ -36,31 +32,50 @@ class TC_Proc_Wait3 < Test::Unit::TestCase
     end
   end
 
-  def test_wait3_version
-    assert_equal('1.6.0', Process::WAIT3_VERSION)
+  test "version constant is set to expected value" do
+    assert_equal('1.7.0', Process::WAIT3_VERSION)
   end
 
-  def test_wait3_basic
+  test "wait3 method is defined" do
     assert_respond_to(Process, :wait3)
   end
 
-  def test_wait3_no_args
-    pid = fork{ sleep 1 }
+  test "wait3 works as expected" do
+    fork{ sleep 0.5 }
     assert_nothing_raised{ Process.wait3 }
   end
 
-  def test_wait3_procstat_members
-    pid = fork{ sleep 1 }
+  test "wait3 returns the expected proc status membes" do
+    fork{ sleep 0.5 }
     assert_nothing_raised{ @proc_stat = Process.wait3 }
     assert_equal(@proc_stat_members, @proc_stat.members)
   end
 
-  def test_wait3_nohang
-    pid = fork{ sleep 1 }
+  test "wait3 with WNOHANG works as expected" do
+    fork{ sleep 0.5 }
     assert_nothing_raised{ Process.wait3(Process::WNOHANG) }
   end
 
-  def test_getdtablesize
+  test "wait3 sets and returns $last_status to expected values" do
+    fork{ sleep 0.5 }
+    Process.wait3
+    assert_kind_of(Struct::ProcStat, $last_status)
+    assert_not_nil($last_status)
+  end
+
+  test "wait3 sets pid and status members of $?" do
+    fork{ sleep 0.5 }
+    Process.wait3
+    assert_not_nil($?)
+  end
+
+  test "wait3 returns frozen struct" do
+    fork{ sleep 0.5 }
+    struct = Process.wait3
+    assert_true(struct.frozen?)
+  end
+
+  test "getdtablesize works as expected" do
     omit_unless(@@solaris, 'getdtablesize skipped on this platform')
 
     assert_respond_to(Process, :getdtablesize)
@@ -68,74 +83,100 @@ class TC_Proc_Wait3 < Test::Unit::TestCase
     assert(Process.getdtablesize > 0)
   end
 
-  def test_wait4_basic
+  test "wait4 method is defined" do
     omit_if(@@hpux, 'wait4 test skipped on this platform')
-
     assert_respond_to(Process,:wait4)
-    assert_raises(ArgumentError){ Process.wait4 } # Must have at least 1 arg
   end
 
-  def test_wait4_in_action
+  test "wait4 requires at least one argument" do
+    assert_raises(ArgumentError){ Process.wait4 }
+  end
+
+  test "wait4 works as expected" do
     omit_if(@@hpux, 'wait4 test skipped on this platform')
 
-    pid = fork{ sleep 1 }
-    assert_nothing_raised{ @proc_stat = Process.wait4(pid) }      
+    pid = fork{ sleep 0.5 }
+    assert_nothing_raised{ @proc_stat = Process.wait4(pid) }
     assert_kind_of(Struct::ProcStat, @proc_stat)
   end
 
-  def test_waitid_basic
-    omit_if(@@hpux || @@darwin || @@freebsd, 'waitid test skipped on this platform')
+  test "wait4 sets and returns $last_status to expected values" do
+    pid = fork{ sleep 0.5 }
+    Process.wait4(pid)
+    assert_kind_of(Struct::ProcStat, $last_status)
+    assert_not_nil($last_status)
+  end
 
-    assert_respond_to(Process, :waitid)
+  test "wait4 sets pid and status members of $?" do
+    pid = fork{ sleep 0.5 }
+    Process.wait4(pid)
+    assert_not_nil($?)
+  end
+
+  test "wait4 returns frozen struct" do
+    pid = fork{ sleep 0.5 }
+    struct = Process.wait4(pid)
+    assert_true(struct.frozen?)
   end
 
-  def test_waitid
+  test "waitid method is defined" do
     omit_if(@@hpux || @@darwin || @@freebsd, 'waitid test skipped on this platform')
-    pid = fork{ sleep 1 }
+    assert_respond_to(Process, :waitid)
+  end
 
+  test "waitid method works as expected" do
+    omit_if(@@hpux || @@darwin || @@freebsd, 'waitid test skipped on this platform')
+    pid = fork{ sleep 0.5 }
     assert_nothing_raised{ Process.waitid(Process::P_PID, pid, Process::WEXITED) }
   end
 
-  def test_waitid_expected_errors
+  test "waitid method raises expected errors if wrong argument type is passed" do
     omit_if(@@hpux || @@darwin || @@freebsd, 'waitid test skipped on this platform')
-    pid = fork{ sleep 1 }
-
+    pid = fork{ sleep 0.5 }
     assert_raises(TypeError){ Process.waitid("foo", pid, Process::WEXITED) }
     assert_raises(TypeError){ Process.waitid(Process::P_PID, pid, "foo") }
     assert_raises(TypeError){ Process.waitid(Process::P_PID, "foo", Process::WEXITED) }
+  end
+
+  test "waitid method raises expected error if invalid argument is passed" do
+    omit_if(@@hpux || @@darwin || @@freebsd, 'waitid test skipped on this platform')
+    fork{ sleep 0.5 }
     assert_raises(Errno::ECHILD, Errno::EINVAL){ Process.waitid(Process::P_PID, 99999999, Process::WEXITED) }
   end
 
-  def test_sigsend_basic
+  test "sigsend method is defined" do
     omit_unless(@@solaris, 'sigsend test skipped on this platform')
     assert_respond_to(Process, :sigsend)
   end
 
-  def test_sigsend_in_action
+  test "sigsend works as expected" do
     omit_unless(@@solaris, 'sigsend test skipped on this platform')
-    pid = fork{ sleep 1 }
-
+    pid = fork{ sleep 0.5 }
     assert_nothing_raised{ Process.sigsend(Process::P_PID, pid, 0) }
   end
 
-  def test_getrusage_basic
+  test "getrusage method is defined" do
     assert_respond_to(Process, :getrusage)
   end
 
-  def test_getrusage_in_action
-    pid = fork{ sleep 1 }
+  test "getrusage works as expected" do
+    fork{ sleep 0.5 }
     assert_nothing_raised{ Process.getrusage }
     assert_nothing_raised{ Process.getrusage(true) }
+  end
+
+  test "getrusage returns the expected struct" do
+    fork{ sleep 0.5 }
     assert_kind_of(Struct::RUsage, Process.getrusage)
     assert_kind_of(Float, Process.getrusage.stime)
     assert_kind_of(Float, Process.getrusage.utime)
   end
 
-  def test_pause
+  test "pause method is defined" do
     assert_respond_to(Process, :pause)
   end
 
-  def test_wait_constants
+  test "expected constants are defined" do
     omit_if(@@darwin || @@freebsd, 'wait constant check skipped on this platform')
 
     assert_not_nil(Process::WCONTINUED)
@@ -147,78 +188,20 @@ class TC_Proc_Wait3 < Test::Unit::TestCase
     assert_not_nil(Process::WTRAPPED)
   end
 
-  def test_getrlimit
-    omit_unless(@@old_ruby, 'getrlimit test skipped on recent versions of Ruby')
-
-    assert_respond_to(Process, :getrlimit)
-    assert_nothing_raised{ Process.getrlimit(Process::RLIMIT_CPU) }
-    assert_kind_of(Array, Process.getrlimit(Process::RLIMIT_CPU))
-    assert_equal(2, Process.getrlimit(Process::RLIMIT_CPU).length)
-  end
-
-  def test_setrlimit
-    omit_unless(@@old_ruby, 'setrlimit test skipped on recent versions of Ruby')
-
-    assert_respond_to(Process, :setrlimit)
-    assert_nothing_raised{
-      Process.setrlimit(
-        Process::RLIMIT_CPU,
-        Process::RLIM_SAVED_CUR,
-        Process::RLIM_SAVED_MAX
-      )
-    }
-
-    assert_nothing_raised{
-      Process.setrlimit(Process::RLIMIT_CPU, Process::RLIM_SAVED_CUR)
-    }
-  end
-
-  # Test to ensure that the various rlimit constants are defined.  Note that
-  # as of Ruby 1.8.5 these are defined by Ruby itself, except for the
-  # RLIMIT_VMEM constant, which is platform dependent.
-  #
-  def test_rlimit_constants
-    assert_not_nil(Process::RLIMIT_AS)
-    assert_not_nil(Process::RLIMIT_CORE)
-    assert_not_nil(Process::RLIMIT_CPU)
-    assert_not_nil(Process::RLIMIT_DATA)
-    assert_not_nil(Process::RLIMIT_FSIZE)
-    assert_not_nil(Process::RLIMIT_NOFILE)
-    assert_not_nil(Process::RLIMIT_STACK)
-    assert_not_nil(Process::RLIM_INFINITY)
-  end
-
-  def test_nonstandard_rlimit_constants
-    omit_unless(@@old_ruby, 'nonstandard rlimit constant tests skipped on recent versions of Ruby') 
-    assert_not_nil(Process::RLIM_SAVED_MAX)
-    assert_not_nil(Process::RLIM_SAVED_CUR)
-  end
-
-  # This test was added to ensure that these three constants are being
-  # defined properly after an issue appeared on Linux with regards to
-  # the value accidentally being assigned a negative value.
-  #
-  def test_rlimit_constants_valid
-    omit_unless(@@old_ruby, 'valid rlimit constant tests skipped on recent versions of Ruby')
-    assert(Process::RLIM_INFINITY > 0)
-    assert(Process::RLIM_SAVED_MAX > 0)
-    assert(Process::RLIM_SAVED_CUR > 0)
-  end
-
-  def test_process_type_flags
+  test "expected process type flag constants are defined" do
     omit_if(@@linux || @@darwin || @@freebsd, 'process type flag check skipped on this platform')
 
     assert_not_nil(Process::P_ALL)
     assert_not_nil(Process::P_CID)
     assert_not_nil(Process::P_GID)
-    assert_not_nil(Process::P_MYID)
+    assert_not_nil(Process::P_MYID) unless @@solaris
     assert_not_nil(Process::P_PGID)
-    assert_not_nil(Process::P_PID)     
-    assert_not_nil(Process::P_SID)     
+    assert_not_nil(Process::P_PID)
+    assert_not_nil(Process::P_SID)
     assert_not_nil(Process::P_UID)
   end
 
-  def test_solaris_process_type_flags
+  test "solaris-specific process type flags are defined on solaris" do
     omit_unless(@@solaris, 'P_TASKID and P_PROJID constant check skipped on this platform')
 
     assert_not_nil(Process::P_TASKID)
@@ -236,6 +219,5 @@ class TC_Proc_Wait3 < Test::Unit::TestCase
     @@hpux     = nil
     @@linux    = nil
     @@freebsd  = nil
-    @@old_ruby = nil
   end
-end 
+end

metadata

@@ -1,50 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: proc-wait3
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  - 0
-  version: 1.6.0
+version: !ruby/object:Gem::Version
+  version: 1.7.0
 platform: ruby
-authors: 
+authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-28 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-04-06 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
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
+      - !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
-  version_requirements: *id001
-description: "    The proc-wait3 library adds the wait3, wait4, waitid, pause, sigsend,\n    and getrusage methods to the Process module.\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |2
+      The proc-wait3 library adds the wait3, wait4, waitid, pause, sigsend,
+      and getrusage methods to the Process module.
 email: djberg96@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGES
 - README
 - MANIFEST
 - ext/proc/wait3.c
-files: 
+files:
 - CHANGES
+- MANIFEST
+- README
+- Rakefile
 - doc/wait3.txt
 - examples/example_getrusage.rb
 - examples/example_pause.rb
@@ -53,42 +63,31 @@ files:
 - examples/example_waitid.rb
 - ext/extconf.rb
 - ext/proc/wait3.c
-- MANIFEST
 - proc-wait3.gemspec
-- Rakefile
-- README
 - test/test_proc_wait3.rb
-has_rdoc: true
-homepage: http://www.rubyforge.org/projects/shards
-licenses: 
+homepage: https://github.com/djberg96/proc-wait3
+licenses:
 - Artistic 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: shards
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Adds wait3, wait4 and other methods to the Process module
-test_files: 
+test_files:
 - test/test_proc_wait3.rb