mysql_isolated_server 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b7662ca8f87b1988b019b96f8402e3ad6f72b0
-  data.tar.gz: 3b93b99749cdd0ad7a06dbbd6d654fa42eb5adfb
+  metadata.gz: 863d2316779205d27fe664054028571cb1f2ed9a
+  data.tar.gz: 76b68adfd94069a2bed8f6c87847db7cf8ab0264
 SHA512:
-  metadata.gz: ff18d5c9930b3f7e6e3053f0b02f5b0bf300e726b6c598d74a9060433f551a05a5dc24676acad052c3528e03ddc19a61f16add134bf9c531dc1e1d5972d578c4
-  data.tar.gz: 0adce2429a5ccb7be43829188301069c2f99ec59d3f03d12d2e4e323c973cf677a80e0ff01bb3c83ccc4cc24cf07cedd8a7058785e9b2531100969e2eeb9c84b
+  metadata.gz: 095538f3c91dc94b0c1979896fa3b8eb5c37702f38e63a50508746cae4d3a15d92ab699ed0fee48f60e7e92a5f01f514fd46c75d5dfcb945f59b9ccd6d844fbe
+  data.tar.gz: 1f56358d3b3ec4e0afee945ada82f31b40f1d7baddd8b7f8a044c839036890724fc2943ab9782f0a10ad70b9c54f03409dce840e91d91437aeb76cdd28d2ed5e

data/bin/boot_isolated_server

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
-require 'rubygems'
 $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
+require 'rubygems'
 require 'mysql_isolated_server'
 require 'getoptlong'
 

data/lib/mysql_isolated_server.rb

@@ -27,18 +27,22 @@ class MysqlIsolatedServer
   end
 
   def self.thread_boot(*params)
-    bin = File.dirname(__FILE__) + "/../bin/boot_isolated_server"
+    bin = [File.dirname(__FILE__) + "/../bin/boot_isolated_server"]
     mysql_dir, mysql_port = nil, nil
     restore_env = {}
 
+    if `which ruby` =~ (/rvm/)
+      bin = ["rvm", "1.8.7", "do", "ruby"] + bin
+    end
+
+    params = ["--pid", $$.to_s] + params
+
     Thread.abort_on_exception = true
     Thread.new do
       ENV.keys.grep(/GEM|BUNDLE|RUBYOPT/).each do |k|
         restore_env[k] = ENV.delete(k)
       end
-      params = ["--pid", $$.to_s] + params
-
-      pipe = IO.popen(["#{bin}"].concat(params), "r") do |pipe|
+      pipe = IO.popen(bin + params, "r") do |pipe|
         mysql_dir = pipe.readline.split(' ').last
         mysql_port = pipe.readline.split(' ').last.to_i
         sleep
@@ -136,17 +140,17 @@ class MysqlIsolatedServer
     connection.query("SET GLOBAL server_id=#{@server_id}")
   end
 
+  include Socket::Constants
   def grab_free_port
     while true
       candidate=9000 + rand(50_000)
 
       begin
-        socket = Socket.new(:INET, :STREAM, 0)
+        socket = Socket.new(AF_INET, SOCK_STREAM, 0)
         socket.bind(Socket.pack_sockaddr_in(candidate, '127.0.0.1'))
         socket.close
         return candidate
       rescue Exception => e
-        puts e
       end
     end
   end

data/lib/mysql_isolated_server/version.rb

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

metadata

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