Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Adding :with-repl option to start a clojure.main/repl in-between test execution #50

Merged
merged 4 commits into from
Feb 26, 2016
Merged

Adding :with-repl option to start a clojure.main/repl in-between test execution #50

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1a510c
Added :with-repl opt, enables basic REPL that behaves the same as
Feb 16, 2016
679e353
Now using clojure.main/repl instead.
Feb 16, 2016
a07cb93
Added `with-repl` sections in README.md and CHANGES.md
Feb 23, 2016
45aa3fc
Restored monitor-keystrokes back to use `(.read System/in)`.
Feb 23, 2016
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: 1 addition & 1 deletion test-refresh/project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
:username :gpg :password :gpg}]
["releases" {:url "https://clojars.org/repo"
:username :gpg :password :gpg}]]
:profiles {:dev {:dependencies [[org.clojure/clojure "1.6.0"]]}}
:profiles {:dev {:dependencies [[org.clojure/clojure "1.7.0"]]}}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kept getting warnings about some of my plugins not running with 1.6.0.

:scm {:name "git"
:url "git@github.com:jakemcc/lein-test-refresh.git"})
52 changes: 40 additions & 12 deletions test-refresh/src/com/jakemccrary/test_refresh.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,27 @@
(defn- something-changed? [x y]
(not= x y))

(defn- monitor-keystrokes [keystroke-pressed]
(def printing (atom false))

(defn- monitor-keystrokes [keystroke-pressed with-repl?]
(future
(loop [c (.read System/in)]
(if (= c -1)
(System/exit 0)
(do (reset! keystroke-pressed true)
(recur (.read System/in)))))))
(let [run-test-refresh! #(do (reset! keystroke-pressed true)
(reset! printing true))]
(if with-repl?
(clojure.main/repl
:prompt #(do (while @printing (Thread/sleep 100))
(clojure.main/repl-prompt))
:read (fn [request-prompt request-exit]
(if-let [line (read-line)]
(if-not (empty? (clojure.string/trim line))
(read-string line)
(do (run-test-refresh!) :run-tests))
(System/exit 0))))
(loop [line (read-line)]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I realized now that this case (not with-repl?) should have just stayed the same, I can change it back if you prefer.

(if-not line
(System/exit 0)
(run-test-refresh!))
(recur (read-line)))))))

(defn- create-user-notifier [notify-command]
(let [notify-command (if (string? notify-command)
Expand Down Expand Up @@ -198,20 +212,24 @@
keystroke-pressed (atom nil)
selectors (second (:nses-and-selectors options))
report (:report options)
run-once? (:run-once options)]
run-once? (:run-once options)
with-repl? (:with-repl options)
monitoring? (atom false)]

(when report
(println "Using reporter:" report))
(when (:quiet options)
(defmethod capture-report :begin-test-ns [m]))

(when-not run-once? (monitor-keystrokes keystroke-pressed))
(loop [tracker (make-change-tracker)]
(let [new-tracker (scan-for-changes tracker)]
(let [new-tracker (scan-for-changes tracker)
something-changed? (something-changed? new-tracker tracker)]
(try
(when (or @keystroke-pressed
(something-changed? new-tracker tracker))
(when (or @keystroke-pressed something-changed?)
(reset! keystroke-pressed nil)
(reset! printing true)

(when (and with-repl? @monitoring? something-changed?) (println))
(print-banner)

(let [was-failed (tracking-failed-tests?)
Expand All @@ -227,7 +245,17 @@
(when (should-notify? result)
(when should-growl
(growl (:status result) (:message result)))
(users-notifier (:message result)))))
(users-notifier (:message result))))
(reset! printing false)

(when (and with-repl? @monitoring? something-changed?)
(clojure.main/repl-prompt)
(flush))

(when (and (not run-once?)
(not @monitoring?))
(monitor-keystrokes keystroke-pressed with-repl?)
(reset! monitoring? true)))
(catch Exception ex (.printStackTrace ex)))
(Thread/sleep 200)
(if-not run-once?
Expand Down
9 changes: 5 additions & 4 deletions test-refresh/src/leiningen/test_refresh.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
(:test-paths project []))))

(defn parse-commandline [project args]
(let [{:keys [notify-command notify-on-success growl silence quiet report changes-only run-once]} (:test-refresh project)
(let [{:keys [notify-command notify-on-success growl silence quiet report changes-only run-once with-repl]} (:test-refresh project)
should-growl (or (some #{:growl ":growl" "growl"} args) growl)
changes-only (or (some #{:changes-only ":changes-only" "changes-only"} args) changes-only)
run-once? (or (some #{:run-once ":run-once" "run-once"} args) run-once)
with-repl? (or (some #{:with-repl ":with-repl" "with-repl"} args) with-repl)
args (remove #{:growl ":growl" "growl"
:changes-only ":changes-only" "changes-only"
:run-once ":run-once" "run-once"} args)
notify-on-success (or (nil? notify-on-success) notify-on-success)
selectors (filter keyword? args)
]
selectors (filter keyword? args)]
{:growl should-growl
:changes-only changes-only
:notify-on-success notify-on-success
Expand All @@ -32,7 +32,8 @@
:test-paths (clojure-test-directories project)
:quiet quiet
:report report
:run-once run-once?}))
:run-once run-once?
:with-repl with-repl?}))

(defn test-refresh
"Autoruns clojure.test tests on source change or
Expand Down