Added Makefile and rewrote tasks.py to support similar operations

Author: Thierry Chappuis

Makefile

@@ -0,0 +1,73 @@
+PY?=python3
+PELICAN?=pelican
+PELICANOPTS=
+
+BASEDIR=$(CURDIR)
+INPUTDIR=$(BASEDIR)/content
+OUTPUTDIR=$(BASEDIR)/output
+CONFFILE=$(BASEDIR)/pelicanconf.py
+PUBLISHCONF=$(BASEDIR)/publishconf.py
+
+
+DEBUG ?= 0
+ifeq ($(DEBUG), 1)
+	PELICANOPTS += -D
+endif
+
+RELATIVE ?= 0
+ifeq ($(RELATIVE), 1)
+	PELICANOPTS += --relative-urls
+endif
+
+help:
+	@echo 'Makefile for a pelican Web site                                           '
+	@echo '                                                                          '
+	@echo 'Usage:                                                                    '
+	@echo '   make html                           (re)generate the web site          '
+	@echo '   make clean                          remove the generated files         '
+	@echo '   make regenerate                     regenerate files upon modification '
+	@echo '   make publish                        generate using production settings '
+	@echo '   make serve [PORT=8000]              serve site at http://localhost:8000'
+	@echo '   make serve-global [SERVER=0.0.0.0]  serve (as root) to $(SERVER):80    '
+	@echo '   make devserver [PORT=8000]          serve and regenerate together      '     '
+	@echo '                                                                          '
+	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html   '
+	@echo 'Set the RELATIVE variable to 1 to enable relative urls                    '
+	@echo '                                                                          '
+
+html:
+	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+
+clean:
+	[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)
+
+regenerate:
+	$(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+
+serve:
+ifdef PORT
+	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT)
+else
+	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+endif
+
+serve-global:
+ifdef SERVER
+	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b $(SERVER)
+else
+	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b 0.0.0.0
+endif
+
+
+devserver:
+ifdef PORT
+	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT)
+else
+	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+endif
+
+publish:
+	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
+
+
+.PHONY: html help clean regenerate serve serve-global devserver stopserver publish ftp_upload

tasks.py

@@ -1,33 +1,98 @@
+# -*- coding: utf-8 -*-
+
 import os
+import shutil
+import sys
+import datetime
 from pathlib import Path
 
 from invoke import task
+from invoke.util import cd
+from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
+
+BASEDIR = (Path(__file__) / '..').resolve()
+INPUTDIR = BASEDIR / 'content'
+OUTPUTDIR = BASEDIR / 'output'
+CONFFILE = BASEDIR / 'pelicanconf.py'
+PUBLISHCONF = BASEDIR / 'publishconf.py'
+
+PORT = 8000
+
+PELICANOPTS = '--fatal=warnings'
+
+
+@task
+def clean(c):
+    """Remove generated files"""
+    if OUTPUTDIR.is_dir():
+        shutil.rmtree(OUTPUTDIR)
+        OUTPUTDIR.mkdir(parents=True, exist_ok=True)
 
 @task
 def build(c):
-    """Builds the local Pelican blog."""
-    c.run('echo "Publishing your Pelican website"')
-    c.run(f'pelican content -s pelicanconf.py --fatal=warnings')
+    """Builds the local Pelican blog"""
+    c.run('echo "Building your Pelican website"')
+    c.run(f'pelican {INPUTDIR} -o {OUTPUTDIR} -s {CONFFILE} {PELICANOPTS}')
+
+@task
+def rebuild(c):
+    """`build` with the delete switch"""
+    c.run('echo "Re-building your Pelican website"')
+    c.run(f'pelican -d -s {CONFFILE} {PELICANOPTS}')
 
 @task
 def publish(c):
-    """Builds the Pelican blog with deployment settings."""
-    c.run('echo "Building your Pelican website"')
-    c.run(f'pelican content -s publishconf.py --fatal=warnings')
+    """Builds the Pelican blog with deployment settings"""
+    c.run('echo "Publishing your Pelican website"')
+    c.run(f'pelican {INPUTDIR} -o {OUTPUTDIR} -s {PUBLISHCONF} {PELICANOPTS}')
 
 @task
 def autoreload(c):
-    """Starts the autoreload server to help during writing of blog articles."""
+    """Starts the autoreload server to help during writing of blog articles"""
     c.run('echo "Running autoreload server. Press CTRL+C to stop"')
-    c.run(f'pelican -r content -s pelicanconf.py')
+    c.run(f'pelican -r {INPUTDIR} -o {OUTPUTDIR} -s {CONFFILE} {PELICANOPTS}')
+
+@task
+def regenerate(c):
+    """Starts the autoreload server to help during writing of blog articles"""
+    autoreload(c)
+
+@task
+def serve(c):
+    """Serve site at http://localhost:8000/"""
+
+    class AddressReuseTCPServer(RootedHTTPServer):
+        allow_reuse_address = True
+
+    server = AddressReuseTCPServer(
+        OUTPUTDIR,
+        ('', PORT),
+        ComplexHTTPRequestHandler)
+
+    sys.stderr.write('Serving on port {port} ...\n'.format(port=PORT))
+    server.serve_forever()
 
 @task
 def runserver(c):
-    """Starts the dev server to visualize the articles locally in a web browser 
-    at url http://localhost:8000.
-    """
-    c.run('echo "Running development server. Press CTRL+C to stop"')
-    c.run(f'python -m http.server -d output')
+    """Serve site at http://localhost:8000/"""
+    serve(c)
+
+@task
+def devserver(c):
+    """Starts the devserver"""
+    c.run('echo "Running Pelican DevServer. Press CTRL+C to stop"')
+    c.run(f'pelican -lr {INPUTDIR} -o {OUTPUTDIR} -s {CONFFILE} {PELICANOPTS} -p {PORT}')
+
+@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')
 
 @task
 def revert(c):