after 0.0.2 → 0.0.4

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,21 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 rdp
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,17 @@
+= wait_pid
+
+Description goes here.
+
+== Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== Copyright
+
+Copyright (c) 2009 rdp. See LICENSE for details.

data/Rakefile

@@ -1,3 +1,4 @@
+
 require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "after"
@@ -6,9 +7,8 @@ require 'jeweler'
     gemspec.email = "rogerdpack@gmail.com"
     gemspec.authors = ["rogerdpack"]
     gemspec.add_dependency 'sane'
-    gemspec.add_dependency 'andand'
     gemspec.add_development_dependency 'jeweler'
     gemspec.add_development_dependency 'rspec'
     gemspec.add_dependency 'ruby-wmi'
-    gemspec.add_dependency 'win32-process'
-  end
+    gemspec.add_dependency 'wait_pid'
+  end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

data/bin/after

@@ -1,16 +1,25 @@
 #!/usr/bin/ruby
 
 if ['-h', '--help'].in?(ARGV) || ARGV.length == 0
-  puts 'syntax: [-v] "command string to match" then some other command to run with its args'
+  puts 'syntax: [-v] [-l or --list to only list] "command string to match" then some other command to run with its args'
   exit
 end
 
 require 'after'
+require 'andand' # to avoid warnings
 
 if ARGV[0] == '-v'
   ARGV.shift
   $VERBOSE = true
-  puts 'running in verbose mode'
+  puts 'running in verbose mode, my pid is ' + Process.pid.to_s
 end
+
+if ARGV[0] == '-l' || ARGV[0] == '--list'
+  $VERBOSE = true # so it'll output
+  ARGV.shift
+  After.find_pids(ARGV.shift)
+  exit
+end
+
 After.find_and_wait_for(ARGV.shift)
 system(ARGV)

data/lib/after.rb

@@ -1,7 +1,6 @@
-require 'ruby-wmi'
+require 'ruby-wmi' # wow not even pretended linux compat. yet
 require 'sane'
-require 'andand'
-require 'win32/process' # waitpid for doze
+require 'wait_pid'
 
 class After
 
@@ -10,8 +9,10 @@ class After
     procs = WMI::Win32_Process.find(:all)
     pids = []
     for proc in procs # TODO respect proc.Name!
-      if proc.CommandLine.andand.contain?(many_args)
-        pids << proc.ProcessId.to_i
+      if proc.CommandLine && proc.CommandLine.contain?(many_args)
+        pid = proc.ProcessId.to_i
+        next if pid == Process.pid
+        pids << pid
         if $VERBOSE
          print 'adding ', proc.ProcessId, ' ', proc.Name, ' ', proc.CommandLine, "\n"
         end
@@ -22,7 +23,7 @@ class After
 
   def self.find_and_wait_for(args)
    pids = find_pids args
-   pids.each{|pid| Process.waitpid pid}
+   pids.each{|pid| WaitPid.wait_nonchild_pid pid }
   end
 
 end

data/spec/helper.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'wait_pid'
+
+class Test::Unit::TestCase
+end

data/{test → spec}/spec.after.rb

@@ -1,11 +1,13 @@
 require 'spec/autorun'
-require 'sane' # require_rel
+require 'sane'
 require_rel '../lib/after'
 
 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
   end
 
   it "should be able to grab the right pid" do
@@ -35,6 +37,17 @@ describe After do
     assert (Time.now - start) > 2     
   end
 
-  it "should split the commands up right--if necessary"
+  it "should split the commands up right and across name, too"
+
+  it "should respect name"
+
+  it "should not return the PID of this process" do
+    a = After.find_pids('ruby')
+    assert !Process.pid.in?(a)
+  end
+
+  it "should run all args" do
+    go 0
+  end
 
 end

data/spec/test_wait_pid.rb

@@ -0,0 +1,7 @@
+require 'helper'
+
+class TestWaitPid < Test::Unit::TestCase
+  should "probably rename this file and start testing for real" do
+    flunk "hey buddy, you should probably rename this file and start testing for real"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: after
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors: 
 - rogerdpack
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 -07:00
+date: 2009-12-22 00:00:00 -07:00
 default_executable: after
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: andand
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
   type: :development
@@ -63,7 +53,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: win32-process
+  name: wait_pid
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -79,15 +69,23 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE
 - README
+- README.rdoc
 files: 
+- .document
+- .gitignore
+- LICENSE
 - README
+- README.rdoc
 - Rakefile
 - VERSION
 - bin/after
 - lib/after.rb
-- test/sleep.rb
-- test/spec.after.rb
+- spec/helper.rb
+- spec/sleep.rb
+- spec/spec.after.rb
+- spec/test_wait_pid.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -117,5 +115,7 @@ signing_key:
 specification_version: 3
 summary: Command to allow you to run a command in one console window, then run another in a separate window after the first completes
 test_files: 
-- test/sleep.rb
-- test/spec.after.rb
+- spec/helper.rb
+- spec/sleep.rb
+- spec/spec.after.rb
+- spec/test_wait_pid.rb