sys-proctable 1.1.1-universal-darwin → 1.1.2-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 536255fca496dc375430fe9698a5f277fdd8db10
-  data.tar.gz: f108e5642d8312dae6fc598023c2a2703320278a
+  metadata.gz: 652e5437c3bb1f7b387ddb2eddd4395a82826f97
+  data.tar.gz: 0b464c401191ad8cd20e2a04d6367fe0efa2130d
 SHA512:
-  metadata.gz: 113ed8abaa560fd6abaa75b545eb9d068c8a510c388ea0eda1c97ba80a2571df9ae11653888920e42f93e775920df151bc65ea9f835a94ef0bb3dcc7bad2f925
-  data.tar.gz: 7d0eb460512b0c1f9cb8173de138069cea86382f0b4173845479c79855e8cbfc8239dbb907b1b8dad00b1511438dfda4f3a40613e782183ec5ee17a47140085b
+  metadata.gz: 1c7eb21e84df140ee2ee80a2004c5bfb474f046cfb578f266142e23ea0efb47afb17ec0e0faaf6795ca67b6b1bc4371f0fa8ed5e6f17feef50e32c53d6e4d57c
+  data.tar.gz: 8698da48d99fb21fe9d74ce3c1b083a83ac9b33419843a9b4513fa02503ffdb0d5f87bee9a9d946fc85694b2d67d63a6c1a8a4ad1aba5b441f4ce1d6307b6574

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.1.2 - 18-Sep-2016
+* Fixed cmdline parsing and handling for OSX. Thanks go to Ben Mathwig for
+  the spot and the patch.
+
 == 1.1.1 - 30-Jun-2016
 * Added thread information for OS X.
 * Fixed VERSION constant for HP-UX.

data/lib/darwin/sys/proctable.rb

@@ -19,6 +19,7 @@ module Sys
 
     CTL_KERN       = 1
     KERN_PROCARGS  = 38
+    KERN_PROCARGS2 = 49
     MAXCOMLEN      = 16
     MAXPATHLEN     = 256
 
@@ -273,6 +274,18 @@ module Sys
       # Since we may not have access to the process information due
       # to improper privileges, just bail if we see a failure here.
 
+      # First use KERN_PROCARGS2 to discover the argc value of the running process.
+      mib.write_array_of_int([CTL_KERN, KERN_PROCARGS2, pid])
+      return if sysctl(mib, 3, nil, len, nil, 0) < 0
+
+      buf = FFI::MemoryPointer.new(:char, len.read_ulong)
+      return if sysctl(mib, 3, buf, len, nil, 0) < 0
+
+      # The argc value is located in the first byte of buf
+      argc = buf.read_bytes(1).ord
+      buf.free
+
+      # Now use KERN_PROCARGS to fetch the rest of the process information
       mib.write_array_of_int([CTL_KERN, KERN_PROCARGS, pid])
       return if sysctl(mib, 3, nil, len, nil, 0) < 0
 
@@ -284,17 +297,30 @@ module Sys
 
       # Parse the rest of the information out of a big, ugly string
       array = buf.read_bytes(len.read_ulong).split(0.chr)
-      array.shift      # Delete first exe
       array.delete('') # Delete empty strings
+      
+      # The format that sysctl outputs is as follows:
+      #
+      #   [full executable path]
+      #   [executable name]
+      #   [arguments]
+      #   [environment variables]
+      #   ...
+      #   \FF\BF
+      #   [full executable path]
+      #
+      # Strip the first executable path and the last two entries from the array.
+      # What is left is the name, arguments, and environment variables
+      array = array[1..-3]
 
       cmdline = ''
 
-      # Anything that doesn't include a '=' sign is a cmdline argument.
-      while array[0] && !array[0].include?('=')
+      # Extract the full command line and it's arguments from the array
+      argc.times do
         cmdline << ' ' + array.shift
       end
 
-      struct[:cmdline] = File.basename(cmdline.strip)
+      struct[:cmdline] = cmdline.strip
 
       # Anything remaining at this point is a collection of key=value
       # pairs which we convert into a hash.

