Move -main to leiningen.core.main.

bin/lein

@@ -75,7 +75,6 @@ LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)"
 CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/"
 LEIN_JAR="$LEIN_HOME/self-installs/leiningen-$LEIN_VERSION-standalone.jar"
 CLOJURE_JAR="$HOME/.m2/repository/org/clojure/clojure/1.3.0/clojure-1.3.0.jar"
-NULL_DEVICE=/dev/null
 
 # apply context specific CLASSPATH entries
 if [ -f .lein-classpath ]; then
@@ -197,7 +196,6 @@ else
         CLOJURE_JAR=`cygpath -w "$CLOJURE_JAR"`
         ORIGINAL_PWD=`cygpath -w "$ORIGINAL_PWD"`
         CLASSPATH=`cygpath -wp "$CLASSPATH"`
-        NULL_DEVICE=NUL
     fi
 
     if [ $DEBUG ]; then
@@ -242,8 +240,7 @@ else
         $JAVA_CMD -Xbootclasspath/a:"$CLOJURE_JAR" -client \
             $LEIN_JVM_OPTS -Dleiningen.original.pwd="$ORIGINAL_PWD" \
             -Dleiningen.trampoline-file=$TRAMPOLINE_FILE -cp "$CLASSPATH" \
-            $JLINE clojure.main -e "(use 'leiningen.core)(-main)" \
-            $NULL_DEVICE "$@"
+            $JLINE clojure.main -m leiningen.core.main "$@"
         if [ -r $TRAMPOLINE_FILE ]; then
             TRAMPOLINE="$(cat $TRAMPOLINE_FILE)"
             rm $TRAMPOLINE_FILE
@@ -254,7 +251,7 @@ else
         # -Xbootclasspath/a:"$CLOJURE_JAR"
         exec $RLWRAP $JAVA_CMD  -client \
              $LEIN_JVM_OPTS -Dleiningen.original.pwd="$ORIGINAL_PWD" \
-             -cp "$CLASSPATH" $JLINE clojure.main -m leiningen.main "$@"
+             -cp "$CLASSPATH" $JLINE clojure.main -m leiningen.core.main "$@"
     fi
     test $CYGWIN_JLINE && stty icanon echo
 fi

leiningen-core/src/leiningen/core/main.clj

@@ -1,4 +1,4 @@
-(ns leiningen.main
+(ns leiningen.core.main
   (:require [leiningen.core.user :as user]
             [leiningen.core.project :as project]
             [clojure.java.io :as io]
@@ -37,7 +37,7 @@
            not-found))))
   ([task] (resolve-task task #'task-not-found)))
 
-(defn matching-arity? [task args]
+(defn ^:internal matching-arity? [task args]
   (some (fn [parameters]
           (and (if (= '& (last (butlast parameters)))
                  (>= (count args) (- (count parameters) 3))

test/leiningen/test/main.clj

@@ -1,37 +0,0 @@
-(ns leiningen.test.main
-  (:use [clojure.test]
-        [leiningen.main]))
-
-(deftest test-group-args-empty-args
-  (is (= [[]] (group-args []))))
-
-(deftest test-group-args-single-task
-  (is (= [["pom"]] (group-args ["pom"]))))
-
-(deftest test-group-args-without-args
-  (is (= [["clean"] ["deps"] ["test"]]
-         (group-args ["clean," "deps," "test"]))))
-
-(deftest test-group-args-with-args
-  (is (= [["test" "test-core"] ["version"]]
-         (group-args ["test" "test-core," "version"]))))
-
-(deftest test-group-args-with-long-chain
-  (is (= [["help" "help"] ["help" "version"] ["version"]
-          ["test" "test-compile"]]
-         (group-args '("help" "help," "help" "version," "version,"
-                       "test" "test-compile")))))
-
-(deftest test-matching-arity
-  (is (not (matching-arity? (resolve-task "version") ["bogus" "arg" "s"])))
-  (is (matching-arity? (resolve-task "test") []))
-  (is (matching-arity? (resolve-task "test") ["test-core"]))
-  (is (matching-arity? (resolve-task "search") ["clojure"]))
-  (is (matching-arity? (resolve-task "search") ["clojure" "2"])))
-
-(deftest test-version-satisfies
-  (is (version-satisfies? "1.5.0" "1.4.2"))
-  (is (not (version-satisfies? "1.4.2" "1.5.0")))
-  (is (version-satisfies? "1.2.3" "1.1.1"))
-  (is (version-satisfies? "1.2.0" "1.2"))
-  (is (version-satisfies? "1.2" "1")))