refactor: remove standalone package files and move those inline

asimpson · Aug 24, 2020 · 367680b · 367680b
1 parent 733c123
commit 367680b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 21 deletions.
diff --git a/cycle-dev-package.lisp b/cycle-dev-package.lisp
diff --git a/cycle-dev.asd b/cycle-dev.asd
@@ -6,5 +6,4 @@
   :serial t
   :depends-on (:cycle
                :sqlite)
-  :components ((:file "cycle-dev-package")
-               (:file "cycle-dev")))
+  :components ((:file "cycle-dev")))
diff --git a/cycle-dev.lisp b/cycle-dev.lisp
@@ -1,6 +1,11 @@
 ;;;; cycle-dev.lisp
 (require "asdf")
 
+(defpackage :cycle-dev
+  (:use
+    :cl
+    :cycle))
+
 (in-package :cycle-dev)
 
 (when (uiop:file-exists-p "BLOG")

diff --git a/cycle.asd b/cycle.asd
@@ -4,7 +4,7 @@
   :description "A opinionated static site builder."
   :author "Adam Simpson <[email protected]>"
   :license "GNU GPLv3"
-  :version "0.2.7"
+  :version "0.2.8"
   :serial t
   :depends-on (
     :local-time
@@ -14,7 +14,6 @@
     :3bmd
     :3bmd-ext-code-blocks
     :unix-opts)
-  :components ((:file "package")
-               (:file "cycle"))
+  :components ((:file "cycle"))
   :build-pathname "cycle"
   :entry-point "cycle:main")
diff --git a/cycle.lisp b/cycle.lisp
@@ -1,6 +1,15 @@
 ;;;; cycle.lisp
 (require "asdf")
 
+(defpackage :cycle
+;;https://lisp-lang.org/style-guide/#one-package-per-file
+  (:use :cl)
+  (:export
+    :main
+    :write-file
+    :split-string
+    :file-basename))
+
 (in-package :cycle)
 
 (defvar posts nil "Global posts variable.")

diff --git a/package.lisp b/package.lisp