systemu 2.4.2 → 2.5.0

data/README

@@ -4,7 +4,8 @@ NAME
 
 SYNOPSIS
 
-  univeral capture of stdout and stderr and handling of child process pid for windows, *nix, etc.
+  universal capture of stdout and stderr and handling of child process pid for
+  windows, *nix, etc.
 
 URIS
 

data/lib/systemu.rb

@@ -1,4 +1,5 @@
-# vim: ts=2:sw=2:sts=2:et:fdm=marker
+# encoding: utf-8
+
 require 'tmpdir'
 require 'socket'
 require 'fileutils'
@@ -13,7 +14,7 @@ class SystemUniversal
 #
 # constants
 #
-  SystemUniversal::VERSION = '2.4.2' unless SystemUniversal.send(:const_defined?, :VERSION)
+  SystemUniversal::VERSION = '2.5.0' unless SystemUniversal.send(:const_defined?, :VERSION)
   def SystemUniversal.version() SystemUniversal::VERSION end
   def version() SystemUniversal::VERSION end
 #
@@ -76,7 +77,7 @@ class SystemUniversal
             line = pipe.gets
             case line
               when %r/^pid: \d+$/
-                cid = Integer line[%r/\d+/] 
+                cid = Integer line[%r/\d+/]
               else
                 begin
                   buf = pipe.read
@@ -120,12 +121,12 @@ class SystemUniversal
     SystemUniversal.quote(*args, &block)
   end
 
-  def new_thread cid, block 
+  def new_thread cid, block
     q = Queue.new
-    Thread.new(cid) do |cid| 
-      current = Thread.current 
+    Thread.new(cid) do |cid|
+      current = Thread.current
       current.abort_on_exception = true
-      q.push current 
+      q.push current
       block.call cid
     end
     q.pop
@@ -150,10 +151,10 @@ class SystemUniversal
     c['argv'] = @argv
     c['env'] = @env
     c['cwd'] = @cwd
-    c['stdin'] = stdin 
-    c['stdout'] = stdout 
-    c['stderr'] = stderr 
-    c['program'] = program 
+    c['stdin'] = stdin
+    c['stdout'] = stdout
+    c['stderr'] = stderr
+    c['program'] = program
     open(config, 'w'){|f| Marshal.dump(c, f)}
 
     open(program, 'w'){|f| f.write child_program(config)}
@@ -171,6 +172,8 @@ class SystemUniversal
 
   def child_program config
     <<-program
+      # encoding: utf-8
+
       PIPE = STDOUT.dup
       begin
         config = Marshal.load(IO.read('#{ config }'))
@@ -190,7 +193,7 @@ class SystemUniversal
         STDERR.reopen stderr
 
         PIPE.puts "pid: \#{ Process.pid }"
-        PIPE.flush                        ### the process is ready yo! 
+        PIPE.flush                        ### the process is ready yo!
         PIPE.close
 
         exec *argv
@@ -221,9 +224,9 @@ class SystemUniversal
       tmp = File.join d, "systemu_#{ @host }_#{ @ppid }_#{ @pid }_#{ rand }_#{ i += 1 }"
 
       begin
-        Dir.mkdir tmp 
+        Dir.mkdir tmp
       rescue Errno::EEXIST
-        raise if i >= max 
+        raise if i >= max
         next
       end
 
@@ -232,7 +235,7 @@ class SystemUniversal
           begin
             b.call tmp
           ensure
-            FileUtils.rm_rf tmp unless SystemU.turd 
+            FileUtils.rm_rf tmp unless SystemU.turd
           end
         else
           tmp
@@ -260,36 +263,39 @@ end
 if defined? JRUBY_VERSION
   require 'jruby'
   java_import org.jruby.RubyProcess
-        
+
   class SystemUniversal
     def systemu
       split_argv = JRuby::PathHelper.smart_split_command @argv
       process = java.lang.Runtime.runtime.exec split_argv.to_java(:string)
-      
+
       stdout, stderr = [process.input_stream, process.error_stream].map do |stream|
         StreamReader.new(stream)
       end
 
       exit_code = process.wait_for
+      field = process.get_class.get_declared_field("pid")
+      field.set_accessible(true)
+      pid = field.get(process)
       [
-        RubyProcess::RubyStatus.new_process_status(JRuby.runtime, exit_code), 
-        stdout.join, 
+        RubyProcess::RubyStatus.new_process_status(JRuby.runtime, exit_code, pid),
+        stdout.join,
         stderr.join
       ]
     end
