dumpdb 2.0.0 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  metadata.gz: b45a5c4f8c56f6beb4b9abb1f28db750d333d73b6b2531a5fba69684d7324bf9d7be336e694831c813bb9fe5ded0fc7769b1bb350ba5f197bd96d4f88b50e25e
+  data.tar.gz: 43ffadbd18f646c146b1b3a4cb74907786162c8d78f0540a35d4223940b88f3e2da564b782eb8f25eb20c691ca0f6b1685bf1223c9f2f876fd54cf3528671dd0
+SHA1: 
+  metadata.gz: 8db6421ca5dfed0343dc706b65d4b924d11039b1
+  data.tar.gz: 97c8455c86faff07ff5c7ffbce8c9eb97eabf6e5

data/Gemfile

@@ -2,5 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rake', "~> 10.4.0"
-gem 'pry',  "~> 0.9.0"
+gem 'pry', "~> 0.9.0"

data/dumpdb.gemspec

@@ -8,17 +8,19 @@ Gem::Specification.new do |gem|
   gem.version     = Dumpdb::VERSION
   gem.authors     = ["Kelly Redding", "Collin Redding"]
   gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
-  gem.description = %q{Dump and restore your databases.}
   gem.summary     = %q{Dump and restore your databases.}
+  gem.description = %q{Dump and restore your databases.}
   gem.homepage    = "http://github.com/redding/dumpdb"
+  gem.license     = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.15"])
+  gem.add_development_dependency("assert", ["~> 2.16.1"])
+
+  gem.add_dependency("much-plugin", ["~> 0.2.0"])
+  gem.add_dependency("scmd",        ["~> 3.0.2"])
 
-  gem.add_dependency("scmd",       ["~> 3.0"])
-  gem.add_dependency("ns-options", ["~> 1.1", ">= 1.1.1"])
 end

data/lib/dumpdb.rb

@@ -1,60 +1,60 @@
-require 'ns-options'
+require 'much-plugin'
 require 'dumpdb/version'
 require 'dumpdb/settings'
 require 'dumpdb/db'
 require 'dumpdb/runner'
 
 module Dumpdb
+  include MuchPlugin
 
-  class BadDatabaseName < RuntimeError; end
-
-  def self.included(receiver)
-    receiver.class_eval do
-      include NsOptions
-      options :settings do
-        option 'ssh',          Settings::Ssh,          :default => ''
-        option 'dump_file',    Settings::DumpFile,     :default => ''
-        option 'source',       Settings::SourceTarget, :default => {}
-        option 'target',       Settings::SourceTarget, :default => {}
-        option 'dump_cmds',    Settings::CmdList,      :default => []
-        option 'restore_cmds', Settings::CmdList,      :default => []
-      end
-
-      extend  SettingsDslMethods
-      include SettingsMethods
-
-      def self.inherited(subclass)
-        subclass.settings.apply(self.settings.to_hash)
-      end
+  plugin_included do
+    extend  ClassMethods
+    include InstanceMethods
 
+    def self.inherited(subclass)
+      subclass.settings = self.settings
     end
-  end
 
-  module SettingsDslMethods
+  end
 
-    def ssh(&block);       settings.ssh       = Settings::Ssh.new(block);          end
-    def dump_file(&block); settings.dump_file = Settings::DumpFile.new(block);     end
-    def source(&block);    settings.source    = Settings::SourceTarget.new(block); end
-    def target(&block);    settings.target    = Settings::SourceTarget.new(block); end
+  module ClassMethods
+
+    def ssh(&block);       settings[:ssh]       = Settings::Ssh.new(block);          end
+    def dump_file(&block); settings[:dump_file] = Settings::DumpFile.new(block);     end
+    def source(&block);    settings[:source]    = Settings::SourceTarget.new(block); end
+    def target(&block);    settings[:target]    = Settings::SourceTarget.new(block); end
+
+    def dump(&block);    settings[:dump_cmds]    << Settings::DumpCmd.new(block);    end
+    def restore(&block); settings[:restore_cmds] << Settings::RestoreCmd.new(block); end
+
+    def settings
+      @settings ||= {
+        :ssh          => Settings::Ssh.new(''),
+        :dump_file    => Settings::DumpFile.new(''),
+        :source       => Settings::SourceTarget.new({}),
+        :target       => Settings::SourceTarget.new({}),
+        :dump_cmds    => Settings::CmdList.new([]),
+        :restore_cmds => Settings::CmdList.new([])
+      }
+    end
 
-    def dump(&block);    settings.dump_cmds    << Settings::DumpCmd.new(block);    end
-    def restore(&block); settings.restore_cmds << Settings::RestoreCmd.new(block); end
+    def settings=(value); @settings = value; end
 
   end
 
-  module SettingsMethods
+  module InstanceMethods
 
-    def settings; self.class.settings; end
-
-    def ssh;       @ssh       ||= settings.ssh.value(self);       end
-    def dump_file; @dump_file ||= settings.dump_file.value(self); end
-    def source;    @source    ||= settings.source.value(self);    end
-    def target;    @target    ||= settings.target.value(self);    end
+    def ssh;       @ssh       ||= settings[:ssh].value(self);       end
+    def dump_file; @dump_file ||= settings[:dump_file].value(self); end
+    def source;    @source    ||= settings[:source].value(self);    end
+    def target;    @target    ||= settings[:target].value(self);    end
 
-    def dump_cmds;     @dump_cmds     ||= settings.dump_cmds.value(self);        end
-    def restore_cmds;  @restore_cmds  ||= settings.restore_cmds.value(self);     end
+    def dump_cmds;     @dump_cmds     ||= settings[:dump_cmds].value(self);      end
+    def restore_cmds;  @restore_cmds  ||= settings[:restore_cmds].value(self);   end
     def copy_dump_cmd; @copy_dump_cmd ||= Settings::CopyDumpCmd.new.value(self); end
 
+    def settings; self.class.settings; end
+
   end
 
   def dump_cmd(&block);   Settings::DumpCmd.new(block).value(self);    end
@@ -89,4 +89,6 @@ module Dumpdb
   def before_cmd_run(*args);   end
   def after_cmd_run(*args);    end
 
+  BadDatabaseName = Class.new(RuntimeError)
+
 end

data/lib/dumpdb/runner.rb

@@ -1,12 +1,13 @@
 require 'dumpdb/settings'
 
 module Dumpdb
+
   class Runner
 
     attr_reader :script, :cmd_runner
 
     def initialize(script, opts={})
-      @script = script
+      @script     = script
       @cmd_runner = opts[:cmd_runner] || scmd_cmd_runner
     end
 
@@ -17,22 +18,22 @@ module Dumpdb
 
       begin
         run_callback 'after_setup'
-        [:dump, :copy_dump, :restore].each{|phase_name| run_phase phase_name}
+        [:dump, :copy_dump, :restore].each{ |phase_name| run_phase phase_name }
       ensure
         run_phase 'teardown'
         run_callback 'after_run'
       end
     end
 
-    protected
+    private
 
     def run_setup
-      run_cmd(@script.dump_cmd    { "mkdir -p #{source.output_dir}"  })
-      run_cmd(@script.restore_cmd { "mkdir -p #{target.output_dir}"  })
+      run_cmd(@script.dump_cmd{ "mkdir -p #{source.output_dir}" })
+      run_cmd(@script.restore_cmd{ "mkdir -p #{target.output_dir}" })
     end
 
     def run_dump
-      @script.dump_cmds.each{|cmd| run_cmd(cmd)}
+      @script.dump_cmds.each{ |cmd| run_cmd(cmd) }
     end
 
     def run_copy_dump
@@ -40,16 +41,14 @@ module Dumpdb
     end
 
     def run_restore
-      @script.restore_cmds.each{|cmd| run_cmd(cmd)}
+      @script.restore_cmds.each{ |cmd| run_cmd(cmd) }
     end
 
     def run_teardown
