Installable Templates 2

armstrong/cli/commands/init.py

@@ -5,10 +5,14 @@
 import shutil
 import codecs
 import json
-import argparse
 from random import choice
 
 CWD = os.getcwd()
+ENTRY_POINT = 'armstrong.templates'
+
+
+class MissingTemplate(RuntimeError):
+    pass
 
 
 class InitCommand(object):
@@ -29,13 +33,14 @@ def __call__(self, template='standard', demo=False, path=CWD, **kwargs):
         # TODO: interactive mode to ask questions for each variable
         from django.conf import settings
 
-        # TODO: appropriate error output if non-existant template chosen
-        template_dir = os.path.realpath(os.path.join(
-            os.path.dirname(__file__),
-            '..',
-            "templates",
-            template,
-        ))
+        from pkg_resources import iter_entry_points
+        try:
+            entry_point = iter_entry_points(ENTRY_POINT, template).next()
+        except StopIteration:
+            raise MissingTemplate("No template named: %s" % template)
+
+        module = entry_point.load()
+        template_dir = module.__path__[0]
 
         settings.configure(DEBUG=False, TEMPLATE_DEBUG=False,
                 TEMPLATE_DIRS=[template_dir, ])
@@ -44,7 +49,7 @@ def __call__(self, template='standard', demo=False, path=CWD, **kwargs):
         # TODO: allow this to be passed in via command line
         project_name = os.path.basename(path)
 
-        # The secret key generate is borrowed directly from Django's startproject
+        # Secret key generation: borrowed directly from Django's startproject
         CHOICES = 'abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)'
         secret_key = ''.join([choice(CHOICES) for i in range(50)])
         context = Context({
@@ -64,7 +69,6 @@ def source_files():
                     if not name.endswith(".pyc"):
                         yield os.path.join(dirpath, name)
 
-
         existing_files = []
         files = []
         excluded_files = [

armstrong/cli/commands/list_templates.py

@@ -1,12 +1,12 @@
+from pkg_resources import iter_entry_points
 import os
 
+from .init import ENTRY_POINT
+
 
 def command():
-    # TODO: make this look for entry_points so third-party templates can be used
     # TODO: make this verify that there's a manifest.json present
     # TODO: make this display manifest.json's description along side template names
-    import armstrong.cli.templates
-    p = armstrong.cli.templates.__path__[0]
-    templates = [a for a in os.listdir(p) if os.path.isdir(os.path.join(p, a))]
     print "The following templates are available:"
-    print "\n    %s" % "\n    ".join(templates)
+    for entry_point in iter_entry_points(ENTRY_POINT):
+        print "    %s" % entry_point.name

armstrong/cli/main.py

@@ -2,8 +2,6 @@
 import sys
 import argparse
 
-from .commands.init import init
-
 # TODO: use logging throughout for output
 ENTRY_POINT = 'armstrong.commands'
 CONFIGURATION_MODULE = "settings"