Moved cli file, updated tests for cli.

Command line interface moved from __main__.py to cli.py to match
the cookiecutter convention. File delete hooks updated accordingly.

Because the module is created dynamically by cookies.bake() I used importlib
to import the created module and test the command line options with
cookies.bake(). Importlib has changed considerably between 2.7/3.3-3.4/3.5
so the code checks for version before running tests. If has a better way to
handle this, please do that instead.

Author: cerickson

hooks/post_gen_project.py

@@ -13,5 +13,5 @@ def remove_file(filepath):
     if '{{ cookiecutter.use_pypi_deployment_with_travis }}' != 'y':
         remove_file('travis_pypi_setup.py')
     if '{{ cookiecutter.create_console_script }}' != 'y':
-        filepath = os.path.join('{{ cookiecutter.project_slug }}', '__main__.py')
+        filepath = os.path.join('{{ cookiecutter.project_slug }}', 'cli.py')
         remove_file(filepath)

tests/test_bake_project.py

@@ -1,9 +1,14 @@
 from contextlib import contextmanager
 import shlex
 import os
+import sys
 import subprocess
 import yaml
-import importlib
+
+if sys.version_info > (3,0):
+    import importlib
+else:
+    import imp
 
 from click.testing import CliRunner
 
@@ -26,6 +31,13 @@ def run_inside_dir(command, dirpath):
     with inside_dir(dirpath):
         return subprocess.check_call(shlex.split(command))
 
+def project_info(result):
+    """Get toplevel dir, project_slug, and project dir from baked cookies"""
+    project_path = str(result.project)
+    project_slug = os.path.split(project_path)[-1]
+    project_dir = os.path.join(project_path, project_slug)
+    return project_path, project_slug, project_dir    
+
 
 def test_bake_with_defaults(cookies):
     result = cookies.bake()
@@ -66,36 +78,46 @@ def test_bake_and_run_travis_pypi_setup(cookies):
 def test_bake_with_no_console_script(cookies):
     context = {'create_console_script': 'n'}
     result = cookies.bake(extra_context=context)
-    project_path = str(result.project)
-    project_slug = os.path.split(project_path)[-1]
-    project_dir = os.path.join(project_path, project_slug)
+    project_path, project_slug, project_dir = project_info(result)
     found_project_files = os.listdir(project_dir)
-    assert "__main__.py" not in found_project_files
+    assert "cli.py" not in found_project_files
 
     setup_path = os.path.join(project_path, 'setup.py')
     with open(setup_path, 'r') as setup_file:
         assert 'entry_points' not in setup_file.read()
 
 
-def test_bake_with_console_script(cookies):
+def test_bake_with_console_script_files(cookies):
     context = {'create_console_script': 'y'}
     result = cookies.bake(extra_context=context)
-    project_path = str(result.project)
-    project_slug = os.path.split(project_path)[-1]
-    project_dir = os.path.join(project_path, project_slug)
+    project_path, project_slug, project_dir = project_info(result)
     found_project_files = os.listdir(project_dir)
-    assert "__main__.py" in found_project_files
+    assert "cli.py" in found_project_files
 
     setup_path = os.path.join(project_path, 'setup.py')
     with open(setup_path, 'r') as setup_file:
         assert 'entry_points' in setup_file.read()
 
-    module_path = '.'.join([project_slug, '__main__'])
-    main_module = importlib.import_module(module_path)
-    noarg_result = runner.invoke(main_module.main)
+def test_bake_with_console_script_cli(cookies):
+    context = {'create_console_script': 'y'}
+    result = cookies.bake(extra_context=context)
+    project_path, project_slug, project_dir = project_info(result)
+    module_path = os.path.join(project_dir, 'cli.py')
+    module_name = '.'.join([project_slug, 'cli'])
+    if sys.version_info >= (3,5):
+        spec = importlib.util.spec_from_file_location(module_name, module_path)
+        cli = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(cli)
+    elif sys.version_info >= (3,3):
+        file_loader = importlib.machinery.SourceFileLoader
+        cli = file_loader(module_name, module_path).load_module()
+    else:
+        cli = imp.load_source(module_name, module_path)
+    print(dir(cli))
+    noarg_result = runner.invoke(cli.main)
     assert noarg_result.exit_code == 0
     expected_noarg_output = ' '.join(['Add a console script for', project_slug])
     assert expected_noarg_output in noarg_result.output
-    help_result = runner.invoke(main_module.main, ['--help'])
+    help_result = runner.invoke(cli.main, ['--help'])
     assert help_result.exit_code == 0
     assert 'Console script for python_boilerplate' in help_result.output