ardb 0.20.0 → 0.21.0

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rake'
-gem 'pry'
+gem 'pry', "~> 0.9.0"
 
 platform :rbx do
   gem 'rubysl'

data/ardb.gemspec

@@ -18,10 +18,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.0"])
+  gem.add_development_dependency("assert",       ["~> 2.10"])
+  gem.add_development_dependency("assert-mocha", ["~> 1.1"])
 
   gem.add_dependency('activerecord',  ["~> 3.2"])
   gem.add_dependency('activesupport', ["~> 3.2"])
   gem.add_dependency('ns-options',    ["~> 1.1"])
+  gem.add_dependency('scmd',          ["~> 2.2"])
 
 end

data/lib/ardb.rb

@@ -51,7 +51,8 @@ module Ardb
     option :root_path,       Pathname, :required => true
     option :logger,                    :required => true
     option :migrations_path, RootPath, :default => proc{ "db/migrations" }
-    option :schema_path,     RootPath, :default => proc{ "db/schema.rb" }
+    option :schema_path,     RootPath, :default => proc{ "db/schema" }
+    option :schema_format,   Symbol,   :default => :ruby
 
     def self.db_settings
       db.to_hash.inject({}) do |settings, (k, v)|

data/lib/ardb/adapter/base.rb

@@ -3,10 +3,15 @@ class Ardb::Adapter; end
 class Ardb::Adapter::Base
 
   attr_reader :config_settings, :database
+  attr_reader :schema_format, :ruby_schema_path, :sql_schema_path
 
   def initialize
     @config_settings = Ardb.config.db_settings
     @database = Ardb.config.db.database
+    @schema_format = Ardb.config.schema_format
+    schema_path = Ardb.config.schema_path
+    @ruby_schema_path = "#{schema_path}.rb"
+    @sql_schema_path  = "#{schema_path}.sql"
   end
 
   def foreign_key_add_sql(*args);  raise NotImplementedError; end
@@ -21,10 +26,40 @@ class Ardb::Adapter::Base
     # silence STDOUT
     current_stdout = $stdout.dup
     $stdout = File.new('/dev/null', 'w')
-    load Ardb.config.schema_path
+    load_ruby_schema if @schema_format == :ruby
+    load_sql_schema  if @schema_format == :sql
     $stdout = current_stdout
   end
 
+  def load_ruby_schema
+    load @ruby_schema_path
+  end
+
+  def load_sql_schema
+    raise NotImplementedError
+  end
+
+  def dump_schema
+    # silence STDOUT
+    current_stdout = $stdout.dup
+    $stdout = File.new('/dev/null', 'w')
+    dump_ruby_schema
+    dump_sql_schema if @schema_format == :sql
+    $stdout = current_stdout
+  end
+
+  def dump_ruby_schema
+    require 'active_record/schema_dumper'
+    FileUtils.mkdir_p File.dirname(@ruby_schema_path)
+    File.open(@ruby_schema_path, 'w:utf-8') do |file|
+      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+    end
+  end
+
+  def dump_sql_schema
+    raise NotImplementedError
+  end
+
   def ==(other_adapter)
     self.class == other_adapter.class
   end

data/lib/ardb/adapter/postgresql.rb

@@ -56,6 +56,31 @@ class Ardb::Adapter
       " DROP CONSTRAINT :name"
     end
 
+    def load_sql_schema
+      require 'scmd'
+      cmd_str = "psql -f \"#{self.sql_schema_path}\" #{self.database}"
+      cmd = Scmd.new(cmd_str, env_var_hash).tap(&:run)
+      raise 'Error loading database' unless cmd.success?
+    end
+
+    def dump_sql_schema
+      require 'scmd'
+      cmd_str = "pg_dump -i -s -x -O -f \"#{self.sql_schema_path}\" #{self.database}"
+      cmd = Scmd.new(cmd_str, env_var_hash).tap(&:run)
+      raise 'Error dumping database' unless cmd.success?
+    end
+
+    private
+
+    def env_var_hash
+      @env_var_hash ||= {
+        'PGHOST'     => self.config_settings['host'],
+        'PGPORT'     => self.config_settings['port'],
+        'PGUSER'     => self.config_settings['username'],
+        'PGPASSWORD' => self.config_settings['password']
+      }
+    end
+
   end
 
 end

data/lib/ardb/runner/migrate_command.rb

@@ -5,11 +5,11 @@ require 'ardb/migration_helpers'
 
 class Ardb::Runner::MigrateCommand
 
-  attr_reader :migrations_path, :schema_file_path, :version, :verbose
+  attr_reader :migrations_path, :version, :verbose
 
   def initialize
+    @adapter = Ardb::Adapter.send(Ardb.config.db.adapter)
     @migrations_path = Ardb.config.migrations_path
-    @schema_file_path = Ardb.config.schema_path
     @version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
     @verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
   end
@@ -29,7 +29,9 @@ class Ardb::Runner::MigrateCommand
 
   def migrate_the_db
     if defined?(ActiveRecord::Migration::CommandRecorder)
-      ActiveRecord::Migration::CommandRecorder.send(:include, Ardb::MigrationHelpers::RecorderMixin)
+      ActiveRecord::Migration::CommandRecorder.class_eval do
+        include Ardb::MigrationHelpers::RecorderMixin
+      end
     end
 
     ActiveRecord::Migrator.migrations_path = @migrations_path
@@ -38,11 +40,7 @@ class Ardb::Runner::MigrateCommand
       ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope)
     end
 
-    require 'active_record/schema_dumper'
-    FileUtils.mkdir_p File.dirname(@schema_file_path)
-    File.open(@schema_file_path, "w:utf-8") do |file|
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-    end
+    @adapter.dump_schema
   end
 
 end

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.20.0"
+  VERSION = "0.21.0"
 end

data/test/helper.rb

@@ -6,6 +6,7 @@ $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
 # require pry for debugging (`binding.pry`)
 require 'pry'
+require 'assert-mocha' if defined?(Assert)
 
 ENV['ARDB_DB_FILE'] = 'tmp/testdb/config/db'
 require 'ardb'

data/test/unit/adapter/base_tests.rb

@@ -3,67 +3,183 @@ require 'ardb/adapter/base'
 
 class Ardb::Adapter::Base
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb::Adapter::Base"
     setup do
       @adapter = Ardb::Adapter::Base.new
     end
-    subject { @adapter }
+    subject{ @adapter }
 
-    should have_reader :config_settings, :database
+    should have_readers :config_settings, :database
+    should have_readers :ruby_schema_path, :sql_schema_path
     should have_imeths :foreign_key_add_sql, :foreign_key_drop_sql
-    should have_imeths :create_db, :drop_db, :load_schema
+    should have_imeths :create_db, :drop_db
+    should have_imeths :load_schema, :load_ruby_schema, :load_sql_schema
+    should have_imeths :dump_schema, :dump_ruby_schema, :dump_sql_schema
 
-    should "use the config's db settings " do
+    should "know its config settings " do
       assert_equal Ardb.config.db_settings, subject.config_settings
     end
 
-    should "use the config's database" do
+    should "know its database" do
       assert_equal Ardb.config.db.database, subject.database
     end
 
+    should "know its schema paths" do
+      assert_equal "#{Ardb.config.schema_path}.rb",  subject.ruby_schema_path
+      assert_equal "#{Ardb.config.schema_path}.sql", subject.sql_schema_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 }
+      assert_raises(NotImplementedError){ subject.foreign_key_add_sql }
+      assert_raises(NotImplementedError){ subject.foreign_key_drop_sql }
     end
 
     should "not implement the create and drop db methods" do
-      assert_raises(NotImplementedError) { subject.create_db }
-      assert_raises(NotImplementedError) { subject.drop_db }
+      assert_raises(NotImplementedError){ subject.create_db }
+      assert_raises(NotImplementedError){ subject.drop_db }
     end
 
     should "not implement the drop table methods" do
-      assert_raises(NotImplementedError) { subject.drop_tables }
+      assert_raises(NotImplementedError){ subject.drop_tables }
+    end
+
+    should "not implement the load and dump sql schema methods" do
+      assert_raises(NotImplementedError){ subject.load_sql_schema }
+      assert_raises(NotImplementedError){ subject.dump_sql_schema }
     end
 
   end
 
-  class LoadSchemaTests < BaseTests
-    desc "given a schema"
+  class LoadAndDumpSchemaTests < UnitTests
     setup do
-      ::FAKE_SCHEMA_LOAD = OpenStruct.new(:count => 0)
-      @orig_schema_path = Ardb.config.schema_path
-      Ardb.config.schema_path = 'fake_schema.rb'
+      @orig_stdout = $stdout.dup
+      @captured_stdout = ""
+      $stdout = StringIO.new(@captured_stdout)
+
+      @orig_schema_format = Ardb.config.schema_format
+
+      @adapter = SchemaSpyAdapter.new
     end
     teardown do
-      Ardb.config.schema_path = @orig_schema_path
+      Ardb.config.schema_format = @orig_schema_format
+      $stdout = @orig_stdout
+    end
+
+    should "load a ruby schema using `load_schema` when the format is ruby" do
+      Ardb.config.schema_format = :ruby
+      adapter = SchemaSpyAdapter.new
+
+      assert_false adapter.load_ruby_schema_called
+      assert_false adapter.load_sql_schema_called
+      adapter.load_schema
+      assert_true adapter.load_ruby_schema_called
+      assert_false adapter.load_sql_schema_called
     end
 
-    should "load the schema suppressing $stdout" do
-      orig_stdout = $stdout.dup
-      captured_stdout = ""
-      $stdout = StringIO.new(captured_stdout)
+    should "load a SQL schema using `load_schema` when the format is sql" do
+      Ardb.config.schema_format = :sql
+      adapter = SchemaSpyAdapter.new
+
+      assert_false adapter.load_ruby_schema_called
+      assert_false adapter.load_sql_schema_called
+      adapter.load_schema
+      assert_false adapter.load_ruby_schema_called
+      assert_true adapter.load_sql_schema_called
+    end
 
-      assert_equal 0, FAKE_SCHEMA_LOAD.count
+    should "suppress stdout when loading the schema" do
       subject.load_schema
-      assert_equal 1, FAKE_SCHEMA_LOAD.count
+      assert_empty @captured_stdout
+    end
+
+    should "always dump a ruby schema using `dump_schema`" do
+      Ardb.config.schema_format = :ruby
+      adapter = SchemaSpyAdapter.new
+
+      assert_false adapter.dump_ruby_schema_called
+      assert_false adapter.dump_sql_schema_called
+      adapter.dump_schema
+      assert_true adapter.dump_ruby_schema_called
+      assert_false adapter.dump_sql_schema_called
+
+      Ardb.config.schema_format = :sql
+      adapter = SchemaSpyAdapter.new
+
+      assert_false adapter.dump_ruby_schema_called
+      adapter.dump_schema
+      assert_true adapter.dump_ruby_schema_called
+    end
+
+    should "dump a SQL schema using `dump_schema` when the format is sql" do
+      Ardb.config.schema_format = :sql
+      adapter = SchemaSpyAdapter.new
+
+      assert_false adapter.dump_ruby_schema_called
+      adapter.dump_schema
+      assert_true adapter.dump_ruby_schema_called
+    end
+
+    should "suppress stdout when dumping the schema" do
       subject.load_schema
-      assert_equal 2, FAKE_SCHEMA_LOAD.count
-      assert_empty captured_stdout
+      assert_empty @captured_stdout
+    end
 
-      $stdout = orig_stdout
+  end
+
+  class LoadRubySchemaTests < UnitTests
+    setup do
+      @orig_schema_path = Ardb.config.schema_path
+      Ardb.config.schema_path = 'fake_schema'
+
+      @adapter = Ardb::Adapter::Base.new
+    end
+    teardown do
+      Ardb.config.schema_path = @orig_schema_path
     end
 
+    should "load a ruby schema file using `load_ruby_schema`" do
+      assert_nil defined?(FAKE_SCHEMA)
+      subject.load_ruby_schema
+      assert_not_nil defined?(FAKE_SCHEMA)
+      assert_equal 1, FAKE_SCHEMA.load_count
+      subject.load_ruby_schema
+      assert_equal 2, FAKE_SCHEMA.load_count
+    end
+
+  end
+
+  class SchemaSpyAdapter < Ardb::Adapter::Base
+    attr_reader :load_ruby_schema_called, :dump_ruby_schema_called
+    attr_reader :load_sql_schema_called, :dump_sql_schema_called
+
+    def initialize(*args)
+      super
+      @load_ruby_schema_called = false
+      @dump_ruby_schema_called = false
+      @load_sql_schema_called  = false
+      @dump_sql_schema_called  = false
+    end
+
+    def load_ruby_schema
+      puts "[load_ruby_schema] This should be suppressed!"
+      @load_ruby_schema_called = true
+    end
+
+    def dump_ruby_schema
+      puts "[dump_ruby_schema] This should be suppressed!"
+      @dump_ruby_schema_called = true
+    end
+
+    def load_sql_schema
+      puts "[load_sql_schema] This should be suppressed!"
+      @load_sql_schema_called = true
+    end
+
+    def dump_sql_schema
+      puts "[dump_sql_schema] This should be suppressed!"
+      @dump_sql_schema_called = true
+    end
   end
 
 end

data/test/unit/adapter/mysql_tests.rb

@@ -3,7 +3,7 @@ require 'ardb/adapter/mysql'
 
 class Ardb::Adapter::Mysql
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb::Adapter::Mysql"
     setup do
       @adapter = Ardb::Adapter::Mysql.new
@@ -26,13 +26,13 @@ class Ardb::Adapter::Mysql
 
     # not currently implemented, see: https://github.com/redding/ardb/issues/13
     should "not implement the create and drop db methods" do
-      assert_raises(NotImplementedError) { subject.create_db }
-      assert_raises(NotImplementedError) { subject.drop_db }
+      assert_raises(NotImplementedError){ subject.create_db }
+      assert_raises(NotImplementedError){ subject.drop_db }
     end
 
     # not currently implemented, see: https://github.com/redding/ardb/issues/28
     should "not implement the drop tables method" do
-      assert_raises(NotImplementedError) { subject.drop_tables }
+      assert_raises(NotImplementedError){ subject.drop_tables }
     end
 
   end

data/test/unit/adapter/postgresql_tests.rb

@@ -1,18 +1,20 @@
 require 'assert'
 require 'ardb/adapter/postgresql'
 
+require 'scmd'
+
 class Ardb::Adapter::Postgresql
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb::Adapter::Postgresql"
     setup do
       @adapter = Ardb::Adapter::Postgresql.new
     end
-    subject { @adapter }
+    subject{ @adapter }
 
-    should have_instance_method :public_schema_settings
+    should have_imeths :public_schema_settings
 
-    should "know it's public schema connection settings" do
+    should "know its public schema connection settings" do
       exp_settings = subject.config_settings.merge({
         'database' => 'postgres',
         'schema_search_path' => 'public'
@@ -36,4 +38,71 @@ class Ardb::Adapter::Postgresql
 
   end
 
+  class SQLSchemaTests < UnitTests
+    setup do
+      @env = {
+        'PGHOST'     => @adapter.config_settings['host'],
+        'PGPORT'     => @adapter.config_settings['port'],
+        'PGUSER'     => @adapter.config_settings['username'],
+        'PGPASSWORD' => @adapter.config_settings['password']
+      }
+    end
+
+  end
+
+  class LoadSQLSchemaTests < SQLSchemaTests
+    setup do
+      cmd_str = "psql -f \"#{@adapter.sql_schema_path}\" #{@adapter.database}"
+      @cmd_spy = CmdSpy.new
+      Scmd.stubs(:new).tap do |s|
+        s.with(cmd_str, @env)
+        s.returns(@cmd_spy)
+      end
+    end
+    teardown do
+      Scmd.unstub(:new)
+    end
+
+    should "run a command for loading a SQL schema using `load_sql_schema`" do
+      subject.load_sql_schema
+      assert_true @cmd_spy.run_called
+    end
+
+  end
+
+  class DumpSQLSchemaTests < SQLSchemaTests
+    setup do
+      cmd_str = "pg_dump -i -s -x -O -f " \
+                "\"#{@adapter.sql_schema_path}\" #{@adapter.database}"
+      @cmd_spy = CmdSpy.new
+      Scmd.stubs(:new).tap do |s|
+        s.with(cmd_str, @env)
+        s.returns(@cmd_spy)
+      end
+    end
+    teardown do
+      Scmd.unstub(:new)
+    end
+
+    should "run a command for dumping a SQL schema using `dump_sql_schema`" do
+      subject.dump_sql_schema
+      assert_true @cmd_spy.run_called
+    end
+
+  end
+
+  class CmdSpy
+    attr_reader :run_called
+
+    def initialize
+      @run_called = false
+    end
+
+    def run
+      @run_called = true
+    end
+
+    def success?; true; end
+  end
+
 end

data/test/unit/adapter/sqlite_tests.rb

@@ -3,7 +3,7 @@ require 'ardb/adapter/sqlite'
 
 class Ardb::Adapter::Sqlite
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb::Adapter::Sqlite"
     setup do
       @adapter = Ardb::Adapter::Sqlite.new
@@ -19,19 +19,19 @@ class Ardb::Adapter::Sqlite
       FileUtils.rm(subject.db_file_path)
     end
 
-    should "know its db_file_path" do
+    should "know its db file path" do
       exp_path = Ardb.config.root_path.join(Ardb.config.db.database).to_s
       assert_equal exp_path, subject.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 }
+      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 }
+      assert_raises(NotImplementedError){ subject.drop_tables }
     end
 
   end

data/test/unit/adapter_spy_tests.rb

@@ -7,7 +7,7 @@ module Ardb::AdapterSpy
     include Ardb::AdapterSpy
   end
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb::AdapterSpy"
     setup do
       @adapter = MyAdapter.new
@@ -19,7 +19,7 @@ module Ardb::AdapterSpy
     should have_imeths :drop_tables, :load_schema, :drop_db, :create_db
 
     should "included the record spy instance methods" do
-      assert_includes Ardb::AdapterSpy::InstanceMethods, subject.class.included_modules
+      assert_includes Ardb::AdapterSpy::InstanceMethods, subject.class
     end
 
     should "default all call counts to zero" do
@@ -45,7 +45,7 @@ module Ardb::AdapterSpy
 
   end
 
-  class NewMethTests < BaseTests
+  class NewMethTests < UnitTests
     desc "`new` method"
     setup do
       @adapter_spy_class = Ardb::AdapterSpy.new do
@@ -56,7 +56,7 @@ module Ardb::AdapterSpy
     subject{ @adapter }
 
     should "build a new spy class and use any custom definition" do
-      assert_includes Ardb::AdapterSpy, subject.class.included_modules
+      assert_includes Ardb::AdapterSpy, subject.class
       assert subject.respond_to? :name
       assert subject.respond_to? :name=
     end

data/test/unit/ardb_tests.rb

@@ -3,7 +3,7 @@ require 'ardb'
 
 module Ardb
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb"
     subject{ Ardb }
     setup do

data/test/unit/config_tests.rb

@@ -1,11 +1,13 @@
 require 'assert'
-require 'ns-options/assert_macros'
 require 'ardb'
 
+require 'ns-options/assert_macros'
+
 class Ardb::Config
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     include NsOptions::AssertMacros
+
     desc "Ardb::Config"
     subject{ Ardb::Config }
 
@@ -21,8 +23,8 @@ class Ardb::Config
       assert_equal exp_path, subject.migrations_path
     end
 
-    should "should use `db/schema.rb` as the default schema path" do
-      exp_path = Pathname.new(TESTDB_PATH).join("db/schema.rb").to_s
+    should "should use `db/schema` as the default schema path" do
+      exp_path = Pathname.new(TESTDB_PATH).join("db/schema").to_s
       assert_equal exp_path, subject.schema_path
     end
 
@@ -37,7 +39,7 @@ class Ardb::Config
 
   end
 
-  class DbTests < BaseTests
+  class DbTests < UnitTests
     desc "db namespace"
     subject{ Ardb::Config.db }
 

data/test/unit/migration_helpers_tests.rb

@@ -3,15 +3,15 @@ require 'ardb/migration_helpers'
 
 module Ardb::MigrationHelpers
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb migration helpers"
     subject{ Ardb::MigrationHelpers }
 
-    should have_instance_methods :foreign_key, :drop_foreign_key, :remove_column_with_fk
+    should have_imeths :foreign_key, :drop_foreign_key, :remove_column_with_fk
 
   end
 
-  class ForeignKeyTests < BaseTests
+  class ForeignKeyTests < UnitTests
     desc "ForeignKey handler"
     setup do
       @fk = ForeignKey.new('fromtbl', 'fromcol', 'totbl')
@@ -20,7 +20,7 @@ module Ardb::MigrationHelpers
 
     should have_readers :from_table, :from_column, :to_table, :to_column
     should have_readers :name, :adapter
-    should have_instance_methods :add_sql, :drop_sql
+    should have_imeths :add_sql, :drop_sql
 
     should "know its from table/column and to table" do
       assert_equal 'fromtbl', subject.from_table

data/test/unit/runner/connect_command_tests.rb

@@ -3,14 +3,14 @@ require 'ardb/runner/connect_command'
 
 class Ardb::Runner::CreateCommand
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb::Runner::ConnectCommand"
     setup do
       @cmd = Ardb::Runner::ConnectCommand.new
     end
     subject{ @cmd }
 
-    should have_instance_methods :run
+    should have_imeths :run
 
   end
 

data/test/unit/runner/create_command_tests.rb

@@ -3,14 +3,14 @@ require 'ardb/runner/create_command'
 
 class Ardb::Runner::CreateCommand
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb::Runner::CreateCommand"
     setup do
       @cmd = Ardb::Runner::CreateCommand.new
     end
     subject{ @cmd }
 
-    should have_instance_methods :run
+    should have_imeths :run
 
   end
 

data/test/unit/runner/drop_command_tests.rb

@@ -3,14 +3,14 @@ require 'ardb/runner/drop_command'
 
 class Ardb::Runner::DropCommand
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb::Runner::DropCommand"
     setup do
       @cmd = Ardb::Runner::DropCommand.new
     end
     subject{ @cmd }
 
-    should have_instance_methods :run
+    should have_imeths :run
 
   end
 

data/test/unit/runner/generate_command_tests.rb

@@ -3,18 +3,18 @@ require 'ardb/runner/generate_command'
 
 class Ardb::Runner::GenerateCommand
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb::Runner::GenerateCommand"
     setup do
       @cmd = Ardb::Runner::GenerateCommand.new(['something'])
     end
     subject{ @cmd }
 
-    should have_instance_methods :run, :migration_cmd
+    should have_imeths :run, :migration_cmd
 
   end
 
-  class MigrationTests < BaseTests
+  class MigrationTests < UnitTests
     desc "Ardb::Runner::GenerateCommand::MigrationCommand"
     setup do
       @cmd = Ardb::Runner::GenerateCommand::MigrationCommand.new('a_migration')

