siringa 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDA0YjA3MzI2MWE2NDBiYjYzMTg3NGNjNmYzYWMxN2E3ZGZjZmIwNA==
-  data.tar.gz: !binary |-
-    YWM2NzI1MWEwOTI4YWRkOTBjYjk4YjJmOWFhMzkyNTgxNWYyZjczYg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZWNhZjAzNTMyY2YxZTA5NWY5N2NiYmUwYmM2NDBmYzA3NmY3ODFhMWMxNzA3
-    N2U5Nzg2NmUwZTNiNjI3ZmIzZDIxM2Y2YmI2M2VkOWVhMjVjNGRmMWZhNDky
-    MzZiZGI3MDNlZmYwZjYwM2MyMjcxYmI0OGVhNjc4ZDJhZmU3OWE=
-  data.tar.gz: !binary |-
-    NDE2NWE2NzQ3NWQ5NjdjOGE2YjRhY2E3ZDk4MmYxOGVkNzY2OTE3ZWMxZThm
-    MjU1NjE0Mjg2NjM0NTI1NDM1ZmQ1ZjIyYzgyMGM2OGI4NDZiZmRmZDdiOTNm
-    ODY0MGJiZjZiODg2ZDY0OGZiZGQ1ZWM0OTc4ZjhiYTJkMjE3OGE=
+SHA1:
+  metadata.gz: 68a1ddbf31d98af8c1e605699a92db678ca7fdf2
+  data.tar.gz: 7e181bb6f29c3a50da42dbc953443dae9ccee78f
+SHA512:
+  metadata.gz: 63e1d2f63d8ec314000de580fd6ff154f8bc22d53d442cdae7e6eb3071d5459958f680f10e33a78834cd60aac8c938d18f9accc8769d04fe975e334238dfaf33
+  data.tar.gz: 923c02e11c80cd349b7c7b9554a69c39b3a8134c5030e41c9da46dec90e2956d71d4ed0ca601bc12cde52169029ec726c3dd6a7f65691dfeb29a5ba1c58c3af5

data/lib/siringa/dumps.rb

@@ -17,7 +17,11 @@ module Siringa
     result = {}
     case adapter_config[:adapter]
     when "mysql", "mysql2"
-      _, result[:error], result[:status] = Open3.capture3(mysql_dump_command(adapter_config[:database], dump_path))
+      _, result[:error], result[:status] = Open3.capture3(mysql_dump_command(adapter_config[:host],
+                                                                             adapter_config[:database],
+                                                                             adapter_config[:username],
+                                                                             adapter_config[:password],
+                                                                             dump_path))
     when "sqlite3"
       _, result[:error], result[:status] = Open3.capture3(sqlite_dump_command(adapter_config[:database], dump_path))
     else
@@ -35,7 +39,11 @@ module Siringa
     result = {}
     case adapter_config[:adapter]
     when "mysql", "mysql2"
-      _, result[:error], result[:status] = Open3.capture3(mysql_restore_command(adapter_config[:database], dump_path))
+      _, result[:error], result[:status] = Open3.capture3(mysql_restore_command(adapter_config[:host],
+                                                                                adapter_config[:database],
+                                                                                adapter_config[:username],
+                                                                                adapter_config[:password],
+                                                                                dump_path))
     when "sqlite3"
       _, result[:error], result[:status] = Open3.capture3(sqlite_restore_command(adapter_config[:database], dump_path))
     else
@@ -69,20 +77,34 @@ module Siringa
 
   # Return a string with the dump command for MySql
   #
+  # @param host [String]
   # @param database [String]
+  # @param username [String]
+  # @param password [String]
   # @param dump_path [String]
   # @return [String]
-  def self.mysql_dump_command(database, dump_path)
-    "/usr/bin/env mysqldump -uroot #{database} > #{dump_path}"
+  def self.mysql_dump_command(host, database, username, password, dump_path)
+    "/usr/bin/env mysqldump -h#{host} -u#{username} #{password_param(password)} #{database} > #{dump_path}"
   end
 
   # Return a string with the restore command for MySql
   #
+  # @param host [String]
   # @param database [String]
+  # @param username [String]
+  # @param password [String]
   # @param dump_path [String]
   # @return [String]
-  def self.mysql_restore_command(database, dump_path)
-    "/usr/bin/env mysql -uroot #{database} < #{dump_path}"
+  def self.mysql_restore_command(host, database, username, password, dump_path)
+    "/usr/bin/env mysql -h#{host} -u#{username} #{password_param(password)} #{database} < #{dump_path}"
+  end
+
+  # Return a string with the password parameter
+  #
+  # @param password [String]
+  # @return [String]
+  def self.password_param(password)
+    !password.nil? ? "-p#{password}" : ""
   end
 
   # Return a string with the dump command for Sqlite

data/lib/siringa/version.rb

@@ -1,3 +1,3 @@
 module Siringa
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end