dumpdb 1.0.1 → 1.0.2

data/lib/dumpdb/settings.rb

@@ -62,6 +62,7 @@ module Dumpdb::Settings
     def value(script, placeholder_vals={})
       val = super(script, script.source.to_hash.merge(placeholder_vals))
       if script.ssh?
+        val = val.gsub("\\", "\\\\\\").gsub('"', '\"')
         val = "ssh -A #{script.ssh_opts} #{script.ssh} \"#{val}\""
       end
       val

data/lib/dumpdb/version.rb

@@ -1,3 +1,3 @@
 module Dumpdb
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/settings_tests.rb

@@ -126,6 +126,20 @@ module Dumpdb
       assert_equal "this is the local db: devdb", cmd_val
     end
 
+    should "not escape any double-quotes in the cmds" do
+      orig_cmd    = "do_something --value=\"a_val\""
+      cmd_val = Settings::DumpCmd.new(Proc.new { orig_cmd }).value(@script)
+
+      assert_equal orig_cmd, cmd_val
+    end
+
+    should "not escape any backslashes in the cmds" do
+      orig_cmd    = "do \\something"
+      cmd_val = Settings::DumpCmd.new(Proc.new { orig_cmd }).value(@script)
+
+      assert_equal orig_cmd, cmd_val
+    end
+
   end
 
   class RemoteDumpCmdTests < DumpCmdTests
@@ -142,6 +156,33 @@ module Dumpdb
       assert_equal exp_cmd_str, cmd_val
     end
 
+    should "escape any double-quotes in the cmds" do
+      orig_cmd    = "do_something --value=\"a_val\""
+      exp_esc_cmd = "do_something --value=\\\"a_val\\\""
+      exp_cmd_str = "ssh -A #{@script.ssh_opts} #{@script.ssh} \"#{exp_esc_cmd}\""
+      cmd_val = Settings::DumpCmd.new(Proc.new { orig_cmd }).value(@script)
+
+      assert_equal exp_cmd_str, cmd_val
+    end
+
+    should "escape any backslashes in the cmds" do
+      orig_cmd    = "do \\something"
+      exp_esc_cmd = "do \\\\something"
+      exp_cmd_str = "ssh -A #{@script.ssh_opts} #{@script.ssh} \"#{exp_esc_cmd}\""
+      cmd_val = Settings::DumpCmd.new(Proc.new { orig_cmd }).value(@script)
+
+      assert_equal exp_cmd_str, cmd_val
+    end
+
+    should "escape any backslashes before double-quotes in the cmds" do
+      orig_cmd    = "do \\something --value=\"a_val\""
+      exp_esc_cmd = "do \\\\something --value=\\\"a_val\\\""
+      exp_cmd_str = "ssh -A #{@script.ssh_opts} #{@script.ssh} \"#{exp_esc_cmd}\""
+      cmd_val = Settings::DumpCmd.new(Proc.new { orig_cmd }).value(@script)
+
+      assert_equal exp_cmd_str, cmd_val
+    end
+
   end
 
   class RestoreCmdTests < CmdTests

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dumpdb
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-18 00:00:00 Z
+date: 2012-12-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert