Skip to content
This repository has been archived by the owner on Oct 2, 2020. It is now read-only.

-main can take multiple files/dirs #28

Merged
merged 3 commits into from
Jan 24, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
:dependencies [[org.clojure/clojure "1.4.0"]]
:profiles {:dev {:dependencies [[org.clojure/tools.trace "0.7.3"]
[org.clojars.runa/clj-schema "0.7.0"]
[gui-diff "0.3.9"]
[korma "0.3.0-beta11"]]}}
:test-selectors {:default (constantly true)
:integration :integration
:unit :unit}
;; retain compatibility with lein1 for now
:dev-dependencies [[org.clojure/tools.trace "0.7.3"]
[org.clojars.runa/clj-schema "0.7.0"]
[gui-diff "0.3.9"]
[korma "0.3.0-beta11"]]
:dev-resource-paths "dev-resources")

5 changes: 3 additions & 2 deletions src/slam/hound.clj
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@

(defn -main
"Takes a file or dir and rewrites the .clj files with reconstructed ns forms."
[file-or-dir]
(doseq [file (file-seq (io/file file-or-dir))
[& file-or-dirs]
(doseq [file-or-dir file-or-dirs
file (file-seq (io/file file-or-dir))
:when (re-find #"/[^\./]+\.clj" (str file))]
(try
(swap-in-reconstructed-ns-form file)
Expand Down
4 changes: 3 additions & 1 deletion src/slam/hound/regrow.clj
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@
:require-refer (for [n (all-ns)
[sym var] (ns-publics n)
:when (= missing (name sym))]
[(ns-name n) :refer [sym]])))
(if (= (ns-name n) 'clojure.test)
['clojure.test :refer :all]
[(ns-name n) :refer [sym]]))))

(defn- butlast-regex [candidate]
(if (symbol? candidate)
Expand Down
9 changes: 6 additions & 3 deletions src/slam/hound/stitch.clj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
(-> c resolve .getName (.split "\\.") last symbol))))))

(defn- group-by-namespace [uses]
(for [[namespace subclause] (group-by first uses)]
[namespace :refer (vec (sort (for [[_ _ [var]] subclause]
var)))]))
(for [[namespace subclause] (group-by first uses)
:let [[[_require_ _refer_ referred]] subclause]]
(if (= :all referred)
[namespace :refer :all]
[namespace :refer (vec (sort (for [[_ _ [var]] subclause]
var)))])))

(defn collapse-clause [ns-map clause]
(case clause
Expand Down
3 changes: 1 addition & 2 deletions test/slam/hound/regrow_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
:gen-class nil
:require-as '[[clojure.java.io :as io] [clojure.set :as set]]
:require-refer '[[slam.hound.stitch :refer [ns-from-map]]
[clojure.test :refer [is]]
[clojure.test :refer [deftest]]]
[clojure.test :refer :all]]
:import '(java.io.File java.io.ByteArrayInputStream
clojure.lang.Compiler$BodyExpr
java.util.UUID)
Expand Down
2 changes: 1 addition & 1 deletion test/slam/hound_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
\"Testing some things going on here.\"
(:require [clojure.java.io :as io]
[clojure.set :as set]
[clojure.test :refer [deftest is]]
[clojure.test :refer :all]
[slam.hound.stitch :refer [ns-from-map]])
(:import (clojure.lang Compiler$BodyExpr)
(java.io ByteArrayInputStream File)
Expand Down