engineyard-serverside 1.5.30 → 1.5.32

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.30'
+    VERSION = '1.5.32'
   end
 end

data/lib/vendor/open4/lib/open4.rb

@@ -4,65 +4,23 @@ require 'timeout'
 require 'thread'
 
 module Open4
-  VERSION = '1.3.0'
+#--{{{
+  VERSION = '1.1.0'
   def self.version() VERSION end
 
   class Error < ::StandardError; end
 
-  def pfork4(fun, &b)
-    Open4.do_popen(b, :block) do |ps_read, _|
-      ps_read.close
-      begin
-        fun.call
-      rescue SystemExit => e
-        # Make it seem to the caller that calling Kernel#exit in +fun+ kills
-        # the child process normally. Kernel#exit! bypasses this rescue
-        # block.
-        exit! e.status
-      else
-        exit! 0
-      end
-    end
-  end
-  module_function :pfork4
-
   def popen4(*cmd, &b)
-    Open4.do_popen(b, :init) do |ps_read, ps_write|
-      ps_read.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-      ps_write.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-      exec(*cmd)
-      raise 'forty-two'   # Is this really needed?
-    end
-  end
-  alias open4 popen4
-  module_function :popen4
-  module_function :open4
-
-  def popen4ext(closefds=false, *cmd, &b)
-    Open4.do_popen(b, :init, closefds) do |ps_read, ps_write|
-      ps_read.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-      ps_write.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-      exec(*cmd)
-      raise 'forty-two'   # Is this really needed?
-    end
-  end
-  module_function :popen4ext
-
-  def self.do_popen(b = nil, exception_propagation_at = nil, closefds=false, &cmd)
+#--{{{
     pw, pr, pe, ps = IO.pipe, IO.pipe, IO.pipe, IO.pipe
 
     verbose = $VERBOSE
     begin
       $VERBOSE = nil
+      ps.first.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+      ps.last.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
 
       cid = fork {
-        if closefds
-          exlist = [0, 1, 2] | [pw,pr,pe,ps].map{|p| [p.first.fileno, p.last.fileno] }.flatten
-          ObjectSpace.each_object(IO){|io|
-            io.close if (not io.closed?) and (not exlist.include? io.fileno)
-          }
-        end
-
         pw.last.close
         STDIN.reopen pw.first
         pw.first.close
@@ -78,59 +36,52 @@ module Open4
         STDOUT.sync = STDERR.sync = true
 
         begin
-          cmd.call(ps)
+          exec(*cmd)
+          raise 'forty-two' 
         rescue Exception => e
           Marshal.dump(e, ps.last)
           ps.last.flush
-        ensure
-          ps.last.close unless ps.last.closed?
         end
-
+        ps.last.close unless (ps.last.closed?)
         exit!
       }
     ensure
       $VERBOSE = verbose
     end
 
-    [ pw.first, pr.last, pe.last, ps.last ].each { |fd| fd.close }
+    [pw.first, pr.last, pe.last, ps.last].each{|fd| fd.close}
 
-    Open4.propagate_exception cid, ps.first if exception_propagation_at == :init
+    begin
+      e = Marshal.load ps.first
+      raise(Exception === e ? e : "unknown failure!")
+    rescue EOFError # If we get an EOF error, then the exec was successful
+      42
+    ensure
+      ps.first.close
+    end
 
     pw.last.sync = true
 
-    pi = [ pw.last, pr.first, pe.first ]
-
-    begin
-      return [cid, *pi] unless b
+    pi = [pw.last, pr.first, pe.first]
 
+    if b 
       begin
-        b.call(cid, *pi)
+        b[cid, *pi]
+        Process.waitpid2(cid).last
       ensure
-        pi.each { |fd| fd.close unless fd.closed? }
+        pi.each{|fd| fd.close unless fd.closed?}
       end
-
-      Open4.propagate_exception cid, ps.first if exception_propagation_at == :block
-
-      Process.waitpid2(cid).last
-    ensure
-      ps.first.close unless ps.first.closed?
+    else
+      [cid, pw.last, pr.first, pe.first]
     end
+#--}}}
   end
-
-  def self.propagate_exception(cid, ps_read)
-    e = Marshal.load ps_read
-    raise Exception === e ? e : "unknown failure!"
-  rescue EOFError
-    # Child process did not raise exception.
-  rescue
-    # Child process raised exception; wait it in order to avoid a zombie.
-    Process.waitpid2 cid
-    raise
-  ensure
-    ps_read.close
-  end
+  alias open4 popen4
+  module_function :popen4
+  module_function :open4
 
   class SpawnError < Error
+#--{{{
     attr 'cmd'
     attr 'status'
     attr 'signals'
@@ -147,9 +98,11 @@ module Open4
       sigs = @signals.map{|k,v| "#{ k }:#{ v.inspect }"}.join(' ')
       super "cmd <#{ cmd }> failed with status <#{ exitstatus.inspect }> signals <#{ sigs }>"
     end
