zerg_support 0.0.5 → 0.0.8

data/test/test_spawn.rb

@@ -8,7 +8,7 @@ require 'flexmock/test_unit'
 
 class TestSpawn < Test::Unit::TestCase
   def temp_file
-    now_cookie = "zerg_test_#{Time.now.to_f}"
+    now_cookie = "zerg_test_#{Time.now.to_f}s"
     File.open(now_cookie, 'w') {}
     return now_cookie
   end
@@ -28,7 +28,7 @@ class TestSpawn < Test::Unit::TestCase
   def test_stdout_redirect
     pid = Zerg::Support::Process.spawn 'ruby', ['-e', 'print "1234\n"'],
         STDOUT => @out_file
-    Process.wait pid
+    Process.waitpid pid
     
     assert_equal "1234\n", File.read(@out_file)
   end
@@ -38,37 +38,58 @@ class TestSpawn < Test::Unit::TestCase
 
     pid = Zerg::Support::Process.spawn 'ruby', ['-e', "print gets"],
         STDIN => @in_file, STDOUT => @out_file
-    Process.wait pid
+    Process.waitpid pid
     assert_equal "1234\n", File.read(@out_file)
   end
 
   def test_stderr_redirect
     pid = Zerg::Support::Process.spawn 'ruby', ['-e', "raise 'zerg_stderr'"],
-        STDOUT => @out_file, STDERR => STDOUT
-    Process.wait pid
+        STDERR => @out_file
+    Process.waitpid pid
     assert_equal "-e:1: zerg_stderr (RuntimeError)\n", File.read(@out_file)
   end
+  
+  def test_redirect_cascade
+    pid = Zerg::Support::Process.spawn 'ruby',
+                                       ['-e', "print 1; raise 'zerg_stderr'"],
+        STDOUT => @out_file, STDERR => STDOUT
+    Process.waitpid pid
+    assert_operator ["1-e:1: zerg_stderr (RuntimeError)\n",
+                     "-e:1: zerg_stderr (RuntimeError)\n1"],
+                    :include?, File.read(@out_file)    
+  end
+  
+  def test_redirect_share
+    pid = Zerg::Support::Process.spawn 'ruby',
+                                       ['-e', "print 1; raise 'zerg_stderr'"],
+        STDOUT => @out_file, STDERR => @out_file
+    Process.waitpid pid
+    assert_operator ["1-e:1: zerg_stderr (RuntimeError)\n",
+                     "-e:1: zerg_stderr (RuntimeError)\n1"],
+                    :include?, File.read(@out_file)    
+  end
     
   def test_async
     t0 = Time.now
     pid = Zerg::Support::Process.spawn 'ruby', ['-e', 'sleep 0.5']
     t1 = Time.now
-    Process.wait pid
+    Process.waitpid pid
     t2 = Time.now
     
-    assert t1 - t0 < 0.2, 'Spawning is not asynchronous'
-    assert t2 - t0 > 0.5, 'The spawned program did not sleep for 1 second'
+    assert_operator t1 - t0, :<, 0.2, 'Spawning is not asynchronous'
+    assert_operator t2 - t0, :>, 0.5,
+                    'The spawned program did not sleep for 1 second'
   end
   
   def test_set_environment
-    pid = Zerg::Support::Process.spawn 'ruby', ['-e', 'print ENV["XA"]'],
+    pid = Zerg::Support::Process.spawn 'ruby', ['-e', 'print ENV[\'XA\']'],
         STDOUT => @out_file, :env => {'XA' => "1234\n"}
-    Process.wait pid
+    Process.waitpid pid
     assert_equal "1234\n", File.read(@out_file)
     
-    pid = Zerg::Support::Process.spawn 'ruby', ['-e', 'print ENV["PATH"]'],
+    pid = Zerg::Support::Process.spawn 'ruby', ['-e', 'print ENV[\'PATH\']'],
         STDOUT => @in_file, :env => {'XA' => "1234\n"}, :unsetenv_others => true
