rps 0.0.2 → 0.0.3

data/.rspec

@@ -0,0 +1 @@
+--color

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Jari Bakken
+Copyright (c) 2010-2011 Jari Bakken
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -10,7 +10,7 @@ $ rps
 
 * BSD/OS X ?
   - FFI
-  - kvm_getprocs() http://www.manpages.info/macosx/kvm_getprocs.3.html
+  - sysctl
   - http://www.opensource.apple.com/source/adv_cmds/adv_cmds-138.1/ps/
 
 == Note on Patches/Pull Requests
@@ -25,4 +25,4 @@ $ rps
 
 == Copyright
 
-Copyright (c) 2010 Jari Bakken. See LICENSE for details.
+Copyright (c) 2010-2011 Jari Bakken. See LICENSE for details.

data/lib/rps.rb

@@ -1,18 +1,51 @@
 require "rbconfig"
+require "rps/cli"
+require "rps/runner"
+require "rps/ui"
 
 module RPS
-  def self.os
-    @os ||= RbConfig::CONFIG['host_os']
+  PLATFORMS = {
+    :linux  => "LinuxProcess",
+    :macosx => "MacOSXProcess"
+  }
+
+  def self.platform
+    @platform ||= (
+      host_os = RbConfig::CONFIG['host_os']
+      case host_os
+      when /mswin|msys|mingw32/
+        :windows
+      when /darwin|mac os/
+        :macosx
+      when /linux/
+        :linux
+      when /bsd/
+        :bsd
+      when /solaris/
+        :solaris
+      else
+        raise "unknown os: #{host_os.inspect}"
+      end
+    )
   end
 
   def self.check_platform
-    unless os =~ /linux/i
-      abort "rps only works on linux at the moment"
+    unless PLATFORMS.has_key? platform
+      abort platform_message
     end
   end
-end
 
-require "rps/cli"
-require "rps/runner"
-require "rps/process_entry"
-require "rps/ui"
+  def self.all
+    clazz = PLATFORMS[platform] or raise platform_message
+    const_get(clazz).all
+  end
+
+  def self.platform_message
+    "rps only works on #{SUPPORTED_PLATFORMS.inspect} at the moment"
+  end
+
+  autoload :LinuxProcess, "rps/linux_process"
+  autoload :BsdProcess, "rps/bsd_process"
+  autoload :MacOSXProcess, "rps/macosx_process"
+
+end

data/lib/rps/bsd_process.rb

@@ -0,0 +1,28 @@
+module RPS
+  class BsdProcess
+    def self.all
+      raise NotImplementedError
+    end
+
+    def readable?
+      raise NotImplementedError
+    end
+
+    def ruby?
+      raise NotImplementedError
+    end
+
+    def exe
+      raise NotImplementedError
+    end
+
+    def pid
+      raise NotImplementedError
+    end
+
+    def command_line
+      raise NotImplementedError
+    end
+
+  end # BsdProcess
+end # RPS

data/lib/rps/cli.rb

@@ -1,12 +1,19 @@
 module RPS
   class CLI
 
-    def initialize(args = nil)
-      @runner = Runner.new
+    def initialize(args = [])
+      opts = {}
+
+      if args.include? "--cwd"
+        opts[:cwd] = true
+      end
+
+      ui = UI.new(STDOUT, opts)
+
+      @runner = Runner.new ui
     end
 
     def run
-      @runner.ui ||= UI.new
       @runner.run
     end
 

data/lib/rps/{process_entry.rb → linux_process.rb}

@@ -1,5 +1,7 @@
 module RPS
-  class ProcessEntry
+  class LinuxProcess
+    NULL = "\000"
+
     def self.all
       Dir['/proc/*'].map { |dir| new(dir) if File.basename(dir) =~ /^\d+$/ }.compact
     end
@@ -24,8 +26,21 @@ module RPS
       @pid ||= Integer(File.basename(@dir))
     end
 
+    def cwd
+      @cwd ||= File.readlink(cwd_path)
+    end
+
     def command_line
-      @command_line ||= File.read(cmdline_path).split("\000")
+      @command_line ||= File.read(cmdline_path).split(NULL)
+    end
+
+    def environment
+      @environment ||= (
+        strings = File.read(environ_path).split(NULL)
+        data = strings.map { |e| e.split("=") }
+
+        Hash[data]
+      )
     end
 
     private
@@ -37,5 +52,13 @@ module RPS
     def cmdline_path
       File.join(@dir, "cmdline")
     end
-  end # ProcessEntry
+
+    def environ_path
+      File.join(@dir, "environ")
+    end
+
+    def cwd_path
+      File.join(@dir, 'cwd')
+    end
+  end # LinuxProcess
 end # RPS

