dohmysql 0.2.34 → 0.2.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 781550d6ef60c6d499005d5b89634c70a760a250
-  data.tar.gz: a59db4a488222896c14c6b1b27bd0363b947a285
+  metadata.gz: 67233ea9d63a00d86fef0a03eae15851a19bdad5
+  data.tar.gz: 58d2659c41deede9a881d74ffd8c2d3f587f0808
 SHA512:
-  metadata.gz: d4ff31f3263f689a4be21cf9c032e906280500ffc3814d459d02646665c062ed3958d82cd9dd82cac0c24f0b14ebab8ee6b8bcfd063da746db55cc5b6c23c91f
-  data.tar.gz: 0d5716c9067c15684993be13a4f5e4949300f9e0ceb72073f3a74e0ff572d5971525a318ea38c1edf528151a142656cdb37351320f79c44e0fb53df1178e04ce
+  metadata.gz: 2b59b5b8efa61a7aa8a3e07173a5f6ef98478e3472726831c6b54b499870e88b82443e31f5574683c1551ba673802a7be28f6c7a33f9f0132e116369863aa429
+  data.tar.gz: 2cacdfa41e2e855c7943eb2035d7d7a0bcc61664a4f70c36a9dc0ff3b90923b4a0bf7e21242b7b542056f7b2897bbc0e99fff0dc9eb15f25a06a1175f27bb404

data/lib/dohmysql/load_sql.rb

@@ -37,18 +37,21 @@ def self.load_sql(dbconfig, filenames)
   end
 end
 
-# trying Open3 now for better error handling; unknown as of yet if this works under JRuby
 def self.load_sql_using_each_open3(dbconfig, filenames)
   dohlog.debug("loading sql file: " + filenames.first) if filenames.size == 1
 
   basecmd = 'mysql' + mysql_arg(dbconfig[:host], 'h') + mysql_arg(dbconfig[:username], 'u') + mysql_arg(dbconfig[:password], 'p') + ' ' + dbconfig[:database] + ' < '
   filenames.each do |elem|
     mysqlcmd = "#{basecmd} #{elem}"
-    stdin, stdout, stderr = Open3.popen3(mysqlcmd)
-    stdoutstr = stdout.read
-    stdout.close
-    stderrstr = stderr.read
-    raise "#{stderrstr} occured while loading file: #{elem}" if !stderrstr.empty?
+    Open3.popen3(mysqlcmd) do |stdin, stdout, stderr, wait_thr|
+      # don't care about any stdout
+      stdout.read
+      errstr = stderr.read.strip
+      errstr = '' if errstr == 'Warning: Using a password on the command line interface can be insecure.'
+      status = wait_thr.value.exitstatus
+      raise "mysql had stderr #{errstr}" unless errstr.empty?
+      raise "mysql command failed with exit code #{status}" unless status == 0
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.2.34
+  version: 0.2.35
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot