Moved from Maven to Leiningen

Flamefork · Feb 12, 2010 · ddea439 · ddea439
1 parent 3870574
commit ddea439
Show file tree

Hide file tree

Showing 33 changed files with 24 additions and 90 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 README.html
-target
+pom.xml
+classes
+lib
 
 
 *.iml

diff --git a/pom.xml b/pom.xml
diff --git a/project.clj b/project.clj
@@ -0,0 +1,10 @@
+(defproject
+  fleet "0.9.2-SNAPSHOT"
+  :description "Templating System for Clojure"
+  :url "http://github.com/Flamefork/fleet"
+
+  :dependencies [[org.clojure/clojure "1.1.0"]
+                 [org.clojure/clojure-contrib "1.1.0"]]
+  :dev-dependencies [[lein-clojars "0.5.0-SNAPSHOT"]
+                     [lein-javac "0.0.2-SNAPSHOT"]]
+  :repositories [["clojure-releases" "http://build.clojure.org/releases"]])
diff --git a/src/main/clojure/fleet.clj → src/fleet.clj b/src/main/clojure/fleet.clj → src/fleet.clj
diff --git a/src/main/clojure/fleet/builder.clj → src/fleet/builder.clj b/src/main/clojure/fleet/builder.clj → src/fleet/builder.clj
diff --git a/src/main/clojure/fleet/loader.clj → src/fleet/loader.clj b/src/main/clojure/fleet/loader.clj → src/fleet/loader.clj
diff --git a/src/main/clojure/fleet/parser.clj → src/fleet/parser.clj b/src/main/clojure/fleet/parser.clj → src/fleet/parser.clj
diff --git a/src/main/clojure/fleet/runtime.clj → src/fleet/runtime.clj b/src/main/clojure/fleet/runtime.clj → src/fleet/runtime.clj
diff --git a/src/main/clojure/fleet/util.clj → src/fleet/util.clj b/src/main/clojure/fleet/util.clj → src/fleet/util.clj
diff --git a/src/main/java/fleet/util/CljString.java → src/fleet/util/CljString.java b/src/main/java/fleet/util/CljString.java → src/fleet/util/CljString.java
diff --git a/...est/clojure/fleet/parser_builder_test.clj → test/fleet/parser_builder_test.clj b/...est/clojure/fleet/parser_builder_test.clj → test/fleet/parser_builder_test.clj
@@ -4,12 +4,12 @@
     [fleet parser builder]))
 
 (deftest parse-test
-  (let [tpl (slurp "src/test/fleet/second/post_tpl.fleet")
-        ast (slurp "src/test/fleet/second/post_tpl.ast.clj")]
+  (let [tpl (slurp "test/resources/second/post_tpl.fleet")
+        ast (slurp "test/resources/second/post_tpl.ast.clj")]
     (is (= (parse tpl) (read-string ast)))))
 
 (deftest build-test
-  (let [ast (read-string (slurp "src/test/fleet/second/post_tpl.ast.clj"))
-        clj (slurp "src/test/fleet/second/post_tpl.clj")]
+  (let [ast (read-string (slurp "test/resources/second/post_tpl.ast.clj"))
+        clj (slurp "test/resources/second/post_tpl.clj")]
 ;    (println (build '(post) ast))
     (is (= (build '(post) ast) clj))))
diff --git a/src/test/clojure/fleet/runtime_test.clj → test/fleet/runtime_test.clj b/src/test/clojure/fleet/runtime_test.clj → test/fleet/runtime_test.clj
diff --git a/src/test/clojure/fleet/util_test.clj → test/fleet/util_test.clj b/src/test/clojure/fleet/util_test.clj → test/fleet/util_test.clj
diff --git a/src/test/clojure/fleet_api_test.clj → test/fleet_api_test.clj b/src/test/clojure/fleet_api_test.clj → test/fleet_api_test.clj
@@ -13,15 +13,15 @@
   "html" :xml
   :fleet :bypass])
 
-(fleet-ns tpl "src/test/fleet/ns" filters)
+(fleet-ns tpl "test/resources/ns" filters)
 
 (deftest fleet-ns-test
   (let [initial-ns *ns*]
-    (fleet-ns 'tpl "src/test/fleet/ns" filters)
+    (fleet-ns 'tpl "test/resources/ns" filters)
     (is (= *ns* initial-ns))
     (is (=
       (tpl.posts/posts-html test-posts test-data)
-      (slurp "src/test/fleet/ns/posts/posts.html")))))
+      (slurp "test/resources/ns/posts/posts.html")))))
 
 (deftest error-reporting-test
   (let [e (is (thrown? ClassCastException (tpl.posts/exceptional)))
@@ -32,9 +32,9 @@
 (deftest cross-lang-test
   (is (=
     (tpl.posts/update (first test-posts))
-    (slurp "src/test/fleet/ns/posts/update.js"))))
+    (slurp "test/resources/ns/posts/update.js"))))
 
 (deftest layout-test
   (is (=
     (tpl/layout (tpl.posts/posts-html test-posts test-data))
-    (slurp "src/test/fleet/ns/posts/posts_with_layout.html"))))
+    (slurp "test/resources/ns/posts/posts_with_layout.html"))))
diff --git a/src/test/clojure/fleet_lang_test.clj → test/fleet_lang_test.clj b/src/test/clojure/fleet_lang_test.clj → test/fleet_lang_test.clj
@@ -7,12 +7,12 @@
 (defmacro fileet
   "Convinient way to define test templates"
   [args filename]
-  `(fleet ~args (slurp (str "src/test/fleet/" ~filename ".fleet")) {:escaping :xml}))
+  `(fleet ~args (slurp (str "test/resources/" ~filename ".fleet")) {:escaping :xml}))
 
 (defmacro readhtml
   "Convinient way to read test data"
   [filename]
-  `(slurp (str "src/test/fleet/" ~filename ".html")))
+  `(slurp (str "test/resources/" ~filename ".html")))
 
 (def test-posts
   [{:body "First Post"  :tags ["tag1" "tag2" "tag3"]},

diff --git a/src/test/fleet/first/test_tpl.fleet → test/resources/first/test_tpl.fleet b/src/test/fleet/first/test_tpl.fleet → test/resources/first/test_tpl.fleet
diff --git a/src/test/fleet/first/test_tpl.html → test/resources/first/test_tpl.html b/src/test/fleet/first/test_tpl.html → test/resources/first/test_tpl.html
diff --git a/src/test/fleet/ns/layout.html.fleet → test/resources/ns/layout.html.fleet b/src/test/fleet/ns/layout.html.fleet → test/resources/ns/layout.html.fleet
diff --git a/src/test/fleet/ns/posts/exceptional.fleet → test/resources/ns/posts/exceptional.fleet b/src/test/fleet/ns/posts/exceptional.fleet → test/resources/ns/posts/exceptional.fleet
diff --git a/src/test/fleet/ns/posts/post.html.fleet → test/resources/ns/posts/post.html.fleet b/src/test/fleet/ns/posts/post.html.fleet → test/resources/ns/posts/post.html.fleet
diff --git a/src/test/fleet/ns/posts/posts.html → test/resources/ns/posts/posts.html b/src/test/fleet/ns/posts/posts.html → test/resources/ns/posts/posts.html
diff --git a/src/test/fleet/ns/posts/posts.html.fleet → test/resources/ns/posts/posts.html.fleet b/src/test/fleet/ns/posts/posts.html.fleet → test/resources/ns/posts/posts.html.fleet
diff --git a/...est/fleet/ns/posts/posts_with_layout.html → ...resources/ns/posts/posts_with_layout.html b/...est/fleet/ns/posts/posts_with_layout.html → ...resources/ns/posts/posts_with_layout.html
diff --git a/src/test/fleet/ns/posts/update.js → test/resources/ns/posts/update.js b/src/test/fleet/ns/posts/update.js → test/resources/ns/posts/update.js
diff --git a/src/test/fleet/ns/posts/update.js.fleet → test/resources/ns/posts/update.js.fleet b/src/test/fleet/ns/posts/update.js.fleet → test/resources/ns/posts/update.js.fleet
diff --git a/src/test/fleet/second/esc_posts_tpl.html → test/resources/second/esc_posts_tpl.html b/src/test/fleet/second/esc_posts_tpl.html → test/resources/second/esc_posts_tpl.html
diff --git a/src/test/fleet/second/post_tpl.ast.clj → test/resources/second/post_tpl.ast.clj b/src/test/fleet/second/post_tpl.ast.clj → test/resources/second/post_tpl.ast.clj
diff --git a/src/test/fleet/second/post_tpl.clj → test/resources/second/post_tpl.clj b/src/test/fleet/second/post_tpl.clj → test/resources/second/post_tpl.clj
diff --git a/src/test/fleet/second/post_tpl.fleet → test/resources/second/post_tpl.fleet b/src/test/fleet/second/post_tpl.fleet → test/resources/second/post_tpl.fleet
diff --git a/src/test/fleet/second/posts_tpl.fleet → test/resources/second/posts_tpl.fleet b/src/test/fleet/second/posts_tpl.fleet → test/resources/second/posts_tpl.fleet
diff --git a/src/test/fleet/second/posts_tpl.html → test/resources/second/posts_tpl.html b/src/test/fleet/second/posts_tpl.html → test/resources/second/posts_tpl.html
diff --git a/src/test/fleet/third/anon_posts_tpl.fleet → test/resources/third/anon_posts_tpl.fleet b/src/test/fleet/third/anon_posts_tpl.fleet → test/resources/third/anon_posts_tpl.fleet
diff --git a/src/test/fleet/third/anon_posts_tpl.html → test/resources/third/anon_posts_tpl.html b/src/test/fleet/third/anon_posts_tpl.html → test/resources/third/anon_posts_tpl.html