Merge branch 'master' of github.com:technomancy/leiningen

bin/lein

@@ -94,8 +94,11 @@ if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
     export LEIN_JVM_OPTS=${LEIN_JVM_OPTS:-"-Dclojure.compile.path=$LEIN_DIR/target/classes"}
     CLASSPATH="$LEIN_DIR/leiningen-core/src/"
     CLASSPATH="$CLASSPATH:$LEIN_DIR/leiningen-core/resources/"
-    CLASSPATH="$CLASSPATH:$(cat $LEIN_DIR/.lein-classpath 2> /dev/null)"
-    CLASSPATH="$CLASSPATH:$LEIN_DIR/leiningen-core/lib/*"
+    if [ -r "$LEIN_DIR/.lein-classpath" ]; then
+        CLASSPATH="$CLASSPATH:$(cat $LEIN_DIR/.lein-classpath 2> /dev/null)"
+    else
+        CLASSPATH="$CLASSPATH:$LEIN_DIR/leiningen-core/lib/*"
+    fi
     CLASSPATH="$CLASSPATH:$LEIN_DIR/test:$LEIN_DIR/target/classes"
     CLASSPATH="$CLASSPATH:$LEIN_DIR/src:$LEIN_DIR/resources:$LEIN_JAR"
     if [ -f .lein-classpath ]; then

leiningen-core/src/leiningen/core/classpath.clj

@@ -89,7 +89,8 @@
       {:host (.getHost url)
        :port (.getPort url)
        :username username
-       :password password})))
+       :password password
+       :non-proxy-hosts (System/getenv "http_nonProxyHosts")})))
 
 (defn- update-policies [update checksum [repo-name opts]]
   [repo-name (merge {:update (or update :daily)

sample.project.clj

@@ -232,7 +232,17 @@
   ;; Extensions here will be propagated to the pom but not used by Leiningen.
   :extensions [[org.apache.maven.wagon/wagon-webdav "1.0-beta-2"]
                [foo/bar-baz "1.0"]]
-  ;; If :scm is set, all key/value pairs appear exactly as configured, otherwise
-  ;; Leiningen will try to use information from a .git directory if it is present.
-  ;; The only purpose is the generation of the <scm> tag in pom.xml.
+  ;; Include <scm> tag in generated pom.xml file. All key/value pairs
+  ;; appear exactly as configured. If absent, Leiningen will try to
+  ;; use information from a .git directory.
   :scm {:name "git" :tag "098afd745bcd" :url "http://127.0.0.1/git/my-project"})
+
+;;; Environment Variables used by Leiningen
+
+;; JAVA_CMD - executable to use for java(1)
+;; JVM_OPTS - extra options to pass to the java command
+;; DEBUG - increased verbosity
+;; LEIN_SNAPSHOTS_IN_RELEASE - allow releases to depend on snapshots
+;; LEIN_REPL_PORT - port on which to start nREPL server
+;; http_proxy - host and port to proxy HTTP connections through
+;; http_no_proxy - hosts which may be accessed without proxying

src/leiningen/repl.clj

@@ -129,5 +129,6 @@ and port."
      ":headless" (do (start-server project
                        (repl-port project)
                        (ack-port project)))
-     ":connect" (reply/launch-nrepl {:attach (first opts)})
+     ":connect" (do (require 'cemerick.drawbridge.client)
+                    (reply/launch-nrepl {:attach (first opts)}))
      (main/abort "Unrecognized flag:" flag))))