after 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/bin/after

@@ -8,24 +8,4 @@ end
 require 'after'
 require 'andand' # to avoid warnings
 
-if ARGV[0] == '-v'
-  ARGV.shift
-  $VERBOSE = true
-  puts 'running in verbose mode'
-end
-
-if ARGV[0] == '-l' || ARGV[0] == '--list'
-  $VERBOSE = true # so it'll output the names...
-  ARGV.shift
-  After.find_pids(ARGV.shift)
-  exit # premature exit
-elsif ARGV[0] == '-p'
-  ARGV.shift
-  pid = ARGV.shift
-  After.wait_pid pid.to_i
-else
- After.find_and_wait_for(ARGV.shift)
-end
-
-puts 'running', ARGV if $VERBOSE
-system(*ARGV) if ARGV.length > 0
+After.go

data/lib/after.rb

@@ -12,9 +12,9 @@ class After
       if (proc.CommandLine && proc.CommandLine.contain?(many_args)) || proc.Name.include?(many_args)
         pid = proc.ProcessId.to_i
         next if pid == Process.pid
-        pids << pid
+        pids << [pid, proc.CommandLine]
         if $VERBOSE
-         print 'adding ', proc.ProcessId, ' ', proc.Name, ' ', proc.CommandLine, "\n"
+          print 'adding ', proc.ProcessId, ' ', proc.Name, ' ', proc.CommandLine, "\n"
         end
       end
     end
@@ -22,18 +22,43 @@ class After
   end
 
   def self.find_and_wait_for(args)
-   pids = find_pids args
-   if pids.length > 1
-     puts "found more than one -- waiting for all #{pids.inspect}"
-   end
-   pids.each{|pid| 
-     puts "waiting for #{pid}"
-     WaitPid.wait_nonchild_pid pid 
-   }
+    pids = find_pids args
+    if pids.length > 1
+      puts "found more than one -- waiting for all #{pids.map{|pid, name| name}.inspect}"
+    end
+    pids.each{|pid, name|
+      puts "waiting for #{pid} (#{name})"
+      WaitPid.wait_nonchild_pid pid
+    }
   end
-  
+
   def self.wait_pid pid
     WaitPid.wait_nonchild_pid pid
   end
 
-end
+  # main, really
+  def self.go
+    if ARGV[0] == '-v'
+      ARGV.shift
+      $VERBOSE = true
+      puts 'running in verbose mode'
+    end
+
+    if ARGV[0] == '-l' || ARGV[0] == '--list'
+      $VERBOSE = true # so it'll output the names...
+      ARGV.shift
+      After.find_pids(ARGV.shift)
+      exit # premature exit
+    elsif ARGV[0] == '-p'
+      ARGV.shift
+      pid = ARGV.shift
+      After.wait_pid pid.to_i
+    else
+      After.find_and_wait_for(ARGV.shift)
+    end
+
+    puts 'running', ARGV if $VERBOSE
+    system(*ARGV) if ARGV.length > 0
+  end
+
+end

data/spec/spec.after.rb

@@ -13,7 +13,7 @@ describe After do
   it "should be able to grab the right pid" do
      pid = go
      a = After.find_pids('sleep')
-     a[0].should == pid
+     a[0][0].should == pid
   end
 
   it "should immediately return if the other process doesn't exist" do
@@ -39,12 +39,12 @@ describe After do
 
   it "should not return the PID of this process" do
     a = After.find_pids('ruby')
-    assert !Process.pid.in?(a)
+    assert !Process.pid.in?(a.map_by(:first))
   end
 
   it "should allow for passing in a pid" do
    pid = go 1
-   After.wait_pid pid 
+   After.wait_pid pid
   end
 
   it "should find .bat filenames" do
@@ -52,16 +52,19 @@ describe After do
      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 == [pid]
+     assert a[0][0] == pid && a.length == 1
   end    	
   
   
   it "should find .bat filenames when run by selves" 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 == [pid]
+     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
@@ -70,5 +73,7 @@ describe After do
   end
 
   it "should split the commands up right and across name, too"
+  
+  
 
 end

metadata

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