Refactor main into some reusable functions.

handroll/command.py

@@ -30,17 +30,8 @@ def main(argv=sys.argv):
             scaffolder.make(args.scaffold, args.site)
             finish()
 
-        site = Site(args.site)
-        valid, message = site.is_valid()
-        if not valid:
-            raise AbortError(_('Invalid site source: {0}').format(message))
-
-        loader = ExtensionLoader()
-        loader.load()
-
-        config = build_config(site.config_file, args)
-        extensions = loader.get_active_extensions(config)
-        director = Director(config, site, extensions)
+        site = Site.build(args)
+        director = prepare_director(args, site)
         director.produce()
 
         if args.watch:
@@ -89,6 +80,15 @@ def parse_args(argv):
     return args
 
 
+def prepare_director(args, site):
+    """Prepare the director to produce a site."""
+    loader = ExtensionLoader()
+    loader.load()
+    config = build_config(site.config_file, args)
+    extensions = loader.get_active_extensions(config)
+    return Director(config, site, extensions)
+
+
 def finish():
     print(_('Complete.'))
     sys.exit()

handroll/site.py

@@ -22,6 +22,15 @@ def __init__(self, path=None):
         if os.path.isdir(self.path):
             self.path = os.path.abspath(self.path)
 
+    @classmethod
+    def build(cls, args):
+        """Build a validated site."""
+        site = cls(args.site)
+        valid, message = site.is_valid()
+        if not valid:
+            raise AbortError(_('Invalid site source: {0}').format(message))
+        return site
+
     @property
     def config_file(self):
         return os.path.join(self.path, self.CONFIG)