em_pessimistic 0.1.2 → 0.2.0

data/lib/em_pessimistic/deferrable_child_process.rb

@@ -3,6 +3,7 @@
 # The MIT License (MIT)
 #
 # Copyright (C) 2012 Gitorious AS
+# Copyright (C) 2013 Andrey Chergik
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -50,9 +51,9 @@ module EMPessimistic
     def unbind
       status = get_status
       if status.exitstatus != 0
-        fail(@stderr.join.strip, status)
+        fail(@stderr.join.strip, @stdout.join.strip, status)
       else
-        succeed(@stdout.join.strip, status)
+        succeed(@stdout.join.strip, @stderr.join.strip, status)
       end
     end
   end

data/lib/em_pessimistic/popen3.rb

@@ -3,6 +3,7 @@
 # The MIT License (MIT)
 #
 # Copyright (C) 2012 Gitorious AS
+# Copyright (C) 2013 Andrey Chergik
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -44,7 +45,10 @@ module EMPessimistic
     $stderr.reopen(wr)
     connection = EM.popen(*args)
     $stderr.reopen(new_stderr)
-    EM.attach(rd, Popen3StderrHandler, connection)
+    EM.attach(rd, Popen3StderrHandler, connection) do |c|
+      wr.close
+      new_stderr.close
+    end
     connection
   end
 end

data/lib/em_pessimistic/version.rb

@@ -2,7 +2,7 @@
 # --
 # The MIT License (MIT)
 #
-# Copyright (C) 2012 Gitorious AS
+# Copyright (C) 2012-2013 Gitorious AS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -24,5 +24,5 @@
 #++
 
 module EMPessimistic
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/test/em_pessimistic/deferrable_child_process_test.rb

@@ -30,8 +30,8 @@ describe EMPessimistic::DeferrableChildProcess do
 
   it "passes stdout data and status to callback on success" do
     process = EMPessimistic::DeferrableChildProcess.open("ls -l")
-    process.callback do |data, status|
-      assert_match /em_pessimistic\.gemspec/, data
+    process.callback do |stdout, stderr, status|
+      assert_match /em_pessimistic\.gemspec/, stdout
       assert_equal 0, status.exitstatus
       done!
     end
@@ -41,8 +41,8 @@ describe EMPessimistic::DeferrableChildProcess do
   it "passes stderr data and status to errback on error" do
     cmd = "git ls-tree master:Gemfile"
     process = EMPessimistic::DeferrableChildProcess.open(cmd)
-    process.errback do |data, status|
-      assert_equal "fatal: not a tree object", data
+    process.errback do |stderr, stdout, status|
+      assert_equal "fatal: not a tree object", stderr
       assert_equal 128, status.exitstatus
       done!
     end

data/test/em_pessimistic/opened_descriptors_leak_test.rb

@@ -0,0 +1,77 @@
+# encoding: utf-8
+# --
+# The MIT License (MIT)
+#
+# Copyright (C) 2013 Andrey Chergik
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+require "test_helper"
+require 'fosl/parser'
+require "em_pessimistic/deferrable_child_process"
+
+describe EMPessimistic::DeferrableChildProcess do
+  include EM::MiniTest::Spec
+
+  def timeout_interval
+   5
+  end
+
+  it "has no dubious opened pipes and unix domain sockets after all child processes exited" do
+
+    parse = FOSL::Parser.new
+    pid = Process.pid
+    finished = 0
+
+    # Increase this amount to your ("system opened file descriptors limit" / 3) and you will meet "Errno::EMFILE: Too many open files" exception.
+    amount = 1
+
+    EM.add_periodic_timer(1) do
+
+      data = Hash[parse.lsof("+p #{pid}")[pid].files.group_by { |f| f[:type] }.select { |k,v| /^(?:unix|PIPE)$/.match(k) }]
+      if finished == amount
+        assert data["PIPE"], 'there are several PIPEs owned by this process'
+
+        # One Pipe is for "lsof" process. Two others for EM loop.
+        assert_equal 3, data["PIPE"].length
+        assert !data["unix"], 'all unix domain sockets for this process are closed'
+        done!
+      else
+        ap data
+      end
+
+    end
+
+    amount.times do |i|
+      process = EMPessimistic::DeferrableChildProcess.open("ruby -v")
+
+      process.callback do |stdout, stderr, status|
+        finished += 1
+      end
+
+      process.errback do |stderr, stdout, status|
+        finished += 1
+      end
+    end
+
+    wait!
+
+  end
+end
+

metadata

@@ -1,133 +1,139 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em_pessimistic
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Christian Johansen
+- Andrey Chergik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-19 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: em-minitest-spec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: em-minitest-spec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: fosl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
   type: :development
-  version_requirements: *id004
-description: EventMachine's built-in popen does not provide access to stderr. Likewise, it's DeferrableChildProcess does not use an errback for when the process fails. This gem fixes both of those mistakes.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+description: EventMachine's built-in popen does not provide access to stderr. Likewise,
+  it's DeferrableChildProcess does not use an errback for when the process fails.
+  This gem fixes both of those mistakes.
+email:
 - christian@gitorious.org
+- achergik@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/em_pessimistic.rb
 - lib/em_pessimistic/deferrable_child_process.rb
 - lib/em_pessimistic/popen3.rb
 - lib/em_pessimistic/version.rb
 - test/em_pessimistic/deferrable_child_process_test.rb
+- test/em_pessimistic/opened_descriptors_leak_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://gitorious.org/gitorious/em_pessimistic
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: em_pessimistic
-rubygems_version: 1.4.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: popen with stderr and DeferrableChildProcess with errback for EventMachine
-test_files: 
+test_files:
 - test/em_pessimistic/deferrable_child_process_test.rb
+- test/em_pessimistic/opened_descriptors_leak_test.rb
 - test/test_helper.rb