hiiro 0.1.334 → 0.1.335

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1393ef224407fe149858ba4e6ab28d25d9b1ea8234c38295b7248db64f05fc18
-  data.tar.gz: 0cb6c207d70bc9b366fe82ad91b0f22d48a3e23d0efd58bb4ce5a9746deb5935
+  metadata.gz: 38d14de5a6bc8cbd862309a844bf9637e98e1fe450c85589f4e8c620ff7f65d0
+  data.tar.gz: 4de0bc0fe83210c727c275bb05266e27b37b039f4f8c130cb7aac63c471b89c6
 SHA512:
-  metadata.gz: e5c17a94ccb9381d940fd594b7c5736433c565c99e78a003b2cf02c6993bf59d727a212e0e98e64ba79812b6b608f9e3472c86702fdb59972fc0d3c5cd9254cb
-  data.tar.gz: 1bce72784775186056d106cb55aa253ea9a0ce0fb5fef4b3c9b6800b37e822a7b0ff0be4cabcb5f46b64ae89733b23c3b9ecb7988391c9d8cf8f1e2536ff707c
+  metadata.gz: 31f62ef65b741598265dcdbdc08ae95a4a0cc0043c435cebfee9d5a5dd21b98ca580e32875bbbf45f1371aad700f9e6b0891392eaada22cc1a38361236f0d8ce
+  data.tar.gz: 3e07dff0a8880ab7368cbdcb39df9e461b3d1e0433c1952d979714b19acb1672686c5e17e240e981a14af419aa94ea755cc93823c8a30a82556c3b60e05270ce

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.1.335] - 2026-04-07
+
+### Added
+- New `Hiiro::PsProcess` class (`lib/hiiro/ps_process.rb`) for encapsulated process info:
+  - `PsProcess.from_line(line)` - parse `ps awwux` output
+  - `PsProcess.all`, `.search(pattern)`, `.find(pid)`, `.in_dirs(*paths)`
+  - Instance methods: `#files`, `#ports`, `#dir`, `#parent`, `#children`
+  - Simple `#to_s` output: PID + CMD
+- New `h ps` subcommands: `info`, `files`, `ports`
+- Smart argument resolution in `h ps`: accepts PID, search pattern, or directory path
+
+### Changed
+- Refactored `h-ps` to use `PsProcess` class instead of raw `ps` parsing
+
 ## [0.1.334] - 2026-04-07
 
 ### Added
@@ -356,4 +370,4 @@
 ## [0.1.295]
 
 ### Changed
-- Filter logic changes for PR management
+- Filter logic changes for PR management

data/README.md