data/lib/rps/macosx_process.rb

@@ -0,0 +1,46 @@
+require 'ffi'
+
+module RPS
+  class MacOSXProcess
+    module Lib
+      extend FFI::Library
+      ffi_lib FFI::CURRENT_PROCESS
+
+      CTL_KERN      = 1
+      KERN_PROC     = 14
+      KERN_PROC_ALL = 0
+      
+      attach_function :sysctl, [:pointer, :uint, :pointer, :pointer, :pointer, :size_t], :int
+    end
+    
+    
+    def self.all
+      raise NotImplementedError
+      
+      mib = [Lib::CTL_KERN, Lib::KERN_PROC, Lib::KERN_PROC_ALL, 0]
+      mip = FFI::MemoryPointer.new(:int, mib.size).write_array_of_int(mib)
+      
+      # meh. struct too much for bsd.
+    end
+
+    def readable?
+      raise NotImplementedError
+    end
+
+    def ruby?
+      raise NotImplementedError
+    end
+
+    def exe
+      raise NotImplementedError
+    end
+
+    def pid
+      raise NotImplementedError
+    end
+
+    def command_line
+      raise NotImplementedError
+    end
+  end # MacOSXProcess
+end # RPS

data/lib/rps/runner.rb

@@ -4,6 +4,7 @@ module RPS
 
     def initialize(ui = nil)
       @ui = ui
+      @opts = {}
     end
 
     def run
@@ -14,7 +15,7 @@ module RPS
     private
 
     def procs
-      @procs ||= ProcessEntry.all
+      @procs ||= RPS.all
     end
   end # Runner
 end # RPS

data/lib/rps/ui.rb

@@ -1,20 +1,21 @@
 module RPS
   class UI
 
-    def initialize(io = $stdout)
+    def initialize(io = $stdout, opts = {})
       @io = io
+      @opts = opts
     end
 
     def render(process)
-      string = format_string % [ process.pid,
-                                 process.exe,
-                                 process.command_line.join(' ') ]
+      string = []
 
-      @io << string
-    end
+      string << process.pid.to_s
+      string << "[#{process.exe}]"
+      string << process.command_line.join(' ')
+      string << "cwd=#{process.cwd}" if @opts[:cwd]
 
-    def format_string
-      "%d [%s] %s\n"
+      @io << string.join(' ') << "\n"
     end
+
   end # RPS
 end # UI

data/lib/rps/version.rb

@@ -1,3 +1,3 @@
 module RPS
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/rps.gemspec

@@ -7,13 +7,15 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jari Bakken"]
   s.email       = ["jari.bakken@gmail.com"]
-  s.homepage    = "http://rubygems.org/gems/rps"
+  s.homepage    = "http://github.com/jarib/rps"
   s.summary     = "Ruby Process Status"
   s.description = "ps for Ruby processes"
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "rps"
 
+  s.add_dependency "ffi", "~> 1.0.9"
+
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec", ">= 2.0.0"
   s.add_development_dependency "autotest", ">= 4.4.5"

data/spec/rps/cli_spec.rb

@@ -5,9 +5,8 @@ module RPS
     it "creates a default runner" do
       runner = mock(Runner, :ui => nil)
 
-      Runner.should_receive(:new).and_return(runner)
+      Runner.should_receive(:new).with(instance_of(UI)).and_return(runner)
       runner.should_receive(:run)
-      runner.should_receive(:ui=).with(instance_of(UI))
 
       CLI.new.run
     end

data/spec/rps/integration_spec.rb

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe "RPS" do
+  it "should include the current process" do
+    RPS.all.find { |e| e.pid == Process.pid }.should be_ruby
+  end
+end

data/spec/rps/{process_entry_spec.rb → linux_process_spec.rb}

@@ -1,40 +1,40 @@
 require "spec_helper"
 
 module RPS
-  describe ProcessEntry do
+  describe LinuxProcess do
     it "creates a process for each process in /proc" do
       Dir.stub!(:[]).with("/proc/*").and_return(["/proc/1", "/proc/2", "/proc/3", "/proc/uptime"])
 
-      procs = ProcessEntry.all
+      procs = LinuxProcess.all
 
       procs.should be_instance_of(Array)
       procs.size.should == 3
-      procs.each { |proc| proc.should be_instance_of(ProcessEntry) }
+      procs.each { |proc| proc.should be_instance_of(LinuxProcess) }
     end
 
     it "returns the pid" do
