yogsototh/marginalia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

First cut at parsing the project.clj file too.

Browse source
This commit is contained in:
fogus 2014-11-18 12:43:18 -05:00
parent e54a83a28b
commit 0bd050d75a
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
project.clj
View file

@ -1,4 +1,4 @@
(defproject marginalia "0.8.0"
(defproject marginalia "0.8.1-SNAPSHOT"
:description "lightweight literate programming for clojure -- inspired by [docco](http://jashkenas.github.com/docco/)"
;; :main marginalia.main
:dependencies

15
src/marginalia/core.clj
View file

@ -247,7 +247,7 @@
If no source files are found, complain with a usage message."
[args & [project]]
(let [[{:keys [dir file name version desc deps css js multi]} files help]
(let [[{:keys [dir file name version desc deps css js multi leiningen]} files help]
(cli args
["-d" "--dir" "Directory into which the documentation will be written" :default "./docs"]
["-f" "--file" "File into which the documentation will be written" :default "uberdoc.html"]
@ -260,8 +260,14 @@
If not given will be taken from project.clj."]
["-j" "--js" "Additional javascript resources <resource1>;<resource2>;...
If not given will be taken from project.clj"]
["-m" "--multi" "Generate each namespace documentation as a separate file" :flag true])
sources (distinct (format-sources (seq files)))]
["-m" "--multi" "Generate each namespace documentation as a separate file" :flag true]
["-l" "--leiningen" "Generate the documentation for a Leiningen project file." :default "./project.clj"])
sources (distinct (format-sources (seq files)))
sources (if leiningen (cons leiningen sources) sources)]
(println "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
(println leiningen)
(println sources)
(println "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
(if-not sources
(do
(println "Wrong number of arguments passed to Marginalia.")
@ -273,7 +279,8 @@
choose #(or %1 %2)
marg-opts (merge-with choose
{:css (when css (.split css ";"))
:javascript (when js (.split js ";"))}
:javascript (when js (.split js ";"))
:leiningen leiningen}
(:marginalia project-clj))
opts (merge-with choose
{:name name