sys-proctable 0.9.6-universal-darwin → 0.9.8-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f940ae8b3bc7264a8c92d5363b9a4956b94143fa
-  data.tar.gz: 7baaa9ab3d5dbbbc7f887beeba7d9f15fa4287b5
+  metadata.gz: 5c0f277bcb390cbb37ee944f42c7f132f9ba1d6b
+  data.tar.gz: 03f34300349b231abdd4d7939e8beee52053dea2
 SHA512:
-  metadata.gz: fccda023f19c3f97026ec37388b8980178d268659477bb8c86079eb8953c02400ee98037f63cab72396b75abcba9a9cb2bf2d4fe3c8007881c5b9b998020479e
-  data.tar.gz: 19dcdfb85e4529b1a324224fb25a4036cf68dead3ee8126ba25fcb9a548c43756b753da17c9c69c5bb58e81dc4fed478b71368aa7b79d28b0dc22f1000892bee
+  metadata.gz: 7dcb080bac19fab492d84fe70adf08e05531a4321543ed931b12bf5485c98ce8c8c3155f55dea6552744fd2e8d7d721e063eaedf6ded5a52a75f2e87216b87bb
+  data.tar.gz: 46fcb3170cf7841ab198d57ec79a3215f4f8dba177edfcf814de705c6aa5e38b2b9c54a0ff5bd0a9ffa8b7b339f9adf2734cee4d9bf67669c8856b650beee6a7

data/CHANGES

@@ -1,3 +1,15 @@
+== 0.9.8 - 18-Apr-2015
+* Fixed a bug in the gemspec. Last version got yanked.
+
+== 0.9.7 - 18-Apr-2015
+* Fixed a bug in the OSX code that could cause the ps method to fail. Thanks
+  go to Koshevoy Anton for the spot.
+* Some internal refactoring of version handling. Now all platforms use a
+  single version file.
+* Replaced vm_size_t and lwpid_t with universal data types on FreeBSD because
+  FFI on FreeBSD 10 no longer understands them. Thanks go to Mike Owens for
+  the spot.
+
 == 0.9.6 - 24-Feb-2015
 * Added NLWP field on Linux. Thanks go to Rich Chatterton for the patch.
 

data/MANIFEST

@@ -16,6 +16,7 @@
 * ext/hpux/extconf.rb
 * ext/hpux/sys/proctable.c
 * lib/sys/top.rb
+* lib/sys/proctable/version.rb
 * lib/aix/sys/proctable.rb
 * lib/freebsd/sys/proctable.rb
 * lib/linux/sys/proctable.rb

data/README

@@ -43,7 +43,7 @@
   # Return the results as an array of ProcTableStructs
   a = ProcTable.ps
   a.each do |p|
-    puts a.pid
+    puts p.pid
     # ...
   end
 

data/Rakefile

@@ -191,7 +191,7 @@ namespace :gem do
   desc 'Install the sys-proctable library as a gem'
   task :install => [:create] do
     gem_name = Dir['*.gem'].first
-    sh "gem install #{gem_name}"
+    sh "gem install -l #{gem_name}"
   end
 end
 

data/ext/darwin/sys/proctable.c

@@ -20,8 +20,6 @@
 
 #define pid_of(pproc) pproc->kp_proc.p_pid
 
-#define SYS_PROCTABLE_VERSION "0.9.6"
-
 #define PROC_MIB_LEN 4
 #define ARGS_MIB_LEN 3
 
