sys-proctable 0.9.8-universal-linux → 0.9.9-universal-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0f7b6e2b99153aa8c0095ef07fd9a682d2c5b63
-  data.tar.gz: 91fb8f80a4cf9e108f81b646c04d719aae532075
+  metadata.gz: f0f13537cd8a33add0739cb78526d05006bc6aa5
+  data.tar.gz: 18433abb3f9dd310603bc9633ec2d55e24025c87
 SHA512:
-  metadata.gz: 72790583c7695cdb38feaaf579d2cf96142432fe7642ee9e47d2975d14002cf2afb64e96babcd4cf1610bf3a84b157c428ec32ff66e7907ca3677aa729dd92f0
-  data.tar.gz: 6a7e1051b83d71f5359f9f576abbb148ce7937bc4dee1be794299b6b20508d5868f57408132cbffa533f7e0abdb326af8bef3b8ae906bef1a3b6374a01d8370b
+  metadata.gz: c9824df5d678bb2cfc4aaa3f8fc202b0acca08d6498d9798b97e51e4b3d9a789e0417be6dcfc4c90cb0cc340a6a3f1b2906897864411a4fe7ff800cb3676da44
+  data.tar.gz: bef2ef2d8b351d42065327e10bcba67e0334d4a7dc758ba5d789754301382d9eab6fa4fa123bb7bf4db33f85e6b868b9c665e30e71c78f6a128295b09c36298f

data.tar.gz.sig

@@ -0,0 +1,3 @@
+�>��ڄΊ�/�M�� �2�
+�`��$r�J���{��5p1�,Js�o�[������9��;i���`w�3l�q
+(���<�wYޭSn�{.]���=y�nا?�{��g��}���(U����GŨC��J�� ������
�*�7�^�E��pNI+��~�l

data/CHANGES

@@ -1,3 +1,9 @@
+== 0.9.9 - 8-Nov-2015
+* Added support for cgroups on Linux. Thanks go to Dennis Günnewig for the patch.
+* Added a sys-proctable.rb file for convenience.
+* This gem is now signed.
+* Gem related tasks in the Rakefile now assume Rubygems 2.x.
+
 == 0.9.8 - 18-Apr-2015
 * Fixed a bug in the gemspec. Last version got yanked.
 

data/MANIFEST

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

data/Rakefile

@@ -126,15 +126,25 @@ Rake::TestTask.new do |t|
 end
 
 namespace :gem do
-  desc 'Create a gem'
-  task :create => [:clean] do
+  desc 'Create a gem for the specified OS, or your current OS by default'
+  task :create, [:os] => [:clean] do |_task, args|
+    require 'rubygems/package'
+
+    if args.is_a?(String)
+      os = args
+    else
+      args.with_defaults(:os => CONFIG['host_os'])
+      os = args[:os]
+    end
+
     spec = eval(IO.read('sys-proctable.gemspec'))
+    spec.files += ['lib/sys-proctable.rb']
 
     # I've had to manually futz with the spec here in some cases
     # in order to get the universal platform settings I want because
     # of some bugginess in Rubygems' platform.rb.
     #
-    case CONFIG['host_os']
+    case os
       when /freebsd/i
          spec.platform = Gem::Platform.new(['universal', 'freebsd'])
          spec.require_paths = ['lib', 'lib/freebsd']
@@ -156,7 +166,7 @@ namespace :gem do
       when /linux/i
          spec.platform = Gem::Platform.new(['universal', 'linux'])
          spec.require_paths = ['lib', 'lib/linux']
-         spec.files += ['lib/linux/sys/proctable.rb']
+         spec.files += ['lib/linux/sys/proctable.rb', 'lib/linux/sys/proctable/cgroup_entry.rb']
          spec.test_files << 'test/test_sys_proctable_linux.rb'
       when /sunos|solaris/i
          spec.platform = Gem::Platform.new(['universal', 'solaris'])
@@ -173,6 +183,8 @@ namespace :gem do
          spec.require_paths = ['lib', 'lib/windows']
          spec.files += ['lib/windows/sys/proctable.rb']
          spec.test_files << 'test/test_sys_proctable_windows.rb'
+      else
+         raise "Unsupported platform: #{os}"
     end
 
     spec.test_files << 'test/test_sys_top.rb'
@@ -180,12 +192,20 @@ namespace :gem do
     # https://github.com/rubygems/rubygems/issues/147
     spec.original_platform = spec.platform
 
-    if Gem::VERSION < "2.0"
-      Gem::Builder.new(spec).build
-    else
-      require 'rubygems/package'
-      Gem::Package.build(spec)
-    end
+    spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
+
+    Gem::Package.build(spec, true)
+  end
+
+  desc 'Create a gem for each supported OS'
+  task :create_all => [:clean] do
+    platforms = %w[aix darwin freebsd hpux linux solaris windows]
+    Rake::Task["clean"].execute
+    platforms.each{ |os|
+      FileUtils.mkdir_p("pkg/#{os}")
+      Rake::Task["gem:create"].execute(os)
+      Dir.glob("*.gem").each{ |gem| FileUtils.mv(gem, "pkg/#{os}") }
+    }
   end
 
   desc 'Install the sys-proctable library as a gem'

data/lib/linux/sys/proctable.rb

@@ -1,4 +1,5 @@
 require 'sys/proctable/version'
+require_relative 'proctable/cgroup_entry'
 
 # The Sys module serves as a namespace only.
 module Sys
@@ -71,7 +72,8 @@ module Sys
       'egid',        # Effective group ID
       'pctcpu',      # Percent of CPU usage (custom field)
       'pctmem',      # Percent of Memory usage (custom field)
-      'nlwp'         # Number of Light-Weight Processes associated with the process (threads) 
+      'nlwp',        # Number of Light-Weight Processes associated with the process (threads)
+      'cgroup'       # Control groups to which the process belongs
     ]
 
     public
@@ -164,6 +166,9 @@ module Sys
         # Every process has at least one thread, so if we fail to read the task directory, set nlwp to 1.
         struct.nlwp = Dir.glob("/proc/#{file}/task/*").length rescue struct.nlwp = 1
 
+        # Get control groups to which the process belongs
+        struct.cgroup = IO.readlines("/proc/#{file}/cgroup").map { |l| CgroupEntry.new(l) } rescue []
+
         # Deal with spaces in comm name. Courtesy of Ara Howard.
         re = %r/\([^\)]+\)/
         comm = stat[re]