-    
+
     class StreamReader
       def initialize(stream)
         @data = ""
         @thread = Thread.new do
           reader = java.io.BufferedReader.new java.io.InputStreamReader.new(stream)
-          
+
           while line = reader.read_line
             @data << line << "\n"
           end
         end
       end
-      
+
       def join
         @thread.join
         @data
@@ -297,7 +303,7 @@ if defined? JRUBY_VERSION
     end
   end
 end
-  
+
 
 
 SystemU = SystemUniversal unless defined? SystemU
@@ -333,20 +339,20 @@ if $0 == __FILE__
 # sleep
 #
   sleep = %q( ruby -e"  p(sleep(1))  " )
-  status, stdout, stderr = systemu sleep 
+  status, stdout, stderr = systemu sleep
   p [status, stdout, stderr]
 
   sleep = %q( ruby -e"  p(sleep(42))  " )
   status, stdout, stderr = systemu(sleep){|cid| Process.kill 9, cid}
   p [status, stdout, stderr]
 #
-# env 
+# env
 #
   env = %q( ruby -e"  p ENV['A']  " )
-  status, stdout, stderr = systemu env, :env => {'A' => 42} 
+  status, stdout, stderr = systemu env, :env => {'A' => 42}
   p [status, stdout, stderr]
 #
-# cwd 
+# cwd
 #
   env = %q( ruby -e"  p Dir.pwd  " )
   status, stdout, stderr = systemu env, :cwd => Dir.tmpdir

data/systemu.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "systemu"
-  spec.version = "2.4.2"
+  spec.version = "2.5.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "systemu"
   spec.description = "description: systemu kicks the ass"
@@ -22,7 +22,10 @@ Gem::Specification::new do |spec|
  "samples/d.rb",
  "samples/e.rb",
  "samples/f.rb",
- "systemu.gemspec"]
+ "systemu.gemspec",
+ "test",
+ "test/systemu_test.rb",
+ "test/testing.rb"]
 
   spec.executables = []
   

data/test/systemu_test.rb

@@ -0,0 +1,64 @@
+
+Testing SystemU do
+
+##
+#
+  testing 'that simple usage works' do
+    status, stdout, stderr = assert{ systemu :bin/:ls }
+    assert{ status == 0 }
+    assert{ stdout['lib'] }
+    assert{ stderr.strip.empty? }
+  end
+
+  testing 'program with stdin' do
+    stdin = '42'
+    status, stdout, stderr = assert{ systemu :bin/:cat, :stdin => stdin }
+    assert{ status == 0 }
+    assert{ stdout == stdin } 
+  end
+
+end
+
+
+
+
+
+BEGIN {
+
+# silly hax to build commands we can shell out to on any platform.  since
+# tests might run on windoze we assume only that 'ruby' is available and build
+# other command-line programs from it.
+#
+  module Kernel
+  private
+    def bin(which, options = {}, &block)
+      case which.to_s
+        when 'ls'
+          %| ruby -e'puts Dir.glob("*").sort' |
+
+        when 'cat'
+          %| ruby -e'STDOUT.write(ARGF.read)' |
+
+        when 'find'
+          %| ruby -e'puts Dir.glob("**/**").sort' |
+      end
+    end
+  end
+
+# just let's us write:   :bin/:ls
+#
+  class Symbol
+    def / other, options = {}, &block
+      eval "#{ self }(:#{ other }, options, &block)"
+    end
+  end
+
+  testdir = File.dirname(File.expand_path(__FILE__))
+  rootdir = File.dirname(testdir)
+  libdir = File.join(rootdir, 'lib')
+  require File.join(libdir, 'systemu')
+  require File.join(testdir, 'testing')
+
+
+  Dir.chdir(rootdir)
+}

data/test/testing.rb

