Merge pull request #15 from TTWShell/enhance

TTWShell · web-flow · commit 7f2d936357eb · 2018-10-09T18:01:18.000+08:00
Enhance
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,15 +14,45 @@ jobs:
       - run:
           name: install dependencies && tox
           command: |
+            # https://github.com/pyenv/pyenv/wiki/Common-build-problems
+            apt-get install -y make build-essential libssl1.0-dev zlib1g-dev libbz2-dev \
+                libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
+                xz-utils tk-dev libffi-dev liblzma-dev
             curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
             export PATH="/root/.pyenv/bin:$PATH"
             eval "$(pyenv init -)"
             eval "$(pyenv virtualenv-init -)"
-            pyenv install 3.7.0
-            pyenv virtualenv -f 3.7.0 py37
-            pyenv shell py37
-            pip install tox
+            pyenv install 2.7 && pyenv virtualenv -f 2.7 py27
+            pyenv install 3.7.0 && pyenv virtualenv -f 3.7.0 py37
+            pyenv shell py27 py37
+            pip3 install tox
             tox
+  test-py27:
+    docker:
+      - image: circleci/python:2.7
+        user: root
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run:
+          name: install dependencies
+          command: pip install flake8 pytest pytest-cov && pip install --editable .
+      - run:
+          name: use flake8 check self
+          command: flake8 .
+      - run:
+          name: run hobbit cmd
+          command: hobbit --echo startproject -n demo -d ~/haha -f --example -p 1024
+      - run:
+          name: run tests
+          environment:
+            FLASK_APP: app/run.py
+            FLASK_ENV: testing
+          command: |
+            cd ~/haha
+            flask db init && flask db migrate && flask db upgrade
+            flake8 . --exclude migrations
+            py.test --cov . --cov-report term-missing -s
   test-py36:
     docker:
       - image: circleci/python:3.6
@@ -32,17 +62,13 @@ jobs:
       - checkout
       - run:
           name: install dependencies
-          command: |
-            pip install flake8 pytest pytest-cov
-            pip install --editable .
+          command: pip install flake8 pytest pytest-cov && pip install --editable .
       - run:
           name: use flake8 check self
-          command: |
-            flake8 .
+          command: flake8 .
       - run:
           name: run hobbit cmd
-          command: |
-            hobbit  --echo startproject -n demo -d ~/haha -f --example
+          command: hobbit --echo startproject -n demo -d ~/haha -f --example -p 1024
       - run:
           name: tree flask project
           command: |
@@ -68,18 +94,15 @@ jobs:
       - checkout
       - run:
           name: install dependencies
-          command: |
-            pip install flake8 pytest pytest-cov
-            pip install --editable .
+          command: pip install flake8 pytest pytest-cov && pip install --editable .
       - run:
           name: use flake8 check self
-          command: |
-            flake8 .
+          command: flake8 .
       - run:
           name: run hobbit cmd
           command: |
             mkdir ~/haha && cd ~/haha
-            hobbit  --echo startproject -n demo -f --example
+            hobbit --echo startproject -n demo -f --example -p 1024
       - run:
           name: tree flask project
           command: |
@@ -102,6 +125,9 @@ workflows:
   test:
     jobs:
       - tox
+      - test-py27:
+          requires:
+            - tox
       - test-py36:
           requires:
             - tox
diff --git a/hobbit_core/flask_hobbit/__init__.py b/hobbit_core/flask_hobbit/__init__.py
@@ -8,7 +8,7 @@
 from flask import Flask
 
 
-class HobbitManager:
+class HobbitManager(object):
     """Customizable utils management.
     """
 
diff --git a/hobbit_core/flask_hobbit/db.py b/hobbit_core/flask_hobbit/db.py
@@ -1,9 +1,10 @@
+# -*- encoding: utf-8 -*-
 import enum
 
 from sqlalchemy import Integer, Column, ForeignKey, func, DateTime
 
 
