open4 0.5.1 → 0.6.0

data/README

@@ -1,6 +1,6 @@
 URIS
 
-  http://rubyforge.org/frs/?group_id=1024
+  http://rubyforge.org/projects/codeforpeople/
   http://www.codeforpeople.com/lib/ruby/
 
 SYNOPSIS
@@ -10,6 +10,35 @@ SYNOPSIS
 
 HISTORY
 
+  0.6.0:
+    - added feature for exitstatus to be list of acceptable exit statuses
+
+        Open4.spawn 'ruby -e "exit 42"'                      # raises
+        Open4.spawn 'ruby -e "exit 42"', :exitstatus=>[0,42] # ok
+
+    - added :status switch, which will always simply return the status (no
+      error thrown for failure)
+
+        Open4.spawn 'ruby -e "exit 42"'                          # raises 
+        status = Open4.spawn 'ruby -e "exit 42"', :status=>true  # ok 
+
+      note, however, that any SpawnError does in fact contain the failed
+      status so, even when they are thrown, error status can be retrieved:
+
+        include Open4
+
+        status =
+          begin
+            spawn 'ruby -e "exit 42"'
+          rescue SpawnError => e
+            warn{ e }
+            e.status
+          end
+
+  0.5.1:
+    - fixes a __critical__ but in ThreadEnsemble class that had a race
+      condition that could cause thread deadlock.  sorry bout that folks.
+
   0.5.0:
     - on the suggestion of tim pease (thanks tim!), i added timeout features
       to open4.  the command run may have an overall timeout and individual

data/lib/{open4-0.5.1.rb → open4-0.6.0.rb}

@@ -4,7 +4,7 @@ require 'thread'
 
 module Open4
 #--{{{
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
   def self.version() VERSION end
 
   class Error < ::StandardError; end
@@ -229,7 +229,7 @@ module Open4
 #--{{{
     getopt = getopts opts
 
-    ignore_exit_failure = getopt[ 'ignore_exit_failure', getopt['quiet', false] ]
+    ignore_exit_failure = getopt[ 'ignore_exit_failure', getopt['status', getopt['quiet', false] ] ]
     ignore_exec_failure = getopt[ 'ignore_exec_failure', !getopt['raise', true] ]
     exitstatus = getopt[ %w( exitstatus exit_status status ), 0 ]
     stdin = getopt[ %w( stdin in i 0 ) << 0 ]
@@ -245,6 +245,8 @@ module Open4
     stdout ||= '' if stdout_timeout
     stderr ||= '' if stderr_timeout
 
+    exitstatus = [*exitstatus]
+
     started = false
 
     status =
@@ -280,7 +282,7 @@ module Open4
       end
 
     raise SpawnError.new(cmd, status) unless
-      (ignore_exit_failure or (status.nil? and ignore_exec_failure) or (status.exitstatus == exitstatus))
+      (ignore_exit_failure or (status.nil? and ignore_exec_failure) or exitstatus.include?(status.exitstatus))
 
     status
 #--}}}

data/lib/open4.rb

@@ -4,7 +4,7 @@ require 'thread'
 
 module Open4
 #--{{{
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
   def self.version() VERSION end
 
   class Error < ::StandardError; end
@@ -229,7 +229,7 @@ module Open4
 #--{{{
     getopt = getopts opts
 
-    ignore_exit_failure = getopt[ 'ignore_exit_failure', getopt['quiet', false] ]
+    ignore_exit_failure = getopt[ 'ignore_exit_failure', getopt['status', getopt['quiet', false] ] ]
     ignore_exec_failure = getopt[ 'ignore_exec_failure', !getopt['raise', true] ]
     exitstatus = getopt[ %w( exitstatus exit_status status ), 0 ]
     stdin = getopt[ %w( stdin in i 0 ) << 0 ]
@@ -245,6 +245,8 @@ module Open4
     stdout ||= '' if stdout_timeout
     stderr ||= '' if stderr_timeout
 
+    exitstatus = [*exitstatus]
+
     started = false
 
     status =
@@ -280,7 +282,7 @@ module Open4
       end
 
     raise SpawnError.new(cmd, status) unless
-      (ignore_exit_failure or (status.nil? and ignore_exec_failure) or (status.exitstatus == exitstatus))
+      (ignore_exit_failure or (status.nil? and ignore_exec_failure) or exitstatus.include?(status.exitstatus))
 
     status
 #--}}}

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: open4
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
-date: 2006-08-22 00:00:00.000000 -06:00
+  version: 0.6.0
+date: 2006-08-31 00:00:00.000000 -06:00
 summary: open4
 require_paths: 
   - lib
@@ -33,11 +33,8 @@ files:
   - sample
   - lib
   - README
-  - build
-  - install
+  - open4-0.6.0.gem
   - gemspec.rb
-  - a.rb
-  - open4-0.5.1.gem
   - sample/block.rb
   - sample/simple.rb
   - sample/exception.rb
@@ -46,7 +43,7 @@ files:
   - sample/timeout.rb
   - sample/stdin_timeout.rb
   - lib/open4.rb
-  - lib/open4-0.5.1.rb
+  - lib/open4-0.6.0.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []

data/a.rb

@@ -1,64 +0,0 @@
-require 'thread'
-
-class ThreadEnsemble
-#--{{{
-  attr 'threads'
-
-  def initialize
-    @threads, @argv, @done, @running = [], [], Queue.new, false
-  end
-
-  def add_thread *a, &b
-    @running ? raise : (@argv << [a, b])
-  end
-
-  def killall
-    (@threads - [Thread.current]).each{|t| t.kill rescue nil} if @running
-  end
-
-  def run
-    @running = true
-
-    begin
-      @argv.each do |a, b|
-        @threads << Thread.new(*a) do |*a|
-          begin
-            b[*a]
-          ensure
-            killall rescue nil if $!
-            @done.push Thread.current
-          end
-        end
-      end
-    rescue
-      killall
-      raise
-    ensure
-      all_done
-    end
-
-    @threads.map{|t| t.value}
-  end
-
-  def all_done
-    @threads.size.times{ @done.pop }
-  end
-#--}}}
-end
-
-loop do
-  te = ThreadEnsemble.new
-
-  1000.times do
-    te.add_thread do
-      raise
-    end
-  end
-
-  begin
-    te.run
-  rescue
-    running = te.threads.select{|t| t.status} 
-    abort running.inspect if running.size > 0
-  end
-end

data/install

