zerg_support 0.1.5 → 0.1.6

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.1.6. Fixed most issues on Ruby 1.9.
+
 v0.1.5. A second take on the SocketFactory issues.
 
 v0.1.4. SocketFactory issues: no lingering, proper closing.

data/Rakefile

@@ -14,9 +14,9 @@ Echoe.new('zerg_support') do |p|
   p.need_zip = !Gem.win_platform?
   p.rdoc_pattern = /^(lib|bin|tasks|ext)|^BUILD|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
   
-  p.development_dependencies = ["echoe >=3.0.2",
-                                "event_machine >=0.12.2",
-                                "flexmock >=0.8.3",
+  p.development_dependencies = ['echoe >=3.0.2',
+                                'event_machine >=0.12.2',
+                                'flexmock >=0.8.3',
                                ]
 end
 

data/lib/zerg_support/protocols/frame_protocol.rb

@@ -1,6 +1,6 @@
 #:nodoc: namespace
 module Zerg::Support::Protocols
-  
+
 # Protocol for sending and receiving discrete-sized frames over TCP streams.
 module FrameProtocol
   # Called when data is available from the TCP stream.
@@ -12,7 +12,7 @@ module FrameProtocol
     loop do
       while @frame_protocol_buffer.nil? and i < data.length
         @frame_protocol_varsize << data[i]
-        if (data[i] & 0x80) == 0
+        if (data[i].ord & 0x80) == 0
           @frame_protocol_bytes_left =
               FrameProtocol.decode_natural @frame_protocol_varsize
           @frame_protocol_buffer = ''
@@ -32,7 +32,7 @@ module FrameProtocol
     @frame_protocol_buffer << data[i..-1]
     @frame_protocol_bytes_left -= data.length - i
   end
-  
+
   # Override to process incoming frames.
   def received_frame(frame_data); end
 
@@ -40,7 +40,7 @@ module FrameProtocol
   def send_frame(frame_data)
     send_bytes FrameProtocol.encode_frame(frame_data)
   end
-  
+
   # :nodoc: Encodes frame data into data to be sent across a TCP wire.
   def self.encode_frame(frame_data)
     encoded_length = FrameProtocol.encode_natural(frame_data.length)
@@ -57,7 +57,7 @@ module FrameProtocol
     end
     string
   end
-  
+
   #:nodoc: Decodes a natural (non-negative) integer from a string.
   def self.decode_natural(string)
     number = 0
@@ -69,7 +69,7 @@ module FrameProtocol
       multiplier *= 0x80
     end
     return number
-  end  
+  end
 end
 
 end  # namespace Zerg::Support::Protocols

data/lib/zerg_support/spawn.rb

@@ -12,7 +12,7 @@ if RUBY_PLATFORM =~ /win/ and RUBY_PLATFORM !~ /darwin/
       # command line processing
       command_line = '"' + binary + '" "' +
           args.map { |a| a.gsub '"', '""' }.join('" "') + '"'
-      
+
       # environment processing
       environment_string = nil
       if options[:env]
@@ -25,7 +25,7 @@ if RUBY_PLATFORM =~ /win/ and RUBY_PLATFORM !~ /darwin/
             map { |k| "#{k}=#{environment[k]}" }.join "\0"
         environment_string << "\0"
       end
-      
+
       # redirection processing
       startup_info = {}
       files = {}
@@ -47,7 +47,7 @@ if RUBY_PLATFORM =~ /win/ and RUBY_PLATFORM !~ /darwin/
         end
       end
       deferred_opens.each { |d| d.call }
-      
+
       # process leader
       creation_flags = 0
       if options[:pgroup]
@@ -58,18 +58,18 @@ if RUBY_PLATFORM =~ /win/ and RUBY_PLATFORM !~ /darwin/
           creation_flags |= Process::CREATE_NEW_PROCESS_GROUP
         end
       end
-      
+
       info = Process.create :command_line => command_line,
                             :cwd => options[:chdir] || Dir.pwd,
                             :environment => environment_string,
                             :creation_flags => creation_flags,
-                            :startup_info => startup_info                            
+                            :startup_info => startup_info
       files.each { |name, io| io.close }
-      
+
       return info[:process_id]
     end
   end
-  
+
 else
 
   #:nodoc:
@@ -80,32 +80,34 @@ else
     def self.spawn(binary, args = [], options = {})
       if Kernel.respond_to? :spawn
         # ruby1.9+: spawn!
-        options = options.dup
-        env = options.delete(:env)
-        Kernel.spawn(*([env, binary] + args + [options]))
+        if options.has_key? :env
+          options = options.dup
+          env = options.delete(:env)
+          Kernel.spawn(*([env, binary] + args + [options]))
+        else
+          Kernel.spawn(*([binary] + args + [options]))
+        end
       else
         # below 1.9: emulate
-        
+
         # chdir option
         Dir.chdir options[:chdir] if options[:chdir]
-        
-        child_pid = fork do
+
+        child_pid = Process.fork do
           Helpers.do_redirects options
-          Helpers.close_fds options          
-          Helpers.set_process_group options          
+          Helpers.close_fds options
+          Helpers.set_process_group options
           Helpers.set_environment options
           Helpers.set_rlimits options
-          
+
           Kernel.exec(*([binary] + args))
         end
         # Get rid of zombies.
         Process.detach child_pid if options[:pgroup]
-
+        child_pid
       end
-      
-      return child_pid
     end
-  end  
+  end
 end
 
 # Helpers for spawning processes.
@@ -113,17 +115,17 @@ module Zerg::Support::Process::Helpers
   # Closes all open file descriptors except for stdin/stdout/stderr
   def self.close_fds(options)
     return if options[:close_others] == false
-    
+
     ObjectSpace.each_object(IO) do |io|
       next if [STDIN, STDOUT, STDERR].include? io
-      
+
       begin
         io.close unless io.closed?
       rescue Exception
       end
     end
   end
-  
+
   # Sets process limits (rlimits) according to the given options. The options
   # follow the convention of Kernel.spawn in ruby1.9
   def self.set_rlimits(options)
@@ -135,33 +137,33 @@ module Zerg::Support::Process::Helpers
         Process.setrlimit rconst, v.first, v.last
       else
         Process.setrlimit rconst, v
-      end              
-    end    
+      end
+    end
   end
-  
+
   # Sets the process' group according to the given options. The options
   # follow the convention of Kernel.spawn in ruby1.9
   def self.set_process_group(options)
     return unless options[:pgroup]
-    
+
     if options[:pgroup].kind_of? Numeric and options[:pgroup] > 0
       Process.setpgid 0, options[:pgroup]
     else
       Process.setsid
     end
   end
-  
+
   # Sets the process' environment according to the given options. The options
   # follow the convention of Kernel.spawn in ruby1.9
   def self.set_environment(options)
     return unless options[:env]
-    
+
     ENV.clear if options[:unsetenv_others]
     options[:env].each do |key, value|
       ENV[key] = value
     end
   end
-  
+
   # Performs IO redirections according to the given options. The options
   # follow the convention of Kernel.spawn in ruby1.9
   def self.do_redirects(options)

data/test/test_spawn.rb

@@ -12,7 +12,7 @@ class TestSpawn < Test::Unit::TestCase
     File.open(now_cookie, 'w') {}
     return now_cookie
   end
-  
+
   def setup
     super
     Thread.abort_on_exception = true
@@ -25,15 +25,15 @@ class TestSpawn < Test::Unit::TestCase
     File.delete @out_file rescue nil
     super
   end
-  
+
   def test_stdout_redirect
     pid = Zerg::Support::Process.spawn 'ruby', ['-e', 'print "1234\n"'],
         STDOUT => @out_file
     Process.waitpid pid
-    
+
     assert_equal "1234\n", File.read(@out_file)
   end
-  
+
   def test_stdin_redirect
     File.open(@in_file, 'w') { |f| f.write "1234\n" }
 
@@ -47,47 +47,46 @@ class TestSpawn < Test::Unit::TestCase
     pid = Zerg::Support::Process.spawn 'ruby', ['-e', "raise 'zerg_stderr'"],
         STDERR => @out_file
     Process.waitpid pid
-    assert_equal "-e:1: zerg_stderr (RuntimeError)\n", File.read(@out_file)
+    assert_match(/zerg_stderr \(RuntimeError\)/m, 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)    
+    assert_match(/zerg_stderr \(RuntimeError\)/m, File.read(@out_file))
+    assert_match(/1\n/m, 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)    
+    assert_match(/zerg_stderr \(RuntimeError\)/m, File.read(@out_file))
+    assert_match(/1/, File.read(@out_file))
+    assert_no_match(/1\n/m, 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.waitpid pid
     t2 = Time.now
-    
+
     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\']'],
         STDOUT => @out_file, :env => {'XA' => "1234\n"}
     Process.waitpid 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.waitpid pid
@@ -95,28 +94,28 @@ class TestSpawn < Test::Unit::TestCase
     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.waitpid pid
     in_file.close
 
-    assert_equal "-e:1:", File.read(@out_file)[0, 5],
-                 'Spawn does not close file descriptors'    
+    assert_match(/^\-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'
@@ -128,11 +127,11 @@ class TestSpawn < Test::Unit::TestCase
     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)
@@ -140,16 +139,16 @@ class TestSpawn < Test::Unit::TestCase
     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.waitpid pid
-    
+
     assert pinfo[:state].index('s'), 'Failed to become session leader'
   end
-  
+
   def test_rlimits
     t0 = Time.now
     pid = Zerg::Support::Process.spawn 'ruby',
@@ -157,8 +156,8 @@ class TestSpawn < Test::Unit::TestCase
         :rlimit_cpu => 1
     Process.waitpid pid
     t1 = Time.now
-    
+
     assert_operator t1 - t0, :>=, 0.95, 'Spawning failed'
     assert_operator t1 - t0, :<=, 2.0, 'Failed to apply rlimit_cpu'
   end
-end
+end

data/zerg_support.gemspec

@@ -1,29 +1,28 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{zerg_support}
-  s.version = "0.1.5"
+  s.name = "zerg_support"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2009-11-11}
-  s.description = %q{Support libraries used by Zergling.Net deployment code.}
-  s.email = %q{victor@zergling.net}
+  s.date = "2012-12-18"
+  s.description = "Support libraries used by Zergling.Net deployment code."
+  s.email = "victor@zergling.net"
   s.extra_rdoc_files = ["CHANGELOG", "lib/zerg_support/event_machine/connection_mocks.rb", "lib/zerg_support/event_machine/protocol_adapter.rb", "lib/zerg_support/gems.rb", "lib/zerg_support/open_ssh.rb", "lib/zerg_support/process.rb", "lib/zerg_support/protocols/frame_protocol.rb", "lib/zerg_support/protocols/object_protocol.rb", "lib/zerg_support/socket_factory.rb", "lib/zerg_support/sockets/protocol_adapter.rb", "lib/zerg_support/sockets/socket_mocks.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/protocol_adapter.rb", "lib/zerg_support/gems.rb", "lib/zerg_support/open_ssh.rb", "lib/zerg_support/process.rb", "lib/zerg_support/protocols/frame_protocol.rb", "lib/zerg_support/protocols/object_protocol.rb", "lib/zerg_support/socket_factory.rb", "lib/zerg_support/sockets/protocol_adapter.rb", "lib/zerg_support/sockets/socket_mocks.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_socket_factory.rb", "test/test_spawn.rb", "zerg_support.gemspec"]
