mysql_isolated_server 0.1.1 → 0.2.0.rc1

data/lib/mysql_isolated_server/version.rb

@@ -1,3 +1,3 @@
 class MysqlIsolatedServer
-  VERSION = "0.1.1"
+  VERSION = "0.2.0.rc1"
 end

data/lib/mysql_isolated_server.rb

@@ -112,22 +112,51 @@ class MysqlIsolatedServer
     devnull = File.open("/dev/null", "w")
     system("mkdir -p #{base}/tmp")
     system("chmod 0777 #{base}/tmp")
-    pid = fork do
-      ENV["TMPDIR"] = "#{base}/tmp"
-      if !@allow_output
-        STDOUT.reopen(devnull)
-        STDERR.reopen(devnull)
+
+    original_pid = $$
+    mysql_pid = nil
+
+    middle_pid = fork do
+      mysql_pid = fork do
+        ENV["TMPDIR"] = "#{base}/tmp"
+        if !@allow_output
+          STDOUT.reopen(devnull)
+          STDERR.reopen(devnull)
+        end
+
+        exec(cmd)
+      end
+
+      # begin waiting for the parent (or mysql) to die; at_exit is hard to control when interacting with test/unit
+      # we can also be killed by our parent with down! and up!
+      #
+      trap("TERM") do
+        Process.kill("KILL", mysql_pid) rescue nil
+        cleanup!
+        exit!
       end
 
-      exec(cmd)
+      while true
+        begin
+          Process.kill(0, original_pid)
+          Process.kill(0, mysql_pid)
+        rescue Exception => e
+          Process.kill("KILL", mysql_pid) rescue nil
+          cleanup!
+          exit!
+        end
+
+        sleep 1
+      end
+
+      at
     end
-    Thread.new { Process.wait(pid) }
-    at_exit {
-      Process.kill("TERM", pid) rescue nil
-      system("rm -Rf #{base}")
-    }
-    @pid = pid
-    devnull.close
+
+    @pid = middle_pid
+  end
+
+  def cleanup!
+    system("rm -Rf #{base}")
   end
 
   def kill!

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mysql_isolated_server
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies: []
 description: A small library that allows you to easily spin up new local mysql servers
   for testing purposes.
@@ -45,9 +45,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25