mysql_isolated_server 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 863d2316779205d27fe664054028571cb1f2ed9a
-  data.tar.gz: 76b68adfd94069a2bed8f6c87847db7cf8ab0264
+  metadata.gz: 40822abde8d3de427280276886533575dbeb17a6
+  data.tar.gz: 511e9f144e09d7f9bce84e80f1ecb12717537b46
 SHA512:
-  metadata.gz: 095538f3c91dc94b0c1979896fa3b8eb5c37702f38e63a50508746cae4d3a15d92ab699ed0fee48f60e7e92a5f01f514fd46c75d5dfcb945f59b9ccd6d844fbe
-  data.tar.gz: 1f56358d3b3ec4e0afee945ada82f31b40f1d7baddd8b7f8a044c839036890724fc2943ab9782f0a10ad70b9c54f03409dce840e91d91437aeb76cdd28d2ed5e
+  metadata.gz: 36da7b3e55bf118d0cb146daf3cb38888462b6b71d4e75d2776c40eafc6daff285fbdb7367af8f254223b77da1d86c2bc84023940a2d84ffa03f7d1d05aa8f8d
+  data.tar.gz: bd421791201d11a1e620a236a7e82e6621ee00863aa6858d55948935bf54ff05633754e64a16754e29a71f5ca889f50fad467d7dfcaf9a7c1d1f83d37849dea9

data/lib/mysql_isolated_server/version.rb

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

data/lib/mysql_isolated_server.rb

@@ -135,8 +135,14 @@ class MysqlIsolatedServer
 
     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
-    system("#{tzinfo_to_sql} /usr/share/zoneinfo 2>/dev/null | mysql -h127.0.0.1 --database=mysql --port=#{@port} -u root mysql ")
-    connection.query("SET GLOBAL time_zone='UTC'")
+    system("#{tzinfo_to_sql} /usr/share/zoneinfo 2>/dev/null| mysql -h127.0.0.1 --database=mysql --port=#{@port} -u root mysql ")
+
+    begin
+      connection.query("SET GLOBAL time_zone='UTC'")
+    rescue Mysql2::Error
+      connection.query("SET GLOBAL time_zone='UTC'")
+    end
+
     connection.query("SET GLOBAL server_id=#{@server_id}")
   end
 
@@ -188,21 +194,18 @@ class MysqlIsolatedServer
         end
       end
 
-
       while true
         begin
           Process.kill(0, parent_pid)
           Process.kill(0, mysql_pid)
         rescue Exception => e
-          Process.kill("KILL", mysql_pid) rescue nil
+          Process.kill("KILL", mysql_pid)
           cleanup!
           exit!
         end
 
         sleep 1
       end
-
-      at
     end
 
     @pid = middle_pid
@@ -217,6 +220,6 @@ class MysqlIsolatedServer
 
   def kill!
     return unless @pid
-    system("kill -KILL #{@pid}")
+    system("kill -TERM #{@pid}")
   end
 end

metadata

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