ardb 0.27.3 → 0.28.0

data/lib/ardb/adapter/sqlite.rb

@@ -1,18 +1,13 @@
-require 'pathname'
 require 'fileutils'
 require 'ardb'
 require 'ardb/adapter/base'
 
-class Ardb::Adapter
+module Ardb::Adapter
 
   class Sqlite < Base
 
     def db_file_path
-      if (path = Pathname.new(self.database)).absolute?
-        path.to_s
-      else
-        Ardb.config.root_path.join(path).to_s
-      end
+      File.expand_path(self.database, self.config.root_path)
     end
 
     def validate!
@@ -24,7 +19,7 @@ class Ardb::Adapter
     def create_db
       validate!
       FileUtils.mkdir_p File.dirname(self.db_file_path)
-      ActiveRecord::Base.establish_connection(self.config_settings)
+      ActiveRecord::Base.establish_connection(self.connect_hash)
     end
 
     def drop_db

data/lib/ardb/adapter_spy.rb

@@ -1,112 +1,92 @@
-require 'much-plugin'
+require 'ardb'
+require 'ardb/adapter/base'
 
 module Ardb
 
-  module AdapterSpy
-    include MuchPlugin
-
-    def self.new(&block)
-      block ||= proc{ }
-      record_spy = Class.new{ include Ardb::AdapterSpy }
-      record_spy.class_eval(&block)
-      record_spy
+  class AdapterSpy < Ardb::Adapter::Base
+
+    attr_accessor :drop_tables_called_count
+    attr_accessor :dump_schema_called_count, :load_schema_called_count
+    attr_accessor :drop_db_called_count, :create_db_called_count
+    attr_accessor :connect_db_called_count, :migrate_db_called_count
+
+    def initialize(config = nil)
+      super(config || Ardb::Config.new)
+      @drop_tables_called_count = 0
+      @dump_schema_called_count = 0
+      @load_schema_called_count = 0
+      @drop_db_called_count     = 0
+      @create_db_called_count   = 0
+      @connect_db_called_count  = 0
+      @migrate_db_called_count  = 0
     end
 
-    plugin_included do
-      include InstanceMethods
+    def create_db_called?
+      self.create_db_called_count > 0
     end
 
-    module InstanceMethods
-
-      attr_accessor :drop_tables_called_count
-      attr_accessor :dump_schema_called_count, :load_schema_called_count
-      attr_accessor :drop_db_called_count, :create_db_called_count
-      attr_accessor :connect_db_called_count, :migrate_db_called_count
-
-      def drop_tables_called_count
-        @drop_tables_called_count ||= 0
-      end
-
-      def drop_tables_called?
-        self.drop_tables_called_count > 0
-      end
-
-      def drop_tables(*args, &block)
-        self.drop_tables_called_count += 1
-      end
-
-      def dump_schema_called_count
-        @dump_schema_called_count ||= 0
-      end
-
-      def dump_schema_called?
-        self.dump_schema_called_count > 0
-      end
-
-      def dump_schema(*args, &block)
-        self.dump_schema_called_count += 1
-      end
-
-      def load_schema_called_count
-        @load_schema_called_count ||= 0
-      end
+    def drop_db_called?
+      self.drop_db_called_count > 0
+    end
 
-      def load_schema_called?
-        self.load_schema_called_count > 0
-      end
+    def drop_tables_called?
+      self.drop_tables_called_count > 0
+    end
 
-      def load_schema(*args, &block)
-        self.load_schema_called_count += 1
-      end
+    def connect_db_called?
+      self.connect_db_called_count > 0
+    end
 
-      def drop_db_called_count
-        @drop_db_called_count ||= 0
-      end
+    def migrate_db_called?
+      self.migrate_db_called_count > 0
+    end
 
-      def drop_db_called?
-        self.drop_db_called_count > 0
-      end
+    def load_schema_called?
+      self.load_schema_called_count > 0
+    end
 
-      def drop_db(*args, &block)
-        self.drop_db_called_count += 1
-      end
+    def dump_schema_called?
+      self.dump_schema_called_count > 0
+    end
 
-      def create_db_called_count
-        @create_db_called_count ||= 0
-      end
+    # Overwritten `Adapter::Base` methods
 
-      def create_db_called?
-        self.create_db_called_count > 0
-      end
+    def foreign_key_add_sql
+      "FAKE ADD FOREIGN KEY SQL :from_table :from_column " \
+      ":to_table :to_column :name"
+    end
 
-      def create_db(*args, &block)
-        self.create_db_called_count += 1
-      end
+    def foreign_key_drop_sql
+      "FAKE DROP FOREIGN KEY SQL :from_table :from_column " \
+      ":to_table :to_column :name"
+    end
 
-      def connect_db_called_count
-        @connect_db_called_count ||= 0
-      end
+    def create_db(*args, &block)
+      self.create_db_called_count += 1
+    end
 
-      def connect_db_called?
-        self.connect_db_called_count > 0
-      end
+    def drop_db(*args, &block)
+      self.drop_db_called_count += 1
+    end
 
-      def connect_db(*args, &block)
-        self.connect_db_called_count += 1
-      end
+    def drop_tables(*args, &block)
+      self.drop_tables_called_count += 1
+    end
 
-      def migrate_db_called_count
-        @migrate_db_called_count ||= 0
-      end
+    def connect_db(*args, &block)
+      self.connect_db_called_count += 1
+    end
 
-      def migrate_db_called?
-        self.migrate_db_called_count > 0
-      end
+    def migrate_db(*args, &block)
+      self.migrate_db_called_count += 1
+    end
 
-      def migrate_db(*args, &block)
-        self.migrate_db_called_count += 1
-      end
+    def load_schema(*args, &block)
+      self.load_schema_called_count += 1
+    end
 
+    def dump_schema(*args, &block)
+      self.dump_schema_called_count += 1
     end
 
   end

data/lib/ardb/cli.rb

@@ -1,22 +1,17 @@
-require 'ardb'
-require 'ardb/clirb'
+require 'ardb/cli/clirb'
+require 'ardb/cli/commands'
+require 'ardb/version'
 
 module Ardb
 
   class CLI
 
-    class InvalidCommand;           end
-    class ConnectCommand;           end
-    class CreateCommand;            end
-    class DropCommand;              end
-    class MigrateCommand;           end
-    class GenerateMigrationCommand; end
-    COMMANDS = Hash.new{ |h, k| InvalidCommand.new(k) }.tap do |h|
-      h['connect']            = ConnectCommand
-      h['create']             = CreateCommand
-      h['drop']               = DropCommand
-      h['migrate']            = MigrateCommand
-      h['generate-migration'] = GenerateMigrationCommand
+    COMMANDS = CommandSet.new{ |unknown| InvalidCommand.new(unknown) }.tap do |c|
+      c.add(ConnectCommand,           'connect')
+      c.add(CreateCommand,            'create')
+      c.add(DropCommand,              'drop')
+      c.add(MigrateCommand,           'migrate')
+      c.add(GenerateMigrationCommand, 'generate-migration')
     end
 
     def self.run(args)
@@ -32,11 +27,10 @@ module Ardb
     def run(args)
       begin
         $LOAD_PATH.push(Dir.pwd) unless $LOAD_PATH.include?(Dir.pwd)
-        Ardb.init(false) # don't establish a connection
 
         cmd_name = args.shift
-        cmd = COMMANDS[cmd_name].new(args)
-        cmd.run
+        cmd = COMMANDS[cmd_name]
+        cmd.run(args)
       rescue CLIRB::HelpExit
         @stdout.puts cmd.help
       rescue CLIRB::VersionExit
@@ -65,208 +59,6 @@ module Ardb
       end
     end
 
