mysql_isolated_server 0.0.3 → 0.1.0

data/lib/mysql_isolated_server/version.rb

@@ -1,3 +1,3 @@
 class MysqlIsolatedServer
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/mysql_isolated_server.rb

@@ -47,6 +47,26 @@ class MysqlIsolatedServer
     output.split("\n").first
   end
 
+  def up!
+    exec_server <<-EOL
+        mysqld --no-defaults --default-storage-engine=innodb \
+                --datadir=#{@mysql_data_dir} --pid-file=#{@base}/mysqld.pid --port=#{@port} \
+                #{@params} --socket=#{@mysql_data_dir}/mysql.sock --log-bin --log-slave-updates
+    EOL
+
+    while !system("mysql -h127.0.0.1 --port=#{@port} --database=mysql -u root -e 'select 1' >/dev/null 2>&1")
+      sleep(0.1)
+    end
+  end
+
+  def down!
+    Process.kill("TERM", @pid)
+    while (Process.kill 0, @pid rescue false)
+      sleep 1
+    end
+    @cx = nil
+  end
+
   def boot!
     @port ||= grab_free_port
     system("rm -Rf #{@mysql_data_dir}")
@@ -61,15 +81,7 @@ class MysqlIsolatedServer
       system("cp #{File.expand_path(File.dirname(__FILE__))}/tables/user.* #{@mysql_data_dir}/mysql")
     end
 
-    exec_server <<-EOL
-        mysqld --no-defaults --default-storage-engine=innodb \
-                --datadir=#{@mysql_data_dir} --pid-file=#{@base}/mysqld.pid --port=#{@port} \
-                #{@params} --socket=#{@mysql_data_dir}/mysql.sock --log-bin --log-slave-updates
-    EOL
-
-    while !system("mysql -h127.0.0.1 --port=#{@port} --database=mysql -u root -e 'select 1' >/dev/null 2>&1")
-      sleep(0.1)
-    end
+    up!
 
     tzinfo_to_sql = locate_executable("mysql_tzinfo_to_sql5", "mysql_tzinfo_to_sql")
     raise "could not find mysql_tzinfo_to_sql" unless tzinfo_to_sql
@@ -109,8 +121,9 @@ class MysqlIsolatedServer
 
       exec(cmd)
     end
+    Thread.new { Process.wait(pid) }
     at_exit {
-      Process.kill("TERM", pid)
+      Process.kill("TERM", pid) rescue nil
       system("rm -Rf #{base}")
     }
     @pid = pid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql_isolated_server
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies: []
 description: A small library that allows you to easily spin up new local mysql servers
   for testing purposes.
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A small library that allows you to easily spin up new local mysql servers