data/lib/sys/proctable/version.rb

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

data/sys-proctable.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-proctable'
-  spec.version    = '1.1.1'
+  spec.version    = '1.1.2'
   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.1', ProcTable::VERSION)
+    assert_equal('1.1.2', ProcTable::VERSION)
   end
 
   test "fields basic functionality" do

data/test/test_sys_proctable_darwin.rb

@@ -23,11 +23,16 @@ class TC_ProcTable_Darwin < Test::Unit::TestCase
       exec('env', '-i', 'A=B', 'Z=', 'sleep', '60')
     end
 
+    @@pid2 = fork do
+      exec('php', '-d setting=true', '-d directory=/usr/bin', '-R', '\'sleep(120);\'')
+    end
+
     sleep 1 # wait to make sure env is replaced by sleep
   end
 
   def setup
     @ptable = Sys::ProcTable.ps(@@pid)
+    @ptable2 = Sys::ProcTable.ps(@@pid2)
   end
 
   test "fields basic functionality" do
@@ -90,6 +95,12 @@ 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
+    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)
+  end
+
   test "exe struct member is defined and returns expected value" do
     assert_respond_to(@ptable, :exe)
     assert_kind_of(String, @ptable.exe)
@@ -104,10 +115,12 @@ class TC_ProcTable_Darwin < Test::Unit::TestCase
 
   def teardown
     @ptable = nil
+    @ptable2 = nil
   end
 
   def self.shutdown
     @@fields = nil
     Process.kill('TERM', @@pid)
+    Process.kill('TERM', @@pid2)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys-proctable
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: universal-darwin
 authors:
 - Daniel J. Berger
@@ -12,25 +12,25 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
   cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+  MB4XDTE2MDkxOTAzNDY0NVoXDTE3MDkxOTAzNDY0NVowPzERMA8GA1UEAwwIZGpi
   ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
-  Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
-  S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
-  gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
-  FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
-  zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
-  DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
-  nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM0eOHOQRpLOeqkyeK7O
+  DGHYLkO0Wq7gStVVVyHXahgyCopLN6JVBwGy5aCpKFcy5sFz2DdnISj+hQ7FctDa
+  yz6Lq9TvAF8Jkis8dDFLQKeHilB/AM4ssQAsGQyoQnoE4v5tCOSW4e3YHFDp/dMZ
+  s7Hkoim6PeEdkh4hB5LCa90OrHSPe8nlMFsVhRIGj86xNTRazEiWPZCOKmN9rZgW
+  ziheP/6hC2c7vNRevv5iE/K+NqaL/WOdMquOSZoF2mdBcoMIPDDBNzh/oHinPQ3N
+  1oOvoET0+Tj+O5tXX/L1TAsUrwZXlyrYGaZ5aYyoo/7r9pmvmbfgBqaU6JywT0EE
+  5x0CAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFO+k
+  C/3R+t2aIyIpwU5wPrAfYVL6MB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
   bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
-  tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
-  /sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
-  wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
-  EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
-  tGSHgAmcLlkdGgan182qsE/4kKM=
+  ggEBAIJWpqQOUMoYhpm0wJ4kfiYv9rZVbpZ3L2cFYt4O6+wgbpdWP8DBBgZfCSQW
+  1J9miChMKdxZ8eOoeId79IMXN3IAcnalTFvD0Rp9ltaFZTXBfXMFqxQN3fHsIVwz
+  as/JSbwXo/PE8rULhjU+Utwcmji38cKEDWLAW4vsCBmwvBTwmAmcuHHKjnNvd8aR
+  YMrq9v505w8IjSysIO3KKysxCFuzoIPIYMdYswquvmtuTA+lpB9btWHr8n2FFsDp
+  A943I/wqE6xbYQpHxkndWo5uLDUbZh+XxG+fhZKpeqLIqHaFuU6wdO5odt32kB/B
+  nCjVswaVYlu1U2iLPCqE+MrjmTA=
   -----END CERTIFICATE-----
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-09-19 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.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: An interface for providing process table information