marcuskammer/coleslaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

preview should happen in the staging directory

Browse source
This commit is contained in:
Masataro Asai 2019-10-27 13:49:29 -04:00
parent 38a6c2d475
commit 8a3b05d2af
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
cli/cli.lisp
View file

@ -8,7 +8,9 @@
#:preview #:preview
#:watch #:watch
#:watch-preview #:watch-preview
#:help)) #:help
#:stage
#:deploy))
(in-package :coleslaw-cli) (in-package :coleslaw-cli)
@ -117,9 +119,15 @@ Excerpt separator is `<!--more-->` by default.
path)))))) path))))))
(defun generate () (defun generate ()
(coleslaw:main *default-pathname-defaults*)) (stage))
(defun preview (&optional (path (getf (read-rc) :deploy-dir))) (defun stage ()
(coleslaw:main *default-pathname-defaults* :deploy nil))
(defun deploy ()
(coleslaw:main *default-pathname-defaults* :deploy t))
(defun preview (&optional (path (getf (read-rc) :staging-dir)))
;; clack depends on the global binding of *default-pathname-defaults*. ;; clack depends on the global binding of *default-pathname-defaults*.
(let ((oldpath *default-pathname-defaults*)) (let ((oldpath *default-pathname-defaults*))
(unwind-protect (unwind-protect
@ -212,10 +220,12 @@ Command Line Syntax:
coleslaw setup [NAME] --- Sets up a new .coleslawrc file in the current directory. coleslaw setup [NAME] --- Sets up a new .coleslawrc file in the current directory.
coleslaw copy-theme THEME [TARGET] --- Copies the installed THEME in coleslaw to the current directory with a different name TARGET. coleslaw copy-theme THEME [TARGET] --- Copies the installed THEME in coleslaw to the current directory with a different name TARGET.
coleslaw new [TYPE] [NAME] --- Creates a new content file with the correct format. TYPE defaults to 'post', NAME defaults to the current date. coleslaw new [TYPE] [NAME] --- Creates a new content file with the correct format. TYPE defaults to 'post', NAME defaults to the current date.
coleslaw generate --- Generates the static html according to .coleslawrc . coleslaw stage --- Generates the static html in the staging dir.
coleslaw preview [DIRECTORY] --- Runs a preview server at port 5000. DIRECTORY defaults to the deploy directory (described in .coleslawrc). coleslaw generate --- Alias to `coleslaw stage`.
coleslaw deploy --- Generates the static html in the staging dir, then publish it to the deploy dir.
coleslaw preview [DIRECTORY] --- Runs a preview server at port 5000. DIRECTORY defaults to the staging directory.
coleslaw watch [DIRECTORY] --- Watches the given directory and generates the site when changes are detected. Defaults to the current directory. coleslaw watch [DIRECTORY] --- Watches the given directory and generates the site when changes are detected. Defaults to the current directory.
coleslaw --- Shorthand of 'coleslaw generate'. coleslaw --- Alias to `coleslaw stage`.
coleslaw -h --- Show this help coleslaw -h --- Show this help
Corresponding REPL commands are available in coleslaw-cli package. Corresponding REPL commands are available in coleslaw-cli package.
@ -225,7 +235,9 @@ Corresponding REPL commands are available in coleslaw-cli package.
(coleslaw-cli:setup &optional name) (coleslaw-cli:setup &optional name)
(coleslaw-cli:copy-theme theme &optional target) (coleslaw-cli:copy-theme theme &optional target)
(coleslaw-cli:new &optional type name) (coleslaw-cli:new &optional type name)
(coleslaw-cli:stage)
(coleslaw-cli:generate) (coleslaw-cli:generate)
(coleslaw-cli:deploy)
(coleslaw-cli:preview &optional directory) (coleslaw-cli:preview &optional directory)
(coleslaw-cli:watch &optional directory) (coleslaw-cli:watch &optional directory)
``` ```
@ -279,7 +291,13 @@ Examples:
(apply #'watch-preview rest)) (apply #'watch-preview rest))
((list* "new" rest) ((list* "new" rest)
(apply #'new rest)) (apply #'new rest))
((or nil (list "generate")) ((list* "generate" rest)
(apply #'generate rest))
((list* "stage" rest)
(apply #'stage rest))
((list* "deploy" rest)
(apply #'deploy rest))
(nil
(generate)) (generate))
((list* "copy-theme" rest) ((list* "copy-theme" rest)
(apply #'copy-theme rest)) (apply #'copy-theme rest))