ardb 0.27.3 → 0.28.0

data/lib/ardb/{clirb.rb → cli/clirb.rb}

@@ -1,4 +1,5 @@
-module Ardb
+module Ardb; end
+class Ardb::CLI
 
   class CLIRB  # Version 1.0.0, https://github.com/redding/cli.rb
     Error    = Class.new(RuntimeError);

data/lib/ardb/cli/commands.rb

@@ -0,0 +1,275 @@
+require 'ardb'
+require 'ardb/cli/clirb'
+require 'much-plugin'
+
+module Ardb; end
+class Ardb::CLI
+
+  InvalidCommandError = Class.new(ArgumentError)
+  CommandExitError    = Class.new(RuntimeError)
+
+  class InvalidCommand
+
+    attr_reader :name, :clirb
+
+    def initialize(name)
+      @name  = name
+      @clirb = CLIRB.new
+    end
+
+    def new; self; end
+
+    def run(argv)
+      @clirb.parse!([@name, argv].flatten.compact)
+      raise CLIRB::HelpExit if @name.to_s.empty?
+      raise InvalidCommandError, "'#{self.name}' is not a command."
+    end
+
+    def help
+      "Usage: ardb [COMMAND] [options]\n\n" \
+      "Options: #{@clirb}\n" \
+      "Commands:\n" \
+      "#{COMMANDS.to_s.split("\n").map{ |l| "  #{l}" }.join("\n")}\n"
+    end
+
+  end
+
+  module ValidCommand
+    include MuchPlugin
+
+    plugin_included do
+      include InstanceMethods
+    end
+
+    module InstanceMethods
+
+      def initialize(&clirb_build)
+        @clirb = CLIRB.new(&clirb_build)
+      end
+
+      def clirb; @clirb; end
+
+      def run(argv, stdout = nil, stderr = nil)
+        @clirb.parse!(argv)
+        @stdout = stdout || $stdout
+        @stderr = stderr || $stderr
+      end
+
+      def summary
+        ''
+      end
+
+    end
+
+  end
+
+  class ConnectCommand
+    include ValidCommand
+
+    def run(argv, *args)
+      super
+
+      Ardb.init(false)
+      begin
+        Ardb.adapter.connect_db
+        @stdout.puts "connected to #{Ardb.config.adapter} db `#{Ardb.config.database}`"
+      rescue StandardError => e
+        @stderr.puts e
+        @stderr.puts e.backtrace.join("\n")
+        @stderr.puts "error connecting to #{Ardb.config.database.inspect} database " \
+                     "with #{Ardb.config.activerecord_connect_hash.inspect}"
+        raise CommandExitError
+      end
+    end
+
+    def summary
+      "Connect to the configured DB"
+    end
+
+    def help
+      "Usage: ardb connect [options]\n\n" \
+      "Options: #{@clirb}\n" \
+      "Description:\n" \
+      "  #{self.summary}"
+    end
+
+  end
+
+  class CreateCommand
+    include ValidCommand
+
+    def run(argv, *args)
+      super
+
+      Ardb.init(false)
+      begin
+        Ardb.adapter.create_db
+        @stdout.puts "created #{Ardb.config.adapter} db `#{Ardb.config.database}`"
+      rescue StandardError => e
+        @stderr.puts e
+        @stderr.puts "error creating #{Ardb.config.database.inspect} database"
+        raise CommandExitError
+      end
+    end
+
+    def summary
+      "Create the configured DB"
+    end
+
+    def help
+      "Usage: ardb create [options]\n\n" \
+      "Options: #{@clirb}\n" \
+      "Description:\n" \
+      "  #{self.summary}"
+    end
+
+  end
+
+  class DropCommand
+    include ValidCommand
+
+    def run(argv, *args)
+      super
+
+      Ardb.init(true)
+      begin
+        Ardb.adapter.drop_db
+        @stdout.puts "dropped #{Ardb.config.adapter} db `#{Ardb.config.database}`"
+      rescue StandardError => e
+        @stderr.puts e
+        @stderr.puts "error dropping #{Ardb.config.database.inspect} database"
+        raise CommandExitError
+      end
+    end
+
+    def summary
+      "Drop the configured DB"
+    end
+
+    def help
+      "Usage: ardb drop [options]\n\n" \
+      "Options: #{@clirb}\n" \
+      "Description:\n" \
+      "  #{self.summary}"
+    end
+
+  end
+
+  class MigrateCommand
+    include ValidCommand
+
+    def run(argv, *args)
+      super
+
+      Ardb.init(true)
+      begin
+        Ardb.adapter.migrate_db
+        Ardb.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.database.inspect} database"
+        raise CommandExitError
+      end
+    end
+
+    def summary
+      "Migrate the configured DB"
+    end
+
+    def help
+      "Usage: ardb migrate [options]\n\n" \
+      "Options: #{@clirb}\n" \
+      "Description:\n" \
+      "  #{self.summary}"
+    end
+
+  end
+
+  class GenerateMigrationCommand
+    include ValidCommand
+
+    def run(argv, *args)
+      super
+
+      Ardb.init(false)
+      begin
+        require 'ardb/migration'
+        migration = Ardb::Migration.new(Ardb.config, @clirb.args.first)
+        migration.save!
+        @stdout.puts "generated #{migration.file_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 summary
+      "Generate a migration file given a MIGRATION-NAME"
+    end
+
+    def help
+      "Usage: ardb generate-migration [options] MIGRATION-NAME\n\n" \
+      "Options: #{@clirb}\n" \
+      "Description:\n" \
+      "  #{self.summary}"
+    end
+
+  end
+
+  class CommandSet
+
+    def initialize(&unknown_cmd_block)
+      @lookup    = Hash.new{ |h,k| unknown_cmd_block.call(k) }
+      @names     = []
+      @aliases   = {}
+      @summaries = {}
+    end
+
+    def add(klass, name, *aliases)
+      begin
+        cmd = klass.new
+      rescue StandardError => err
+        # don't add any commands you can't init
+      else
+        ([name] + aliases).each{ |n| @lookup[n] = cmd }
+        @to_s = nil
+        @names << name
+        @aliases[name] = aliases.empty? ? '' : "(#{aliases.join(', ')})"
+        @summaries[name] = cmd.summary.to_s.empty? ? '' : "# #{cmd.summary}"
+      end
+    end
+
+    def remove(name)
+      @lookup.delete(name)
+      @names.delete(name)
+      @aliases.delete(name)
+      @to_s = nil
+    end
+
+    def [](name)
+      @lookup[name]
+    end
+
+    def size
+      @names.size
+    end
+
+    def to_s
+      max_name_size  = @names.map{ |n| n.size }.max || 0
+      max_alias_size = @aliases.values.map{ |v| v.size }.max || 0
+
+      @to_s ||= @names.map do |n|
+        "#{n.ljust(max_name_size)} #{@aliases[n].ljust(max_alias_size)} #{@summaries[n]}"
+      end.join("\n")
+    end
+
+  end
+
+end

data/lib/ardb/migration.rb

@@ -4,16 +4,18 @@ module Ardb
 
   class Migration
 
-    attr_reader :identifier, :class_name, :file_name, :file_path
-    attr_reader :source
+    attr_reader :migrations_path, :identifier
+    attr_reader :class_name, :file_name, :file_path, :source
 
-    def initialize(identifier)
+    def initialize(ardb_config, identifier)
       raise NoIdentifierError if identifier.to_s.empty?
 
-      @identifier = identifier
+      @migrations_path = ardb_config.migrations_path
+      @identifier      = identifier
+
       @class_name = @identifier.classify.pluralize
       @file_name  = get_file_name(@identifier)
-      @file_path  = File.join(Ardb.config.migrations_path, "#{@file_name}.rb")
+      @file_path  = File.join(self.migrations_path, "#{@file_name}.rb")
 
       @source = "require 'ardb/migration_helpers'\n\n" \
                 "class #{@class_name} < ActiveRecord::Migration\n" \
@@ -24,7 +26,7 @@ module Ardb
     end
 
     def save!
-      FileUtils.mkdir_p Ardb.config.migrations_path
+      FileUtils.mkdir_p self.migrations_path
       File.open(self.file_path, 'w'){ |f| f.write(self.source) }
       self
     end

data/lib/ardb/migration_helpers.rb

@@ -32,7 +32,7 @@ module Ardb
         @to_table    = to_table.to_s
         @to_column   = (options[:to_column] || 'id').to_s
         @name        = (options[:name] || "fk_#{@from_table}_#{@from_column}").to_s
-        @adapter     = Ardb::Adapter.send(Ardb.config.db.adapter)
+        @adapter     = Ardb::Adapter.new(Ardb.config)
       end
 
       def add_sql

data/lib/ardb/pg_json.rb

@@ -0,0 +1,90 @@
+require 'active_record'
+require 'active_support'
+
+# Allow ActiveRecord to work with PostgreSQL json/jsonb fields, which aren't
+# supported with ActiveRecord 3.2
+# https://github.com/romanbsd/activerecord-postgres-json/blob/master/lib/activerecord-postgres-json/activerecord.rb
+require 'active_record/connection_adapters/postgresql_adapter'
+
+module ActiveRecord
+  module ConnectionAdapters
+    PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:json]  = { :name => 'json' }
+    PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:jsonb] = { :name => 'jsonb' }
+
+    class PostgreSQLColumn < Column
+      # Adds the json type for the column.
+      def simplified_type_with_json(field_type)
+        case field_type
+        when 'json'
+          :json
+        when 'jsonb'
+          :jsonb
+        else
+          simplified_type_without_json(field_type)
+        end
+      end
+
+      alias_method_chain :simplified_type, :json
+
+      class << self
+        def extract_value_from_default_with_json(default)
+          case default
+          when "'{}'::json", "'{}'::jsonb"
+            '{}'
+          when "'[]'::json", "'[]'::jsonb"
+            '[]'
+          else
+            extract_value_from_default_without_json(default)
+          end
+        end
+
+        alias_method_chain :extract_value_from_default, :json
+      end
+
+    end
+
+    class TableDefinition
+      # Adds json type for migrations. So you can add columns to a table like:
+      #   create_table :people do |t|
+      #     ...
+      #     t.json :info
+      #     ...
+      #   end
+      def json(*args)
+        options = args.extract_options!
+        column_names = args
+        column_names.each { |name| column(name, 'json', options) }
+      end
+
+      def jsonb(*args)
+        options = args.extract_options!
+        column_names = args
+        column_names.each { |name| column(name, 'jsonb', options) }
+      end
+
+    end
+
+    class Table
+      # Adds json type for migrations. So you can add columns to a table like:
+      #   change_table :people do |t|
+      #     ...
+      #     t.json :info
+      #     ...
+      #   end
+      def json(*args)
+        options = args.extract_options!
+        column_names = args
+        column_names.each { |name| column(name, 'json', options) }
+      end
+
+      def jsonb(*args)
+        options = args.extract_options!
+        column_names = args
+        column_names.each { |name| column(name, 'jsonb', options) }
+      end
+
+    end
+
+  end
+
+end

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.27.3"
+  VERSION = "0.28.0"
 end

data/test/helper.rb

@@ -4,10 +4,22 @@
 # add the root dir to the load path
 $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
+TEST_SUPPORT_PATH = File.expand_path("../support", __FILE__)
+TMP_PATH          = File.expand_path("../../tmp", __FILE__)
+
+require 'logger'
+log_path = File.expand_path("../../log/test.log", __FILE__)
+TEST_LOGGER = Logger.new(File.open(log_path, 'w'))
+
 # require pry for debugging (`binding.pry`)
 require 'pry'
 require 'test/support/factory'
 
-ENV['ARDB_DB_FILE'] = 'tmp/testdb/config/db'
-require 'ardb'
-Ardb.init(false)
+# 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/support/factory.rb

@@ -8,4 +8,19 @@ module Factory
     "#{Factory.string}_things"
   end
 
+  def self.ardb_config
+    Ardb::Config.new.tap do |c|
+      c.adapter          = Factory.string
+      c.database         = Factory.string
+      c.encoding         = Factory.string
+      c.host             = Factory.string
+      c.port             = Factory.integer
+      c.username         = Factory.string
+      c.password         = Factory.string
+      c.pool             = Factory.integer
+      c.checkout_timeout = Factory.integer
+      c.min_messages     = Factory.string
+    end
+  end
+
 end