Merge pull request #26 from michaelklishin/directory-structure-fix

Directory structure fix

project.clj

@@ -1,4 +1,4 @@
-(defproject lein-newnew "0.2.7"
+(defproject lein-newnew "0.2.8"
   :description "A Leiningen plugin for generating new projects based on templates."
   :dependencies [[stencil "0.2.0"]
                  [bultitude "0.1.5"]]

src/leiningen/new/default.clj

@@ -1,19 +1,20 @@
 (ns leiningen.new.default
   "Generate a basic project."
   (:use [leiningen.new.templates :only [renderer sanitize year
-                                        ->files sanitize-ns]]))
+                                        ->files sanitize-ns qualified-name-to-path]]))
 
 (defn default
   "A general project template."
   [name]
   (let [render (renderer "default")
         data {:name (sanitize-ns name)
               :sanitized (sanitize name)
+              :nested-dirs (qualified-name-to-path name)
               :year (year)}]
     (println "Generating a project called" name "based on the 'default' template.")
     (->files data
              ["project.clj" (render "project.clj" data)]
              ["README.md" (render "README.md" data)]
              [".gitignore" (render "gitignore" data)]
-             ["src/{{sanitized}}/core.clj" (render "core.clj" data)]
-             ["test/{{sanitized}}/core_test.clj" (render "test.clj" data)])))
+             ["src/{{nested-dirs}}/core.clj" (render "core.clj" data)]
+             ["test/{{nested-dirs}}/core_test.clj" (render "test.clj" data)])))

src/leiningen/new/templates.clj

@@ -35,6 +35,16 @@
   [s]
   (string/replace s #"-" "_"))
 
+(defn qualified-name-to-path
+  "Constructs directory structure from fully qualified artifact name:
+
+   myproject         creates src/myproject/* directory
+   mygroup.myproject creates src/mygroup/myproject/* directory
+
+   and so on. Uses platform-specific file separators."
+  [s]
+  (-> s (sanitize) (string/replace #"\." java.io.File/separator)))
+
 (defn sanitize-ns
   "Returns project namespace name from (possibly group-qualified) project name: