after 0.6.0 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/after.rb

@@ -1,24 +1,36 @@
-require 'ruby-wmi' # wow not even pretended linux compat. yet
+require 'os'
+if OS.windows?
+  require 'ruby-wmi' # wow not even pretended linux compat. yet
+end
 require 'sane'
 require 'wait_pid'
 
 class After
 
   def self.find_pids(many_args)
-    procs = WMI::Win32_Process.find(:all)
-    #_dbg
-    pids = []
-    for proc in procs # TODO respect proc.Name!
-      if (proc.CommandLine && proc.CommandLine.contain?(many_args)) || proc.Name.include?(many_args)
-        pid = proc.ProcessId.to_i
+
+    procs_by_pid = {}
+    if OS.windows?
+      procs = WMI::Win32_Process.find(:all)
+      for proc in procs
+        procs_by_pid[proc.ProcessId] = proc.CommandLine.to_s + proc.Name.to_s
+      end
+    else
+      a = `ps -ef`
+      a.lines.to_a[1..-1].each{|l| pid = l.split(/\s+/)[1]; procs_by_pid[pid.to_i] = l}
+    end
+
+    good_pids = []
+    for pid, description in procs_by_pid
+      if description.contain?(many_args)
         next if pid == Process.pid
-        pids << [pid, proc.CommandLine]
+        good_pids << [pid, description]
         if $VERBOSE
-          print 'adding ', proc.ProcessId, ' ', proc.Name, ' ', proc.CommandLine, "\n"
+         pps 'adding', pid, description
         end
       end
     end
-    pids
+    good_pids
   end
 
   def self.find_and_wait_for(args)

data/spec/spec.after.rb

@@ -1,19 +1,21 @@
+require 'rubygems'
 require 'spec/autorun'
 require 'sane'
 require_relative '../lib/after'
+require 'backports' if RUBY_VERSION < '1.9'
 
 describe After do
 
   def go how_many = 1
-     pid = Process.spawn "ruby ./sleep.rb #{how_many}"
-     Thread.new { Process.wait pid } # wait for it, so we can collect child processes, too
-     pid
+    pid = Process.spawn "ruby ./sleep.rb #{how_many}"
+    Thread.new { Process.wait pid } # wait for it, so we can collect child processes, too
+    pid
   end
 
   it "should be able to grab the right pid" do
-     pid = go
-     a = After.find_pids('sleep')
-     a[0][0].should == pid
+    pid = go
+    a = After.find_pids('sleep')
+    a[0][0].should == pid
   end
 
   it "should immediately return if the other process doesn't exist" do
@@ -25,7 +27,7 @@ describe After do
     go
     start = Time.now
     After.find_and_wait_for('sleep')
-    assert (Time.now - start) > 0.5 
+    assert (Time.now - start) > 0.5
   end
 
   it "should work if there are several available" do
@@ -34,7 +36,7 @@ describe After do
     go 3
     start = Time.now
     After.find_and_wait_for('sleep')
-    assert (Time.now - start) > 2     
+    assert (Time.now - start) > 2
   end
 
   it "should not return the PID of this process" do
@@ -43,37 +45,39 @@ describe After do
   end
 
   it "should allow for passing in a pid" do
-   pid = go 1
-   After.wait_pid pid
+    pid = go 1
+    After.wait_pid pid
   end
 
-  it "should find .bat filenames" do
-    # unfortunately I don't know how to query for exact parameters, though...
-     pid = Process.spawn "cmd /c sleep.bat 1"
-     Thread.new { Process.wait pid } # wait for it, so we can collect child processes, too
-     a = After.find_pids('sleep.bat')
-     assert a[0][0] == pid && a.length == 1
-  end    	
-  
-  
+  if OS.windows?
+    it "should find .bat filenames" do
+      # unfortunately I don't know how to query for exact parameters, though...
+      pid = Process.spawn "cmd /c sleep.bat 1"
+      Thread.new { Process.wait pid } # wait for it, so we can collect child processes, too
+      a = After.find_pids('sleep.bat')
+      assert a[0][0] == pid && a.length == 1
+    end
+  end
+
+
   it "should find .bat filenames when run by selves" do
-     pending "knowing how to do this in windows" do
-     
+    pending "knowing how to do this in windows" do
+
       # unfortunately I don't know how to query for exact parameters, though...
       pid = Process.spawn "sleep.bat 1"
       Thread.new { Process.wait pid } # wait for it, so we can collect child processes, too
       a = After.find_pids('sleep.bat')
       assert a[0][0] == pid && a.length == 1
     end
-  end    	
-  
-  it "should find exe names too" do
-     a = After.find_pids('csrss')   # only searchable via name of csrss.exe
-     assert a.length == 1  
   end
 
+  if OS.windows?
+   it "should find exe names too" do
+    a = After.find_pids('csrss')   # only searchable via name of csrss.exe
+    assert a.length == 1
+   end
+  end
+
   it "should split the commands up right and across name, too"
-  
-  
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: after
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - rogerdpack
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 -07:00
+date: 2010-01-12 00:00:00 -07:00
 default_executable: after
 dependencies: 
 - !ruby/object:Gem::Dependency