data/lib/linux/sys/proctable/cgroup_entry.rb

@@ -0,0 +1,50 @@
+module Sys
+  class ProcTable
+    # This represents a cgroup entry
+    #
+    # Have a look at `man 5 proc` on a linux distribution, to get some more
+    # information about the lines and there fields in `/proc/[pid]/cgroup`.
+    #
+    # Example:
+    #
+    #   entry = CgroupEntry.new '7:devices:/init.scope'
+    #   entry.hierarchy_id  # => 7
+    #   entry.subsystems    # => ['devices']
+    #   entry.control_group # => '/init.scope'
+    #
+    class CgroupEntry
+      # Create a new cgroup entry object
+      #
+      # This expects a string of '7:devices:/init.scope' - see `man 5 proc` for a
+      # reference.
+      def initialize(string)
+        @string = string.chomp
+        @fields = @string.split(/:/)
+      rescue
+        @fields = []
+      end
+
+      # This returns the hierarchy id of the cgroup entry
+      def hierarchy_id
+        @fields[0].to_i
+      end
+
+      # Return sets of subsystems bound to the hierarchy
+      def subsystems
+        @fields[1].split(/,/)
+      rescue
+        []
+      end
+
+      # control group in the hierarchy to which the process belongs
+      def control_group
+        @fields[2]
+      end
+
+      # Return the line itself
+      def to_s
+        @string
+      end
+    end
+  end
+end

data/lib/sys-proctable.rb

@@ -0,0 +1 @@
+require 'sys/proctable'

data/lib/sys/proctable/version.rb

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

data/sys-proctable.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-proctable'
-  spec.version    = '0.9.8'
+  spec.version    = '0.9.9'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Artistic 2.0' 
   spec.email      = 'djberg96@gmail.com'
@@ -10,6 +10,7 @@ Gem::Specification.new do |spec|
   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']
+  spec.cert_chain = ['certs/djberg96_pub.pem']
    
   # Additional files for your platform are added by the 'rake gem' task.
   spec.files = [

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

data/test/test_sys_proctable_linux.rb

@@ -17,7 +17,7 @@ class TC_ProcTable_Linux < Test::Unit::TestCase
       stime cutime cstime priority nice itrealvalue starttime vsize
       rss rlim startcode endcode startstack kstkesp kstkeip signal blocked
       sigignore sigcatch wchan nswap cnswap exit_signal processor environ
-      pctcpu pctmem nlwp
+      pctcpu pctmem nlwp cgroup
       /
   end
 
@@ -295,6 +295,12 @@ class TC_ProcTable_Linux < Test::Unit::TestCase
     assert_kind_of(Fixnum, @ptable.nlwp)
   end
 
+  def test_cgroup
+    assert_respond_to(@ptable, :cgroup)
+    assert_kind_of(Array, @ptable.cgroup)
+    assert_kind_of(ProcTable::CgroupEntry, @ptable.cgroup.first)
+  end
+
   def teardown
     @ptable = nil
   end

metadata

@@ -1,14 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: sys-proctable
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: universal-linux
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
+  cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+  MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+  ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
+  Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
+  S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
+  gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
+  FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
+  zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
+  DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
+  nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
+  bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
+  ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
+  tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
+  /sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
+  wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
+  EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
+  tGSHgAmcLlkdGgan182qsE/4kKM=
+  -----END CERTIFICATE-----
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -60,13 +82,13 @@ files:
 - benchmarks/bench_ps.rb
 - doc/top.txt
 - examples/example_ps.rb
-- lib/linux/sys/proctable.rb
+- lib/sys-proctable.rb
 - lib/sys/proctable/version.rb
 - lib/sys/top.rb
 - sys-proctable.gemspec
 - test/test_sys_proctable_all.rb
-- test/test_sys_proctable_linux.rb
-- test/test_sys_top.rb
+- lib/linux/sys/proctable.rb
+- lib/linux/sys/proctable/cgroup_entry.rb
 homepage: http://github.com/djberg96/sys-proctable
 licenses:
 - Artistic 2.0
@@ -88,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: An interface for providing process table information