Manage script added

Test runserver command added to manage.py
Script run_tes_app.py removed

collector/collector/api/db/__init__.py

@@ -3,4 +3,4 @@ from flask_sqlalchemy import SQLAlchemy
 from collector.api.app import app
 
 
-db = SQLAlchemy(app)
+db = SQLAlchemy(app)

collector/collector/api/db/migration/alembic.ini

@@ -1,59 +0,0 @@
-# A generic, single database configuration.
-
-[alembic]
-# path to migration scripts
-script_location = alembic_migrations
-
-# template used to generate migration files
-# file_template = %%(rev)s_%%(slug)s
-
-# max length of characters to apply to the
-# "slug" field
-#truncate_slug_length = 40
-
-# set to 'true' to run the environment during
-# the 'revision' command, regardless of autogenerate
-# revision_environment = false
-
-# set to 'true' to allow .pyc and .pyo files without
-# a source .py file to be detected as revisions in the
-# versions/ directory
-# sourceless = false
-
-sqlalchemy.url = driver://user:pass@localhost/dbname
-
-
-# Logging configuration
-[loggers]
-keys = root,sqlalchemy,alembic
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = WARN
-handlers = console
-qualname =
-
-[logger_sqlalchemy]
-level = WARN
-handlers =
-qualname = sqlalchemy.engine
-
-[logger_alembic]
-level = INFO
-handlers =
-qualname = alembic
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S

collector/collector/api/db/migration/alembic_migrations/README

@@ -1 +0,0 @@
-Generic single-database configuration.

collector/collector/api/db/migration/alembic_migrations/env.py

@@ -1,72 +0,0 @@
-from __future__ import with_statement
-from alembic import context
-from sqlalchemy import engine_from_config, pool
-from logging.config import fileConfig
-
-# this is the Alembic Config object, which provides
-# access to the values within the .ini file in use.
-config = context.config
-
-# Interpret the config file for Python logging.
-# This line sets up loggers basically.
-fileConfig(config.config_file_name)
-
-# add your model's MetaData object here
-# for 'autogenerate' support
-# from myapp import mymodel
-# target_metadata = mymodel.Base.metadata
-target_metadata = None
-
-# other values from the config, defined by the needs of env.py,
-# can be acquired:
-# my_important_option = config.get_main_option("my_important_option")
-# ... etc.
-
-
-def run_migrations_offline():
-    """Run migrations in 'offline' mode.
-
-    This configures the context with just a URL
-    and not an Engine, though an Engine is acceptable
-    here as well.  By skipping the Engine creation
-    we don't even need a DBAPI to be available.
-
-    Calls to context.execute() here emit the given string to the
-    script output.
-
-    """
-    url = config.get_main_option("sqlalchemy.url")
-    context.configure(url=url, target_metadata=target_metadata)
-
-    with context.begin_transaction():
-        context.run_migrations()
-
-
-def run_migrations_online():
-    """Run migrations in 'online' mode.
-
-    In this scenario we need to create an Engine
-    and associate a connection with the context.
-
-    """
-    engine = engine_from_config(
-        config.get_section(config.config_ini_section),
-        prefix='sqlalchemy.',
-        poolclass=pool.NullPool)
-
-    connection = engine.connect()
-    context.configure(
-        connection=connection,
-        target_metadata=target_metadata
-    )
-
-    try:
-        with context.begin_transaction():
-            context.run_migrations()
-    finally:
-        connection.close()
-
-if context.is_offline_mode():
-    run_migrations_offline()
-else:
-    run_migrations_online()

collector/collector/api/db/migration/alembic_migrations/script.py.mako

@@ -1,22 +0,0 @@
-"""${message}
-
-Revision ID: ${up_revision}
-Revises: ${down_revision}
-Create Date: ${create_date}
-
-"""
-
-# revision identifiers, used by Alembic.
-revision = ${repr(up_revision)}
-down_revision = ${repr(down_revision)}
-
-from alembic import op
-import sqlalchemy as sa
-${imports if imports else ""}
-
-def upgrade():
-    ${upgrades if upgrades else "pass"}
-
-
-def downgrade():
-    ${downgrades if downgrades else "pass"}

collector/collector/api/db/migration/alembic_migrations/versions/4ab26067b091_initial_revision.py

@@ -1,22 +0,0 @@
-"""Initial revision
-
-Revision ID: 4ab26067b091
-Revises: None
-Create Date: 2014-09-18 18:40:38.634752
-
-"""
-
-# revision identifiers, used by Alembic.
-revision = '4ab26067b091'
-down_revision = None
-
-from alembic import op
-import sqlalchemy as sa
-
-
-def upgrade():
-    pass
-
-
-def downgrade():
-    pass

collector/collector/api/db/model.py

@@ -3,6 +3,6 @@ from collector.api.db import db
 
 class ActionLog(db.Model):
     id = db.Column(db.Integer, primary_key=True)
-    node_aid = db.Columg(db.String, nullable=False)
+    node_aid = db.Column(db.String, nullable=False)
     external_id = db.Column(db.Integer, nullable=False)
     db.Index('node_aid', 'external_id', unique=True)

collector/collector/api/db/util.py

@@ -0,0 +1,6 @@
+def sync_db():
+    pass
+
+
+def drop_db():
+    pass

collector/manage.py

@@ -0,0 +1,32 @@
+# Migration manager
+
+from flask_migrate import Migrate
+from flask_migrate import MigrateCommand
+from flask_script import Command
+from flask_script import Manager
+
+from collector.api import log
+from collector.api.app import app
+from collector.api.app import db
+from collector.api.db import model
+
+
+class RutTest(Command):
+    """Starts test application
+    """
+
+    def run(self):
+        app.config.from_object('collector.api.config.Testing')
+        log.init_logger()
+        app.run()
+
+
+manager = Manager(app)
+
+migrate = Migrate(app, db)
+manager.add_command('db', MigrateCommand)
+manager.add_command('runserver_test', RutTest())
+
+
+if __name__ == '__main__':
+    manager.run()

collector/run_test_app.py

@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from collector.api.app import app
-from collector.api.log import init_logger
-
-app.config.from_object('collector.api.config.Testing')
-init_logger()
-app.run()