@@ -1,201 +0,0 @@
-#!/usr/bin/env ruby
-require 'rbconfig'
-require 'find'
-require 'ftools'
-require 'tempfile'
-include Config
-
-LIBDIR      = "lib"
-LIBDIR_MODE = 0644
-
-BINDIR      = "bin"
-BINDIR_MODE = 0755
-
-
-$srcdir            = CONFIG["srcdir"]
-$version           = CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
-$libdir            = File.join(CONFIG["libdir"], "ruby", $version)
-$archdir           = File.join($libdir, CONFIG["arch"])
-$site_libdir       = $:.find {|x| x =~ /site_ruby$/}
-$bindir            = CONFIG["bindir"] || CONFIG['BINDIR']
-$ruby_install_name = CONFIG['ruby_install_name'] || CONFIG['RUBY_INSTALL_NAME'] || 'ruby'
-$ruby_ext          = CONFIG['EXEEXT'] || ''
-$ruby              = File.join($bindir, ($ruby_install_name + $ruby_ext))
-
-if !$site_libdir
-  $site_libdir = File.join($libdir, "site_ruby")
-elsif $site_libdir !~ %r/#{Regexp.quote($version)}/
-  $site_libdir = File.join($site_libdir, $version)
-end
-
-def install_rb(srcdir=nil, destdir=nil, mode=nil, bin=nil)
-#{{{
-  path   = []
-  dir    = []
-  Find.find(srcdir) do |f|
-    next unless FileTest.file?(f)
-    next if (f = f[srcdir.length+1..-1]) == nil
-    next if (/CVS$/ =~ File.dirname(f))
-    next if f =~ %r/\.lnk/
-    path.push f
-    dir |= [File.dirname(f)]
-  end
-  for f in dir
-    next if f == "."
-    next if f == "CVS"
-    File::makedirs(File.join(destdir, f))
-  end
-  for f in path
-    next if (/\~$/ =~ f)
-    next if (/^\./ =~ File.basename(f))
-    unless bin
-      File::install(File.join(srcdir, f), File.join(destdir, f), mode, true)
-    else
-      from = File.join(srcdir, f)
-      to = File.join(destdir, f)
-      shebangify(from) do |sf|
-        $deferr.print from, " -> ", File::catname(from, to), "\n"
-        $deferr.printf "chmod %04o %s\n", mode, to 
-        File::install(sf, to, mode, false)
-      end
-    end
-  end
-#}}}
-end
-def shebangify f
-#{{{
-  open(f) do |fd|
-    buf = fd.read 42 
-    if buf =~ %r/^\s*#\s*!.*ruby/o
-      ftmp = Tempfile::new("#{ $$ }_#{ File::basename(f) }")
-      begin
-        fd.rewind
-        ftmp.puts "#!#{ $ruby  }"
-        while((buf = fd.read(8192)))
-          ftmp.write buf
-        end
-        ftmp.close
-        yield ftmp.path
-      ensure
-        ftmp.close!
-      end
-    else
-      yield f
-    end
-  end
-#}}}
-end
-def ARGV.switch
-#{{{
-  return nil if self.empty?
-  arg = self.shift
-  return nil if arg == '--'
-  if arg =~ /^-(.)(.*)/
-    return arg if $1 == '-'
-    raise 'unknown switch "-"' if $2.index('-')
-    self.unshift "-#{$2}" if $2.size > 0
-    "-#{$1}"
-  else
-    self.unshift arg
-    nil
-  end
-#}}}
-end
-def ARGV.req_arg
-#{{{
-  self.shift || raise('missing argument')
-#}}}
-end
-def linkify d, linked = []
-#--{{{
-  if test ?d, d
-    versioned = Dir[ File::join(d, "*-[0-9].[0-9].[0-9].rb") ]
-    versioned.each do |v| 
-      src, dst = v, v.gsub(%r/\-[\d\.]+\.rb$/, '.rb')
-      lnk = nil
-      begin
-        if test ?l, dst
-          lnk = "#{ dst }.lnk"
-          puts "#{ dst } -> #{ lnk }"
-          File::rename dst, lnk
-        end
-        unless test ?e, dst
-          puts "#{ src } -> #{ dst }"
-          File::copy src, dst 
-          linked << dst
-        end
-      ensure
-        if lnk
-          at_exit do
-            puts "#{ lnk } -> #{ dst }"
-            File::rename lnk, dst
-          end
-        end
-      end
-    end
-  end
-  linked
-#--}}}
-end
-
-
-#
-# main program
-#
-
-libdir = $site_libdir
-bindir = $bindir
-no_linkify = false
-linked = nil
-help = false
-
-usage = <<-usage
-  #{ File::basename $0 }
-    -d, --destdir    <destdir>
-    -l, --libdir     <libdir>
-    -b, --bindir     <bindir>
-    -r, --ruby       <ruby>
-    -n, --no_linkify
-    -h, --help
-usage
-
-begin
-  while switch = ARGV.switch
-    case switch
-    when '-d', '--destdir'
-      libdir = ARGV.req_arg
-    when '-l', '--libdir'
-      libdir = ARGV.req_arg
-    when '-b', '--bindir'
-      bindir = ARGV.req_arg
-    when '-r', '--ruby'
-      $ruby = ARGV.req_arg
-    when '-n', '--no_linkify'
-      no_linkify = true
-    when '-h', '--help'
-      help = true
-    else
-      raise "unknown switch #{switch.dump}"
-    end
-  end
-rescue
-  STDERR.puts $!.to_s
-  STDERR.puts usage
-  exit 1
-end    
-
-if help
-  STDOUT.puts usage
-  exit
-end
-
-unless no_linkify
-  linked = linkify('lib') + linkify('bin')
-end
-
-install_rb(LIBDIR, libdir, LIBDIR_MODE)
-install_rb(BINDIR, bindir, BINDIR_MODE, bin=true)
-
-if linked
-  linked.each{|path| File::rm_f path}
-end