procps-rb 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c976117d306543a0b1edc526541e00095305a4be
-  data.tar.gz: 3374e2058c9a1b07c867945bef45daaeb02d4173
+  metadata.gz: 6339640587de9a0b986ab9e619ce79e05103e977
+  data.tar.gz: 9015b5ef02de0533655ea8374e76e92459bd48a8
 SHA512:
-  metadata.gz: d7845dbf401dd46514182ecf18e3b7b7b5ff76ad32a2db33456a8cff96d60b5012bd29532c1179cdc9a49b2344894b36aafa8eb631ae0b16d7b381c9725f66b7
-  data.tar.gz: 310656840e0238caf054e823959f5249b242ff1f406581b663a9ca97411bc384c1d3fb00da939c24dad9e242ca664285ae37e23f1e2498e54686fb829ddb0530
+  metadata.gz: 7ca8462293275665111926cf580431df168d76d176c65e770d17ac1b7afd1fa34cd1834f46a48bbbc79ab27a4888366bdfeb875b653532f59f785db362e7f3bc
+  data.tar.gz: 2271e315406bed2f3a119baa1e32c277a9d49e97178d095a1100433c9daba14c0fa3f9445d6e207d62e1b19614669df0072a0ba5a8631a1de3f7f202e881cd64

data/lib/procps/ps/base_columns.rb

@@ -0,0 +1,62 @@
+require 'procps/column'
+require 'procps/column_types/command'
+require 'procps/column_types/memsize'
+
+module Procps
+  class PS
+    Address    = -> (base = 10, null: "-".freeze) { -> (v) { v.is_a?(String) ? v == null ? nil : v.to_i(base) : v } }
+    Address_10 = Address[]
+    Address_16 = Address[16]
+
+    define_column :cmd, "CMD", Command
+    define_column :comm, "COMMAND"
+    define_column :command, "COMMAND", Command
+    define_column :gid, &:to_i
+    define_column :group
+    define_column :ni, &:to_i
+    define_column :nlwp, &:to_i
+    define_column :nwchan, "WCHAN", Address_16
+    define_column :pcpu, "%CPU", &:to_f
+    define_column :pgid, &:to_i
+    define_column :pgrp, "PGRP", &:to_i
+    define_column :pid, &:to_i
+    define_column :pmem, "%MEM", &:to_f
+    define_column :ppid, &:to_i
+    define_column :rgid, &:to_i
+    define_column :rgroup
+    define_column :rss, "RSS", Memsize
+    define_column :rtprio, "RTPRIO", Address_10
+    define_column :ruid, &:to_i
+    define_column :ruser
+    define_column :s
+    define_column :sess, &:to_i
+    define_column :sgid, &:to_i
+    define_column :sgroup
+    define_column :sid, &:to_i
+    define_column :size, &:to_i
+    define_column :start, "STARTED"
+    define_column :start_time
+    define_column :stat
+    define_column :tgid, &:to_i
+    define_column :sz, &:to_i
+    define_column :thcount, "THCNT", &:to_i
+    define_column :tid, &:to_i
+    define_column :time
+    define_column :tname, "TTY"
+    define_column :tt
+    define_column :user
+    define_column :uid, &:to_i
+    define_column :userns, &:to_i
+
+    alias_column :'%cpu',     :pcpu
+    alias_column :'%mem',     :pmem
+    alias_column :nice,       :ni
+    alias_column :args,       :command
+    alias_column :cputime,    :time
+    alias_column :rssize,     :rss
+    alias_column :rsz,        :rss
+    alias_column :state,      :s
+    alias_column :tty,        :tt
+    alias_column :uname,      :user
+  end
+end

data/lib/procps/ps/extra_columns.rb