-    InvalidCommandError = Class.new(ArgumentError)
-    CommandExitError    = Class.new(RuntimeError)
-
-    class InvalidCommand
-
-      attr_reader :name, :argv, :clirb
-
-      def initialize(name)
-        @name  = name
-        @argv  = []
-        @clirb = Ardb::CLIRB.new
-      end
-
-      def new(args)
-        @argv = [@name, args].flatten.compact
-        self
-      end
-
-      def run
-        @clirb.parse!(@argv)
-        raise CLIRB::HelpExit if @clirb.args.empty? || @name.to_s.empty?
-        raise InvalidCommandError, "'#{self.name}' is not a command."
-      end
-
-      def help
-        "Usage: ardb [COMMAND] [options]\n\n" \
-        "Commands: #{COMMANDS.keys.sort.join(', ')}\n" \
-        "Options: #{@clirb}"
-      end
-
-    end
-
-    class ConnectCommand
-
-      attr_reader :clirb
-
-      def initialize(argv, stdout = nil, stderr = nil)
-        @argv   = argv
-        @stdout = stdout || $stdout
-        @stderr = stderr || $stderr
-
-        @clirb   = Ardb::CLIRB.new
-        @adapter = Ardb::Adapter.send(Ardb.config.db.adapter)
-      end
-
-      def run
-        @clirb.parse!(@argv)
-        begin
-          Ardb.init
-          @adapter.connect_db
-          @stdout.puts "connected to #{Ardb.config.db.adapter} db `#{Ardb.config.db.database}`"
-        rescue StandardError => e
-          @stderr.puts e
-          @stderr.puts e.backtrace.join("\n")
-          @stderr.puts "error connecting to #{Ardb.config.db.database.inspect} database " \
-                       "with #{Ardb.config.db_settings.inspect}"
-          raise CommandExitError
-        end
-      end
-
-      def help
-        "Usage: ardb connect [options]\n\n" \
-        "Options: #{@clirb}"
-      end
-
-    end
-
-    class CreateCommand
-
-      attr_reader :clirb
-
-      def initialize(argv, stdout = nil, stderr = nil)
-        @argv   = argv
-        @stdout = stdout || $stdout
-        @stderr = stderr || $stderr
-
-        @clirb   = Ardb::CLIRB.new
-        @adapter = Ardb::Adapter.send(Ardb.config.db.adapter)
-      end
-
-      def run
-        @clirb.parse!(@argv)
-        begin
-          @adapter.create_db
-          @stdout.puts "created #{Ardb.config.db.adapter} db `#{Ardb.config.db.database}`"
-        rescue StandardError => e
-          @stderr.puts e
-          @stderr.puts "error creating #{Ardb.config.db.database.inspect} database"
-          raise CommandExitError
-        end
-      end
-
-      def help
-        "Usage: ardb create [options]\n\n" \
-        "Options: #{@clirb}"
-      end
-
-    end
-
-    class DropCommand
-
-      attr_reader :clirb
-
-      def initialize(argv, stdout = nil, stderr = nil)
-        @argv   = argv
-        @stdout = stdout || $stdout
-        @stderr = stderr || $stderr
-
-        @clirb   = Ardb::CLIRB.new
-        @adapter = Ardb::Adapter.send(Ardb.config.db.adapter)
-      end
-
-      def run
-        @clirb.parse!(@argv)
-        begin
-          @adapter.drop_db
-          @stdout.puts "dropped #{Ardb.config.db.adapter} db `#{Ardb.config.db.database}`"
-        rescue StandardError => e
-          @stderr.puts e
-          @stderr.puts "error dropping #{Ardb.config.db.database.inspect} database"
-          raise CommandExitError
-        end
-      end
-
-      def help
-        "Usage: ardb drop [options]\n\n" \
-        "Options: #{@clirb}"
-      end
-
-    end
-
-    class MigrateCommand
-
-      attr_reader :clirb
-
-      def initialize(argv, stdout = nil, stderr = nil)
-        @argv   = argv
-        @stdout = stdout || $stdout
-        @stderr = stderr || $stderr
-
-        @clirb   = Ardb::CLIRB.new
-        @adapter = Ardb::Adapter.send(Ardb.config.db.adapter)
-      end
-
-      def run
-        @clirb.parse!(@argv)
-        begin
-          Ardb.init
-          @adapter.migrate_db
-          @adapter.dump_schema unless ENV['ARDB_MIGRATE_NO_SCHEMA']
-        rescue StandardError => e
-          @stderr.puts e
-          @stderr.puts e.backtrace.join("\n")
-          @stderr.puts "error migrating #{Ardb.config.db.database.inspect} database"
-          raise CommandExitError
-        end
-      end
-
-      def help
-        "Usage: ardb migrate [options]\n\n" \
-        "Options: #{@clirb}"
-      end
-
-    end
-
-    class GenerateMigrationCommand
-
-      attr_reader :clirb
-
-      def initialize(argv, stdout = nil, stderr = nil)
-        @argv   = argv
-        @stdout = stdout || $stdout
-        @stderr = stderr || $stderr
-
-        @clirb = Ardb::CLIRB.new
-      end
-
-      def run
-        @clirb.parse!(@argv)
-        begin
-          require "ardb/migration"
-          path = Ardb::Migration.new(@clirb.args.first).save!.file_path
-          @stdout.puts "generated #{path}"
-        rescue Ardb::Migration::NoIdentifierError => exception
-          error = ArgumentError.new("MIGRATION-NAME must be provided")
-          error.set_backtrace(exception.backtrace)
-          raise error
-        rescue StandardError => e
-          @stderr.puts e
-          @stderr.puts e.backtrace.join("\n")
-          @stderr.puts "error generating migration"
-          raise CommandExitError
-        end
-      end
-
-      def help
-        "Usage: ardb generate-migration [options] MIGRATION-NAME\n\n" \
-        "Options: #{@clirb}"
-      end
-
-    end
-
   end
 
 end