data/test/unit/runner/migrate_command_tests.rb

@@ -3,18 +3,17 @@ require 'ardb/runner/migrate_command'
 
 class Ardb::Runner::MigrateCommand
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb::Runner::MigrateCommand"
     setup do
       @cmd = Ardb::Runner::MigrateCommand.new
     end
     subject{ @cmd }
 
-    should have_readers :migrations_path, :schema_file_path, :version, :verbose
+    should have_readers :migrations_path, :version, :verbose
 
-    should "use the config's migrations and schema file paths" do
+    should "use the config's migrations path" do
       assert_equal Ardb.config.migrations_path, subject.migrations_path
-      assert_equal Ardb.config.schema_path, subject.schema_file_path
     end
 
     should "not target a specific version by default" do
@@ -27,7 +26,7 @@ class Ardb::Runner::MigrateCommand
 
   end
 
-  class VersionTests < BaseTests
+  class VersionTests < UnitTests
     desc "with a version ENV setting"
     setup do
       ENV["VERSION"] = '12345'
@@ -43,7 +42,7 @@ class Ardb::Runner::MigrateCommand
 
   end
 
-  class VerboseTests < BaseTests
+  class VerboseTests < UnitTests
     desc "with a verbose ENV setting"
     setup do
       ENV["VERBOSE"] = 'no'

data/test/unit/runner_tests.rb

@@ -1,11 +1,12 @@
 require 'assert'
-require 'pathname'
-require 'active_record'
 require 'ardb/runner'
 
+require 'active_record'
+require 'pathname'
+
 class Ardb::Runner
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb::Runner"
     setup do
       @runner = Ardb::Runner.new(['null', 1, 2], 'some' => 'opts')
@@ -22,7 +23,7 @@ class Ardb::Runner
 
   end
 
-  class RunTests < BaseTests
+  class RunTests < UnitTests
     desc "when running a command"
     setup do
       Ardb::Adapter.reset

data/test/unit/test_helpers_tests.rb

@@ -3,7 +3,7 @@ require 'ardb/test_helpers'
 
 module Ardb::TestHelpers
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Ardb test helpers"
     subject{ Ardb::TestHelpers }
 
@@ -11,7 +11,7 @@ module Ardb::TestHelpers
 
   end
 
-  class UsageTests < BaseTests
+  class UsageTests < UnitTests
     setup do
       @adapter_spy_class = Ardb::AdapterSpy.new
       @orig_ardb_adapter = Ardb.adapter

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ardb
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 75
   prerelease: 
   segments: 
   - 0
-  - 20
+  - 21
   - 0
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,25 +16,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-05-07 00:00:00 Z
+date: 2014-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
         - 2
-        - 0
-        version: "2.0"
+        - 10
+        version: "2.10"
+  version_requirements: *id001
   type: :development
-  requirement: *id001
-  prerelease: false
   name: assert
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  version_requirements: *id002
+  type: :development
+  name: assert-mocha
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,12 +59,12 @@ dependencies:
         - 3
         - 2
         version: "3.2"
+  version_requirements: *id003
   type: :runtime
-  requirement: *id002
-  prerelease: false
   name: activerecord
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,12 +74,12 @@ dependencies:
         - 3
         - 2
         version: "3.2"
+  version_requirements: *id004
   type: :runtime
-  requirement: *id003
-  prerelease: false
   name: activesupport
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,10 +89,25 @@ dependencies:
         - 1
         - 1
         version: "1.1"
+  version_requirements: *id005
   type: :runtime
-  requirement: *id004
-  prerelease: false
   name: ns-options
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        version: "2.2"
+  version_requirements: *id006
+  type: :runtime
+  name: scmd
+  prerelease: false
 description: Activerecord database tools.
 email: 
 - kelly@kellyredding.com
@@ -176,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: Activerecord database tools.