@@ -0,0 +1,195 @@
+require 'test/unit'
+
+testdir = File.expand_path(File.dirname(__FILE__))
+rootdir = File.dirname(testdir)
+libdir = File.join(rootdir, 'lib')
+
+STDOUT.sync = true
+
+$:.unshift(testdir) unless $:.include?(testdir)
+$:.unshift(libdir) unless $:.include?(libdir)
+$:.unshift(rootdir) unless $:.include?(rootdir)
+
+class Testing
+  class Slug < ::String
+    def Slug.for(*args)
+      string = args.flatten.compact.join('-')
+      words = string.to_s.scan(%r/\w+/)
+      words.map!{|word| word.gsub %r/[^0-9a-zA-Z_-]/, ''}
+      words.delete_if{|word| word.nil? or word.strip.empty?}
+      new(words.join('-').downcase)
+    end
+  end
+  
+  class Context
+    attr_accessor :name
+
+    def initialize(name, *args)
+      @name = name
+    end
+
+    def to_s
+      Slug.for(name)
+    end
+  end
+end
+
+def Testing(*args, &block)
+  Class.new(::Test::Unit::TestCase) do
+
+  ## class methods
+  #
+    class << self
+      def contexts
+        @contexts ||= []
+      end
+
+      def context(*args, &block)
+        return contexts.last if(args.empty? and block.nil?)
+
+        context = Testing::Context.new(*args)
+        contexts.push(context)
+
+        begin
+          block.call(context)
+        ensure
+          contexts.pop
+        end
+      end
+
+      def slug_for(*args)
+        string = [context, args].flatten.compact.join('-')
+        words = string.to_s.scan(%r/\w+/)
+        words.map!{|word| word.gsub %r/[^0-9a-zA-Z_-]/, ''}
+        words.delete_if{|word| word.nil? or word.strip.empty?}
+        words.join('-').downcase.sub(/_$/, '')
+      end
+
+      def name() const_get(:Name) end
+
+      def testno()
+        '%05d' % (@testno ||= 0)
+      ensure
+        @testno += 1
+      end
+
+      def testing(*args, &block)
+        method = ["test", testno, slug_for(*args)].delete_if{|part| part.empty?}.join('_')
+        define_method(method, &block)
+      end
+
+      def test(*args, &block)
+        testing(*args, &block)
+      end
+
+      def setup(&block)
+        define_method(:setup, &block) if block
+      end
+
+      def teardown(&block)
+        define_method(:teardown, &block) if block
+      end
+
+      def prepare(&block)
+        @prepare ||= []
+        @prepare.push(block) if block
+        @prepare
+      end
+
+      def cleanup(&block)
+        @cleanup ||= []
+        @cleanup.push(block) if block
+        @cleanup
+      end
+    end
+
+  ## configure the subclass!
+  #
+    const_set(:Testno, '0')
+    slug = slug_for(*args).gsub(%r/-/,'_')
+    name = ['TESTING', '%03d' % const_get(:Testno), slug].delete_if{|part| part.empty?}.join('_')
+    name = name.upcase!
+    const_set(:Name, name)
+    const_set(:Missing, Object.new.freeze)
+
+  ## instance methods
+  #
+    alias_method('__assert__', 'assert')
+
+    def assert(*args, &block)
+      if args.size == 1 and args.first.is_a?(Hash)
+        options = args.first
+        expected = getopt(:expected, options){ missing }
+        actual = getopt(:actual, options){ missing }
+        if expected == missing and actual == missing
+          actual, expected, *ignored = options.to_a.flatten
+        end
+        expected = expected.call() if expected.respond_to?(:call)
+        actual = actual.call() if actual.respond_to?(:call)
+        assert_equal(expected, actual)
+      end
+
+      if block
+        label = "assert(#{ args.join(' ') })"
+        result = nil
+        assert_nothing_raised{ result = block.call }
+        __assert__(result, label)
+        result
+      else
+        result = args.shift
+        label = "assert(#{ args.join(' ') })"
+        __assert__(result, label)
+        result
+      end
+    end
+
+    def missing
+      self.class.const_get(:Missing)
+    end
+
+    def getopt(opt, hash, options = nil, &block)
+      [opt.to_s, opt.to_s.to_sym].each do |key|
+        return hash[key] if hash.has_key?(key)
+      end
+      default =
+        if block
+          block.call
+        else
+          options.is_a?(Hash) ? options[:default] : nil
+        end
+      return default
+    end
+
+    def subclass_of exception
+      class << exception
+        def ==(other) super or self > other end
+      end
+      exception
+    end
+
+  ##
+  #
+    module_eval(&block)
+
+    self.setup()
+    self.prepare.each{|b| b.call()}
+
+    at_exit{ 
+      self.teardown()
+      self.cleanup.each{|b| b.call()}
+    }
+
+    self
+  end
+end
+
+
+if $0 == __FILE__
+
+  Testing 'Testing' do
+    testing('foo'){ assert true }
+    test{ assert true }
+    p instance_methods.grep(/test/)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: systemu
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000 Z
+date: 2012-03-13 00:00:00.000000000 Z
 dependencies: []
 description: ! 'description: systemu kicks the ass'
 email: ara.t.howard@gmail.com
@@ -29,6 +29,8 @@ files:
 - samples/e.rb
 - samples/f.rb
 - systemu.gemspec
+- test/systemu_test.rb
+- test/testing.rb
 homepage: https://github.com/ahoward/systemu
 licenses: []
 post_install_message: