ardb 0.28.1 → 0.29.2

data/test/unit/adapter/sqlite_tests.rb

@@ -1,8 +1,9 @@
-require 'assert'
-require 'ardb/adapter/sqlite'
+# frozen_string_literal: true
 
-class Ardb::Adapter::Sqlite
+require "assert"
+require "ardb/adapter/sqlite"
 
+class Ardb::Adapter::Sqlite
   class UnitTests < Assert::Context
     desc "Ardb::Adapter::Sqlite"
     setup do
@@ -24,21 +25,14 @@ class Ardb::Adapter::Sqlite
       exp = File.expand_path(@config.database, @config.root_path)
       assert_equal exp, subject.db_file_path
 
-      @config.database = File.join(TMP_PATH, 'abs_sqlite_db_test')
+      @config.database = File.join(TMP_PATH, "abs_sqlite_db_test")
       adapter = Ardb::Adapter::Sqlite.new(@config)
       assert_equal @config.database, adapter.db_file_path
     end
 
-    should "not implement the foreign key sql meths" do
-      assert_raises(NotImplementedError){ subject.foreign_key_add_sql }
-      assert_raises(NotImplementedError){ subject.foreign_key_drop_sql }
-    end
-
     # not currently implemented, see: https://github.com/redding/ardb/issues/29
     should "not implement the drop tables method" do
       assert_raises(NotImplementedError){ subject.drop_tables }
     end
-
   end
-
 end

data/test/unit/adapter_spy_tests.rb

@@ -1,8 +1,9 @@
-require 'assert'
-require 'ardb/adapter_spy'
+# frozen_string_literal: true
 
-class Ardb::AdapterSpy
+require "assert"
+require "ardb/adapter_spy"
 
+class Ardb::AdapterSpy
   class UnitTests < Assert::Context
     desc "Ardb::AdapterSpy"
     setup do
@@ -13,7 +14,6 @@ class Ardb::AdapterSpy
     should "be a kind of ardb adapter" do
       assert subject < Ardb::Adapter::Base
     end
-
   end
 
   class InitTests < UnitTests
@@ -28,8 +28,8 @@ class Ardb::AdapterSpy
     should have_accessors :dump_schema_called_count, :load_schema_called_count
     should have_accessors :drop_db_called_count, :create_db_called_count
     should have_accessors :connect_db_called_count, :migrate_db_called_count
-    should have_imeths :foreign_key_add_sql, :foreign_key_drop_sql
-    should have_imeths :create_db_called?, :drop_db_called?, :drop_tables_called?
+    should have_imeths :create_db_called?, :drop_db_called?
+    should have_imeths :drop_tables_called?
     should have_imeths :connect_db_called?, :migrate_db_called?
     should have_imeths :dump_schema_called?, :load_schema_called?
     should have_imeths :create_db, :drop_db, :drop_tables
@@ -46,15 +46,6 @@ class Ardb::AdapterSpy
       assert_equal 0, subject.dump_schema_called_count
     end
 
-    should "know its add and drop foreign key sql" do
-      exp = "FAKE ADD FOREIGN KEY SQL :from_table :from_column " \
-            ":to_table :to_column :name"
-      assert_equal exp, subject.foreign_key_add_sql
-      exp = "FAKE DROP FOREIGN KEY SQL :from_table :from_column " \
-            ":to_table :to_column :name"
-      assert_equal exp, subject.foreign_key_drop_sql
-    end
-
     should "know if and how many times a method is called" do
       assert_equal false, subject.create_db_called?
       subject.create_db
@@ -91,7 +82,5 @@ class Ardb::AdapterSpy
       assert_equal 1, subject.load_schema_called_count
       assert_equal true, subject.load_schema_called?
     end
-
   end
-
 end

data/test/unit/ardb_tests.rb

@@ -1,26 +1,30 @@
-require 'assert'
-require 'ardb'
+# frozen_string_literal: true
 
-require 'logger'
-require 'ardb/adapter_spy'
-require 'ardb/adapter/mysql'
-require 'ardb/adapter/postgresql'
-require 'ardb/adapter/sqlite'
+require "assert"
+require "ardb"
 
-module Ardb
+require "logger"
+require "ardb/adapter_spy"
+require "ardb/adapter/mysql"
+require "ardb/adapter/postgresql"
+require "ardb/adapter/sqlite"
 
+module Ardb
   class UnitTests < Assert::Context
     desc "Ardb"
     setup do
       @module = Ardb
     end
+    teardown do
+      @module.reset_adapter
+    end
     subject{ @module }
 
-    should have_imeths :config, :configure, :adapter, :init
-    should have_imeths :escape_like_pattern
+    should have_imeths :config, :configure, :adapter, :reset_adapter
+    should have_imeths :init, :escape_like_pattern
 
     should "default the db file env var" do
-      assert_equal 'config/db', ENV['ARDB_DB_FILE']
+      assert_equal "config/db", ENV["ARDB_DB_FILE"]
     end
 
     should "know its config" do
@@ -34,17 +38,16 @@ module Ardb
       subject.configure{ |c| yielded = c }
       assert_same subject.config, yielded
     end
-
   end
 
   class InitMethodSetupTests < UnitTests
     setup do
-      @orig_env_pwd          = ENV['PWD']
-      @orig_env_ardb_db_file = ENV['ARDB_DB_FILE']
+      @orig_env_pwd          = ENV["PWD"]
+      @orig_env_ardb_db_file = ENV["ARDB_DB_FILE"]
       @orig_ar_logger        = ActiveRecord::Base.logger
 
       # stub in a temporary config, this allows us to modify it and not worry
-      # about affecting Ardb's global config which could cause issues on other
+      # about affecting Ardb"s global config which could cause issues on other
       # tests
       @ardb_config = Config.new
       Assert.stub(Ardb, :config){ @ardb_config }
@@ -54,16 +57,15 @@ module Ardb
         @ardb_adapter ||= Ardb::AdapterSpy.new(*args)
       end
 
-      ENV['ARDB_DB_FILE']   = 'test/support/require_test_db_file'
+      ENV["ARDB_DB_FILE"]   = "test/support/require_test_db_file"
       @ardb_config.adapter  = Adapter::VALID_ADAPTERS.sample
       @ardb_config.database = Factory.string
     end
     teardown do
       ActiveRecord::Base.logger = @orig_ar_logger
-      ENV['ARDB_DB_FILE']       = @orig_env_ardb_db_file
-      ENV['PWD']                = @orig_env_pwd
+      ENV["ARDB_DB_FILE"]       = @orig_env_ardb_db_file
+      ENV["PWD"]                = @orig_env_pwd
     end
-
   end
 
   class InitMethodTests < InitMethodSetupTests
@@ -71,25 +73,25 @@ module Ardb
 
     should "require the autoloaded active record files" do
       subject.init
-      assert_false require('ardb/require_autoloaded_active_record_files')
+      assert_false require("ardb/require_autoloaded_active_record_files")
     end
 
     should "require the db file" do
       subject.init
-      assert_false require(ENV['ARDB_DB_FILE'])
+      assert_false require(ENV["ARDB_DB_FILE"])
     end
 
     should "require the db file relative to the working directory if needed" do
-      ENV['PWD']          = 'test/support'
-      ENV['ARDB_DB_FILE'] = 'relative_require_test_db_file'
+      ENV["PWD"]          = "test/support"
+      ENV["ARDB_DB_FILE"] = "relative_require_test_db_file"
       subject.init
-      assert_false require(File.expand_path(ENV['ARDB_DB_FILE'], ENV['PWD']))
+      assert_false require(File.expand_path(ENV["ARDB_DB_FILE"], ENV["PWD"]))
     end
 
     should "raise an invalid db file error when it can't require it" do
-      ENV['ARDB_DB_FILE'] = Factory.file_path
+      ENV["ARDB_DB_FILE"] = Factory.file_path
       error = assert_raises(InvalidDBFileError){ subject.init }
-      exp = "can't require `#{ENV['ARDB_DB_FILE']}`, check that the " \
+      exp = "can't require `#{ENV["ARDB_DB_FILE"]}`, check that the " \
             "ARDB_DB_FILE env var is set to the file path of your db file"
       assert_equal exp, error.message
     end
@@ -110,6 +112,16 @@ module Ardb
       assert_same @ardb_adapter, subject.adapter
     end
 
+    should "set ActiveRecord::Base attributes" do
+      subject.init
+
+      assert_equal subject.config.logger, ActiveRecord::Base.logger
+      assert_equal(
+        subject.config.default_timezone,
+        ActiveRecord::Base.default_timezone,
+      )
+    end
+
     should "optionally establish an AR connection" do
       assert_nil @ardb_adapter
       subject.init
@@ -122,6 +134,17 @@ module Ardb
       assert_equal 2, @ardb_adapter.connect_db_called_count
     end
 
+    should "raise a not initialized error using its adapter before init" do
+      subject.reset_adapter
+      assert_raises(NotInitializedError){ subject.adapter }
+      assert_raises(NotInitializedError) do
+        subject.escape_like_pattern(Factory.string)
+      end
+
+      subject.init
+      assert_nothing_raised{ subject.adapter }
+      assert_nothing_raised{ subject.escape_like_pattern(Factory.string) }
+    end
   end
 
   class InitTests < InitMethodSetupTests
@@ -135,7 +158,6 @@ module Ardb
       exp = subject.adapter.escape_like_pattern(pattern)
       assert_equal exp, subject.escape_like_pattern(pattern)
     end
-
   end
 
   class ConfigTests < UnitTests
@@ -156,17 +178,17 @@ module Ardb
         :password,
         :pool,
         :checkout_timeout,
-        :min_messages
+        :min_messages,
       ]
       assert_equal exp, subject::ACTIVERECORD_ATTRS
     end
 
     should "know its default migrations path" do
-      assert_equal 'db/migrations', subject::DEFAULT_MIGRATIONS_PATH
+      assert_equal "db/migrations", subject::DEFAULT_MIGRATIONS_PATH
     end
 
     should "know its default schema path" do
-      assert_equal 'db/schema', subject::DEFAULT_SCHEMA_PATH
+      assert_equal "db/schema", subject::DEFAULT_SCHEMA_PATH
     end
 
     should "know its schema formats" do
@@ -175,7 +197,6 @@ module Ardb
       exp = [subject::RUBY_SCHEMA_FORMAT, subject::SQL_SCHEMA_FORMAT]
       assert_equal exp, subject::VALID_SCHEMA_FORMATS
     end
-
   end
 
   class ConfigInitTests < ConfigTests
@@ -185,18 +206,27 @@ module Ardb
     end
     subject{ @config }
 
-    should have_accessors *Ardb::Config::ACTIVERECORD_ATTRS
-    should have_accessors :logger, :root_path
+    should have_accessors(*Ardb::Config::ACTIVERECORD_ATTRS)
+    should have_accessors :default_timezone, :logger, :root_path
     should have_readers :schema_format
     should have_writers :migrations_path, :schema_path
     should have_imeths :activerecord_connect_hash, :validate!
 
     should "default its attributs" do
+      assert_equal :utc, subject.default_timezone
       assert_instance_of Logger, subject.logger
-      assert_equal ENV['PWD'], subject.root_path
-      exp = File.expand_path(@config_class::DEFAULT_MIGRATIONS_PATH, subject.root_path)
+      assert_equal ENV["PWD"], subject.root_path
+      exp =
+        File.expand_path(
+          @config_class::DEFAULT_MIGRATIONS_PATH,
+          subject.root_path,
+        )
       assert_equal exp, subject.migrations_path
-      exp = File.expand_path(@config_class::DEFAULT_SCHEMA_PATH, subject.root_path)
+      exp =
+        File.expand_path(
+          @config_class::DEFAULT_SCHEMA_PATH,
+          subject.root_path,
+        )
       assert_equal exp, subject.schema_path
       assert_equal @config_class::RUBY_SCHEMA_FORMAT, subject.schema_format
     end
@@ -235,11 +265,11 @@ module Ardb
     end
 
     should "know its activerecord connection hash" do
-      attrs_and_values = @config_class::ACTIVERECORD_ATTRS.map do |attr_name|
-        value = [Factory.string,  nil].sample
+      attrs_and_values = @config_class::ACTIVERECORD_ATTRS.map{ |attr_name|
+        value = [Factory.string, nil].sample
         subject.send("#{attr_name}=", value)
-        [attr_name.to_s, value] if !value.nil?
-      end.compact
+        [attr_name.to_s, value] unless value.nil?
+      }.compact
       assert_equal Hash[attrs_and_values], subject.activerecord_connect_hash
     end
 
@@ -265,11 +295,12 @@ module Ardb
 
     should "know if its equal to another config" do
       attrs = @config_class::ACTIVERECORD_ATTRS + [
+        :default_timezone,
         :logger,
         :root_path,
         :schema_format,
         :migrations_path,
-        :schema_path
+        :schema_path,
       ]
       attrs.each do |attr_name|
         subject.send("#{attr_name}=", Factory.string)
@@ -285,7 +316,6 @@ module Ardb
       other_config.send("#{attr_name}=", Factory.string)
       assert_not_equal other_config, subject
     end
-
   end
 
   class AdapterTests < UnitTests
@@ -304,21 +334,21 @@ module Ardb
 
     should "know its valid adapters" do
       exp = [
-        'sqlite',
-        'sqlite3',
-        'postgresql',
-        'postgres',
-        'mysql',
-        'mysql2'
+        "sqlite",
+        "sqlite3",
+        "postgresql",
+        "postgres",
+        "mysql",
+        "mysql2",
       ]
       assert_equal exp, subject::VALID_ADAPTERS
     end
 
     should "build an adapter specific class using the passed config" do
       adapter_key, exp_adapter_class = [
-        ['sqlite',     Ardb::Adapter::Sqlite],
-        ['postgresql', Ardb::Adapter::Postgresql],
-        ['mysql',      Ardb::Adapter::Mysql]
+        ["sqlite",     Ardb::Adapter::Sqlite],
+        ["postgresql", Ardb::Adapter::Postgresql],
+        ["mysql",      Ardb::Adapter::Mysql],
       ].sample
       @config.adapter = adapter_key
 
@@ -356,7 +386,5 @@ module Ardb
       assert_instance_of Ardb::Adapter::Mysql, adapter
       assert_equal @config, adapter.config
     end
-
   end
-
 end

data/test/unit/cli_tests.rb

@@ -1,12 +1,13 @@
-require 'assert'
-require 'ardb/cli'
+# frozen_string_literal: true
 
-require 'ardb'
-require 'ardb/adapter_spy'
-require 'ardb/migration'
+require "assert"
+require "ardb/cli"
 
-class Ardb::CLI
+require "ardb"
+require "ardb/adapter_spy"
+require "ardb/migration"
 
+class Ardb::CLI
   class UnitTests < Assert::Context
     desc "Ardb::CLI"
     setup do
@@ -26,16 +27,22 @@ class Ardb::CLI
     end
 
     should "know its commands" do
-      assert_equal 5, COMMANDS.size
+      assert_equal 9, COMMANDS.size
 
       assert_instance_of InvalidCommand, COMMANDS[Factory.string]
-      assert_instance_of ConnectCommand,           COMMANDS['connect']
-      assert_instance_of CreateCommand,            COMMANDS['create']
-      assert_instance_of DropCommand,              COMMANDS['drop']
-      assert_instance_of MigrateCommand,           COMMANDS['migrate']
-      assert_instance_of GenerateMigrationCommand, COMMANDS['generate-migration']
+      assert_instance_of ConnectCommand, COMMANDS["connect"]
+      assert_instance_of CreateCommand,  COMMANDS["create"]
+      assert_instance_of DropCommand,    COMMANDS["drop"]
+      assert_instance_of(
+        GenerateMigrationCommand,
+        COMMANDS["generate-migration"],
+      )
+      assert_instance_of MigrateCommand,         COMMANDS["migrate"]
+      assert_instance_of MigrateUpCommand,       COMMANDS["migrate-up"]
+      assert_instance_of MigrateDownCommand,     COMMANDS["migrate-down"]
+      assert_instance_of MigrateForwardCommand,  COMMANDS["migrate-forward"]
+      assert_instance_of MigrateBackwardCommand, COMMANDS["migrate-backward"]
     end
-
   end
 
   class InitTests < UnitTests
@@ -50,25 +57,25 @@ class Ardb::CLI
     subject{ @cli }
 
     should have_imeths :run
-
   end
 
   class RunSetupTests < InitTests
     setup do
       @command_name = Factory.string
-      @argv = [@command_name, Factory.string]
+      @command_class = Class.new{ include ValidCommand }
+      Assert.stub(@command_class, :command_name){ @command_name }
 
-      @command_class = Class.new
-      @command_spy  = CommandSpy.new
+      @command_spy = CommandSpy.new(@command_name)
       Assert.stub(@command_class, :new){ @command_spy }
-      COMMANDS.add(@command_class, @command_name)
+      COMMANDS.add(@command_class)
 
       @invalid_command = InvalidCommand.new(@command_name)
+
+      @argv = [@command_name, Factory.string]
     end
     teardown do
-      COMMANDS.remove(@command_name)
+      COMMANDS.remove(@command_class)
     end
-
   end
 
   class RunTests < RunSetupTests
@@ -88,7 +95,6 @@ class Ardb::CLI
     should "have successfully exited" do
       assert_equal 0, @kernel_spy.exit_status
     end
-
   end
 
   class RunWithNoArgsTests < RunSetupTests
@@ -98,14 +104,13 @@ class Ardb::CLI
     end
 
     should "output the invalid command's help" do
-      assert_equal @invalid_command.help, @stdout.read
+      assert_equal @invalid_command.command_help, @stdout.read
       assert_empty @stderr.read
     end
 
     should "have successfully exited" do
       assert_equal 0, @kernel_spy.exit_status
     end
-
   end
 
   class RunWithInvalidCommandTests < RunSetupTests
@@ -117,15 +122,14 @@ class Ardb::CLI
     end
 
     should "output that it is invalid and output the invalid command's help" do
-      exp = "'#{@name}' is not a command.\n\n"
+      exp = "\"#{@name}\" is not a command.\n\n"
       assert_equal exp, @stderr.read
-      assert_equal @invalid_command.help, @stdout.read
+      assert_equal @invalid_command.command_help, @stdout.read
     end
 
     should "have unsuccessfully exited" do
       assert_equal 1, @kernel_spy.exit_status
     end
-
   end
 
   class RunWithCommandExitErrorTests < RunSetupTests
@@ -139,30 +143,28 @@ class Ardb::CLI
       assert_equal 1, @kernel_spy.exit_status
       assert_empty @stderr.read
     end
-
   end
 
   class RunWithHelpTests < RunSetupTests
     desc "and run with the help switch"
     setup do
-      @cli.run([ '--help' ])
+      @cli.run(["--help"])
     end
 
     should "output the invalid command's help" do
-      assert_equal @invalid_command.help, @stdout.read
+      assert_equal @invalid_command.command_help, @stdout.read
       assert_empty @stderr.read
     end
 
     should "have successfully exited" do
       assert_equal 0, @kernel_spy.exit_status
     end
-
   end
 
   class RunWithVersionTests < RunSetupTests
     desc "and run with the version switch"
     setup do
-      @cli.run([ '--version' ])
+      @cli.run(["--version"])
     end
 
     should "output its version" do
@@ -173,7 +175,6 @@ class Ardb::CLI
     should "have successfully exited" do
       assert_equal 0, @kernel_spy.exit_status
     end
-
   end
 
   class RunWithErrorTests < RunSetupTests
@@ -193,7 +194,6 @@ class Ardb::CLI
     should "have unsuccessfully exited" do
       assert_equal 1, @kernel_spy.exit_status
     end
-
   end
 
   class InvalidCommandTests < UnitTests
@@ -206,7 +206,7 @@ class Ardb::CLI
     subject{ @cmd }
 
     should have_readers :name, :clirb
-    should have_imeths :new, :run, :help
+    should have_imeths :new, :run, :command_help
 
     should "know its attrs" do
       assert_equal @name, subject.name
@@ -218,12 +218,12 @@ class Ardb::CLI
     end
 
     should "parse its argv on run" do
-      assert_raises(CLIRB::HelpExit){ subject.new.run([ '--help' ]) }
-      assert_raises(CLIRB::VersionExit){ subject.new.run([ '--version' ]) }
+      assert_raises(CLIRB::HelpExit){ subject.new.run(["--help"]) }
+      assert_raises(CLIRB::VersionExit){ subject.new.run(["--version"]) }
     end
 
     should "raise a help exit if its name is empty" do
-      cmd = @command_class.new([nil, ''].sample)
+      cmd = @command_class.new([nil, ""].sample)
       argv = [Factory.string, Factory.string]
       assert_raises(CLIRB::HelpExit){ cmd.new.run(argv) }
     end
@@ -237,9 +237,8 @@ class Ardb::CLI
             "Options: #{subject.clirb}\n" \
             "Commands:\n" \
             "#{COMMANDS.to_s.split("\n").map{ |l| "  #{l}" }.join("\n")}\n"
-      assert_equal exp, subject.help
+      assert_equal exp, subject.command_help
     end
-
   end
 
   class CommandSetupTests < UnitTests
@@ -253,7 +252,6 @@ class Ardb::CLI
       Assert.stub(Ardb, :adapter){ @adapter_spy }
     end
     subject{ @cmd }
-
   end
 
   class ValidCommandTests < CommandSetupTests
@@ -263,7 +261,10 @@ class Ardb::CLI
       @cmd = @command_class.new
     end
 
-    should have_imeths :clirb, :run, :summary
+    should have_cmeths :command_name, :command_summary
+
+    should have_imeths :clirb, :run
+    should have_imeths :command_name, :command_summary, :command_help
 
     should "know its CLI.RB" do
       assert_instance_of CLIRB, subject.clirb
@@ -277,16 +278,32 @@ class Ardb::CLI
 
     should "take custom CLIRB build procs" do
       cmd = @command_class.new do
-        option 'test', 'testing', :abbrev => 't'
+        option "test", "testing", abbrev: "t"
       end
-      cmd.run(['-t'], @stdout, @stderr)
-      assert_true cmd.clirb.opts['test']
+      cmd.run(["-t"], @stdout, @stderr)
+      assert_true cmd.clirb.opts["test"]
     end
 
-    should "default its summary" do
-      assert_equal '', subject.summary
+    should "not implement its command name" do
+      assert_raises NotImplementedError do
+        subject.command_name
+      end
     end
 
+    should "default its command summary" do
+      assert_equal "", subject.command_summary
+    end
+
+    should "know its command help" do
+      Assert.stub(subject, :command_name){ "some-command" }
+      Assert.stub(subject, :command_summary){ "some-summary" }
+
+      exp = "Usage: ardb #{subject.command_name} [options]\n\n" \
+            "Options: #{subject.clirb}\n" \
+            "Description:\n" \
+            "  #{subject.command_summary}"
+      assert_equal exp, subject.command_help
+    end
   end
 
   class ConnectCommandTests < CommandSetupTests
@@ -300,17 +317,12 @@ class Ardb::CLI
       assert_kind_of ValidCommand, subject
     end
 
-    should "know its summary" do
-      exp = "Connect to the configured DB"
-      assert_equal exp, subject.summary
-    end
+    should "know its command name and summary" do
+      exp = "connect"
+      assert_equal exp, subject.command_name
 
-    should "know its help" do
-      exp = "Usage: ardb connect [options]\n\n" \
-            "Options: #{subject.clirb}\n" \
-            "Description:\n" \
-            "  #{subject.summary}"
-      assert_equal exp, subject.help
+      exp = "Connect to the configured DB"
+      assert_equal exp, subject.command_summary
     end
 
     should "init ardb and connect to the db when run" do
@@ -319,7 +331,9 @@ class Ardb::CLI
       assert_equal [false], @ardb_init_called_with
       assert_true @adapter_spy.connect_db_called?
 
-      exp = "connected to #{Ardb.config.adapter} db `#{Ardb.config.database}`\n"
+      exp =
+        "connected to #{Ardb.config.adapter} "\
+        "db #{Ardb.config.database.inspect}\n"
       assert_equal exp, @stdout.read
     end
 
@@ -338,7 +352,6 @@ class Ardb::CLI
             "with #{Ardb.config.activerecord_connect_hash.inspect}"
       assert_includes exp, err_output
     end
-
   end
 
   class CreateCommandTests < CommandSetupTests
@@ -352,17 +365,12 @@ class Ardb::CLI
       assert_kind_of ValidCommand, subject
     end
 
-    should "know its summary" do
-      exp = "Create the configured DB"
-      assert_equal exp, subject.summary
-    end
+    should "know its command name and summary" do
+      exp = "create"
+      assert_equal exp, subject.command_name
 
-    should "know its help" do
-      exp = "Usage: ardb create [options]\n\n" \
-            "Options: #{subject.clirb}\n" \
-            "Description:\n" \
-            "  #{subject.summary}"
-      assert_equal exp, subject.help
+      exp = "Create the configured DB"
+      assert_equal exp, subject.command_summary
     end
 
     should "init ardb and create the db when run" do
@@ -371,7 +379,8 @@ class Ardb::CLI
       assert_equal [false], @ardb_init_called_with
       assert_true @adapter_spy.create_db_called?
 
-      exp = "created #{Ardb.config.adapter} db `#{Ardb.config.database}`\n"
+      exp =
+        "created #{Ardb.config.adapter} db #{Ardb.config.database.inspect}\n"
       assert_equal exp, @stdout.read
     end
 
@@ -386,7 +395,6 @@ class Ardb::CLI
       exp = "error creating #{Ardb.config.database.inspect} database"
       assert_includes exp, err_output
     end
-
   end
 
   class DropCommandTests < CommandSetupTests
@@ -400,17 +408,12 @@ class Ardb::CLI
       assert_kind_of ValidCommand, subject
     end
 
-    should "know its summary" do
-      exp = "Drop the configured DB"
-      assert_equal exp, subject.summary
-    end
+    should "know its command name and summary" do
+      exp = "drop"
+      assert_equal exp, subject.command_name
 
-    should "know its help" do
-      exp = "Usage: ardb drop [options]\n\n" \
-            "Options: #{subject.clirb}\n" \
-            "Description:\n" \
-            "  #{subject.summary}"
-      assert_equal exp, subject.help
+      exp = "Drop the configured DB"
+      assert_equal exp, subject.command_summary
     end
 
     should "init ardb and drop the db when run" do
@@ -419,7 +422,8 @@ class Ardb::CLI
       assert_equal [true], @ardb_init_called_with
       assert_true @adapter_spy.drop_db_called?
 
-      exp = "dropped #{Ardb.config.adapter} db `#{Ardb.config.database}`\n"
+      exp =
+        "dropped #{Ardb.config.adapter} db #{Ardb.config.database.inspect}\n"
       assert_equal exp, @stdout.read
     end
 
@@ -434,35 +438,102 @@ class Ardb::CLI
       exp = "error dropping #{Ardb.config.database.inspect} database"
       assert_includes exp, err_output
     end
+  end
+
+  class GenerateMigrationCommandTests < CommandSetupTests
+    desc "GenerateMigrationCommand"
+    setup do
+      @identifier = Factory.migration_id
+
+      @migration_spy   = nil
+      @migration_class = Ardb::Migration
+      Assert.stub(@migration_class, :new) do |*args|
+        @migration_spy = MigrationSpy.new(*args)
+      end
+
+      @command_class = GenerateMigrationCommand
+      @cmd = @command_class.new
+    end
+
+    should "be a valid command" do
+      assert_kind_of ValidCommand, subject
+    end
+
+    should "know its command name and summary" do
+      exp = "generate-migration"
+      assert_equal exp, subject.command_name
+
+      exp = "Generate a MIGRATION-NAME migration file"
+      assert_equal exp, subject.command_summary
+    end
+
+    should "init ardb and save a migration for the identifier when run" do
+      subject.run([@identifier], @stdout, @stderr)
+
+      assert_equal [false],     @ardb_init_called_with
+      assert_equal Ardb.config, @migration_spy.ardb_config
+      assert_equal @identifier, @migration_spy.identifier
+      assert_true @migration_spy.save_called
+
+      exp = "generated #{@migration_spy.file_path}\n"
+      assert_equal exp, @stdout.read
+    end
 
+    should "re-raise a specific argument error on "\
+           "migration \"no identifer\" errors" do
+      Assert.stub(@migration_class, :new) do
+        raise Ardb::Migration::NoIdentifierError
+      end
+
+      ex =
+        assert_that{
+          cmd = @command_class.new
+          cmd.run([])
+        }.raises(ArgumentError)
+      exp = "MIGRATION-NAME must be provided"
+      assert_equal exp, ex.message
+      assert_not_empty ex.backtrace
+    end
+
+    should "output any errors and raise an exit error when run" do
+      err = StandardError.new(Factory.string)
+      err.set_backtrace(Factory.integer(3).times.map{ Factory.path })
+      Assert.stub(@migration_class, :new){ raise err }
+
+      assert_raises(CommandExitError) do
+        subject.run([@identifier], @stdout, @stderr)
+      end
+      err_output = @stderr.read
+
+      assert_includes err.to_s,                 err_output
+      assert_includes err.backtrace.join("\n"), err_output
+
+      exp = "error generating migration"
+      assert_includes exp, err_output
+    end
   end
 
   class MigrateCommandTests < CommandSetupTests
     desc "MigrateCommand"
     setup do
-      @orig_env_var_migrate_no_schema = ENV['ARDB_MIGRATE_NO_SCHEMA']
+      @orig_env_var_migrate_no_schema = ENV["ARDB_MIGRATE_NO_SCHEMA"]
       @command_class = MigrateCommand
       @cmd = @command_class.new
     end
     teardown do
-      ENV['ARDB_MIGRATE_NO_SCHEMA'] = @orig_env_var_migrate_no_schema
+      ENV["ARDB_MIGRATE_NO_SCHEMA"] = @orig_env_var_migrate_no_schema
     end
 
-    should "be a valid command" do
-      assert_kind_of ValidCommand, subject
+    should "be a migrate command" do
+      assert_kind_of MigrateCommandBehaviors, subject
     end
 
-    should "know its summary" do
-      exp = "Migrate the configured DB"
-      assert_equal exp, subject.summary
-    end
+    should "know its command name and summary" do
+      exp = "migrate"
+      assert_equal exp, subject.command_name
 
-    should "know its help" do
-      exp = "Usage: ardb migrate [options]\n\n" \
-            "Options: #{subject.clirb}\n" \
-            "Description:\n" \
-            "  #{subject.summary}"
-      assert_equal exp, subject.help
+      exp = "Migrate the configured DB"
+      assert_equal exp, subject.command_summary
     end
 
     should "init ardb, migrate the db and dump the schema when run" do
@@ -473,8 +544,9 @@ class Ardb::CLI
       assert_true @adapter_spy.dump_schema_called?
     end
 
-    should "only init ardb and migrate when run with no schema dump env var set" do
-      ENV['ARDB_MIGRATE_NO_SCHEMA'] = 'yes'
+    should "only init ardb and migrate when run with no schema dump "\
+           "env var set" do
+      ENV["ARDB_MIGRATE_NO_SCHEMA"] = "yes"
       subject.run([], @stdout, @stderr)
 
       assert_equal [true], @ardb_init_called_with
@@ -496,83 +568,86 @@ class Ardb::CLI
       exp = "error migrating #{Ardb.config.database.inspect} database"
       assert_includes exp, err_output
     end
-
   end
 
-  class GenerateMigrationCommandTests < CommandSetupTests
-    desc "GenerateMigrationCommand"
+  class MigrateUpCommandTests < CommandSetupTests
+    desc "MigrateUpCommand"
     setup do
-      @identifier = Factory.migration_id
-
-      @migration_spy   = nil
-      @migration_class = Ardb::Migration
-      Assert.stub(@migration_class, :new) do |*args|
-        @migration_spy = MigrationSpy.new(*args)
-      end
-
-      @command_class = GenerateMigrationCommand
+      @command_class = MigrateUpCommand
       @cmd = @command_class.new
     end
 
-    should "be a valid command" do
-      assert_kind_of ValidCommand, subject
+    should "be a migrate command" do
+      assert_kind_of MigrateCommandBehaviors, subject
     end
 
-    should "know its summary" do
-      exp = "Generate a migration file given a MIGRATION-NAME"
-      assert_equal exp, subject.summary
+    should "know its command name and summary" do
+      exp = "migrate-up"
+      assert_equal exp, subject.command_name
+
+      exp = "Migrate the configured DB up"
+      assert_equal exp, subject.command_summary
     end
+  end
 
-    should "know its help" do
-      exp = "Usage: ardb generate-migration [options] MIGRATION-NAME\n\n" \
-            "Options: #{subject.clirb}\n" \
-            "Description:\n" \
-            "  #{subject.summary}"
-      assert_equal exp, subject.help
+  class MigrateDownCommandTests < CommandSetupTests
+    desc "MigrateDownCommand"
+    setup do
+      @command_class = MigrateDownCommand
+      @cmd = @command_class.new
     end
 
-    should "init ardb and save a migration for the identifier when run" do
-      subject.run([@identifier], @stdout, @stderr)
+    should "be a migrate command" do
+      assert_kind_of MigrateCommandBehaviors, subject
+    end
 
-      assert_equal [false],     @ardb_init_called_with
-      assert_equal Ardb.config, @migration_spy.ardb_config
-      assert_equal @identifier, @migration_spy.identifier
-      assert_true @migration_spy.save_called
+    should "know its command name and summary" do
+      exp = "migrate-down"
+      assert_equal exp, subject.command_name
 
-      exp = "generated #{@migration_spy.file_path}\n"
-      assert_equal exp, @stdout.read
+      exp = "Migrate the configured DB down"
+      assert_equal exp, subject.command_summary
     end
+  end
 
-    should "re-raise a specific argument error on migration 'no identifer' errors" do
-      Assert.stub(@migration_class, :new){ raise Ardb::Migration::NoIdentifierError }
-      err = nil
-      begin
-        cmd = @command_class.new
-        cmd.run([])
-      rescue ArgumentError => err
-      end
+  class MigrateForwardCommandTests < CommandSetupTests
+    desc "MigrateForwardCommand"
+    setup do
+      @command_class = MigrateForwardCommand
+      @cmd = @command_class.new
+    end
 
-      assert_not_nil err
-      exp = "MIGRATION-NAME must be provided"
-      assert_equal exp, err.message
-      assert_not_empty err.backtrace
+    should "be a migrate command" do
+      assert_kind_of MigrateCommandBehaviors, subject
     end
 
-    should "output any errors and raise an exit error when run" do
-      err = StandardError.new(Factory.string)
-      err.set_backtrace(Factory.integer(3).times.map{ Factory.path })
-      Assert.stub(@migration_class, :new){ raise err }
+    should "know its command name and summary" do
+      exp = "migrate-forward"
+      assert_equal exp, subject.command_name
 
-      assert_raises(CommandExitError){ subject.run([@identifier], @stdout, @stderr) }
-      err_output = @stderr.read
+      exp = "Migrate the configured DB forward"
+      assert_equal exp, subject.command_summary
+    end
+  end
 
-      assert_includes err.to_s,                 err_output
-      assert_includes err.backtrace.join("\n"), err_output
+  class MigrateBackwardCommandTests < CommandSetupTests
+    desc "MigrateBackwardCommand"
+    setup do
+      @command_class = MigrateBackwardCommand
+      @cmd = @command_class.new
+    end
 
-      exp = "error generating migration"
-      assert_includes exp, err_output
+    should "be a migrate command" do
+      assert_kind_of MigrateCommandBehaviors, subject
     end
 
+    should "know its command name and summary" do
+      exp = "migrate-backward"
+      assert_equal exp, subject.command_name
+
+      exp = "Migrate the configured DB backward"
+      assert_equal exp, subject.command_summary
+    end
   end
 
   class CLISpy
@@ -588,9 +663,10 @@ class Ardb::CLI
   end
 
   class CommandSpy
-    attr_reader :argv, :stdout, :stderr, :run_called
+    attr_reader :command_name, :argv, :stdout, :stderr, :run_called
 
-    def initialize
+    def initialize(command_name)
+      @command_name = command_name
       @argv = nil
       @stdout, @stderr = nil, nil
       @run_called = false
@@ -602,12 +678,12 @@ class Ardb::CLI
       @run_called = true
     end
 
-    def summary
-      @summary ||= Factory.string
+    def command_summary
+      @command_summary ||= Factory.string
     end
 
-    def help
-      @help ||= Factory.text
+    def command_help
+      @command_help ||= Factory.text
     end
   end
 
@@ -653,5 +729,4 @@ class Ardb::CLI
       self
     end
   end
-
 end