Merge pull request #59 from fogus/manual-parse

Manual parse

project.clj

@@ -4,7 +4,7 @@
   :dependencies
   [[org.clojure/clojure "1.2.0"]
    [org.clojure/clojure-contrib "1.2.0"]
-   [hiccup "0.3.0"]
+   [hiccup "0.3.7"]
    [org.markdownj/markdownj "0.3.0-1.0.2b4"]]
   :dev-dependencies
   [[lein-clojars "0.6.0"]

src/marginalia/core.clj

@@ -236,7 +236,7 @@
      using the found source files and a project file expected to be in its default location.
 
    If no source files are found, complain with a usage message."
-  [args]
+  [args & [project]]
   (with-command-line args
     (str "Leiningen plugin for running marginalia against your project.\n\n"
          "Usage: lein marg <options?> <src1> ... <src-n>\n")
@@ -258,8 +258,9 @@
           (println "Wrong number of arguments passed to marginalia.")
           (print-help))
         (binding [*docs* dir]
-          (let [project-clj (when (.exists (io/file "project.clj"))
-                              (parse-project-file))
+          (let [project-clj (or project
+                                (when (.exists (io/file "project.clj"))
+                                  (parse-project-file)))
                 choose #(or %1 %2)
                 marg-opts (merge-with choose
                                       {:css (when css (.split css ";"))

src/marginalia/html.clj

@@ -121,13 +121,6 @@
                            [:td {:class "dep-version"} (second %)]])
                    deps)]]))))
 
-(defn cake-plugins-html [tasks]
-  (when tasks
-    (html [:div {:class "plugins"}
-           [:h3 "cake plugin namespaces"]
-           [:ul
-            (map #(vector :li %) tasks)]])))
-
 ;; # Load Optional Resources
 ;; Use external Javascript and CSS in your documentation. For example:
 ;; To format Latex math equations, download the
@@ -166,8 +159,7 @@
       [:br]
       (md (:description project-info))]
      (dependencies-html (:dependencies project-info))
-     (dependencies-html (:dev-dependencies project-info) "dev dependencies")
-     (cake-plugins-html (:tasks project-info))]
+     (dependencies-html (:dev-dependencies project-info) "dev dependencies")]
     [:td {:class "codes"
           :style "text-align: center; vertical-align: middle;color: #666;padding-right:20px"}
      [:br]