@@ -32,27 +30,21 @@
 VALUE cProcTableError, sProcStruct;
 
 int argv_of_pid(int pid, VALUE* v_cmdline, VALUE* v_exe, VALUE* v_environ) {
-  int    mib[3], argmax, nargs, c = 0;
-  size_t    size;
-  char    *procargs, *sp, *np, *cp;
+  int mib[3], argmax, nargs, c = 0;
+  size_t size;
+  char *procargs, *sp, *np, *cp;
   int show_args = 1;
 
-  /* fprintf(stderr, "Getting argv of PID %d\n", pid); */
-
   mib[0] = CTL_KERN;
   mib[1] = KERN_ARGMAX;
 
   size = sizeof(argmax);
-  if (sysctl(mib, 2, &argmax, &size, NULL, 0) == -1) {
-    goto ERROR_A;
-  }
 
-  /* Allocate space for the arguments. */
-  procargs = (char *)malloc(argmax);
-  if (procargs == NULL) {
+  if (sysctl(mib, 2, &argmax, &size, NULL, 0) == -1)
     goto ERROR_A;
-  }
 
+  // Allocate space for the arguments.
+  procargs = (char *)ruby_xmalloc(argmax);
 
   /*
    * Make a sysctl() call to get the raw argument space of the process.
@@ -99,40 +91,36 @@ int argv_of_pid(int pid, VALUE* v_cmdline, VALUE* v_exe, VALUE* v_environ) {
   mib[1] = KERN_PROCARGS2;
   mib[2] = pid;
 
-
   size = (size_t)argmax;
-  if (sysctl(mib, 3, procargs, &size, NULL, 0) == -1) {
+
+  if (sysctl(mib, 3, procargs, &size, NULL, 0) == -1)
     goto ERROR_B;
-  }
 
   memcpy(&nargs, procargs, sizeof(nargs));
   cp = procargs + sizeof(nargs);
 
-  /* Copy exec_path to ruby String. */
+  // Copy exec_path to ruby String.
   *v_exe = rb_str_new2(cp);
 
-  /* Skip the saved exec_path. */
+  // Skip the saved exec_path.
   for (; cp < &procargs[size]; cp++) {
-    if (*cp == '\0') {
-      /* End of exec_path reached. */
-      break;
-    }
+    if (*cp == '\0')
+      break; // End of exec_path reached.
   }
-  if (cp == &procargs[size]) {
+
+  if (cp == &procargs[size])
     goto ERROR_B;
-  }
 
-  /* Skip trailing '\0' characters. */
-  for (; cp < &procargs[size]; cp++) {
-    if (*cp != '\0') {
-      /* Beginning of first argument reached. */
-      break;
-    }
+  // Skip trailing '\0' characters.
+  for (; cp < &procargs[size]; cp++){
+    if (*cp != '\0')
+      break; // Beginning of first argument reached.
   }
-  if (cp == &procargs[size]) {
+
+  if (cp == &procargs[size])
     goto ERROR_B;
-  }
-  /* Save where the argv[0] string starts. */
+
+  // Save where the argv[0] string starts.
   sp = cp;
 
   /*
@@ -145,13 +133,11 @@ int argv_of_pid(int pid, VALUE* v_cmdline, VALUE* v_exe, VALUE* v_environ) {
   for (np = NULL; c < nargs && cp < &procargs[size]; cp++) {
     if (*cp == '\0') {
       c++;
-      if (np != NULL) {
-        /* Convert previous '\0'. */
-        *np = ' ';
-      } else {
-        /* *argv0len = cp - sp; */
-      }
-      /* Note location of current '\0'. */
+
+      if (np != NULL)
+        *np = ' '; // Convert previous '\0'.
+
+      // Note location of current '\0'.
       np = cp;
 
       if (!show_args) {
@@ -170,31 +156,31 @@ int argv_of_pid(int pid, VALUE* v_cmdline, VALUE* v_exe, VALUE* v_environ) {
    * sp points to the beginning of the arguments/environment string, and
    * np should point to the '\0' terminator for the string.
    */
-  if (np == NULL || np == sp) {
-    /* Empty or unterminated string. */
-    goto ERROR_B;
-  }
+  if (np == NULL || np == sp)
+    goto ERROR_B; // Empty or unterminated string.
 
-  /* Make a copy of the string to ruby String. */
+  // Make a copy of the string to ruby String.
   *v_cmdline = rb_str_new2(sp);
 
-  /* Read environment variables to ruby Hash. */
+  // Read environment variables to ruby Hash.
   *v_environ = rb_hash_new();
+
   while (cp[0]) {
     sp = strsep(&cp, "=");
-    if (sp == NULL) {
+
+    if (!sp || !cp)
       break;
-    }
+
     rb_hash_aset(*v_environ, rb_str_new2(sp), rb_str_new2(cp));
     cp += strlen(cp) + 1;
   }
 
-  /* Clean up. */
-  free(procargs);
+  // Cleanup.
+  ruby_xfree(procargs);
   return 0;
 
   ERROR_B:
-  free(procargs);
+  ruby_xfree(procargs);
   ERROR_A:
   return -1;
 }
@@ -235,10 +221,7 @@ static VALUE pt_ps(int argc, VALUE* argv, VALUE klass){
     rb_raise(cProcTableError, "sysctl: %s", strerror(errno));
 
   // Populate the kproc buffer
-  procs = malloc(length);
-
-  if(procs == NULL)
-    rb_raise(cProcTableError, "malloc: %s", strerror(errno));
+  procs = ruby_xmalloc(length);
 
   err = sysctl( (int *) name_mib, PROC_MIB_LEN, procs, &length, NULL, 0);
 
@@ -300,9 +283,9 @@ static VALUE pt_ps(int argc, VALUE* argv, VALUE klass){
     }
 
     v_groups = rb_ary_new();
-    for (g = 0; g < procs[i].kp_eproc.e_ucred.cr_ngroups; ++g) {
+
+    for (g = 0; g < procs[i].kp_eproc.e_ucred.cr_ngroups; ++g)
       rb_ary_push(v_groups, INT2FIX(procs[i].kp_eproc.e_ucred.cr_groups[g]));
-    }
 
     v_pstruct = rb_struct_new(
       sProcStruct,
@@ -357,7 +340,8 @@ static VALUE pt_ps(int argc, VALUE* argv, VALUE klass){
       rb_ary_push(v_array, v_pstruct);
   }
 
-  if(procs) free(procs);
+  if(procs)
+    free(procs);
 
   if(!rb_block_given_p()){
     if(NIL_P(v_pid))
@@ -415,10 +399,8 @@ void Init_proctable(){
   /* There is no constructor */
   rb_funcall(cProcTable, rb_intern("private_class_method"), 1, ID2SYM(rb_intern("new")));
 
-  /* Constants */
-
-  /* 0.9.6: The version of the sys-proctable library */
-  rb_define_const(cProcTable, "VERSION", rb_str_new2(SYS_PROCTABLE_VERSION));
+  /* 0.9.8: The version of the sys-proctable library */
+  rb_define_const(cProcTable, "VERSION", rb_str_new2("0.9.8"));
 
   /* Structs */
 

data/lib/sys/proctable/version.rb

@@ -0,0 +1,6 @@
+module Sys
+  class ProcTable
+    # The version of the sys-proctable library
+    VERSION = '0.9.8'
+  end
+end

data/sys-proctable.gemspec

@@ -2,11 +2,11 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-proctable'
-  spec.version    = '0.9.6'
+  spec.version    = '0.9.8'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Artistic 2.0' 
   spec.email      = 'djberg96@gmail.com'
-  spec.homepage   = 'http://www.rubyforge.org/projects/sysutils'
+  spec.homepage   = 'http://github.com/djberg96/sys-proctable'
   spec.platform   = Gem::Platform::CURRENT # Probably altered by Rake task
   spec.summary    = 'An interface for providing process table information'
   spec.test_files = ['test/test_sys_proctable_all.rb']
@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
   spec.files = [
     'benchmarks/bench_ps.rb',
     'examples/example_ps.rb',
+    'lib/sys/proctable/version.rb',
     'lib/sys/top.rb',
     'CHANGES',
     'MANIFEST',
@@ -23,7 +24,6 @@ Gem::Specification.new do |spec|
     'sys-proctable.gemspec'
   ]
 
-  spec.rubyforge_project = 'sysutils'
   spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST', 'doc/top.txt']
 
   spec.add_development_dependency('test-unit')

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.6', ProcTable::VERSION)
+    assert_equal('0.9.8', ProcTable::VERSION)
   end
 
   def test_fields

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sys-proctable
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8
 platform: universal-darwin
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -64,12 +64,13 @@ files:
 - examples/example_ps.rb
 - ext/darwin/extconf.rb
 - ext/darwin/sys/proctable.c
+- lib/sys/proctable/version.rb
 - lib/sys/top.rb
 - sys-proctable.gemspec
 - test/test_sys_proctable_all.rb
 - test/test_sys_proctable_darwin.rb
 - test/test_sys_top.rb
-homepage: http://www.rubyforge.org/projects/sysutils
+homepage: http://github.com/djberg96/sys-proctable
 licenses:
 - Artistic 2.0
 metadata: {}
@@ -88,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sysutils
+rubyforge_project: 
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4