pstree 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e014bdaf62c7729a110d61a4a6e843203794f63d
-  data.tar.gz: 82a952887e613b3e207156254eca617cca7f1530
+SHA256:
+  metadata.gz: 2429e1d084cac9859aaa8677db294d46d95c99fa6d2c56f550782ce33a195447
+  data.tar.gz: 307882fe91950b9d5176ab73034c27765833f8c6927593603ef413e6318f1368
 SHA512:
-  metadata.gz: ecb0e4c7184909e8f01242a766fa568ef4e7ee3d501ce092aab890a0f25eb5a9512392e11ea368ae0222c2d8f2ea233d30c2fce7d320e6748036ce2c4d7bb48f
-  data.tar.gz: 27c9c88f99d4451ac72b4f8e6fc6f4406e8551bab0925b8b650b9972c0ab58817eab1ad82f80575faa08db8b69260ebd0d5570ecf9f8a5d634c7746ed4cd1bd3
+  metadata.gz: b3b5616d54fbeba092270820559bdb0cff8d56955183db5793af12afccf41db76741e5c102efa227fac481abd88051520ac79893af2eac5d86b8c4e366e9c457
+  data.tar.gz: 4fe3d17d87130083f37dffe188f766e030d4df8c3f353a2a5ee3bfe46c34aa9b4b53dc47a02e12aab34a00232fb1b61db1c74d0bdbfad6123537ad9b57aaf3ba

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '38 16 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.2.3

data/{README.rdoc → README.md}

@@ -1,29 +1,38 @@
-= PSTree - Process Status Tree for UNIX in Ruby
+# PSTree - Process Status Tree for UNIX in Ruby
 
-== Description
+## Description
 
 This library can be used to create and display a process status tree as a Ruby
 datastructure.
 
-== Installation
+## Installation
 
 Install the gem by typing
 
-# gem install term-ansicolor
+# gem install pstree
 
-== Download
-
-The homepage of this library is located at
+## Usage
 
 You can display a simple process tree by executing the ruby-pstree script.
 
+```
+$ ruby-pstree $$
+34223 -bash (flori)
+└─ 37124 ruby /Users/flori/.rvm/gems/ruby-2.6.2/bin/ruby-pstree 34223 (flori)
+   └─ 37129 /bin/ps axww -o ppid,pid,user,command (root)
+```
+
+## Download
+
+The homepage of this library is located at
+
 * http://flori.github.com/pstree
 
-== Author
+## Author
 
-Florian Frank mailto:flori@ping.de
+Florian Frank <flori@ping.de>
 
-== License
+## License
 
 This is free software; you can redistribute it and/or modify it under the
 terms of the GNU General Public License Version 2 as published by the Free

data/Rakefile

@@ -8,13 +8,13 @@ GemHadar do
   module_type 'class'
   author      'Florian Frank'
   email       'flori@ping.de'
-  homepage    "http://flori.github.com/#{name}"
+  homepage    "https://github.com/flori/#{name}"
   summary     'Ruby library that builds a process tree of this host'
   description 'This library uses the output of the ps command to creaste process tree data structure for the current host.'
   licenses    << 'GPL-2'
   test_dir    'tests'
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.rvmrc', 'coverage'
-  readme      'README.rdoc'
+  readme      'README.md'
   executables << 'ruby-pstree'
 
   development_dependency 'simplecov'

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.1

data/lib/pstree/version.rb

@@ -1,6 +1,6 @@
 class PSTree
   # PSTree version
-  VERSION         = '0.2.0'
+  VERSION         = '0.3.1'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/pstree.rb

@@ -65,7 +65,7 @@ class PSTree
     @process = {}
     @pstree = Hash.new { |h,k| h[k] = [] }
     pid = @root_pid.zero? ? nil : @root_pid
-    psoutput = `/bin/ps axww -o ppid,pid,user,command #{pid}`
+    psoutput = `/bin/ps axww -o ppid,pid,user,command`
     psoutput.each_line do |line|
       next if line !~ /^\s*\d+/
       line.strip!
@@ -75,7 +75,8 @@ class PSTree
     end
   end
 
-  def recurse(pid, shift_callback = nil, level = 0, &node_callback)
+  def recurse(pid, shift_callback = nil, level = 0, in_root = false, &node_callback)
+    in_root = in_root || @root_pid == 0 || @root_pid == pid
     @child_count[level] = @pstree[pid].size
     for l in 0...level
       shift_callback and shift_callback.call(@child_count[l], l == level - 1)
@@ -84,7 +85,7 @@ class PSTree
     if @pstree.key?(pid)
       @child_count[level] = @pstree[pid].size - 1
       @pstree[pid].each do |ps|
-        recurse(ps.pid, shift_callback, level + 1, &node_callback)
+        recurse(ps.pid, shift_callback, level + 1, in_root, &node_callback)
         @child_count[level] -= 1
       end
     end

data/pstree.gemspec

@@ -1,37 +1,27 @@
 # -*- encoding: utf-8 -*-
-# stub: pstree 0.2.0 ruby lib
+# stub: pstree 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pstree".freeze
-  s.version = "0.2.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2017-11-07"
+  s.date = "2024-03-15"
   s.description = "This library uses the output of the ps command to creaste process tree data structure for the current host.".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ruby-pstree".freeze]
-  s.extra_rdoc_files = ["README.rdoc".freeze, "lib/pstree.rb".freeze, "lib/pstree/version.rb".freeze]
-  s.files = [".gitignore".freeze, "Gemfile".freeze, "README.rdoc".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/ruby-pstree".freeze, "lib/pstree.rb".freeze, "lib/pstree/version.rb".freeze, "pstree.gemspec".freeze]
-  s.homepage = "http://flori.github.com/pstree".freeze
+  s.extra_rdoc_files = ["README.md".freeze, "lib/pstree.rb".freeze, "lib/pstree/version.rb".freeze]
+  s.files = [".github/workflows/codeql-analysis.yml".freeze, ".gitignore".freeze, ".tool-versions".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/ruby-pstree".freeze, "lib/pstree.rb".freeze, "lib/pstree/version.rb".freeze, "pstree.gemspec".freeze]
+  s.homepage = "https://github.com/flori/pstree".freeze
   s.licenses = ["GPL-2".freeze]
-  s.rdoc_options = ["--title".freeze, "Pstree - Ruby library that builds a process tree of this host".freeze, "--main".freeze, "README.rdoc".freeze]
-  s.rubygems_version = "2.6.13".freeze
+  s.rdoc_options = ["--title".freeze, "Pstree - Ruby library that builds a process tree of this host".freeze, "--main".freeze, "README.md".freeze]
+  s.rubygems_version = "3.4.19".freeze
   s.summary = "Ruby library that builds a process tree of this host".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
-    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-  end
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.14.0"])
+  s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pstree
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Florian Frank
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2024-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -45,29 +45,31 @@ executables:
 - ruby-pstree
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 - lib/pstree.rb
 - lib/pstree/version.rb
 files:
+- ".github/workflows/codeql-analysis.yml"
 - ".gitignore"
+- ".tool-versions"
 - Gemfile
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/ruby-pstree
 - lib/pstree.rb
 - lib/pstree/version.rb
 - pstree.gemspec
-homepage: http://flori.github.com/pstree
+homepage: https://github.com/flori/pstree
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Pstree - Ruby library that builds a process tree of this host
 - "--main"
-- README.rdoc
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -81,9 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Ruby library that builds a process tree of this host
 test_files: []