cleans up ns declarations

removes def-in-def
MailOnline · Jan 5, 2015 · 7235a4f · 7235a4f
1 parent 6d2aa54
commit 7235a4f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 21 deletions.
diff --git a/bin/gargamel.jar b/bin/gargamel.jar
diff --git a/src/gargamel/bower.clj b/src/gargamel/bower.clj
@@ -1,11 +1,11 @@
 (ns gargamel.bower
-  (:require [clojure.java.shell :as sh]
-            [cheshire.core :as json]
-            [clojure.java.io :as io]
-            [clojure.data :as data]
-            [leiningen.gargamel :as grg]
-            [clojure.string :as s]
-            [gargamel.git :as git]))
+  (:require [cheshire.core :as json]
+            [clojure
+             [data :as data]
+             [string :as s]]
+            [clojure.java.shell :as sh]
+            [gargamel.git :as git]
+            [leiningen.gargamel :as grg]))
 
 (defn- config [project-dir & {:keys [rev] :or {rev "HEAD"}}]
   (json/parse-string (:out (sh/sh "git" "show" (str rev ":bower.json" )

diff --git a/src/gargamel/core.clj b/src/gargamel/core.clj
@@ -1,10 +1,10 @@
 (ns gargamel.core
   (:gen-class)
-  (:require [leiningen.gargamel :as grg]
-            [leiningen.gargamel-lr :as grg-lr]
+  (:require [clojure.tools.cli :as cli]
             [gargamel.bower :as bower]
-            [clojure.tools.cli :as cli]
-            [clojure.string :as str]))
+            [leiningen
+             [gargamel :as grg]
+             [gargamel-lr :as grg-lr]]))
 
 (def gargamel-quotes
   ["Son of a smurf!"

diff --git a/src/gargamel/git.clj b/src/gargamel/git.clj
@@ -1,6 +1,6 @@
 (ns gargamel.git
-  (:require [gargamel.util :as util]
-            [clojure.java.shell :as sh]))
+  (:require [clojure.java.shell :as sh]
+            [gargamel.util :as util]))
 
 (defn changelog [from to dir]
   (:out (sh/sh "git" "log" "--date=short" "--format=%h%;%cN;%d;%ad;%s;%b;" (format "%s..%s" from to) :dir dir)))

diff --git a/src/leiningen/gargamel.clj b/src/leiningen/gargamel.clj
@@ -1,9 +1,8 @@
 (ns leiningen.gargamel
-  (:require [clojure.java.shell :as sh]
-            [clojure.string :as str]
-            [stencil.core :as st]
-            [gargamel.git :as git])
-  (:import [java.io File]))
+  (:require [clojure.string :as str]
+            [gargamel.git :as git]
+            [stencil.core :as st])
+  (:import java.io.File))
 
 (def ^:dynamic proj-name nil)
 
@@ -35,7 +34,6 @@
 (defn changelog [from to project]
   {:pre [from]}
   (let [raw-changelog (git/changelog from to (:dir project))]
-    (def myrawcl raw-changelog)
     (->> (str/split raw-changelog #";")
          (partition 6)
          (map #(zipmap [:hash :commiter :refs :date :subject :body] %))

diff --git a/src/leiningen/gargamel_lr.clj b/src/leiningen/gargamel_lr.clj
@@ -1,7 +1,7 @@
 (ns leiningen.gargamel-lr
   (:require [clojure.java.shell :as sh]
-            [leiningen.gargamel :as gr]
-            [clojure.string :as str]))
+            [clojure.string :as str]
+            [leiningen.gargamel :as gr]))
 
 (def ^:private default-release-tag-pattern
   "release-\\d+-\\d+_\\d+")