activerecord-snapshot 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e940ac1dd6c0727931c63986fd0d9ab647a8a97
-  data.tar.gz: 581896f88fb4b33b80bdbf8332298dc1dbe01b96
+  metadata.gz: b51b97b1c6cf1f04d2d3c38b89f953e1aafb4e9f
+  data.tar.gz: 53fbe06bc4d402008d1e6732f8f51daec5c8d7a9
 SHA512:
-  metadata.gz: 4c99693338d284f980b2d8a6a6c92475fbdbd43f2331853c16f0e92ddb71fa045890f23a80b6cfb60743808d33846de6ff4d738bbff637305df4a3a3db3ac55b
-  data.tar.gz: 16be625dff9065a4862887082953c3a320645853c87eb4c1a6a0cee4e37db9eb62f421702ad205b65003bc9438693d68df6aea9d9474dfe2dfd141fb9248b9d3
+  metadata.gz: dcec9e3ef3029f1883bdf8973ca00f0e0ea2f06514b61e48ace9236e955175f394bd0abb0ad402fcc4b0843624996a4210af4438212c5722807ade46f49a1cd7
+  data.tar.gz: 5eee2391e5f2b426cfd1c88833ee6cb4e508eb0cf4ec5b33b83fcbb9c9f837fadb365f087fcdd8f0d43949df6599b1574ed78a2a9bdaebd6affaae0b6c74a15e

data/lib/active_record/snapshot/commands/mysql.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module ActiveRecord
   module Snapshot
     class MySQL
@@ -17,27 +19,46 @@ module ActiveRecord
       def import(input:)
         system(<<~SH)
           nice mysql \\
-            --user #{username} \\
-            #{password ? '--password' : ''} #{password} \\
-            --host #{host} \\
+            --user=#{username} \\
+            #{password_string} \\
+            --host=#{host} \\
             #{database} < #{input}
         SH
       end
 
       private
 
-      delegate :username, :password, :host, :database, to: :db_config
-
       def db_config
         ActiveRecord::Snapshot.config.db
       end
 
+      def escape(value)
+        Shellwords.escape(value)
+      end
+
+      def username
+        escape(db_config.username)
+      end
+
+      def password_string
+        return if db_config.password.blank?
+        "--password=#{escape(db_config.password)}"
+      end
+
+      def host
+        escape(db_config.host)
+      end
+
+      def database
+        escape(db_config.database)
+      end
+
       def dump_command(args = "")
         system(<<~SH)
           nice mysqldump \\
-            --user #{username} \\
-            --password #{password} \\
-            --host #{host} \\
+            --user=#{username} \\
+            #{password_string} \\
+            --host=#{host} \\
             #{args}
         SH
       end

data/lib/active_record/snapshot/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Snapshot
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-snapshot
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Bernardo Farah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties