zerg_support 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.0.4. Polished implementation and tests for process spawning.
+
 v0.0.3. Preliminary implementation of process spawning.
 
 v0.0.2. Process management.

data/Rakefile

@@ -12,7 +12,9 @@ Echoe.new('zerg_support') do |p|
   
   p.need_tar_gz = true
   p.need_zip = true
-  p.rdoc_pattern = /^(lib|bin|tasks|ext)|^BUILD|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/  
+  p.rdoc_pattern = /^(lib|bin|tasks|ext)|^BUILD|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
+  
+  p.development_dependencies = ["flexmock >=0.8.3"]
 end
 
 if $0 == __FILE__

data/lib/zerg_support/process.rb

@@ -128,8 +128,11 @@ rescue Exception
                                  priority, user_priority].map { |s| s.to_i })
         @start = Time.parse start
         @ix_rss, @id_rss, @is_rss = text_size.to_f, rssize.to_f, vsz.to_f
-        @pctcpu, @pctmem = *([pctcpu, pctmem].map { |s| s.to_f })        
+        @pctcpu, @pctmem = *([pctcpu, pctmem].map { |s| s.to_f })
         @cmdline = cmdline
+        
+        # TODO(victor): translate UNIX strings into something else
+        @state = state
       end
       attr_reader :pid, :ppid, :ruid, :rgid, :uid, :gid, :nice, :priority,
                   :user_priority, :start, :ix_rss, :id_rss, :is_rss, :pctcpu,
@@ -137,9 +140,9 @@ rescue Exception
     end
 
     @@ps_root_cmdline = 'ps -o pid,ppid,ruid,rgid,uid,gid' +
-                        ',lstart=STARTED+++++++++++++++++++++++++++++++++' +
-                        ',nice,rss,rssize,tsiz,vsz,utime,cputime,pcpu=%CPU+,' +
-                        ',pmem=%MEM+,pri,usrpri,state,command'
+                        ',lstart="STARTED_________________________________"' +
+                        ',nice,rss,rssize,tsiz,vsz,utime,cputime,pcpu="PCPU_"' +
+                        ',pmem="PMEM_",pri,usrpri,stat,command'
                         
     @@ps_all_cmdline = @@ps_root_cmdline + ' -A'
     @@ps_some_cmdline = @@ps_root_cmdline + ' -p '

data/test/test_spawn.rb

@@ -3,6 +3,9 @@ require 'test/unit'
 
 require 'zerg_support'
 
+require 'rubygems'
+require 'flexmock/test_unit'
+
 class TestSpawn < Test::Unit::TestCase
   def temp_file
     now_cookie = "zerg_test_#{Time.now.to_f}"
@@ -11,6 +14,7 @@ class TestSpawn < Test::Unit::TestCase
   end
   
   def setup
+    super
     @in_file = temp_file
     @out_file = temp_file
   end
@@ -18,6 +22,7 @@ class TestSpawn < Test::Unit::TestCase
   def teardown
     File.delete @in_file rescue nil
     File.delete @out_file rescue nil
+    super
   end
   
   def test_stdout_redirect
@@ -28,6 +33,22 @@ class TestSpawn < Test::Unit::TestCase
     assert_equal "1234\n", File.read(@out_file)
   end
   
+  def test_stdin_redirect
+    File.open(@in_file, 'w') { |f| f.write "1234\n" }
+
+    pid = Zerg::Support::Process.spawn 'ruby', ['-e', "print gets"],
+        STDIN => @in_file, STDOUT => @out_file
+    Process.wait 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
+    assert_equal "-e:1: zerg_stderr (RuntimeError)\n", File.read(@out_file)
+  end
+    
   def test_async
     t0 = Time.now
     pid = Zerg::Support::Process.spawn 'ruby', ['-e', 'sleep 0.5']
@@ -38,4 +59,79 @@ class TestSpawn < Test::Unit::TestCase
     assert t1 - t0 < 0.2, 'Spawning is not asynchronous'
     assert 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"]'],
+        STDOUT => @out_file, :env => {'XA' => "1234\n"}
+    Process.wait pid
+    assert_equal "1234\n", File.read(@out_file)
+    
+    pid = Zerg::Support::Process.spawn 'ruby', ['-e', 'print ENV["PATH"]'],
+        STDOUT => @in_file, :env => {'XA' => "1234\n"}, :unsetenv_others => true
+    Process.wait 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'
+  end
+  
+  def test_close_fd
+    in_file = File.open(@in_file, 'w')
+    in_file.sync = true
+    in_file.write "1234\n"
+    in_file.close
+    
+    in_file = File.open(@in_file, 'r')
+    
+    in_fd = in_file.fileno
+    read_fd_code = "File.open(#{in_fd}).read"
+    assert_equal "1234\n", eval(read_fd_code), 'File reading code is broken'
+    
+    pid = Zerg::Support::Process.spawn 'ruby', ['-e', "print #{read_fd_code}"],
+        STDOUT => @out_file, STDERR => STDOUT
+    Process.wait 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
+    flexmock(Process).should_receive(:setrlimit).
+                      with(Process::RLIMIT_CPU, 1, 5).once.and_return(nil)
+    flexmock(Process).should_receive(:setrlimit).
+                      with(Process::RLIMIT_RSS, 64 * 1024 * 1024).once.
+                      and_return(nil)
+    
+    Zerg::Support::Process::Helpers.set_rlimits :rlimit_cpu => [1, 5],
+                                                :rlimit_rss => 64 * 1024 * 1024
+  end
+  
+  def test_process_group_processing
+    flexmock(Process).should_receive(:setpgid).with(0, 42).once.and_return(nil)
+    flexmock(Process).should_receive(:setsid).with().once.and_return(nil)
+
+    Zerg::Support::Process::Helpers.set_process_group :pgroup => 42
+    Zerg::Support::Process::Helpers.set_process_group :pgroup => true
+  end
+  
+  def test_process_group
+    pid = Zerg::Support::Process.spawn 'ruby', ['-e', "sleep 0.5"],
+                                       :pgroup => true
+    pinfo = Zerg::Support::Process::process_info pid
+    Process.wait pid
+    
+    assert pinfo[:state].index('s'), 'Failed to become session leader'
+  end
+  
+  def test_rlimits
+    t0 = Time.now
+    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
+    t1 = Time.now
+    
+    assert t1 - t0 >= 1.0, 'Spawning failed'
+    assert t1 - t0 <= 2.0, 'Failed to apply rlimit_cpu'
+  end
 end

data/zerg_support.gemspec

@@ -1,6 +1,8 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{zerg_support}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
@@ -14,7 +16,7 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{1.3.1}
   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"]
 
@@ -22,12 +24,12 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
-      s.add_development_dependency(%q<echoe>, [">= 0"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<flexmock>, [">= 0.8.3"])
     else
-      s.add_dependency(%q<echoe>, [">= 0"])
+      s.add_dependency(%q<flexmock>, [">= 0.8.3"])
     end
   else
-    s.add_dependency(%q<echoe>, [">= 0"])
+    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.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Victor Costan
@@ -13,14 +13,14 @@ date: 2008-11-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: echoe
+  name: flexmock
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.8.3
     version: 
 description: Support libraries used by the Zerg system.
 email: victor@zergling.net
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rails-pwnage
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Support libraries used by the Zerg system.