-class SurrogatePK:
+class SurrogatePK(object):
     """A mixin that add ``id``、``created_at`` and ``updated_at`` columns
     to any declarative-mapped class.
 
diff --git a/hobbit_core/flask_hobbit/err_handler.py b/hobbit_core/flask_hobbit/err_handler.py
@@ -1,9 +1,10 @@
+# -*- encoding: utf-8 -*-
 from sqlalchemy.orm import exc as orm_exc
 
 from .response import Result, ServerErrorResult, gen_response, RESP_MSGS
 
 
-class ErrHandler:
+class ErrHandler(object):
     """Base error handler that catch all exceptions. Be sure response is::
 
         {
diff --git a/hobbit_core/flask_hobbit/pagination.py b/hobbit_core/flask_hobbit/pagination.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 from collections import Mapping
 from flask_sqlalchemy import model
 
diff --git a/hobbit_core/flask_hobbit/response.py b/hobbit_core/flask_hobbit/response.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 from flask.json import dumps
 from werkzeug import Response
 
@@ -41,7 +42,7 @@ def __init__(self, response=None, status=None, headers=None,
                  direct_passthrough=False):
         assert sorted(response.keys()) == ['code', 'detail', 'message'], \
             '错误的返回格式'
-        return super().__init__(
+        return super(Result, self).__init__(
             response=dumps(response, indent=0, separators=(',', ':')) + '\n',
             status=status or self.status, headers=headers, mimetype=mimetype,
             content_type=content_type, direct_passthrough=direct_passthrough)
@@ -53,7 +54,7 @@ class SuccessResult(Result):
     status = 200
 
     def __init__(self, code=None, message='', detail=None, status=None):
-        return super().__init__(
+        return super(SuccessResult, self).__init__(
             gen_response(code or self.status, message, detail),
             self.status or status)
 
@@ -64,7 +65,7 @@ class FailedResult(Result):
     status = 400
 
     def __init__(self, code=None, message='', detail=None):
-        return super().__init__(
+        return super(FailedResult, self).__init__(
             gen_response(code or self.status, message, detail), self.status)
 
 
diff --git a/hobbit_core/flask_hobbit/schemas.py b/hobbit_core/flask_hobbit/schemas.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 from marshmallow import Schema, fields
 
 
diff --git a/hobbit_core/flask_hobbit/utils.py b/hobbit_core/flask_hobbit/utils.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 import six
 
 
diff --git a/hobbit_core/hobbit/bootstrap.py b/hobbit_core/hobbit/bootstrap.py
@@ -17,21 +17,23 @@ def cli(ctx, force):
 
 @cli.command()
 @click.option('-n', '--name', help='Name of project.', required=True)
+@click.option('-p', '--port', help='Port of web server.', required=True,
+              type=click.IntRange(1024, 65535))
 @click.option('-d', '--dist', type=click.Path(), required=False,
               help='Dir for new project.')
 @click.option('-t', '--template', type=click.Choice(['shire']),
               default='shire', help='Template name.')
 @click.option('-f', '--force', default=False, is_flag=True,
               help='Force render files, covered if file exist.')
 @click.option('--example/--no-example', default=False,
-              help='Generate api、test example files or not.')
+              help='Generate api, test example files or not.')
 @click.pass_context
-def startproject(ctx, name, dist, template, force, example):
+def startproject(ctx, name, port, dist, template, force, example):
     """Create a new flask project, render from different template.
 
     Examples::
 
-        hobbit --echo startproject -n demo -d /tmp/test --example
+        hobbit --echo startproject -n demo -d /tmp/test --example -p 1024
 
     Other tips::
 
@@ -42,6 +44,7 @@ def startproject(ctx, name, dist, template, force, example):
     ctx.obj['EXAMPLE'] = example
     ctx.obj['JINJIA_CONTEXT'] = {
         'project_name': name,
+        'port': port,
         'secret_key': ''.join(random.choice(
             string.ascii_letters) for i in range(38)),
         'version': '.'.join(str(i) for i in VERSION),
diff --git a/hobbit_core/hobbit/handlers/bootstrap.py b/hobbit_core/hobbit/handlers/bootstrap.py
@@ -13,7 +13,9 @@
 def chdir(dist):
     cwd = os.getcwd()
     echo('mkdir\t{}', (dist, ))
-    os.makedirs(dist, exist_ok=True)
+    # exist_ok py3 only
+    if not os.path.exists(dist):
+        os.makedirs(dist)
     os.chdir(dist)
     yield dist
     os.chdir(cwd)
diff --git a/hobbit_core/hobbit/static/bootstrap/shire/app/models/example.py.jinja2 b/hobbit_core/hobbit/static/bootstrap/shire/app/models/example.py.jinja2
@@ -3,6 +3,7 @@ from app.exts import db
 
 
 class User(SurrogatePK, db.Model):
-    username = Column(db.String(20), unique=True, nullable=False, doc='用户名')
-    nick = Column(db.String(20), unique=True, nullable=False, doc='昵称')
+    username = Column(db.String(20), unique=True, nullable=False,
+                      doc='username')
+    nick = Column(db.String(20), unique=True, nullable=False, doc='nick name')
 
diff --git a/hobbit_core/hobbit/static/bootstrap/shire/deploy.sh.jinja2 b/hobbit_core/hobbit/static/bootstrap/shire/deploy.sh.jinja2
@@ -2,13 +2,11 @@
 : '
 Usage:
 
-    USER=root PASSWORD=root ./deploy.sh 192.168.x.x
-
+    USER=root PASSWORD=root ./deploy.sh 192.168.x.1,192.168.x.2
 '
 
 INSTALL_PATH="/data/{{ project_name }}"
 IMAGE="ttwshell/hobbit-app:latest"
-HOST=$1
 
 commonExclude="*.pyc* .* /.git/* /.test/* /*/__pycache__/* /.pytest_cache/* /logs/* /tests/* zip.sh"
 commonInclude="/app/* /migrations/* requirements.txt"
@@ -18,13 +16,19 @@ function mzip() {
 }
 
 function mssh() {
-    sshpass -p ${PASSWORD} ssh -o StrictHostKeyChecking=no ${USER}@${HOST} $1
+    sshpass -p ${PASSWORD} ssh -o StrictHostKeyChecking=no ${USER}@${host} $1
 }
 
-mzip server
+function deploy() {
+    for host in $(echo $1 | tr "," "\n")
+    do
+        echo -e "\033[32mdeploy to ${host} ...\033[0m"
+        mssh "sudo mkdir -p ${INSTALL_PATH} && sudo chown -R ${USER}:${USER} ${INSTALL_PATH}"
+        sshpass -p ${PASSWORD} scp ./server.zip ${USER}@${host}:${INSTALL_PATH}
+        mssh "docker pull ${IMAGE}"
+        mssh "cd ${INSTALL_PATH} && unzip -o server.zip  -d . && docker-compose down && docker-compose up -d"
+    done
+}
 
-mssh "sudo mkdir -p ${INSTALL_PATH} && sudo chown -R ${USER}:${USER} ${INSTALL_PATH}"
-sshpass -p ${PASSWORD} scp ./server.zip ${USER}@${HOST}:${INSTALL_PATH}
-mssh "docker pull ${IMAGE}"
-mssh "cd ${INSTALL_PATH} && unzip -o server.zip  -d . && docker-compose down && docker-compose up -d"
+mzip server && deploy $1
 
diff --git a/hobbit_core/hobbit/static/bootstrap/shire/docker-compose.yml.jinja2 b/hobbit_core/hobbit/static/bootstrap/shire/docker-compose.yml.jinja2
@@ -6,7 +6,7 @@ services:
     image: ttwshell/hobbit-app:latest
     restart: always
     ports:
-      - 5000:5000
+      - {{ port }}:5000
     environment:
       - LANG=C.UTF-8
       - FLASK_APP=app/run.py
diff --git a/setup.py b/setup.py
@@ -27,7 +27,8 @@ def gen_data(data_root='hobbit/static/bootstrap'):
 setup(
     name='hobbit-core',
     version='.'.join(str(i) for i in hobbit_core.VERSION),
-    python_requires='>=3.6',
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*,'
+                    ' !=3.4.*, !=3.5.*, <4',
     description='Hobbit - A flask project generator.',
     long_description=long_description,
     author='Legolas Bloom',
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -3,7 +3,8 @@
 import functools
 
 
-class BaseTest:
+class BaseTest(object):
+    root_path = os.path.split(os.path.abspath(__name__))[0]
 
     def setup_method(self, method):
         print('\n{}::{}'.format(type(self).__name__, method.__name__))
@@ -22,7 +23,8 @@ def wrapper(func):
         @functools.wraps(func)
         def inner(*args, **kwargs):
             cwd = os.getcwd()
-            os.makedirs(path, exist_ok=True)
+            if not os.path.exists(path):
+                os.makedirs(path)
             os.chdir(path)
             func(*args, **kwargs)
             os.chdir(cwd)
diff --git a/tests/test_hobbit.py b/tests/test_hobbit.py
@@ -12,11 +12,12 @@ class TestHobbit(BaseTest):
 
     def setup_method(self, method):
         rmdir(self.wkdir)
-        super().setup_method(method)
+        super(TestHobbit, self).setup_method(method)
 
     def teardown_method(self, method):
+        os.chdir(self.root_path)
         rmdir(self.wkdir)
-        super().teardown_method(method)
+        super(TestHobbit, self).teardown_method(method)
 
     def test_hobbit_cmd(self):
         runner = CliRunner()
@@ -37,7 +38,9 @@ def test_startproject_cmd_nodist(self):
         assert 'Error: Missing option "-n" / "--name".' in result.output
 
         result = runner.invoke(
-            hobbit, ['--echo', 'startproject', '-n', 'haha', '-f'], obj={})
+            hobbit, [
+                '--echo', 'startproject', '-n', 'haha', '-f', '-p', '1024',
+            ], obj={})
         assert result.exit_code == 0
         assert 'mkdir\t{}'.format(self.wkdir) in result.output
         assert 'render\t{}'.format(self.wkdir) in result.output
@@ -49,9 +52,10 @@ def test_startproject_cmd_dist(self):
         runner = CliRunner()
 
         result = runner.invoke(
-            hobbit,
-            ['--echo', 'startproject', '-n', 'haha', '-f', '-d', self.wkdir],
-            obj={})
+            hobbit, [
+                '--echo', 'startproject', '-n', 'haha', '-f', '-d', self.wkdir,
+                '-p', '1024',
+            ], obj={})
         assert result.exit_code == 0
         assert 'mkdir\t{}'.format(self.wkdir) in result.output
         assert 'render\t{}'.format(self.wkdir) in result.output
@@ -65,9 +69,10 @@ def test_startproject_cmd_curdir(self):
         runner = CliRunner()
 
         result = runner.invoke(
-            hobbit,
-            ['--echo', 'startproject', '-n', 'haha', '-f', '-d', '.'],
-            obj={})
+            hobbit, [
+                '--echo', 'startproject', '-n', 'haha', '-f', '-d', '.',
+                '-p', '1024',
+            ], obj={})
         assert result.exit_code == 0
         assert os.path.exists(os.path.join(
             os.getcwd(), 'app', 'models', '__init__.py'))
@@ -79,7 +84,9 @@ def test_startproject_cmd_example(self):
         runner = CliRunner()
 
         result = runner.invoke(
-            hobbit,
-            ['--echo', 'startproject', '-n', 'haha', '--example'], obj={})
+            hobbit, [
+                '--echo', 'startproject', '-n', 'haha', '--example',
+                '-p', '1024',
+            ], obj={})
         assert result.exit_code == 0
         assert 'example.py' in result.output
diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
-envlist = py36,py37
+envlist = py27,py36,py37
 
 [testenv]
 deps =
     pytest
     pytest-cov
     flake8
+    py27: ipython==5.8.0
 commands =
     flake8 .
     py.test --cov=hobbit_core --cov=tests --cov-report term-missing -s

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
	`1`	`+# -- encoding: utf-8 --`
`1`	`2`	`from sqlalchemy.orm import exc as orm_exc`
`2`	`3`
`3`	`4`	`from .response import Result, ServerErrorResult, gen_response, RESP_MSGS`
`4`	`5`
`5`	`6`
`6`		`-class ErrHandler:`
	`7`	`+class ErrHandler(object):`
`7`	`8`	`"""Base error handler that catch all exceptions. Be sure response is::`
`8`	`9`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# -- encoding: utf-8 --`
`1`	`2`	`from collections import Mapping`
`2`	`3`	`from flask_sqlalchemy import model`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# -- encoding: utf-8 --`
`1`	`2`	`from marshmallow import Schema, fields`
`2`	`3`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# -- encoding: utf-8 --`
`1`	`2`	`import six`
`2`	`3`
`3`	`4`