isolated_server 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0ceedebc8690cbb19a2f5b81fc359200a3f2fc0
-  data.tar.gz: a6f2110ecae501e098897a39a573d73324f75413
+  metadata.gz: 0e4c2cbe1e48b3e767d9be526f2d63ba973f1773
+  data.tar.gz: 724b3f8962866941f24d087310dadf5f75054a9d
 SHA512:
-  metadata.gz: 8ca8590fde71ff80ec7420b092aebfe828e7a2374473b74ff70c74843689f0fbfffd176b12a72b097bb592156daf144340f923150dcbb61c3a73744edf3531b8
-  data.tar.gz: cdb3306372163032ae63bc2c3b2ab42b83efda95e59b4d6aae5f8be7b4a3c00e032ae04656e6909b6829f14a2f96708676a25816166aaecae6adaf74ee08a63a
+  metadata.gz: a1ec4968bd1679e6a679ba35285377e699d015156a9d981954464c96bebae4f7ed7af41b06fee84477bcb97013fb204b9b3b3815a68b43056db1a0e258efa9f5
+  data.tar.gz: 616b1f9d58e04ae7d4e0bdea2952fc68f8c494b9856f1ff569d5ee948f5f19f568f5c43fb4373f90e3f27f8101e63e5176b22ac5fb96a6fae31ec9cbcb48da23

data/lib/isolated_server/mysql.rb

@@ -77,6 +77,7 @@ module IsolatedServer
         "--pid-file=#{@base}/mysqld.pid",
         "--port=#{@port}",
         "--socket=#{@mysql_data_dir}/mysql.sock",
+        "--server-id=#{@port}",
         @log_bin,
         '--log-slave-updates',
         *@params
@@ -90,7 +91,7 @@ module IsolatedServer
     end
 
     def console
-      system("mysql -uroot --port #{@port.to_s.shellescape} mysql --host 127.0.0.1")
+      system!("mysql -uroot --port #{@port.to_s.shellescape} mysql --host 127.0.0.1")
     end
 
     def reconnect!
@@ -121,12 +122,16 @@ module IsolatedServer
 
     private
 
+    def system!(cmd)
+      system(cmd) or raise Exception, "Error executing #{cmd}"
+    end
+
     def setup_data_dir
-      system("rm -Rf #{@mysql_data_dir.shellescape}")
-      system("mkdir #{@mysql_data_dir.shellescape}")
+      system!("rm -Rf #{@mysql_data_dir.shellescape}")
+      system!("mkdir -p #{@mysql_data_dir.shellescape}")
       if @load_data_path
-        system("cp -a #{@load_data_path.shellescape}/* #{@mysql_data_dir.shellescape}")
-        system("rm -f #{@mysql_data_dir.shellescape}/relay-log.info")
+        system!("cp -a #{@load_data_path.shellescape}/* #{@mysql_data_dir.shellescape}")
+        system!("rm -f #{@mysql_data_dir.shellescape}/relay-log.info")
       else
         mysqld = locate_executable("mysqld")
         `#{mysqld} --version` =~ /mysqld\s+Ver (5\.\d)\.\d+/
@@ -138,8 +143,8 @@ module IsolatedServer
         mysql_install_db = locate_executable("mysql_install_db")
 
         idb_path = File.dirname(mysql_install_db)
-        system("(cd #{idb_path.shellescape}/..; mysql_install_db --datadir=#{@mysql_data_dir.shellescape} --basedir=#{basedir.shellescape} --user=`whoami`) >/dev/null 2>&1")
-        system("cp #{File.expand_path(File.dirname(__FILE__)).shellescape}/mysql/tables/#{major_version}/user.* #{@mysql_data_dir.shellescape}/mysql")
+        system!("(cd #{idb_path.shellescape}/..; mysql_install_db --datadir=#{@mysql_data_dir.shellescape} --basedir=#{basedir.shellescape} --user=`whoami`) >/dev/null 2>&1")
+        system!("cp #{File.expand_path(File.dirname(__FILE__)).shellescape}/mysql/tables/#{major_version}/user.* #{@mysql_data_dir.shellescape}/mysql")
       end
     end
 
@@ -153,15 +158,15 @@ module IsolatedServer
           binlog_dir = @log_bin
         end
 
-        system("mkdir -p #{binlog_dir.shellescape}")
+        system!("mkdir -p #{binlog_dir.shellescape}")
         @log_bin = "--log-bin=#{binlog_dir}"
       end
     end
 
     # http://dev.mysql.com/doc/refman/5.0/en/temporary-files.html
     def setup_tmp_dir
-      system("mkdir -p #{base.shellescape}/tmp")
-      system("chmod 0777 #{base.shellescape}/tmp")
+      system!("mkdir -p #{base.shellescape}/tmp")
+      system!("chmod 0777 #{base.shellescape}/tmp")
       ENV["TMPDIR"] = "#{base.shellescape}/tmp"
     end
 
@@ -169,7 +174,7 @@ module IsolatedServer
     def setup_time_zone
       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.shellescape} /usr/share/zoneinfo 2>/dev/null | mysql -h127.0.0.1 --database=mysql --port=#{@port.to_s.shellescape} -u root mysql")
+      system!("#{tzinfo_to_sql.shellescape} /usr/share/zoneinfo 2>/dev/null | mysql -h127.0.0.1 --database=mysql --port=#{@port.to_s.shellescape} -u root mysql")
 
       begin
         connection.query("SET GLOBAL time_zone='UTC'")

data/lib/isolated_server/version.rb

@@ -1,3 +1,3 @@
 module IsolatedServer
-  VERSION = "0.4.10"
+  VERSION = "0.4.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isolated_server
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Ben Osheroff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,6 +98,9 @@ files:
 - lib/isolated_server/mysql/tables/5.6/user.MYD
 - lib/isolated_server/mysql/tables/5.6/user.MYI
 - lib/isolated_server/mysql/tables/5.6/user.frm
+- lib/isolated_server/mysql/tables/5.7/user.MYD
+- lib/isolated_server/mysql/tables/5.7/user.MYI
+- lib/isolated_server/mysql/tables/5.7/user.frm
 - lib/isolated_server/version.rb
 - spec/lib/isolated_server/mongodb_spec.rb
 - spec/lib/isolated_server/mysql_spec.rb
@@ -122,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A small library that allows you to easily spin up new local mysql servers