-      run_cmd(@script.dump_cmd    { "rm -rf #{source.output_dir}" })
-      run_cmd(@script.restore_cmd { "rm -rf #{target.output_dir}" })
+      run_cmd(@script.dump_cmd{ "rm -rf #{source.output_dir}" })
+      run_cmd(@script.restore_cmd{ "rm -rf #{target.output_dir}" })
     end
 
-    private
-
     def run_phase(phase_name)
       run_callback "before_#{phase_name}"
       self.send("run_#{phase_name}")
@@ -73,4 +72,5 @@ module Dumpdb
     end
 
   end
+
 end

data/lib/dumpdb/settings.rb

@@ -6,7 +6,7 @@ module Dumpdb::Settings
 
     attr_reader :proc
 
-    def initialize(proc=nil)
+    def initialize(proc = nil)
       @proc = proc.kind_of?(::Proc) ? proc : Proc.new { proc }
     end
 
@@ -45,7 +45,7 @@ module Dumpdb::Settings
 
   class DumpCmd < Cmd
 
-    def value(script, placeholder_vals={})
+    def value(script, placeholder_vals = {})
       val = super(script, script.source.to_hash.merge(placeholder_vals))
       if script.ssh?
         val = val.gsub("\\", "\\\\\\").gsub('"', '\"')
@@ -58,7 +58,7 @@ module Dumpdb::Settings
 
   class RestoreCmd < Cmd
 
-    def value(script, placeholder_vals={})
+    def value(script, placeholder_vals = {})
       super(script, script.target.to_hash.merge(placeholder_vals))
     end
 
@@ -78,7 +78,7 @@ module Dumpdb::Settings
 
   class CmdList < ::Array
 
-    def value(script, placeholder_vals={})
+    def value(script, placeholder_vals = {})
       self.map{ |cmd| cmd.value(script, placeholder_vals) }
     end
 

data/lib/dumpdb/version.rb

@@ -1,3 +1,3 @@
 module Dumpdb
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/test/helper.rb

@@ -10,3 +10,11 @@ require 'pry'
 
 require 'test/support/factory'
 
+# 1.8.7 backfills
+
+# Array#sample
+if !(a = Array.new).respond_to?(:sample) && a.respond_to?(:choice)
+  class Array
+    alias_method :sample, :choice
+  end
+end

data/test/unit/db_tests.rb

@@ -41,7 +41,7 @@ class Dumpdb::Db
         :custom_value => @custom_value
       })
     end
-    subject { @db }
+    subject{ @db }
 
     should have_imeths :host, :port, :user, :pw, :db
     should have_imeths :output_root, :output_dir, :dump_file
@@ -54,8 +54,10 @@ class Dumpdb::Db
       assert_equal @pw,          subject.pw
       assert_equal @db_name,     subject.db
       assert_equal @output_root, subject.output_root
+
       exp = File.join(@output_root, "#{@host}__#{@db_name}__#{@current_time.to_f}")
       assert_equal exp, subject.output_dir
+
       exp = File.join(subject.output_dir, @dump_file_name)
       assert_equal exp, subject.dump_file
     end
@@ -75,6 +77,7 @@ class Dumpdb::Db
       assert_equal DEFAULT_VALUE, db.db
       assert_equal DEFAULT_VALUE, db.output_root
       assert_equal @current_time.to_f.to_s, db.output_dir
+
       exp = File.join(db.output_dir, 'dump.output')
       assert_equal exp, db.dump_file
     end

data/test/unit/{script_tests.rb → dumpdb_tests.rb}

@@ -1,15 +1,22 @@
 require 'assert'
+require 'dumpdb'
+
 require 'test/support/fake_cmd_runner'
 require 'test/support/test_scripts'
 
 module Dumpdb
 
-  class ScriptTests < Assert::Context
-    desc "the main script mixin"
+  class UnitTests < Assert::Context
+    desc "Dumpdb"
+
+  end
+
+  class InitTests < UnitTests
+    desc "when init"
     setup do
-      @script = LocalScript.new
+      @script = LocalScript.new # mixes in Dumpdb
     end
-    subject { @script }
+    subject{ @script }
 
     should have_cmeths :settings
     should have_imeths :settings, :dump_cmd, :restore_cmd
@@ -26,23 +33,18 @@ module Dumpdb
     should have_imeths :before_dump, :before_copy_dump, :before_restore
     should have_imeths :after_dump,  :after_copy_dump,  :after_restore
 
-    should "store its settings using ns-options" do
-      assert_kind_of NsOptions::Namespace, subject.class.settings
-      assert_same subject.class.settings, subject.settings
-    end
-
     should "store off the settings for the script" do
-      assert_kind_of Settings::Ssh,          subject.settings.ssh
-      assert_kind_of Settings::DumpFile,     subject.settings.dump_file
-      assert_kind_of Settings::SourceTarget, subject.settings.source
-      assert_kind_of Settings::SourceTarget, subject.settings.target
-      assert_kind_of Settings::CmdList,      subject.settings.dump_cmds
-      assert_kind_of Settings::CmdList,      subject.settings.restore_cmds
+      assert_kind_of Settings::Ssh,          subject.settings[:ssh]
+      assert_kind_of Settings::DumpFile,     subject.settings[:dump_file]
+      assert_kind_of Settings::SourceTarget, subject.settings[:source]
+      assert_kind_of Settings::SourceTarget, subject.settings[:target]
+      assert_kind_of Settings::CmdList,      subject.settings[:dump_cmds]
+      assert_kind_of Settings::CmdList,      subject.settings[:restore_cmds]
     end
 
   end
 
-  class CmdMethsTests < ScriptTests
+  class CmdMethsTests < InitTests
 
     should "build dump command strings" do
       assert_equal 'echo local', subject.dump_cmd { "echo #{type}" }
@@ -54,7 +56,7 @@ module Dumpdb
 
   end
 
-  class SshTests < ScriptTests
+  class SshTests < InitTests
 
     should "know if its in ssh mode or not" do
       assert     RemoteScript.new.ssh?
@@ -71,27 +73,27 @@ module Dumpdb
 
   end
 
-  class RunTests < ScriptTests
+  class RunTests < InitTests
     setup do
-      FakeCmdRunner.reset
+      Dumpdb::FakeCmdRunner.reset
       @script = RunnerScript.new
     end
     teardown do
-      FakeCmdRunner.reset
+      Dumpdb::FakeCmdRunner.reset
     end
 
     should "run the script when `run` is called" do
-      assert_empty FakeCmdRunner.cmds
-      @script.run(FakeCmdRunner)
+      assert_empty Dumpdb::FakeCmdRunner.cmds
+      @script.run(Dumpdb::FakeCmdRunner)
 
-      assert_not_empty FakeCmdRunner.cmds
-      assert_equal 7, FakeCmdRunner.cmds.size
-      assert_equal "a restore cmd", FakeCmdRunner.cmds[-3]
+      assert_not_empty Dumpdb::FakeCmdRunner.cmds
+      assert_equal 7, Dumpdb::FakeCmdRunner.cmds.size
+      assert_equal "a restore cmd", Dumpdb::FakeCmdRunner.cmds[-3]
     end
 
   end
 
-  class InheritedTests < ScriptTests
+  class InheritedTests < InitTests
     desc "when inherited"
     setup do
       @a_remote_script     = RemoteScript.new

data/test/unit/runner_tests.rb

@@ -1,39 +1,41 @@
 require 'assert'
+require 'dumpdb/runner'
+
 require 'test/support/fake_cmd_runner'
 require 'test/support/test_scripts'
-require 'dumpdb/runner'
 
-module Dumpdb
+class Dumpdb::Runner
 
-  class RunnerTests < Assert::Context
-    desc "the runner"
+  class UnitTests < Assert::Context
+    desc "Dumpdb::Runner"
     setup do
-      FakeCmdRunner.reset
+      @fake_cmd_runner = Dumpdb::FakeCmdRunner
+      @fake_cmd_runner.reset
+
       @script = RunnerScript.new
-      @runner = Runner.new(@script, :cmd_runner => FakeCmdRunner)
+      @runner = Dumpdb::Runner.new(@script, :cmd_runner => @fake_cmd_runner)
     end
     teardown do
-      FakeCmdRunner.reset
+      @fake_cmd_runner.reset
     end
-    subject { @runner }
-
+    subject{ @runner }
 
     should have_reader :script, :cmd_runner
 
     should "run the script" do
-      assert_empty FakeCmdRunner.cmds
+      assert_empty @fake_cmd_runner.cmds
       subject.run
 
-      assert_not_empty FakeCmdRunner.cmds
-      assert_equal 7, FakeCmdRunner.cmds.size
-      assert_equal "a restore cmd", FakeCmdRunner.cmds[-3]
+      assert_not_empty @fake_cmd_runner.cmds
+      assert_equal 7, @fake_cmd_runner.cmds.size
+      assert_equal "a restore cmd", @fake_cmd_runner.cmds[-3]
     end
 
     should "call the callbacks" do
-      assert_not @script.all_callbacks_called?
+      assert_false @script.all_callbacks_called?
       subject.run
 
-      assert @script.all_callbacks_called?
+      assert_true @script.all_callbacks_called?
     end
 
   end

data/test/unit/settings_tests.rb

@@ -1,189 +1,162 @@
 require 'assert'
-require 'test/support/test_scripts'
 require 'dumpdb/settings'
 
-module Dumpdb
+require 'dumpdb/db'
+require 'test/support/test_scripts'
+
+module Dumpdb::Settings
 
-  class SettingsTests < Assert::Context
-    desc "the script settings"
+  class UnitTests < Assert::Context
+    desc "Dumpdb::Settings"
     setup do
-      @setting = Settings::Base.new
       @script = LocalScript.new
     end
-    subject { @setting }
 
-    should have_imeth :value
-    should have_reader :proc
+  end
 
-    should "know its value proc" do
+  class BaseTests < UnitTests
+    desc "Base"
+    setup do
+      @setting = Base.new
+    end
+    subject{ @setting }
+
+    should have_readers :proc
+    should have_imeths :value
+
+    should "know its proc" do
       assert_kind_of ::Proc, subject.proc
       assert_nil subject.proc.call
     end
 
     should "instance eval its proc in the scope of a script to return a value" do
-      setting = Settings::Base.new(Proc.new { "something: #{type}"})
+      setting = Base.new(Proc.new{ "something: #{type}" })
 
-      assert_equal "local", @script.type
+      assert_equal "local",            @script.type
       assert_equal "something: local", setting.value(@script)
     end
 
   end
 
-  class SshSettingTests < SettingsTests
-    desc "`ssh` setting"
+  class SshTests < UnitTests
+    desc "Ssh"
 
-    should "be available" do
-      assert Settings::Ssh
+    should "be a Base setting" do
+      assert_true Ssh < Base
     end
 
   end
 
-  class DumpFileSettingTests < SettingsTests
-    desc "`dump_file` setting"
+  class DumpFileTests < UnitTests
+    desc "DumpFile"
 
-    should "be available" do
-      assert Settings::DumpFile
+    should "be a Base setting" do
+      assert_true DumpFile < Base
     end
 
   end
 
-  class SourceTargetSettingTests < SettingsTests
-    desc "`source` or `target` setting"
-    setup do
-      @from_hash = {'host' => 'from_hash'}
-    end
+  class SourceTargetTests < UnitTests
+    desc "SourceTarget"
 
-    should "be available" do
-      assert Settings::SourceTarget
+    should "be a Base setting" do
+      assert_true SourceTarget < Base
     end
 
-    should "come from a hash" do
-      db = Settings::SourceTarget.new(@from_hash).value(@script)
+    should "have a Db value built from a hash" do
+      from_hash = { 'host' => 'from_hash' }
+      db = SourceTarget.new(from_hash).value(@script)
 
-      assert_kind_of Db, db
+      assert_kind_of Dumpdb::Db, db
       assert_equal 'from_hash', db.host
     end
 
   end
 
-  class CmdTests < SettingsTests
-    desc "command helper class"
-    setup do
-      @cmd_str = Proc.new { "this is the #{type} db: :db" }
-    end
+  class CmdTests < UnitTests
+    desc "Cmd"
 
-    should "be available" do
-      assert Settings::Cmd
+    should "be a Base setting" do
+      assert_true Cmd < Base
     end
 
     should "eval and apply any placeholders to the cmd string" do
-      cmd_val = Settings::Cmd.new(@cmd_str).value(@script, @script.source.to_hash)
+      cmd_str = Proc.new{ "this is the #{type} db: :db" }
+      cmd_val = Cmd.new(cmd_str).value(@script, @script.source.to_hash)
       assert_equal "this is the local db: devdb", cmd_val
     end
 
   end
 
-  class DumpCmdTests < CmdTests
-    desc "for dump commands"
+  class DumpCmdTests < UnitTests
+    desc "DumpCmd"
+
+    should "be a Cmd setting" do
+      assert_true DumpCmd < Cmd
+    end
 
     should "eval and apply any source placeholders to the cmd string" do
-      cmd_val = Settings::DumpCmd.new(@cmd_str).value(@script)
+      cmd_str = Proc.new{ "this is the #{type} db: :db" }
+      cmd_val = DumpCmd.new(cmd_str).value(@script)
       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)
-
+      orig_cmd = "do_something --value=\"a_val\""
+      cmd_val  = 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)
-
+      orig_cmd = "do \\something"
+      cmd_val  = DumpCmd.new(Proc.new{ orig_cmd }).value(@script)
       assert_equal orig_cmd, cmd_val
     end
 
   end
 
-  class RemoteDumpCmdTests < DumpCmdTests
-    desc "using ssh"
-    setup do
-      @script = RemoteScript.new
-      @cmd_str = Proc.new { "echo hello" }
-    end
-
-    should "build the cmds to run remtoely using ssh" do
-      exp_cmd_str = "ssh -A #{@script.ssh_opts} #{@script.ssh} \"echo hello\""
-      cmd_val = Settings::DumpCmd.new(@cmd_str).value(@script)
-
-      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)
+  class RestoreCmdTests < UnitTests
+    desc "RestoreCmd"
 
-      assert_equal exp_cmd_str, cmd_val
+    should "be a Cmd setting" do
+      assert_true RestoreCmd < Cmd
     end
 
-  end
-
-  class RestoreCmdTests < CmdTests
-    desc "for restore commands"
-
     should "eval and apply any target placeholders to the cmd string" do
-      cmd_val = Settings::RestoreCmd.new(@cmd_str).value(@script)
+      cmd_str = Proc.new{ "this is the #{type} db: :db" }
+      cmd_val = RestoreCmd.new(cmd_str).value(@script)
       assert_equal "this is the local db: testdb", cmd_val
     end
 
   end
 
-  class CopyDumpCmdTests < CmdTests
+  class CopyDumpCmdTests < UnitTests
+    desc "CopyDumpCmd"
 
-    should "be a copy cmd for non-ssh scripts" do
-      script = @script
-      exp_cmd = "cp #{script.source.dump_file} #{script.target.dump_file}"
+    should "be a Cmd setting" do
+      assert_true CopyDumpCmd < Cmd
+    end
 
-      assert_equal exp_cmd, script.copy_dump_cmd
+    should "be a copy cmd for non-ssh scripts" do
+      exp = "cp #{@script.source.dump_file} #{@script.target.dump_file}"
+      assert_equal exp, @script.copy_dump_cmd
     end
 
     should "be an sftp cmd for ssh scripts" do
       script = RemoteScript.new
-      exp_cmd = "sftp #{script.ssh_opts} #{script.ssh}:#{script.source.dump_file} #{script.target.dump_file}"
-
-      assert_equal exp_cmd, script.copy_dump_cmd
+      exp = "sftp #{script.ssh_opts} #{script.ssh}:#{script.source.dump_file} " \
+            "#{script.target.dump_file}"
+      assert_equal exp, script.copy_dump_cmd
     end
 
   end
 
-  class CmdListTests < SettingsTests
-    desc "command list helper class"
+  class CmdListTests < UnitTests
+    desc "CmdList"
     setup do
       @cmds = [
-        Settings::Cmd.new(Proc.new { "this is the #{type} target db: :db" }),
-        Settings::Cmd.new(Proc.new { "this is the #{type} target host: :host" })
+        Cmd.new(Proc.new{ "this is the #{type} target db: :db" }),
+        Cmd.new(Proc.new{ "this is the #{type} target host: :host" })
       ]
       @exp_val_cmds = [
         "this is the local target db: testdb",
@@ -192,15 +165,52 @@ module Dumpdb
     end
 
     should "be an Array" do
-      assert_kind_of ::Array, Settings::CmdList.new
+      assert_kind_of ::Array, CmdList.new
     end
 
     should "return the commands, eval'd and placeholders applied" do
-      val_cmds = Settings::CmdList.new(@cmds).value(@script, @script.target.to_hash)
+      val_cmds = CmdList.new(@cmds).value(@script, @script.target.to_hash)
       assert_equal @exp_val_cmds, val_cmds
     end
 
   end
 
+  class RemoteDumpCmdTests < UnitTests
+    desc "using ssh"
+    setup do
+      @script  = RemoteScript.new
+      @cmd_str = Proc.new{ "echo hello" }
+    end
+
+    should "build the cmds to run remotely using ssh" do
+      exp = "ssh -A #{@script.ssh_opts} #{@script.ssh} \"echo hello\""
+      assert_equal exp, DumpCmd.new(@cmd_str).value(@script)
+    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 = "ssh -A #{@script.ssh_opts} #{@script.ssh} \"#{exp_esc_cmd}\""
+      assert_equal exp, DumpCmd.new(Proc.new{ orig_cmd }).value(@script)
+    end
+
+    should "escape any backslashes in the cmds" do
+      orig_cmd    = "do \\something"
+      exp_esc_cmd = "do \\\\something"
+
+      exp = "ssh -A #{@script.ssh_opts} #{@script.ssh} \"#{exp_esc_cmd}\""
+      assert_equal exp, DumpCmd.new(Proc.new{ orig_cmd }).value(@script)
+    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 = "ssh -A #{@script.ssh_opts} #{@script.ssh} \"#{exp_esc_cmd}\""
+      assert_equal exp, DumpCmd.new(Proc.new{ orig_cmd }).value(@script)
+    end
+
+  end
 
 end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dumpdb
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,61 +10,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-12-09 00:00:00 Z
+date: 2016-06-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: assert
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 15
-        version: "2.15"
+        version: 2.16.1
   type: :development
-  name: assert
   version_requirements: *id001
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: much-plugin
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+        version: 0.2.0
   type: :runtime
-  name: scmd
   version_requirements: *id002
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: scmd
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 1
-        - 1
-        version: 1.1.1
+        version: 3.0.2
   type: :runtime
-  name: ns-options
   version_requirements: *id003
-  prerelease: false
 description: Dump and restore your databases.
 email: 
 - kelly@kellyredding.com
@@ -86,7 +57,6 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - dumpdb.gemspec
 - lib/dumpdb.rb
 - lib/dumpdb/db.rb
@@ -99,12 +69,14 @@ files:
 - test/support/fake_cmd_runner.rb
 - test/support/test_scripts.rb
 - test/unit/db_tests.rb
+- test/unit/dumpdb_tests.rb
 - test/unit/runner_tests.rb
-- test/unit/script_tests.rb
 - test/unit/settings_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/dumpdb
-licenses: []
+licenses: 
+- MIT
+metadata: {}
 
 post_install_message: 
 rdoc_options: []
@@ -112,29 +84,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - &id004 
+    - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id004
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.6.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Dump and restore your databases.
 test_files: 
 - test/helper.rb
@@ -142,6 +105,6 @@ test_files:
 - test/support/fake_cmd_runner.rb
 - test/support/test_scripts.rb
 - test/unit/db_tests.rb
+- test/unit/dumpdb_tests.rb
 - test/unit/runner_tests.rb
-- test/unit/script_tests.rb
 - test/unit/settings_tests.rb

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"