@@ -356,3 +356,11 @@ MIT
 
 
 ```
+
+# Development
+
+Testing locally:
+
+```sh
+ruby -I lib bin/h-ps search ruby
+```

data/bin/h-ps

@@ -3,19 +3,33 @@
 require "hiiro"
 
 Hiiro.run(*ARGV) do
+  # Resolve argument to list of PsProcess instances
+  # - all digits: find by PID
+  # - valid path: processes with files open in that dir
+  # - otherwise: search by pattern
+  def resolve_processes(arg)
+    return [] if arg.nil?
+
+    if arg.match?(/^\d+$/)
+      p = Hiiro::PsProcess.find(arg)
+      p ? [p] : []
+    elsif File.directory?(File.expand_path(arg))
+      Hiiro::PsProcess.in_dirs(arg)
+    else
+      Hiiro::PsProcess.search(arg)
+    end
+  end
+
   add_subcmd(:search) { |pattern = nil|
     if pattern.nil?
       puts "Usage: h ps search <pattern>"
       next
     end
 
-    output = `ps auxww`.lines
-    header = output.first
-    matches = output[1..].select { |line| line.include?(pattern) }
+    processes = Hiiro::PsProcess.search(pattern)
 
-    if matches.any?
-      puts header
-      matches.each { |line| puts line }
+    if processes.any?
+      processes.each { |p| puts p }
     else
       puts "No processes found matching '#{pattern}'"
     end
@@ -27,64 +41,119 @@ Hiiro.run(*ARGV) do
       next
     end
 
-    pids = Set.new
-    paths.each do |path|
-      expanded = File.expand_path(path)
-      lsof_output = `lsof +D #{expanded.shellescape} 2>/dev/null`.lines[1..]
-      next unless lsof_output
+    processes = Hiiro::PsProcess.in_dirs(*paths)
+
+    if processes.empty?
+      puts "No processes found with files open in: #{paths.join(', ')}"
+    else
+      processes.each { |p| puts p }
+    end
+  }
+
+  add_subcmd(:getdir) { |pattern = nil|
+    if pattern.nil?
+      puts "Usage: h ps getdir <pattern>"
+      next
+    end
+
+    processes = Hiiro::PsProcess.search(pattern)
+
+    if processes.empty?
+      puts "No processes found matching '#{pattern}'"
+      next
+    end
 
-      lsof_output.each do |line|
-        fields = line.split
-        pids << fields[1] if fields[1]
+    found_any = false
+    processes.each do |p|
+      dir = p.dir
+      if dir
+        found_any = true
+        puts "#{p.pid}\t#{dir}\t#{p.cmd}"
       end
     end
 
-    if pids.empty?
-      puts "No processes found with files open in: #{paths.join(', ')}"
+    puts "Could not determine working directories for matching processes" unless found_any
+  }
+
+  add_subcmd(:info) { |arg = nil|
+    if arg.nil?
+      puts "Usage: h ps info <pid|pattern|path>"
       next
     end
 
-    ps_output = `ps auxww`.lines
-    header = ps_output.first
-    matches = ps_output[1..].select { |line| pids.include?(line.split[1]) }
+    processes = resolve_processes(arg)
 
-    puts header
-    matches.each { |line| puts line }
+    if processes.empty?
+      puts "No processes found for '#{arg}'"
+      next
+    end
+
+    processes.each_with_index do |p, i|
+      puts "---" if i > 0
+      puts "PID:    #{p.pid}"
+      puts "User:   #{p.user}"
+      puts "CPU:    #{p.cpu}%"
+      puts "Mem:    #{p.mem}%"
+      puts "Stat:   #{p.stat}"
+      puts "Dir:    #{p.dir || '(unknown)'}"
+      puts "Cmd:    #{p.cmd}"
+
+      parent = p.parent
+      puts "Parent: #{parent.pid} #{parent.cmd.slice(0, 60)}" if parent
+
+      children = p.children
+      if children.any?
+        puts "Children:"
+        children.each { |c| puts "  #{c.pid}\t#{c.cmd.slice(0, 60)}" }
+      end
+    end
   }
 