@@ -0,0 +1,78 @@
+require "procps/column_types/scheduling_policy"
+
+module Procps
+  class PS
+    define_column :blocked
+    define_column :bsdstart, "START"
+    define_column :bsdtime, "TIME"
+    define_column :c, &:to_f
+    define_column :caught
+    define_column :cgroup
+    define_column :cls, "CLS", SchedulingPolicy
+    define_column :cp do |v|
+      v.to_f / 100_0
+    end
+    define_column :eip
+    define_column :esp
+    define_column :egid, &:to_i
+    define_column :egroup
+    define_column :etime, "ELAPSED"
+    define_column :etimes, "ELAPSED", &:to_i
+    define_column :f, &:to_i
+    define_column :fgid, &:to_i
+    define_column :fgroup
+    define_column :fname
+    define_column :fuid, &:to_i
+    define_column :fuser
+    define_column :ignored
+    define_column :ipcns, "IPCNS", Address_10
+    define_column :label
+    define_column :lstart, "STARTED"
+    define_column :lsession
+    define_column :lwp, &:to_i
+    define_column :machine
+    define_column :maj_flt
+    define_column :min_flt
+    define_column :mntns, "MNTNS", Address_10
+    define_column :netns, "NETNS", Address_10
+    define_column :ouid, "OWNER", &:to_i
+    define_column :pending
+    define_column :pidns, &:to_i
+    define_column :policy, "POL", SchedulingPolicy
+    define_column :pri, &:to_i
+    define_column :psr, &:to_i
+    define_column :sched, "SCH" do |v|
+      SchedulingPolicy.(v.to_i)
+    end
+    define_column :seat
+    define_column :suid, &:to_i
+    define_column :suser
+    define_column :supgid, &:to_i
+    define_column :supgrp
+    define_column :sgi_p, "SGI_P", Address[null: "*".freeze]
+    define_column :slice
+    define_column :spid, &:to_i
+    define_column :stackp, "STACKP", Address_16
+    define_column :svgid, &:to_i
+    define_column :svuid, &:to_i
+    define_column :tpgid, &:to_i
+    define_column :ucmd, "CMD"
+    define_column :unit
+    define_column :utsns, &:to_i
+    define_column :uunit
+    define_column :vsz, Memsize
+
+    alias_column :class,      :cls
+    alias_column :flag,       :f
+    alias_column :flags,      :f
+    alias_column :sig,        :pending
+    alias_column :sig_block,  :blocked
+    alias_column :sigmask,    :blocked
+    alias_column :sig_catch,  :caught
+    alias_column :sigcatch,   :caught
+    alias_column :sig_ignore, :ignored
+    alias_column :sigignore,  :ignored
+    alias_column :ucomm,      :comm
+    alias_column :vsize,      :vsz
+  end
+end

data/lib/procps/ps.rb

@@ -1,11 +1,30 @@
-require 'procps/ps/columns'
 require 'procps/ps/command_builder'
 
 module Procps
+  # By default it loads only base columns.
+  # To load extra columns require <tt>procps/ps/extra_columns</tt> after the gem is loaded.
+  #
+  # You can also define custom columns with the Procps::PS.define_column method.
   class PS
     DEFAULT_BIN_PATH = "/usr/bin/ps"
     DEFAULT_COLUMNS  = %i(pid rss pcpu)
 
+    def self.columns
+      @@columns ||= {}
+    end
+
+    # Define a column (see base columns in <tt>lib/procps/ps/base_columns.rb
+    # </tt> and extra columns in <tt>lib/procps/ps/extra_columns.rb</tt>)
+    def self.define_column(name, header = nil, cast = nil, &cast_block)
+      header ||= name.to_s.upcase
+      columns[name.downcase.to_sym] = Column.new(header, cast, &cast_block)
+    end
+
+    # Creates an alias to a column
+    def self.alias_column(new_name, old_name)
+      columns[new_name.to_sym] = old_name.to_sym
+    end
+
     attr_accessor :bin_path, :options, :modifiers
 
     # Creates a Procps::PS object. Takes an argument with a bin path to ps command.
@@ -148,4 +167,4 @@ module Procps
       process
     end
   end
-end
+end

data/lib/procps/version.rb

