Merge pull request #2 from TTWShell/feature/tests

Feature/tests

Author: TTWShell

.circleci/config.yml

@@ -4,27 +4,37 @@
 #
 version: 2
 jobs:
+  tox:
+    docker:
+      - image: circleci/python:3.6
+        user: root
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run:
+          name: install dependencies && tox
+          command: |
+            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
+            tox
   test-py36:
     docker:
-      # specify the version you desire here
-      # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
       - image: circleci/python:3.6
         user: root
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/postgres:9.4
-
     working_directory: ~/repo
-
     steps:
       - checkout
       - run:
           name: install dependencies
           command: |
-            sudo pip install flake8 pytest pytest-cov
-            sudo pip install --editable .
+            pip install flake8 pytest pytest-cov
+            pip install --editable .
       - run:
           name: use flake8 check self
           command: |
@@ -59,8 +69,8 @@ jobs:
       - run:
           name: install dependencies
           command: |
-            sudo pip install flake8 pytest pytest-cov
-            sudo pip install --editable .
+            pip install flake8 pytest pytest-cov
+            pip install --editable .
       - run:
           name: use flake8 check self
           command: |
@@ -91,7 +101,10 @@ workflows:
   version: 2
   test:
     jobs:
-      - test-py36
-      - test-py37
-
-
+      - tox
+      - test-py36:
+          requires:
+            - tox
+      - test-py37:
+          requires:
+            - tox

.gitignore

@@ -5,6 +5,8 @@
 __pycache__/*
 */__pycache__/*
 .coverage
+.pytest_cache/*
+.tox/*
 
 hobbit_core.egg-info/*
 dist/*

Dockerfile

@@ -7,6 +7,9 @@ name = "pypi"
 click = "*"
 jinja2 = "*"
 pypandoc = "*"
+tox = "*"
+pytest = "*"
+pytest-cov = "*"
 
 [dev-packages]
 

Pipfile

@@ -17,7 +17,7 @@ def cli(ctx, force):
 
 @cli.command()
 @click.option('-n', '--name', help='Name of project.', required=True)
-@click.option('-d', '--dist', type=click.Path(), default=os.getcwd(),
+@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.')
@@ -27,6 +27,7 @@ def cli(ctx, force):
 def startproject(ctx, name, dist, template, force):
     """Create a new flask project, render from different template.
     """
+    dist = os.getcwd() if dist is None else dist
     ctx.obj['FORCE'] = force
     ctx.obj['JINJIA_CONTEXT'] = {
         'project_name': name,

Pipfile.lock

@@ -11,7 +11,7 @@
 @contextmanager
 def chdir(dist):
     cwd = os.getcwd()
-    echo('mkdir {}', (dist, ))
+    echo('mkdir\t{}', (dist, ))
     os.makedirs(dist, exist_ok=True)
     os.chdir(dist)
     yield dist
@@ -46,7 +46,7 @@ def render_file(ctx, dist, fn, data):
         echo('exists {}, ignore ...', (target, ))
         return
 
-    echo('render {} ...', (target, ))
+    echo('render\t{} ...', (target, ))
 
     with open(fn, 'w') as wf:
         wf.write(data)

hobbit_core/hobbit/bootstrap.py

@@ -0,0 +1,30 @@
+import os
+import shutil
+import functools
+
+
+class BaseTest:
+
+    def setup_method(self, method):
+        print('\n{}::{}'.format(type(self).__name__, method.__name__))
+
+    def teardown_method(self, method):
+        pass
+
+
+def rmdir(path):
+    if os.path.exists(path):
+        shutil.rmtree(path)
+
+
+def chdir(path):
+    def wrapper(func):
+        @functools.wraps(func)
+        def inner(*args, **kwargs):
+            cwd = os.getcwd()
+            os.makedirs(path, exist_ok=True)
+            os.chdir(path)
+            func(*args, **kwargs)
+            os.chdir(cwd)
+        return inner
+    return wrapper

hobbit_core/hobbit/handlers/bootstrap.py

@@ -0,0 +1,54 @@
+import os
+
+from click.testing import CliRunner
+
+from hobbit_core.hobbit import main as hobbit
+
+from . import BaseTest, rmdir, chdir
+
+
+class TestHobbit(BaseTest):
+    wkdir = os.path.abspath('hobbit-tox-test')
+
+    def setup_method(self, method):
+        rmdir(self.wkdir)
+        super().setup_method(method)
+
+    def teardown_method(self, method):
+        rmdir(self.wkdir)
+        super().teardown_method(method)
+
+    def test_hobbit_cmd(self):
+        runner = CliRunner()
+
+        result = runner.invoke(hobbit)
+        assert result.exit_code == 0
+
+        result = runner.invoke(hobbit, ['doesnotexistcmd'], obj={})
+        assert 'Error: cmd not exist: doesnotexistcmd' in result.output
+
+    @chdir(wkdir)
+    def test_startproject_cmd_nodist(self):
+        assert os.getcwd() == self.wkdir
+        runner = CliRunner()
+
+        result = runner.invoke(hobbit, ['--echo', 'startproject'], obj={})
+        assert result.exit_code == 2
+        assert 'Error: Missing option "-n" / "--name".' in result.output
+
+        result = runner.invoke(
+            hobbit, ['--echo', 'startproject', '-n', 'haha', '-f'], obj={})
+        assert result.exit_code == 0
+        assert 'mkdir\t{}'.format(self.wkdir) in result.output
+        assert 'render\t{}'.format(self.wkdir) in result.output
+
+    def test_startproject_cmd_dist(self):
+        runner = CliRunner()
+
+        result = runner.invoke(
+            hobbit,
+            ['--echo', 'startproject', '-n', 'haha', '-f', '-d', self.wkdir],
+            obj={})
+        assert result.exit_code == 0
+        assert 'mkdir\t{}'.format(self.wkdir) in result.output
+        assert 'render\t{}'.format(self.wkdir) in result.output