Replace Fabric by Invoke.

pelican/tools/pelican_quickstart.py

@@ -266,7 +266,7 @@ needed by Pelican.
     CONF['timezone'] = ask_timezone('What is your time zone?',
                                     CONF['timezone'], _TZ_URL)
 
-    automation = ask('Do you want to generate a Fabfile/Makefile '
+    automation = ask('Do you want to generate a tasks.py/Makefile '
                      'to automate generation and publishing?', bool, True)
 
     if automation:
@@ -364,9 +364,9 @@ needed by Pelican.
 
     if automation:
         try:
-            with codecs.open(os.path.join(CONF['basedir'], 'fabfile.py'),
+            with codecs.open(os.path.join(CONF['basedir'], 'tasks.py'),
                              'w', 'utf-8') as fd:
-                _template = _jinja_env.get_template('fabfile.py.jinja2')
+                _template = _jinja_env.get_template('tasks.py.jinja2')
                 fd.write(_template.render(**CONF))
                 fd.close()
         except OSError as e:

pelican/tools/templates/fabfile.py.jinja2

@@ -1,95 +0,0 @@
-from fabric.api import *
-import fabric.contrib.project as project
-import os
-import shutil
-import sys
-
-# Local path configuration (can be absolute or relative to fabfile)
-env.deploy_path = 'output'
-DEPLOY_PATH = env.deploy_path
-
-{% if ssh %}
-# Remote server configuration
-production = '{{ssh_user}}@{{ssh_host}}:{{ssh_port}}'
-dest_path = '{{ssh_target_dir}}'
-
-{% endif %}
-{% if cloudfiles %}
-# Rackspace Cloud Files configuration settings
-env.cloudfiles_username = '{{cloudfiles_username}}'
-env.cloudfiles_api_key = '{{cloudfiles_api_key}}'
-env.cloudfiles_container = '{{cloudfiles_container}}'
-
-{% endif %}
-{% if github %}
-# Github Pages configuration
-env.github_pages_branch = '{{github_pages_branch}}'
-{% endif %}
-
-# Port for `serve`
-PORT = 8000
-
-def clean():
-    """Remove generated files"""
-    if os.path.isdir(DEPLOY_PATH):
-        shutil.rmtree(DEPLOY_PATH)
-        os.makedirs(DEPLOY_PATH)
-
-def build():
-    """Build local version of site"""
-    local('pelican -s pelicanconf.py')
-
-def rebuild():
-    """`build` with the delete switch"""
-    local('pelican -d -s pelicanconf.py')
-
-def regenerate():
-    """Automatically regenerate site upon file modification"""
-    local('pelican -r -s pelicanconf.py')
-
-def serve():
-    """Serve site at http://localhost:8000/"""
-    local('pelican -l -s pelicanconf.py')
-
-def devserver():
-    """Serve site at http://localhost:8000/ and regenerate automatically"""
-    local('pelican -r -l -s pelicanconf.py')
-
-def reserve():
-    """`build`, then `serve`"""
-    build()
-    serve()
-
-def preview():
-    """Build production version of site"""
-    local('pelican -s publishconf.py')
-
-{% if cloudfiles %}
-def cf_upload():
-    """Publish to Rackspace Cloud Files"""
-    rebuild()
-    with lcd(DEPLOY_PATH):
-        local('swift -v -A https://auth.api.rackspacecloud.com/v1.0 '
-              '-U {cloudfiles_username} '
-              '-K {cloudfiles_api_key} '
-              'upload -c {cloudfiles_container} .'.format(**env))
-{% endif %}
-
-@hosts(production)
-def publish():
-    """Publish to production via rsync"""
-    local('pelican -s publishconf.py')
-    project.rsync_project(
-        remote_dir=dest_path,
-        exclude=".DS_Store",
-        local_dir=DEPLOY_PATH.rstrip('/') + '/',
-        delete=True,
-        extra_opts='-c',
-    )
-
-{% if github %}
-def gh_pages():
-    """Publish to GitHub Pages"""
-    rebuild()
-    local("ghp-import -b {github_pages_branch} {deploy_path} -p".format(**env))
-{% endif %}

pelican/tools/templates/tasks.py.jinja2

@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+
+import os
+import shutil
+import sys
+try:
+    import socketserver
+except ImportError:
+    import SocketServer as socketserver
+
+from invoke import task
+from invoke.util import cd
+from pelican.server import ComplexHTTPRequestHandler
+
+CONFIG = {
+    # Local path configuration (can be absolute or relative to tasks.py)
+    'deploy_path': 'output',
+{% if ssh %}
+    # Remote server configuration
+    'production': '{{ssh_user}}@{{ssh_host}}:{{ssh_port}}',
+    'dest_path': '{{ssh_target_dir}}',
+{% endif %}
+{% if cloudfiles %}
+    # Rackspace Cloud Files configuration settings
+    'cloudfiles_username': '{{cloudfiles_username}}',
+    'cloudfiles_api_key': '{{cloudfiles_api_key}}',
+    'cloudfiles_container': '{{cloudfiles_container}}',
+{% endif %}
+{% if github %}
+    # Github Pages configuration
+    'github_pages_branch': '{{github_pages_branch}}',
+{% endif %}
+    # Port for `serve`
+    'port': 8000,
+}
+
+@task
+def clean(c):
+    """Remove generated files"""
+    if os.path.isdir(CONFIG['deploy_path']):
+        shutil.rmtree(CONFIG['deploy_path'])
+        os.makedirs(CONFIG['deploy_path'])
+
+@task
+def build(c):
+    """Build local version of site"""
+    c.run('pelican -s pelicanconf.py')
+
+@task
+def rebuild(c):
+    """`build` with the delete switch"""
+    c.run('pelican -d -s pelicanconf.py')
+
+@task
+def regenerate(c):
+    """Automatically regenerate site upon file modification"""
+    c.run('pelican -r -s pelicanconf.py')
+
+@task
+def serve(c):
+    """Serve site at http://localhost:8000/"""
+    os.chdir(CONFIG['deploy_path'])
+
+    class AddressReuseTCPServer(socketserver.TCPServer):
+        allow_reuse_address = True
+
+    server = AddressReuseTCPServer(
+        ('', CONFIG['port']),
+        ComplexHTTPRequestHandler)
+
+    sys.stderr.write('Serving on port {port} ...\n'.format(**CONFIG))
+    server.serve_forever()
+
+@task
+def reserve(c):
+    """`build`, then `serve`"""
+    build(c)
+    serve(c)
+
+@task
+def preview(c):
+    """Build production version of site"""
+    c.run('pelican -s publishconf.py')
+
+{% if cloudfiles %}
+@task
+def cf_upload(c):
+    """Publish to Rackspace Cloud Files"""
+    rebuild(c)
+    with cd(CONFIG['deploy_path']):
+        c.run('swift -v -A https://auth.api.rackspacecloud.com/v1.0 '
+              '-U {cloudfiles_username} '
+              '-K {cloudfiles_api_key} '
+              'upload -c {cloudfiles_container} .'.format(**CONFIG))
+{% endif %}
+
+@task
+def publish(c):
+    """Publish to production via rsync"""
+    c.run('pelican -s publishconf.py')
+    c.run(
+        'rsync --delete --exclude ".DS_Store" -pthrvz -c '
+        '{} {production}:{dest_path}'.format(
+            CONFIG['deploy_path'].rstrip('/') + '/',
+            **CONFIG))
+
+{% if github %}
+@task
+def gh_pages(c):
+    """Publish to GitHub Pages"""
+    rebuild(c)
+    c.run("ghp-import -b {github_pages_branch} {deploy_path} -p".format(
+        **CONFIG))
+{% endif %}