-      ProcessEntry.new("/proc/123").pid.should == 123
+      LinuxProcess.new("/proc/123").pid.should == 123
     end
 
     it "returns the executable path" do
       File.stub!(:readlink).with("/proc/1/exe").and_return("/some/executable")
-      ProcessEntry.new("/proc/1").exe.should == "/some/executable"
+      LinuxProcess.new("/proc/1").exe.should == "/some/executable"
     end
 
     it "returns the command line" do
       File.stub!(:read).with("/proc/1/cmdline").and_return("ruby\000-e\000sleep\000")
-      ProcessEntry.new("/proc/1").command_line.should == ["ruby", "-e", "sleep"]
+      LinuxProcess.new("/proc/1").command_line.should == ["ruby", "-e", "sleep"]
     end
 
     it "knows if the process is a ruby process" do
-      pe = ProcessEntry.new("/proc/1")
+      pe = LinuxProcess.new("/proc/1")
       pe.stub!(:exe).and_return "/path/to/ruby"
 
       pe.should be_ruby
     end
 
     it "knows if the process is not a ruby process" do
-      pe = ProcessEntry.new("/proc/1")
+      pe = LinuxProcess.new("/proc/1")
       pe.stub!(:exe).and_return "/path/to/something else"
 
       pe.should_not be_ruby
@@ -45,7 +45,7 @@ module RPS
            with("/proc/1/exe").
            and_return(true)
 
-      pe = ProcessEntry.new("/proc/1")
+      pe = LinuxProcess.new("/proc/1")
       pe.should be_readable
     end
 
@@ -54,7 +54,7 @@ module RPS
            with("/proc/1/exe").
            and_return(false)
 
-      pe = ProcessEntry.new("/proc/1")
+      pe = LinuxProcess.new("/proc/1")
       pe.should_not be_readable
     end
 

data/spec/rps/runner_spec.rb

@@ -6,18 +6,19 @@ module RPS
     let(:runner) { Runner.new(ui) }
 
     it "fetches the process list" do
-      ProcessEntry.should_receive(:all).and_return([])
+      RPS.should_receive(:all).and_return([])
       runner.run
     end
 
     it "shows each readable ruby process on the UI" do
       procs = [
-        mock(ProcessEntry, :ruby? => true, :readable? => true),
-        mock(ProcessEntry, :ruby? => false, :readable? => true),
-        mock(ProcessEntry, :ruby? => true, :readable? => false),
-        mock(ProcessEntry, :ruby? => true, :readable? => true)
+        mock(:ruby? => true, :readable? => true),
+        mock(:ruby? => false, :readable? => true),
+        mock(:ruby? => true, :readable? => false),
+        mock(:ruby? => true, :readable? => true)
       ]
-      ProcessEntry.should_receive(:all).and_return(procs)
+
+      RPS.should_receive(:all).and_return(procs)
 
       ui.should_receive(:render).once.with(procs.first)
       ui.should_receive(:render).once.with(procs.last)

data/spec/rps/ui_spec.rb

@@ -6,7 +6,7 @@ module RPS
     let(:ui)     { UI.new(io) }
 
     it "renders the given proc" do
-      pe = mock(ProcessEntry,
+      pe = mock(
         :exe          => "/usr/bin/ruby1.8",
         :pid          => 123,
         :command_line => %w[ruby -e sleep]

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rps
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jari Bakken
@@ -14,54 +15,72 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 +01:00
-default_executable: 
+date: 2011-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: ffi
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 0
+        - 9
+        version: 1.0.9
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: autotest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 37
         segments: 
         - 4
         - 4
         - 5
         version: 4.4.5
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: ps for Ruby processes
 email: 
 - jari.bakken@gmail.com
@@ -73,26 +92,28 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- autotest/discover.rb
 - bin/rps
 - lib/rps.rb
+- lib/rps/bsd_process.rb
 - lib/rps/cli.rb
-- lib/rps/process_entry.rb
+- lib/rps/linux_process.rb
+- lib/rps/macosx_process.rb
 - lib/rps/runner.rb
 - lib/rps/ui.rb
 - lib/rps/version.rb
 - rps.gemspec
 - spec/rps/cli_spec.rb
-- spec/rps/process_entry_spec.rb
+- spec/rps/integration_spec.rb
+- spec/rps/linux_process_spec.rb
 - spec/rps/runner_spec.rb
 - spec/rps/ui_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://rubygems.org/gems/rps
+homepage: http://github.com/jarib/rps
 licenses: []
 
 post_install_message: 
@@ -105,6 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -113,6 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -121,9 +144,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rps
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby Process Status
 test_files: []
 
+has_rdoc: 

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }