tweaks to make game runnable via lein

cemerick · cemerick · commit 18f69002e632 · 2012-04-03T15:01:09.000-04:00
diff --git a/ch04-concurrency/project.clj b/ch04-concurrency/project.clj
@@ -1,4 +1,10 @@
 (defproject concurrency "1.0.0-SNAPSHOT"
-  :description "FIXME: write description"
-  :dependencies [[org.clojure/clojure "1.3.0"]
-                 [enlive "1.0.0"]])
+  :description "An array-backed set implementation, analogous to
+Clojure's array-map, explored in chapter 3 of 'Clojure Programming' by
+Emerick, Carper, and Grand."
+  :url "http://github.com/clojurebook/ClojureProgramming"
+  :dependencies [[org.clojure/clojure "1.3.0"]]
+  :profiles {:1.4 {:dependencies [[org.clojure/clojure "1.4.0-beta6"]]}}
+  :run-aliases {:loot com.clojurebook.concurrency.game/-loot-demo
+                :battle com.clojurebook.concurrency.game/-battle-demo
+                :logged-battle com.clojurebook.concurrency.game-validators/-main})
diff --git a/ch04-concurrency/src/com/clojurebook/concurrency/game.clj b/ch04-concurrency/src/com/clojurebook/concurrency/game.clj
@@ -67,32 +67,40 @@
   (while (and (alive? @character)
               (alive? @other)
               (action character other))
-    (Thread/sleep (rand-int 50))))
+    (Thread/sleep (rand-int 100))))
 
-(comment
-  ;epic battle!
+(defn -battle-demo []
   (def smaug (character "Smaug" :health 500 :strength 400))
   (def bilbo (character "Bilbo" :health 100 :strength 100))
   (def gandalf (character "Gandalf" :health 75 :mana 1000))
-  
+
   (wait-futures 1
                 (play bilbo attack smaug)
                 (play smaug attack bilbo)
                 (play gandalf heal bilbo))
 
-  (pprint (map (comp #(select-keys % [:name :health :mana]) deref) [smaug bilbo gandalf])))
+  (clojure.pprint/pprint
+    (map
+      (comp #(select-keys % [:name :health :mana]) deref)
+      [smaug bilbo gandalf]))
+
+  (shutdown-agents))
 
 
-(comment
+(defn -loot-demo []
   (def smaug (character "Smaug" :health 500 :strength 400 :items (set (range 50))))
   (def bilbo (character "Bilbo" :health 100 :strength 100))
   (def gandalf (character "Gandalf" :health 75 :mana 1000))
   (wait-futures 1
                 (while (loot smaug bilbo))
                 (while (loot smaug gandalf)))
-  
-  (println (map (comp count :items deref) [bilbo gandalf]))
-  (println (filter (:items @bilbo) (:items @gandalf))))
+
+  (println "Bilbo's and Gandalf's item counts (should always == 50):"
+    (map (comp count :items deref) [bilbo gandalf]))
+  (println "Overlap in Bilbo's and Gandalf's items (should always be empty):"
+    (filter (:items @bilbo) (:items @gandalf)))
+
+  (shutdown-agents))
 
 
 
diff --git a/ch04-concurrency/src/com/clojurebook/concurrency/game_validators.clj b/ch04-concurrency/src/com/clojurebook/concurrency/game_validators.clj
@@ -79,20 +79,25 @@
               (action character other))
     (Thread/sleep (rand-int 100))))
 
-(comment
+(defn -main []
   (def smaug (character "Smaug" :health 500 :strength 400))
   (def bilbo (character "Bilbo" :health 100 :strength 100))
   (def gandalf (character "Gandalf" :health 75 :mana 1000))
 
   (log-reference bilbo console character-log)
   (log-reference smaug console character-log)
-  
+
   (wait-futures 1
                 (play bilbo attack smaug)
                 (play smaug attack bilbo)
                 (play gandalf heal bilbo))
 
-  (clojure.pprint/pprint (map (comp #(select-keys % [:name :health :mana]) deref) [smaug bilbo gandalf])))
+  (clojure.pprint/pprint
+    (map
+      (comp #(select-keys % [:name :health :mana]) deref)
+      [smaug bilbo gandalf]))
+
+  (shutdown-agents))
 
 
 