-    Process.wait pid    
+    Process.waitpid pid
     # clearing the environment will reset PATH, so ruby might not run at all
     output = File.read(@in_file)
     assert output == 'nil' || output == '', 'The environment was not cleared'
@@ -88,14 +109,19 @@ class TestSpawn < Test::Unit::TestCase
     
     pid = Zerg::Support::Process.spawn 'ruby', ['-e', "print #{read_fd_code}"],
         STDOUT => @out_file, STDERR => STDOUT
-    Process.wait pid
+    Process.waitpid pid
     in_file.close
 
     assert_equal "-e:1:", File.read(@out_file)[0, 5],
                  'Spawn does not close file descriptors'    
   end
-  
+    
   def test_rlimit_processing
+    if RUBY_PLATFORM =~ /win/ and RUBY_PLATFORM !~ /darwin/
+      Process.const_set :RLIMIT_CPU, 'rlimit_cpu'
+      Process.const_set :RLIMIT_RSS, 'rlimit_rss'
+    end
+
     flexmock(Process).should_receive(:setrlimit).
                       with(Process::RLIMIT_CPU, 1, 5).once.and_return(nil)
     flexmock(Process).should_receive(:setrlimit).
@@ -118,7 +144,7 @@ class TestSpawn < Test::Unit::TestCase
     pid = Zerg::Support::Process.spawn 'ruby', ['-e', "sleep 0.5"],
                                        :pgroup => true
     pinfo = Zerg::Support::Process::process_info pid
-    Process.wait pid
+    Process.waitpid pid
     
     assert pinfo[:state].index('s'), 'Failed to become session leader'
   end
@@ -128,10 +154,10 @@ class TestSpawn < Test::Unit::TestCase
     pid = Zerg::Support::Process.spawn 'ruby',
         ['-e', "i = 0; t0 = Time.now; i += 1 while Time.now - t0 < 3.0"],
         :rlimit_cpu => 1
-    Process.wait pid
+    Process.waitpid pid
     t1 = Time.now
     
-    assert t1 - t0 >= 1.0, 'Spawning failed'
-    assert t1 - t0 <= 2.0, 'Failed to apply rlimit_cpu'
+    assert_operator t1 - t0, :>=, 0.95, 'Spawning failed'
+    assert_operator t1 - t0, :<=, 2.0, 'Failed to apply rlimit_cpu'
   end
 end

data/zerg_support.gemspec

@@ -1,33 +1,41 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{zerg_support}
-  s.version = "0.0.5"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2008-11-19}
-  s.description = %q{Support libraries used by the Zerg system.}
+  s.date = %q{2009-02-24}
+  s.description = %q{Support libraries used by Zergling.Net deployment code.}
   s.email = %q{victor@zergling.net}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/zerg_support/gems.rb", "lib/zerg_support/process.rb", "lib/zerg_support/spawn.rb", "lib/zerg_support.rb", "LICENSE", "README"]
