From 8c0b1f8697cd414424a70d1c616e85f30176dc00 Mon Sep 17 00:00:00 2001
From: Brit Butler <redline6561@gmail.com>
Date: Tue, 14 Aug 2012 23:56:25 -0400
Subject: [PATCH] Rework ASDs, add stub md+rst plugins, docs script, and stub
 tests.

---
 coleslaw-static.asd            | 18 -------------
 coleslaw.asd                   | 49 ++++++++++++++++++++--------------
 gen-docs.sh                    |  4 +++
 plugins/markdown.lisp          |  9 +++++++
 plugins/restructured-text.lisp |  7 +++++
 tests/packages.lisp            |  3 +++
 tests/tests.lisp               |  1 +
 7 files changed, 53 insertions(+), 38 deletions(-)
 delete mode 100644 coleslaw-static.asd
 create mode 100755 gen-docs.sh
 create mode 100644 plugins/markdown.lisp
 create mode 100644 plugins/restructured-text.lisp
 create mode 100644 tests/packages.lisp
 create mode 100644 tests/tests.lisp

diff --git a/coleslaw-static.asd b/coleslaw-static.asd
deleted file mode 100644
index d1fef4e..0000000
--- a/coleslaw-static.asd
+++ /dev/null
@@ -1,18 +0,0 @@
-(defsystem :coleslaw-static
-  :name "coleslaw-static"
-  :description "Flexible Lisp Blogware, Static backend"
-  :version "0.0.1"
-  :maintainer "Brit Butler <redline6561@gmail.com>"
-  :author "Brit Butler <redline6561@gmail.com>"
-  :licence "LLGPL"
-  :depends-on (:coleslaw :trivial-timers :cl-store :split-sequence)
-  :components ((:module static
-                        :components ((:file "coleslaw")
-                                     (:file "comments"
-                                            :depends-on ("coleslaw"))
-                                     (:file "posts"
-                                            :depends-on ("coleslaw"))
-                                     (:file "indices"
-                                            :depends-on ("posts"))
-                                     (:file "util"
-                                            :depends-on ("coleslaw"))))))
diff --git a/coleslaw.asd b/coleslaw.asd
index fc42e1e..8ddaf99 100644
--- a/coleslaw.asd
+++ b/coleslaw.asd
@@ -1,23 +1,32 @@
-(defsystem :coleslaw
+(defsystem #:coleslaw
   :name "coleslaw-core"
   :description "Flexible Lisp Blogware"
-  :version "0.0.2"
-  :maintainer "Brit Butler <redline6561@gmail.com>"
+  :version "0.0.3"
+  :license "BSD"
   :author "Brit Butler <redline6561@gmail.com>"
-  :licence "LLGPL"
-  :depends-on (:cl-markdown :docutils :closure-template
-               :cl-fad :local-time)
-  :components ((:module src
-                        :components ((:file "packages")
-                                     (:file "coleslaw"
-                                            :depends-on ("packages"))
-                                     (:file "themes"
-                                            :depends-on ("coleslaw"))
-                                     (:file "comments"
-                                            :depends-on ("coleslaw"))
-                                     (:file "posts"
-                                            :depends-on ("coleslaw"))
-                                     (:file "indices"
-                                            :depends-on ("posts"))
-                                     (:file "plugins"
-                                            :depends-on ("packages"))))))
+  :pathname "src/"
+  :depends-on (:closure-template :cl-fad :local-time :alexandria)
+  :serial t
+  :components ((:file "packages")
+               (:file "coleslaw")
+               (:file "themes")
+               (:file "comments")
+               (:file "posts")
+               (:file "indices")
+               (:file "plugins"))
+  :in-order-to ((test-op (load-op coleslaw-tests)))
+  :perform (test-op :after (op c)
+                    (funcall (intern "RUN!" :coleslaw-tests)
+                             (intern "COLESLAW-TESTS" :coleslaw-tests))))
+
+(defsystem #:coleslaw-tests
+  :depends-on (coleslaw fiveam)
+  :pathname "tests/"
+  :serial t
+  :components ((:file "packages")
+               (:file "tests")))
+
+(defmethod operation-done-p ((op test-op)
+                             (c (eql (find-system :coleslaw))))
+  (values nil))
+
diff --git a/gen-docs.sh b/gen-docs.sh
new file mode 100755
index 0000000..d210802
--- /dev/null
+++ b/gen-docs.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+sbcl --eval "(ql:quickload '(coleslaw sb-introspect cl-api))" \
+     --eval "(cl-api:api-gen :coleslaw \"docs/coleslaw.html\")" \
+     --eval "(progn (terpri) (sb-ext:quit))"
diff --git a/plugins/markdown.lisp b/plugins/markdown.lisp
new file mode 100644
index 0000000..db650c5
--- /dev/null
+++ b/plugins/markdown.lisp
@@ -0,0 +1,9 @@
+(eval-when (:compile-toplevel)
+  (ql:quickload '3mbd))
+
+(defpackage :coleslaw-md
+  (:use :cl :coleslaw))
+
+(in-package :coleslaw-md)
+
+
diff --git a/plugins/restructured-text.lisp b/plugins/restructured-text.lisp
new file mode 100644
index 0000000..a543e51
--- /dev/null
+++ b/plugins/restructured-text.lisp
@@ -0,0 +1,7 @@
+(eval-when (:compile-toplevel :load-toplevel)
+  (ql:quickload 'docutils))
+
+(defpackage :coleslaw-rst
+  (:use :cl :coleslaw))
+
+(in-package :coleslaw-rst)
diff --git a/tests/packages.lisp b/tests/packages.lisp
new file mode 100644
index 0000000..6661770
--- /dev/null
+++ b/tests/packages.lisp
@@ -0,0 +1,3 @@
+(defpackage :coleslaw-tests
+  (:use :cl :fiveam)
+  (:export #:run!))
diff --git a/tests/tests.lisp b/tests/tests.lisp
new file mode 100644
index 0000000..75b39d1
--- /dev/null
+++ b/tests/tests.lisp
@@ -0,0 +1 @@
+(in-package :coleslaw-tests)