Skip to content

Commit

Permalink
Add mollyui and mollyrest command line tools
Browse files Browse the repository at this point in the history
  • Loading branch information
cnorthwood committed Dec 24, 2012
1 parent 67dd171 commit 90c77c3
Show file tree
Hide file tree
Showing 11 changed files with 78 additions and 20 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -2,4 +2,5 @@
*.pyc
conf/local.conf
docs/_build
*.iml
*.iml
dist/
2 changes: 1 addition & 1 deletion conf/default.conf
@@ -1,5 +1,5 @@
[weather]
module = molly.apps.weather
provider.metoffice = molly.apps.weather.providers.metoffice
provider.metoffice.api_key = 12345
provider.metoffice.api_key = 52d92e14-e005-4929-97b0-6a87674db31d
provider.metoffice.location_id = 3330
29 changes: 29 additions & 0 deletions molly/command.py
@@ -0,0 +1,29 @@
from flask.ext.script import Manager
from gunicorn.app.base import Application

from molly.rest import flask_app

manager = Manager(flask_app, with_default_commands=False)

@manager.command
def start():
class MollyApplication(Application):

def init(self, parser, opts, args):
pass

def load(self):
return flask_app

MollyApplication().run()

@manager.command
def debug():
flask_app.debug = True
flask_app.run(debug=True, port=8000)

def main():
manager.run()

if __name__ == '__main__':
main()
4 changes: 0 additions & 4 deletions molly/debug_server.py

This file was deleted.

2 changes: 1 addition & 1 deletion molly/rest.py
@@ -1,7 +1,7 @@
import os

from flask import Flask
from flaskext.babel import Babel
from flask.ext.babel import Babel

from molly.config import ConfigLoader
from molly.apps.homepage import App as Homepage
Expand Down
33 changes: 33 additions & 0 deletions molly/ui/html5/command.py
@@ -0,0 +1,33 @@
import os.path

from flask.ext.script import Manager
from gunicorn.app.base import Application

from molly.ui.html5.server import flask_app

manager = Manager(flask_app, with_default_commands=False)

@manager.command
def start():
class MollyApplication(Application):

def init(self, parser, opts, args):
pass

def load(self):
return flask_app

MollyApplication().run()

@manager.command
def debug():
flask_app.debug = True
flask_app.static_folder = os.path.abspath(os.path.join(os.path.dirname(__file__), 'assets'))
flask_app.static_url_path = 'static'
flask_app.run(debug=True, port=8002)

def main():
manager.run()

if __name__ == '__main__':
main()
9 changes: 0 additions & 9 deletions molly/ui/html5/debug_server.py

This file was deleted.

6 changes: 3 additions & 3 deletions molly/ui/html5/server.py
@@ -1,11 +1,11 @@
from flask import Flask
from flask.ext.babel import Babel
from jinja2 import PackageLoader

from molly.ui.html5.components.factory import ComponentFactory
from molly.ui.html5.page_decorators.page_decorator_factory import PageDecoratorFactory

from .router import Router
from .request_factory import HttpRequestFactory
from molly.ui.html5.request_factory import HttpRequestFactory
from molly.ui.html5.router import Router

flask_app = Flask(__name__)
Babel(flask_app)
Expand Down
2 changes: 2 additions & 0 deletions requirements.txt
Expand Up @@ -3,3 +3,5 @@ gunicorn
unittest2
mock
Flask-Babel
python-dateutil
Flask-Script
8 changes: 7 additions & 1 deletion setup.py
Expand Up @@ -11,5 +11,11 @@
author='The Molly Project',
setup_requires=['setuptools'],
tests_require=['unittest2', 'mock'],
test_suite='unittest2.collector'
test_suite='unittest2.collector',
entry_points={
'console_scripts': [
'mollyui = molly.ui.html5.command:main',
'mollyrest = molly.command:main'
]
}
)
Empty file added tests/molly/ui/__init__.py
Empty file.

0 comments on commit 90c77c3

Please sign in to comment.