+#--}}}
   end
 
   class ThreadEnsemble
+#--{{{
     attr 'threads'
 
     def initialize cid
@@ -201,14 +154,18 @@ module Open4
     def all_done
       @threads.size.times{ @done.pop }
     end
+#--}}}
   end
 
   def to timeout = nil
+#--{{{
     Timeout.timeout(timeout){ yield }
+#--}}}
   end
   module_function :to
 
   def new_thread *a, &b
+#--{{{
     cur = Thread.current
     Thread.new(*a) do |*a|
       begin
@@ -217,25 +174,29 @@ module Open4
         cur.raise e
       end
     end
+#--}}}
   end
   module_function :new_thread
 
   def getopts opts = {}
+#--{{{
     lambda do |*args|
       keys, default, ignored = args
-      catch(:opt) do
+      catch('opt') do
         [keys].flatten.each do |key|
           [key, key.to_s, key.to_s.intern].each do |key|
-            throw :opt, opts[key] if opts.has_key?(key)
+            throw 'opt', opts[key] if opts.has_key?(key)
           end
         end
         default
       end
     end
+#--}}}
   end
   module_function :getopts
 
   def relay src, dst = nil, t = nil
+#--{{{
     send_dst =
       if dst.respond_to?(:call)
         lambda{|buf| dst.call(buf)}
@@ -283,10 +244,12 @@ module Open4
         send_dst[buf]
       end
     end
+#--}}}
   end
   module_function :relay
 
   def spawn arg, *argv 
+#--{{{
     argv.unshift(arg)
     opts = ((argv.size > 1 and Hash === argv.last) ? argv.pop : {})
     argv.flatten!
@@ -362,6 +325,7 @@ module Open4
       (ignore_exit_failure or (status.nil? and ignore_exec_failure) or exitstatus.include?(status.exitstatus))
 
     status
+#--}}}
   end
   module_function :spawn
 
@@ -372,6 +336,7 @@ module Open4
   module_function :chdir
 
   def background arg, *argv 
+#--{{{
     require 'thread'
     q = Queue.new
     opts = { 'pid' => q, :pid => q }
@@ -389,12 +354,14 @@ module Open4
       define_method(:exitstatus){ @exitstatus ||= spawn_status.exitstatus }
     }
     thread
+#--}}}
   end
   alias bg background
   module_function :background
   module_function :bg
 
   def maim pid, opts = {}
+#--{{{
     getopt = getopts opts
     sigs = getopt[ 'signals', %w(SIGTERM SIGQUIT SIGKILL) ]
     suspend = getopt[ 'suspend', 4 ]
@@ -412,10 +379,12 @@ module Open4
       return true unless alive? pid
     end
     return(not alive?(pid)) 
+#--}}}
   end
   module_function :maim
 
   def alive pid
+#--{{{
     pid = Integer pid
     begin
       Process.kill 0, pid
@@ -423,10 +392,12 @@ module Open4
     rescue Errno::ESRCH
       false
     end
+#--}}}
   end
   alias alive? alive
   module_function :alive
   module_function :'alive?'
+#--}}}
 end
 
 def open4(*cmd, &b) cmd.size == 0 ? Open4 : Open4::popen4(*cmd, &b) end

metadata

@@ -1,92 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: engineyard-serverside
-version: !ruby/object:Gem::Version 
-  hash: 63
+version: !ruby/object:Gem::Version
+  version: 1.5.32
   prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 30
-  version: 1.5.30
 platform: ruby
-authors: 
+authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-03-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.3.2
-  prerelease: false
-  requirement: *id001
   type: :development
-  name: rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
-        version: 0.9.2.2
   prerelease: false
-  requirement: *id002
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+- !ruby/object:Gem::Dependency
   name: rdoc
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: cloud@engineyard.com
-executables: 
+executables:
 - engineyard-serverside
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/engineyard-serverside
 - lib/engineyard-serverside/cli.rb
 - lib/engineyard-serverside/configuration.rb
@@ -326,8 +321,6 @@ files:
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
 - spec/fixtures/gemfiles/1.0.21-rails-31-with-sqlite
-- spec/fixtures/gitrepo/bar
-- spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/lockfiles/0.9-no-bundler
@@ -358,48 +351,38 @@ files:
 - spec/support/integration.rb
 homepage: http://github.com/engineyard/engineyard-serverside
 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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3428567106811631275
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
-test_files: 
+test_files:
 - spec/basic_deploy_spec.rb
 - spec/bundler_deploy_spec.rb
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
 - spec/fixtures/gemfiles/1.0.21-rails-31-with-sqlite
-- spec/fixtures/gitrepo/bar
-- spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/lockfiles/0.9-no-bundler