-  add_subcmd(:getdir) { |pattern = nil|
-    if pattern.nil?
-      puts "Usage: h ps getdir <pattern>"
+  add_subcmd(:files) { |arg = nil|
+    if arg.nil?
+      puts "Usage: h ps files <pid|pattern|path>"
       next
     end
 
-    ps_output = `ps auxww`.lines
-    pids = ps_output[1..].select { |line| line.include?(pattern) }.map { |line| line.split[1] }
+    processes = resolve_processes(arg)
 
-    if pids.empty?
-      puts "No processes found matching '#{pattern}'"
+    if processes.empty?
+      puts "No processes found for '#{arg}'"
       next
     end
 
-    dirs = {}
-    pids.each do |pid|
-      cwd = `lsof -p #{pid} 2>/dev/null | grep cwd`.strip
-      if cwd && !cwd.empty?
-        # lsof cwd line format: COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME
-        dir = cwd.split.last
-        dirs[pid] = dir
+    processes.each do |p|
+      puts "=== #{p.pid}\t#{p.cmd.slice(0, 60)}" if processes.size > 1
+      files = p.files
+      if files.empty?
+        puts "  (no open files)" if processes.size > 1
+      else
+        files.each { |f| puts "#{f[:fd]}\t#{f[:type]}\t#{f[:name]}" }
       end
     end
+  }
 
-    if dirs.empty?
-      puts "Could not determine working directories for matching processes"
+  add_subcmd(:ports) { |arg = nil|
+    if arg.nil?
+      puts "Usage: h ps ports <pid|pattern|path>"
       next
     end
 
-    dirs.each do |pid, dir|
-      process_line = ps_output.find { |l| l.split[1] == pid }
-      cmd = process_line.split[10..].join(' ') rescue '(unknown)'
-      puts "#{pid}\t#{dir}\t#{cmd}"
+    processes = resolve_processes(arg)
+
+    if processes.empty?
+      puts "No processes found for '#{arg}'"
+      next
+    end
+
+    processes.each do |p|
+      puts "=== #{p.pid}\t#{p.cmd.slice(0, 60)}" if processes.size > 1
+      ports = p.ports
+      if ports.empty?
+        puts "  (no open ports)" if processes.size > 1
+      else
+        ports.each { |pt| puts "#{pt[:protocol]}\t#{pt[:name]}" }
+      end
     end
   }
 end

data/lib/hiiro/ps_process.rb

@@ -0,0 +1,119 @@
+require 'set'
+require 'shellwords'
+
+class Hiiro::PsProcess
+  attr_reader :user, :pid, :cpu, :mem, :vsz, :rss, :tty, :stat, :start, :time, :cmd
+
+  def initialize(user:, pid:, cpu:, mem:, vsz:, rss:, tty:, stat:, start:, time:, cmd:)
+    @user = user
+    @pid = pid
+    @cpu = cpu
+    @mem = mem
+    @vsz = vsz
+    @rss = rss
+    @tty = tty
+    @stat = stat
+    @start = start
+    @time = time
+    @cmd = cmd
+  end
+
+  # Parse a line from `ps awwux` output
+  # Format: USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND...
+  def self.from_line(line)
+    parts = line.split
+    return nil if parts.size < 11
+
+    new(
+      user: parts[0],
+      pid: parts[1],
+      cpu: parts[2],
+      mem: parts[3],
+      vsz: parts[4],
+      rss: parts[5],
+      tty: parts[6],
+      stat: parts[7],
+      start: parts[8],
+      time: parts[9],
+      cmd: parts[10..].join(' ')
+    )
+  end
+
+  # Get all processes
+  def self.all
+    `ps awwux`.lines[1..].filter_map { |line| from_line(line) }
+  end
+
+  # Search processes by pattern (matches against full line)
+  def self.search(pattern)
+    all.select { |p| p.cmd.include?(pattern) || p.user.include?(pattern) }
+  end
+
+  # Find process by PID
+  def self.find(pid)
+    all.find { |p| p.pid == pid.to_s }
+  end
+
+  # Find processes with files open in given directories
+  def self.in_dirs(*paths)
+    pids = Set.new
+    paths.each do |path|
+      expanded = File.expand_path(path)
+      lsof_output = `lsof +D #{expanded.shellescape} 2>/dev/null`.lines[1..]
+      next unless lsof_output
+
+      lsof_output.each do |line|
+        fields = line.split
+        pids << fields[1] if fields[1]
+      end
+    end
+
+    all.select { |p| pids.include?(p.pid) }
+  end
+
+  # Open files for this process
+  def files
+    `lsof -p #{pid} 2>/dev/null`.lines[1..].map do |line|
+      parts = line.split
+      { fd: parts[3], type: parts[4], name: parts[8] } if parts.size >= 9
+    end.compact
+  end
+
+  # Open network ports for this process
+  def ports
+    `lsof -p #{pid} -i 2>/dev/null`.lines[1..].map do |line|
+      parts = line.split
+      { protocol: parts[7], name: parts[8] } if parts.size >= 9
+    end.compact
+  end
+
+  # Current working directory
+  def dir
+    cwd_line = `lsof -p #{pid} 2>/dev/null | grep ' cwd '`.strip
+    return nil if cwd_line.empty?
+    cwd_line.split.last
+  end
+
+  # Parent process
+  def parent
+    ppid = `ps -o ppid= -p #{pid}`.strip
+    return nil if ppid.empty?
+    self.class.find(ppid)
+  end
+
+  # Child processes
+  def children
+    child_pids = `pgrep -P #{pid}`.lines.map(&:strip)
+    child_pids.filter_map { |cpid| self.class.find(cpid) }
+  end
+
+  # Simple display: PID and CMD
+  def to_s
+    "#{pid}\t#{cmd}"
+  end
+
+  # Detailed display
+  def inspect
+    "#<PsProcess pid=#{pid} user=#{user} stat=#{stat} cmd=#{cmd.slice(0, 40)}...>"
+  end
+end

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.334"
+  VERSION = "0.1.335"
 end

data/lib/hiiro.rb

@@ -35,6 +35,7 @@ require_relative "hiiro/todo"
 require_relative "hiiro/service_manager"
 require_relative "hiiro/runner_tool"
 require_relative "hiiro/app_files"
+require_relative "hiiro/ps_process"
 require_relative "hiiro/rbenv"
 require_relative "hiiro/any_struct"
 require_relative "hiiro/pinned_pr"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.334
+  version: 0.1.335
 platform: ruby
 authors:
 - Joshua Toyota
@@ -351,6 +351,7 @@ files:
 - lib/hiiro/pinned_pr_manager.rb
 - lib/hiiro/project.rb
 - lib/hiiro/projects.rb
+- lib/hiiro/ps_process.rb
 - lib/hiiro/queue.rb
 - lib/hiiro/rbenv.rb
 - lib/hiiro/registry.rb