Merge branch 'devel'

Author: whtsky

.gitignore

@@ -36,3 +36,6 @@ pip-log.txt
 
 #OS X
 .DS_Store
+
+#Sphinx
+docs/_build/

.travis.yml

@@ -2,7 +2,6 @@ language: python
 python:
   - 2.6
   - 2.7
-  - 3.2
 
 install: python setup.py install
 

README.rst

@@ -1,14 +1,14 @@
-================
 catsup
-================
+----------------
 
-.. image:: https://travis-ci.org/whtsky/catsup.png?branch=master
+.. image:: https://travis-ci.org/whtsky/catsup.png?branch-master
     :target: https://travis-ci.org/whtsky/catsup
 
 A lightweight static blog generator.
+Document here: https://catsup.readthedocs.org/en/latest/
 
 Install
-========
+--------
 
 Simple way using pip::
 
@@ -30,16 +30,16 @@ Or another hard way to install::
 
 
 Setup your blog
-===============
+---------------
 
 Change directory to the directory you prefer to place your blog and run ``catsup init`` to initialize it.
 
 Then you can edit ``config.json`` to change your configuration.
 
 
 Write a post
-============
-catsup uses Markdown to write posts.
+------------
+Catsup support markup of Markdown.
 Filename should like ``year-month-day-title.md``
 
 (For example: ``2000-01-01-catsup.md``)
@@ -55,45 +55,8 @@ Post Example::
     print "hi,I'm coding."
     ```
 
-Post properties
-================
-catsup supports some post properties. Write them before ``---``
- and start with ``-`` .
-Example::
-
-    - category: A Category
-    - date: 2012-12-24
-    - tags: tag1, tag2
-    - comment: disabled
-    - summary: this is a simple post.
-
-The ``category`` property defines the category of the post, but it's not used yet.
-
-The ``date`` property can overwrite the date from the file name.
-
-The ``tags`` property defines the tags of the post.
-
-The ``comment`` property defines whether the post can be commented or not.
-
-Post summary
--------------
-
-You can choose to display summary rather than full content on your homepage
-by changing `display_summary` in your configuration file.
-
-If you defined summary as a post property, catsup will use it.
-
-Otherwise, we will try to analytic the summary in order of:
-
-1. Content before`<!--more-->` in your post.
-
-2. Content before first horizontal rule(like `***`)
-
-3. Content before second header(like '##xx')
-
-
 Install theme
-=============
+-------------
 
 Run ``catsup themes`` to list available themes. And run ``catsup install path [-g]`` to install a new theme.
 
@@ -105,17 +68,6 @@ If it's a git repo, catsup will clone and install it automatically.
 
 
 Build your blog
-=================
+-----------------
 run ``catsup build``
-And you can find your static blog in ``~/build/`` .
-
-Develop
-==========
-Catsup needs your code.Fork and code the repo, then run ::
-
-    python setup.py develop
-
-And start hacking catsup!
-Note that all the code must be flask8 passed ::
-
-    flake8 catsup
+And you can find your static blog in ``~/build/`` .

catsup/__init__.py

@@ -2,4 +2,4 @@
 Catsup, a lightweight static blog generator
 """
 
-__version__ = '0.0.7'
+__version__ = '0.0.8'

catsup/build.py

@@ -9,7 +9,7 @@
 
 from catsup.options import config, g
 from catsup.reader import load_posts
-from .utils import Pagination
+from .utils import Pagination, call
 
 
 def load_filters():
@@ -226,9 +226,9 @@ def build():
         return
 
     if os.path.exists(config.config.output):
-        shutil.rmtree(config.config.output)
-
-    os.makedirs(config.config.output)
+        call('rm -rf *', cwd=config.config.output)
+    else:
+        os.makedirs(config.config.output)
 
     build_feed()
     build_articles()

catsup/cli.py

@@ -8,12 +8,15 @@
     sys.setdefaultencoding('utf-8')
 
 import os
-from catsup.options import g, enable_pretty_logging
+import logging
+
+from catsup.options import config, g, enable_pretty_logging
 
 enable_pretty_logging()
 
 g.catsup_path = os.path.abspath(os.path.dirname(__file__))
 g.public_templates_path = os.path.join(g.catsup_path, 'templates')
+g.cwdpath = os.path.abspath('.')
 
 try:
     import catsup
@@ -26,6 +29,9 @@
 Usage:
     catsup init [<path>]
     catsup build [-s <file>|--settings=<file>]
+    catsup deploy [-s <file>|--settings=<file>]
+    catsup git [-s <file>|--settings=<file>]
+    catsup rsync [-s <file>|--settings=<file>]
     catsup server [-s <file>|--settings=<file>] [-p <port>|--port=<port>]
     catsup webhook [-s <file>|--settings=<file>] [-p <port>|--port=<port>]
     catsup themes
@@ -44,6 +50,7 @@
 import catsup.server
 import catsup.themes
 import catsup.build
+import catsup.deploy
 
 
 from parguments import Parguments
@@ -79,6 +86,56 @@ def build(args):
     catsup.build.build()
 
 
+@parguments.command
+def deploy(args):
+    """
+Usage:
+    catsup deploy [-s <file>|--settings=<file>]
+
+Options:
+    -h --help               show this screen.
+    -s --settings=<file>    specify a setting file. [default: config.json]
+    """
+    path = args.get('--settings')
+    catsup.config.load(path)
+    if config.deploy.default == 'git':
+        catsup.deploy.git()
+    elif config.deploy.default == 'rsync':
+        catsup.deploy.rsync()
+    else:
+        logging.error("Unknown deploy: %s" % config.deploy.default)
+
+
+@parguments.command
+def git(args):
+    """
+Usage:
+    catsup git [-s <file>|--settings=<file>]
+
+Options:
+    -h --help               show this screen.
+    -s --settings=<file>    specify a setting file. [default: config.json]
+    """
+    path = args.get('--settings')
+    catsup.config.load(path)
+    catsup.deploy.git()
+
+
+@parguments.command
+def rsync(args):
+    """
+Usage:
+    catsup rsync [-s <file>|--settings=<file>]
+
+Options:
+    -h --help               show this screen.
+    -s --settings=<file>    specify a setting file. [default: config.json]
+    """
+    path = args.get('--settings')
+    catsup.config.load(path)
+    catsup.deploy.rsync()
+
+
 @parguments.command
 def server(args):
     """

catsup/config.py

@@ -44,15 +44,14 @@ def init(path):
 
 
 def update_config(base, update):
-    for key in update:
-        if isinstance(update[key], dict):
-            if key in base:
-                update_config(base[key], update[key])
-            else:
-                # convert dict into ObjectDict.
-                base[key] = ObjectDict(**update[key])
+    for k in update:
+        v = update[k]
+        if isinstance(v, dict):
+            if k not in base:
+                base[k] = ObjectDict()
+            update_config(base[k], v)
         else:
-            base[key] = update[key]
+            base[k] = v
 
 
 def parse(path):

catsup/deploy.py

@@ -0,0 +1,65 @@
+import os
+import sys
+import datetime
+import logging
+
+from catsup.options import g, config
+from catsup.utils import call, check_git, check_rsync
+
+
+def git():
+    if not check_git():
+        logging.error("Catsup can't find git.Please install git first.")
+        sys.exit(1)
+    logging.info("Deploying your blog via git")
+
+    cwd = os.path.abspath(config.config.output)
+    def _call(*args, **kwargs):
+        return call(*args, cwd=cwd, **kwargs)
+
+    if not os.path.exists(os.path.join(cwd, '.git')):
+        _call('rm -rf *')
+        # Hasn't setup git.
+        _call('git init', silence=True)
+        _call(['git', 'remote', 'add', 'origin', config.deploy.git.repo],
+            silence=False)
+        if config.deploy.git.branch != 'master':
+            _call('git branch -m %s' % config.deploy.git.branch, silence=True)
+        _call(['git', 'pull', 'origin', config.deploy.git.branch])
+
+        logging.info("Rebuild your blog..")
+        import catsup.build
+        catsup.build.build()
+
+    # GitHub custom domain support
+    with open(os.path.join(cwd, 'CNAME'), 'w') as f:
+        domain = config.site.url.split('//')[-1].rstrip('/')
+        f.write(domain)
+
+    _call('git add .', silence=True)
+    _call(['git', 'commit',
+       '-m',"Update at %s" % str(datetime.datetime.utcnow())],
+        silence=True)
+    _call(['git', 'push', 'origin', config.deploy.git.branch])
+
+
+
+def rsync():
+    if not check_rsync():
+        logging.error("Catsup can't find rsync.Please install rsync first.")
+        sys.exit(1)
+    logging.info("Deploying your blog via rsync")
+    if config.deploy.rsync.delete:
+        args = "--delete"
+    else:
+        args = ""
+    cmd = "rsync -avze 'ssh -p {ssh_port}' {args}" \
+          " {deploy_dir}/ {ssh_user}@{ssh_host}:{document_root}".format(
+        ssh_port=config.deploy.rsync.ssh_port,
+        args=args,
+        deploy_dir=config.config.output,
+        ssh_user=config.deploy.rsync.ssh_user,
+        ssh_host=config.deploy.rsync.ssh_host,
+        document_root=config.deploy.rsync.document_root
+    )
+    os.system(cmd)