finished startproject test

Author: TTWShell

hobbit_core/hobbit/bootstrap.py

@@ -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,

hobbit_core/hobbit/handlers/bootstrap.py

@@ -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)

tests/__init__.py

@@ -1,13 +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

tests/test_hobbit.py

@@ -1,19 +1,54 @@
+import os
 
 from click.testing import CliRunner
 
-from hobbit_core.hobbit import main
+from hobbit_core.hobbit import main as hobbit
 
-from . import BaseTest, rmdir
+from . import BaseTest, rmdir, chdir
 
 
 class TestHobbit(BaseTest):
-    wkdir = '/tmp/hobbit-tox-test'
+    wkdir = os.path.abspath('hobbit-tox-test')
 
     def setup_method(self, method):
         rmdir(self.wkdir)
         super().setup_method(method)
 
-    def test_startproject(self):
+    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(main)
+
+        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