@@ -1,3 +1,3 @@
 module Procps
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/procps.rb

@@ -1,4 +1,5 @@
 require "procps/ps"
+require "procps/ps/base_columns"
 require "procps/version"
 
 module Procps

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: procps-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Anton Semenov
@@ -60,8 +60,9 @@ files:
 - lib/procps/column_types/memsize.rb
 - lib/procps/column_types/scheduling_policy.rb
 - lib/procps/ps.rb
-- lib/procps/ps/columns.rb
+- lib/procps/ps/base_columns.rb
 - lib/procps/ps/command_builder.rb
+- lib/procps/ps/extra_columns.rb
 - lib/procps/version.rb
 - procps-rb.gemspec
 homepage: https://github.com/estum/procps-rb

data/lib/procps/ps/columns.rb

@@ -1,138 +0,0 @@
-require 'procps/column'
-require 'procps/column_types/command'
-require 'procps/column_types/memsize'
-require 'procps/column_types/scheduling_policy'
-
-module Procps
-  class PS
-    Address    = -> (base = 10, null: "-".freeze) { -> (v) { v.is_a?(String) ? v == null ? nil : v.to_i(base) : v } }
-    Address_10 = Address[]
-    Address_16 = Address[16]
-
-    @@columns = {
-      :blocked    => Column.new("BLOCKED"),
-      :bsdstart   => Column.new("START"),
-      :bsdtime    => Column.new("TIME"),
-      :c          => Column.new("C", &:to_f),
-      :caught     => Column.new("CAUGHT"),
-      :cgroup     => Column.new("CGROUP"),
-      :cls        => Column.new("CLS", SchedulingPolicy),
-      :cmd        => Column.new("CMD", Command),
-      :comm       => Column.new("COMMAND"),
-      :command    => Column.new("COMMAND", Command),
-      :cp         => Column.new("CP") { |v| v.to_f / 100_0 }, # tenths of a percent
-      :egid       => Column.new("EGID", &:to_i),
-      :egroup     => Column.new("EGROUP"),
-      :eip        => Column.new("EIP"),
-      :esp        => Column.new("ESP"),
-      :etime      => Column.new("ELAPSED"),
-      :etimes     => Column.new("ELAPSED", &:to_i),
-      :f          => Column.new("F", &:to_i),
-      :fgid       => Column.new("FGID", &:to_i),
-      :fgroup     => Column.new("FGROUP"),
-      :fname      => Column.new("FNAME"),
-      :fuid       => Column.new("FUID", &:to_i),
-      :fuser      => Column.new("FUSER"),
-      :gid        => Column.new("GID", &:to_i),
-      :group      => Column.new("GROUP"),
-      :ignored    => Column.new("IGNORED"),
-      :ipcns      => Column.new("IPCNS", Address_10),
-      :label      => Column.new("LABEL"),
-      :lstart     => Column.new("STARTED"),
-      :lsession   => Column.new("SESSION"),
-      :lwp        => Column.new("LWP", &:to_i),
-      :machine    => Column.new("MACHINE"),
-      :maj_flt    => Column.new("MAJFLT"),
-      :min_flt    => Column.new("MINFLT"),
-      :mntns      => Column.new("MNTNS", Address_10),
-      :netns      => Column.new("NETNS", Address_10),
-      :ni         => Column.new("NI", &:to_i),
-      :nlwp       => Column.new("NLWP", &:to_i),
-      :nwchan     => Column.new("WCHAN", Address_16),
-      :ouid       => Column.new("OWNER", &:to_i),
-      :pending    => Column.new("PENDING"),
-      :pcpu       => Column.new("%CPU", &:to_f),
-      :pgid       => Column.new("PGID", &:to_i),
-      :pgrp       => Column.new("PGRP", &:to_i),
-      :pid        => Column.new("PID", &:to_i),
-      :pidns      => Column.new("PIDNS", &:to_i),
-      :pmem       => Column.new("%MEM", &:to_f),
-      :policy     => Column.new("POL", SchedulingPolicy),
-      :ppid       => Column.new("PPID", &:to_i),
-      :pri        => Column.new("PRI", &:to_i),
-      :psr        => Column.new("PSR", &:to_i),
-      :rgid       => Column.new("RGID", &:to_i),
-      :rgroup     => Column.new("RGROUP"),
-      :rss        => Column.new("RSS", Memsize),
-      :rtprio     => Column.new("RTPRIO", Address_10),
-      :ruid       => Column.new("RUID", &:to_i),
-      :ruser      => Column.new("RUSER"),
-      :s          => Column.new("S"),
-      :sched      => Column.new("SCH") { |v| SchedulingPolicy.(v.to_i) },
-      :seat       => Column.new("SEAT"),
-      :sess       => Column.new("SESS", &:to_i),
-      :sgi_p      => Column.new("SGI_P", Address[null: "*".freeze]),
-      :sgid       => Column.new("SGID", &:to_i),
-      :sgroup     => Column.new("SGROUP"),
-      :sid        => Column.new("SID", &:to_i),
-      :size       => Column.new("SIZE", &:to_i),
-      :slice      => Column.new("SLICE"),
-      :spid       => Column.new("SPID", &:to_i),
-      :stackp     => Column.new("STACKP", Address_16),
-      :start      => Column.new("STARTED"),
-      :start_time => Column.new("START_TIME"),
-      :stat       => Column.new("STAT"),
-      :suid       => Column.new("SUID", &:to_i),
-      :suser      => Column.new("SUSER"),
-      :supgid     => Column.new("SUPGID", &:to_i),
-      :supgrp     => Column.new("SUPGRP"),
-      :svgid      => Column.new("SVGID", &:to_i),
-      :svuid      => Column.new("SVUID", &:to_i),
-      :sz         => Column.new("SZ", &:to_i),
-      :tgid       => Column.new("TGID", &:to_i),
-      :thcount    => Column.new("THCNT", &:to_i),
-      :tid        => Column.new("TID", &:to_i),
-      :time       => Column.new("TIME"),
-      :tname      => Column.new("TTY"),
-      :tpgid      => Column.new("TPGID", &:to_i),
-      :tt         => Column.new("TT"),
-      :ucmd       => Column.new("CMD"),
-      :uid        => Column.new("UID", &:to_i),
-      :unit       => Column.new("UNIT"),
-      :user       => Column.new("USER"),
-      :userns     => Column.new("USERNS", &:to_i),
-      :utsns      => Column.new("UTSNS", &:to_i),
-      :uunit      => Column.new("UUNIT"),
-      :vsz        => Column.new("VSZ", Memsize)
-    }.tap do |cols|
-      cols.update(
-        :'%cpu'     => cols.fetch(:pcpu),
-        :'%mem'     => cols.fetch(:pmem),
-        :args       => cols.fetch(:command),
-        :class      => cols.fetch(:cls),
-        :cputime    => cols.fetch(:time),
-        :flag       => cols.fetch(:f),
-        :flags      => cols.fetch(:f),
-        :nice       => cols.fetch(:ni),
-        :rssize     => cols.fetch(:rss),
-        :rsz        => cols.fetch(:rss),
-        :sig        => cols.fetch(:pending),
-        :sig_block  => cols.fetch(:blocked),
-        :sigmask    => cols.fetch(:blocked),
-        :sig_catch  => cols.fetch(:caught),
-        :sigcatch   => cols.fetch(:caught),
-        :sig_ignore => cols.fetch(:ignored),
-        :sigignore  => cols.fetch(:ignored),
-        :state      => cols.fetch(:s),
-        :tty        => cols.fetch(:tt),
-        :ucomm      => cols.fetch(:comm),
-        :uname      => cols.fetch(:user),
-        :vsize      => cols.fetch(:vsz)
-      )
-    end
-
-    def self.columns
-      @@columns
-    end
-  end
-end