--- a/piecrust/commands/builtin/themes.py	Sun Jun 05 00:01:40 2016 -0700
+++ b/piecrust/commands/builtin/themes.py	Thu Jun 09 22:25:16 2016 -0700
@@ -6,6 +6,7 @@
 from piecrust import (
         RESOURCES_DIR, THEME_DIR, THEME_CONFIG_PATH, THEME_INFO_PATH)
 from piecrust.commands.base import ChefCommand
+from piecrust.pathutil import SiteNotFoundError
 
 
 logger = logging.getLogger(__name__)
@@ -18,9 +19,6 @@
         self.description = "Manage the themes for the current website."
 
     def setupParser(self, parser, app):
-        if app.root_dir is None:
-            return
-
         subparsers = parser.add_subparsers()
         p = subparsers.add_parser(
                 'info',
@@ -28,118 +26,70 @@
         p.set_defaults(sub_func=self._info)
 
         p = subparsers.add_parser(
-                'create',
-                help="Create a new theme for the current website.")
-        p.add_argument(
-                '--from-default',
-                action='store_true',
-                help=("Create a new theme by copying the default PieCrust "
-                      "theme into the theme directory"))
-        p.add_argument(
-                'theme_name',
-                help=("The name of the theme"))
-        p.set_defaults(sub_func=self._createTheme)
-
-        p = subparsers.add_parser(
                 'override',
-                help="Copies a theme to the website for customization.")
+                help="Copies the current theme to the website for "
+                     "customization.")
         p.set_defaults(sub_func=self._overrideTheme)
 
         p = subparsers.add_parser(
-                'activate',
+                'link',
                 help="Makes a given theme the active one for the current "
                      "website by creating a symbolic link to it from the "
-                     "'theme' directory. If a symbolic link can't be created "
-                     "the theme will be copied to the 'theme' directory.")
+                     "'theme' directory.")
         p.add_argument(
                 'theme_dir',
                 help="The directory of the theme to link.")
-        p.add_argument(
-                '--link-only',
-                action='store_true',
-                help="Abort the activation if a symbolic link can't be "
-                     "created")
-        p.set_defaults(sub_func=self._activateTheme)
+        p.set_defaults(sub_func=self._linkTheme)
 
         p = subparsers.add_parser(
-                'deactivate',
+                'unlink',
                 help="Removes the currently active theme for the website. "
                      "This removes the symbolic link to the theme, if any, or "
                      "deletes the theme folder if it was copied locally.")
-        p.set_defaults(sub_func=self._deactivateTheme)
+        p.set_defaults(sub_func=self._unlinkTheme)
 
     def checkedRun(self, ctx):
+        if ctx.app.root_dir is None:
+            raise SiteNotFoundError(theme=ctx.app.theme_site)
+
         if not hasattr(ctx.args, 'sub_func'):
             ctx.args = ctx.parser.parse_args(['themes', 'info'])
         ctx.args.sub_func(ctx)
 
     def _info(self, ctx):
-        theme_dir = os.path.join(ctx.app.root_dir, THEME_DIR)
+        theme_dir = ctx.app.theme_dir
         if not os.path.exists(theme_dir):
             logger.info("Using default theme, from: %s" % ctx.app.theme_dir)
-        elif os.path.islink(theme_dir):
-            target = os.readlink(theme_dir)
-            target = os.path.join(os.path.dirname(theme_dir), target)
-            logger.info("Using theme, from: %s" % target)
+        elif theme_dir.startswith(ctx.app.root_dir):
+            if os.path.islink(theme_dir):
+                target = os.readlink(theme_dir)
+                target = os.path.join(os.path.dirname(theme_dir), target)
+                logger.info("Using local theme, from: %s" % target)
+            else:
+                logger.info("Using local theme.")
         else:
-            logger.info("Using local theme.")
-
-    def _createTheme(self, ctx):
-        theme_dir = os.path.join(ctx.app.root_dir, THEME_DIR)
-        if os.path.exists(theme_dir):
-            logger.warning("A theme already exists, and will be overwritten. "
-                           "Are you sure? [Y/n]")
-            ans = input()
-            if len(ans) > 0 and ans.lower() not in ['y', 'yes']:
-                return 1
-
-            shutil.rmtree(theme_dir)
-
-        try:
-            if ctx.args.from_default:
-                def reporting_copy2(src, dst):
-                    rel_dst = os.path.relpath(dst, ctx.app.root_dir)
-                    logger.info(rel_dst)
-                    shutil.copy2(src, dst)
+            logger.info("Using theme from: %s" % theme_dir)
 
-                default_theme_dir = os.path.join(RESOURCES_DIR, 'theme')
-                shutil.copytree(default_theme_dir, theme_dir,
-                                copy_function=reporting_copy2)
-                return 0
-
-            logger.info("Creating theme directory.")
-            os.makedirs(theme_dir)
-
-            logger.info("Creating theme_config.yml")
-            config_path = os.path.join(theme_dir, THEME_CONFIG_PATH)
-            with open(config_path, 'w', encoding='utf8') as fp:
-                fp.write('')
-
-            logger.info("Creating theme_info.yml")
-            info_path = os.path.join(theme_dir, THEME_INFO_PATH)
-            with open(info_path, 'w', encoding='utf8') as fp:
-                yaml.dump(
-                        {
-                            'name': ctx.args.theme_name or 'My New Theme',
-                            'description': "A new PieCrust theme.",
-                            'authors': ['Your Name Here <email or twitter>'],
-                            'url': 'http://www.example.org'},
-                        fp,
-                        default_flow_style=False)
-            return 0
-        except:
-            logger.error("Error occured, deleting theme directory.")
-            shutil.rmtree(theme_dir)
-            raise
+        info_path = os.path.join(theme_dir, THEME_CONFIG_PATH)
+        if os.path.exists(info_path):
+            info = None
+            with open(info_path, 'r', encoding='utf8') as fp:
+                theme_cfg = yaml.load(fp.read())
+                if isinstance(theme_cfg, dict):
+                    info = theme_cfg.get('theme')
+            if info:
+                logger.info("Theme info:")
+                for k, v in info.items():
+                    logger.info("  - %s: %s" % (str(k), str(v)))
 
     def _overrideTheme(self, ctx):
-        app_dir = ctx.app.root_dir
         theme_dir = ctx.app.theme_dir
         if not theme_dir:
-            logger.error("There is not theme currently applied to override.")
+            logger.error("There is no theme currently applied.")
             return 1
 
         copies = []
+        app_dir = ctx.app.root_dir
         for dirpath, dirnames, filenames in os.walk(theme_dir):
             rel_dirpath = os.path.relpath(dirpath, theme_dir)
             for name in filenames:
@@ -169,25 +119,16 @@
                 os.makedirs(os.path.dirname(c[1]))
             shutil.copy2(c[0], c[1])
 
-    def _activateTheme(self, ctx):
+    def _linkTheme(self, ctx):
         if not os.path.isdir(ctx.args.theme_dir):
             logger.error("Invalid theme directory: %s" % ctx.args.theme_dir)
             return 1
 
-        theme_dir = os.path.join(ctx.app.root_dir, THEME_DIR)
+        msg = ("A theme already exists, and will be deleted. "
+                "Are you sure? [Y/n]")
+        self._doUnlinkTheme(ctx.app.root_dir, msg)
 
-        if os.path.islink(theme_dir):
-            logger.debug("Unlinking: %s" % theme_dir)
-            os.unlink(theme_dir)
-        elif os.path.isdir(theme_dir):
-            logger.warning("A theme already exists, and will be overwritten. "
-                           "Are you sure? [Y/n]")
-            ans = input()
-            if len(ans) > 0 and ans.lower() not in ['y', 'yes']:
-                return 1
-
-            shutil.rmtree(theme_dir)
-
+        theme_dir = os.path.join(ctx.app.root_dir, THEME_DIR)
         try:
             os.symlink(ctx.args.theme_dir, theme_dir)
         except (NotImplementedError, OSError) as ex:
@@ -195,27 +136,29 @@
                 logger.error("Couldn't symlink the theme: %s" % ex)
                 return 1
 
-            # pre-Vista Windows, or unprivileged user... gotta copy the
-            # theme the old fashioned way.
-            logging.warning("Can't create a symbolic link... copying the "
-                            "theme directory instead.")
-            ignore = shutil.ignore_patterns('.git*', '.hg*', '.svn', '.bzr')
-            shutil.copytree(ctx.args.theme_dir, theme_dir, ignore=ignore)
+    def _unlinkTheme(self, ctx):
+        msg = ("The active theme is local. Are you sure you want "
+                "to delete the theme directory? [Y/n]")
+        self._doUnlinkTheme(ctx.app.root_dir, msg)
 
-    def _deactivateTheme(self, ctx):
-        theme_dir = os.path.join(ctx.app.root_dir, THEME_DIR)
+    def _doUnlinkTheme(self, root_dir, delete_message):
+        theme_dir = os.path.join(root_dir, THEME_DIR)
 
         if os.path.islink(theme_dir):
             logger.debug("Unlinking: %s" % theme_dir)
             os.unlink(theme_dir)
-        elif os.path.isdir(theme_dir):
-            logger.warning("The active theme is local. Are you sure you want "
-                           "to delete the theme directory? [Y/n]")
+            return True
+
+        if os.path.isdir(theme_dir):
+            logger.warning(delete_message)
             ans = input()
             if len(ans) > 0 and ans.lower() not in ['y', 'yes']:
                 return 1
 
+            logger.debug("Deleting: %s" % theme_dir)
             shutil.rmtree(theme_dir)
-        else:
-            logger.info("No currently active theme.")
+
+            return True
 
+        return False
+