-  s.homepage = %q{http://github.com/costan/zerg_support}
+  s.homepage = "http://github.com/costan/zerg_support"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Zerg_support", "--main", "README"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{zerglings}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Support libraries used by Zergling.Net deployment code.}
-  s.test_files = ["test/test_spawn.rb", "test/test_socket_factory.rb", "test/test_gems.rb", "test/test_open_ssh.rb", "test/test_object_protocol.rb", "test/test_frame_protocol.rb", "test/test_process.rb", "test/test_connection_mocks.rb"]
+  s.rubyforge_project = "zerglings"
+  s.rubygems_version = "1.8.24"
+  s.summary = "Support libraries used by Zergling.Net deployment code."
+  s.test_files = ["test/test_open_ssh.rb", "test/test_socket_factory.rb", "test/test_frame_protocol.rb", "test/test_connection_mocks.rb", "test/test_process.rb", "test/test_object_protocol.rb", "test/test_gems.rb", "test/test_spawn.rb"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= 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"])

metadata

@@ -1,54 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: zerg_support
-version: !ruby/object:Gem::Version 
-  version: 0.1.5
+version: !ruby/object:Gem::Version
+  version: 0.1.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Victor Costan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-11-11 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: echoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.2
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.2
-    version: 
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: event_machine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.2
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.2
-    version: 
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: flexmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.3
-    version: 
 description: Support libraries used by Zergling.Net deployment code.
 email: victor@zergling.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG
 - lib/zerg_support/event_machine/connection_mocks.rb
 - lib/zerg_support/event_machine/protocol_adapter.rb
@@ -64,7 +79,7 @@ extra_rdoc_files:
 - lib/zerg_support.rb
 - LICENSE
 - README
-files: 
+files:
 - CHANGELOG
 - lib/zerg_support/event_machine/connection_mocks.rb
 - lib/zerg_support/event_machine/protocol_adapter.rb
@@ -93,45 +108,42 @@ files:
 - test/test_socket_factory.rb
 - test/test_spawn.rb
 - zerg_support.gemspec
-has_rdoc: true
 homepage: http://github.com/costan/zerg_support
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Zerg_support
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: zerglings
-rubygems_version: 1.3.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Support libraries used by Zergling.Net deployment code.
-test_files: 
-- test/test_spawn.rb
-- test/test_socket_factory.rb
-- test/test_gems.rb
+test_files:
 - test/test_open_ssh.rb
-- test/test_object_protocol.rb
+- test/test_socket_factory.rb
 - test/test_frame_protocol.rb
-- test/test_process.rb
 - test/test_connection_mocks.rb
+- test/test_process.rb
+- test/test_object_protocol.rb
+- test/test_gems.rb
+- test/test_spawn.rb