-  s.files = ["CHANGELOG", "lib/zerg_support/gems.rb", "lib/zerg_support/process.rb", "lib/zerg_support/spawn.rb", "lib/zerg_support.rb", "LICENSE", "Manifest", "Rakefile", "README", "test/test_gems.rb", "test/test_process.rb", "test/test_spawn.rb", "zerg_support.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/zerg_support/event_machine/connection_mocks.rb", "lib/zerg_support/event_machine/frame_protocol.rb", "lib/zerg_support/event_machine/object_protocol.rb", "lib/zerg_support/gems.rb", "lib/zerg_support/open_ssh.rb", "lib/zerg_support/process.rb", "lib/zerg_support/spawn.rb", "lib/zerg_support.rb", "LICENSE", "README"]
+  s.files = ["CHANGELOG", "lib/zerg_support/event_machine/connection_mocks.rb", "lib/zerg_support/event_machine/frame_protocol.rb", "lib/zerg_support/event_machine/object_protocol.rb", "lib/zerg_support/gems.rb", "lib/zerg_support/open_ssh.rb", "lib/zerg_support/process.rb", "lib/zerg_support/spawn.rb", "lib/zerg_support.rb", "LICENSE", "Manifest", "Rakefile", "README", "RUBYFORGE", "test/fork_tree.rb", "test/test_connection_mocks.rb", "test/test_frame_protocol.rb", "test/test_gems.rb", "test/test_object_protocol.rb", "test/test_open_ssh.rb", "test/test_process.rb", "test/test_spawn.rb", "zerg_support.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://www.zergling.net}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Zerg_support", "--main", "README"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{rails-pwnage}
-  s.rubygems_version = %q{1.2.0}
-  s.summary = %q{Support libraries used by the Zerg system.}
-  s.test_files = ["test/test_gems.rb", "test/test_process.rb", "test/test_spawn.rb"]
+  s.rubyforge_project = %q{zerglings}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Support libraries used by Zergling.Net deployment code.}
+  s.test_files = ["test/test_connection_mocks.rb", "test/test_frame_protocol.rb", "test/test_gems.rb", "test/test_object_protocol.rb", "test/test_open_ssh.rb", "test/test_process.rb", "test/test_spawn.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<echoe>, [">= 3.0.2"])
+      s.add_development_dependency(%q<event_machine>, [">= 0.12.2"])
       s.add_development_dependency(%q<flexmock>, [">= 0.8.3"])
     else
+      s.add_dependency(%q<echoe>, [">= 3.0.2"])
+      s.add_dependency(%q<event_machine>, [">= 0.12.2"])
       s.add_dependency(%q<flexmock>, [">= 0.8.3"])
     end
   else
+    s.add_dependency(%q<echoe>, [">= 3.0.2"])
+    s.add_dependency(%q<event_machine>, [">= 0.12.2"])
     s.add_dependency(%q<flexmock>, [">= 0.8.3"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zerg_support
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,9 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-19 00:00:00 -05:00
+date: 2009-02-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.0.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: event_machine
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.12.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: flexmock
   type: :development
@@ -22,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.3
     version: 
-description: Support libraries used by the Zerg system.
+description: Support libraries used by Zergling.Net deployment code.
 email: victor@zergling.net
 executables: []
 
@@ -30,7 +50,11 @@ extensions: []
 
 extra_rdoc_files: 
 - CHANGELOG
+- lib/zerg_support/event_machine/connection_mocks.rb
+- lib/zerg_support/event_machine/frame_protocol.rb
+- lib/zerg_support/event_machine/object_protocol.rb
 - lib/zerg_support/gems.rb
+- lib/zerg_support/open_ssh.rb
 - lib/zerg_support/process.rb
 - lib/zerg_support/spawn.rb
 - lib/zerg_support.rb
@@ -38,7 +62,11 @@ extra_rdoc_files:
 - README
 files: 
 - CHANGELOG
+- lib/zerg_support/event_machine/connection_mocks.rb
+- lib/zerg_support/event_machine/frame_protocol.rb
+- lib/zerg_support/event_machine/object_protocol.rb
 - lib/zerg_support/gems.rb
+- lib/zerg_support/open_ssh.rb
 - lib/zerg_support/process.rb
 - lib/zerg_support/spawn.rb
 - lib/zerg_support.rb
@@ -46,7 +74,13 @@ files:
 - Manifest
 - Rakefile
 - README
+- RUBYFORGE
+- test/fork_tree.rb
+- test/test_connection_mocks.rb
+- test/test_frame_protocol.rb
 - test/test_gems.rb
+- test/test_object_protocol.rb
+- test/test_open_ssh.rb
 - test/test_process.rb
 - test/test_spawn.rb
 - zerg_support.gemspec
@@ -76,12 +110,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: rails-pwnage
-rubygems_version: 1.2.0
+rubyforge_project: zerglings
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Support libraries used by the Zerg system.
+summary: Support libraries used by Zergling.Net deployment code.
 test_files: 
+- test/test_connection_mocks.rb
+- test/test_frame_protocol.rb
 - test/test_gems.rb
+- test/test_object_protocol.rb
+- test/test_open_ssh.rb
 - test/test_process.rb
 - test/test_spawn.rb