mysql_isolated_server 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40822abde8d3de427280276886533575dbeb17a6
-  data.tar.gz: 511e9f144e09d7f9bce84e80f1ecb12717537b46
+  metadata.gz: 67d72229d0517a98714dfc5deed145686d15615b
+  data.tar.gz: cdbcf4df767a442c2966f3bbca80c744d9faa8d2
 SHA512:
-  metadata.gz: 36da7b3e55bf118d0cb146daf3cb38888462b6b71d4e75d2776c40eafc6daff285fbdb7367af8f254223b77da1d86c2bc84023940a2d84ffa03f7d1d05aa8f8d
-  data.tar.gz: bd421791201d11a1e620a236a7e82e6621ee00863aa6858d55948935bf54ff05633754e64a16754e29a71f5ca889f50fad467d7dfcaf9a7c1d1f83d37849dea9
+  metadata.gz: 5b93073f78435f66251c6798c7ff04ad48c9ff88eed4b68e72d615499470793dfc29b111cf800cd69203b44b5ae1f2888d5b321b3b68496437d5bd351f3536cc
+  data.tar.gz: 68d52352a2b3dc84306eece440380dc71ea8f4e616dd3b25bd50a27abe1c26a047f4bde3ed1aa1322e3614f981313ac7e6b73b2c92f3117ffc271bc41ef049cd

data/lib/mysql_isolated_server/version.rb

@@ -1,3 +1,3 @@
 class MysqlIsolatedServer
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/mysql_isolated_server.rb

@@ -162,20 +162,14 @@ class MysqlIsolatedServer
   end
 
   attr_reader :pid
-  def exec_server(cmd)
-    cmd.strip!
-    cmd.gsub!(/\\\n/, ' ')
-    devnull = File.open("/dev/null", "w")
-    system("mkdir -p #{base}/tmp")
-    system("chmod 0777 #{base}/tmp")
-
-    parent_pid = @parent_pid || $$
-    mysql_pid = nil
-
-    middle_pid = fork do
-      mysql_pid = fork do
-        ENV["TMPDIR"] = "#{base}/tmp"
-        if !@allow_output
+  def self.exec_wait(cmd, options = {})
+    allow_output = options[:allow_output] # default false
+    parent_pid = options[:parent_pid] || $$
+
+    fork do
+      exec_pid = fork do
+        if !allow_output
+          devnull = File.open("/dev/null", "w")
           STDOUT.reopen(devnull)
           STDERR.reopen(devnull)
         end
@@ -188,8 +182,12 @@ class MysqlIsolatedServer
       #
       ["TERM", "INT"].each do |sig|
         trap(sig) do
-          Process.kill("KILL", mysql_pid) rescue nil
-          cleanup!
+          if block_given?
+            yield(exec_pid)
+          else
+            Process.kill("KILL", exec_pid)
+          end
+
           exit!
         end
       end
@@ -197,18 +195,36 @@ class MysqlIsolatedServer
       while true
         begin
           Process.kill(0, parent_pid)
-          Process.kill(0, mysql_pid)
+          Process.kill(0, exec_pid)
         rescue Exception => e
-          Process.kill("KILL", mysql_pid)
-          cleanup!
+          if block_given?
+            yield(exec_pid)
+          else
+            Process.kill("KILL", exec_pid)
+          end
+
           exit!
         end
 
         sleep 1
       end
     end
+  end
 
-    @pid = middle_pid
+  def exec_server(cmd)
+    cmd.strip!
+    cmd.gsub!(/\\\n/, ' ')
+    system("mkdir -p #{base}/tmp")
+    system("chmod 0777 #{base}/tmp")
+
+    parent_pid = @parent_pid || $$
+    mysql_pid = nil
+
+    ENV["TMPDIR"] = "#{base}/tmp"
+    @pid = MysqlIsolatedServer.exec_wait(cmd, allow_output: @allow_output, parent_pid: @parent_pid) do |mysql_pid|
+      Process.kill("KILL", mysql_pid)
+      cleanup!
+    end
   end
 
   def mysql_shell

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_isolated_server
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies: []
 description: A small library that allows you to easily spin up new local mysql servers
   for testing purposes.