yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into testsUnderWindows1

Browse source
This commit is contained in:
AtKaaZ 2013-05-13 21:00:58 +03:00
commit 9588d307d5
4 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
leiningen-core/src/leiningen/core/project.clj
View file

@ -232,7 +232,7 @@
[map] [map]
(-> map (-> map
(update-if-in-map [:repositories :deploy-repositories (update-if-in-map [:repositories :deploy-repositories
:plugin-repositories] normalize-repos) :mirrors :plugin-repositories] normalize-repos)
(update-if-in-map [:profiles] map-vals normalize-values))) (update-if-in-map [:profiles] map-vals normalize-values)))
(defn make (defn make

4
src/leiningen/new.clj
View file

@ -1,9 +1,9 @@
(ns leiningen.new (ns leiningen.new
"Generate project scaffolding based on a template." "Generate project scaffolding based on a template."
(:refer-clojure :exclude [new list]) (:refer-clojure :exclude [new list])
(:use [leiningen.new.templates :only [*dir*]])
(:require [bultitude.core :as bultitude] (:require [bultitude.core :as bultitude]
[leiningen.core.main :refer [abort]]) [leiningen.core.main :refer [abort]]
[leiningen.new.templates :refer [*dir*]])
(:import java.io.FileNotFoundException)) (:import java.io.FileNotFoundException))
(defn- fake-project [name] (defn- fake-project [name]

30
src/leiningen/repl.clj
View file

@ -1,16 +1,16 @@
(ns leiningen.repl (ns leiningen.repl
"Start a repl session either with the current project or standalone." "Start a repl session either with the current project or standalone."
(:require (clojure set (:require [clojure.set]
main [clojure.main]
[string :as s]) [clojure.string :as s]
[clojure.java.io :as io] [clojure.java.io :as io]
(clojure.tools.nrepl [ack :as nrepl.ack] [clojure.tools.nrepl.ack :as nrepl.ack]
[server :as nrepl.server]) [clojure.tools.nrepl.server :as nrepl.server]
(leiningen.core [eval :as eval] [leiningen.core.eval :as eval]
[main :as main] [leiningen.core.main :as main]
[user :as user] [leiningen.core.user :as user]
[project :as project] [leiningen.core.project :as project]
[classpath :as classpath]) [leiningen.core.classpath :as classpath]
[leiningen.trampoline :as trampoline] [leiningen.trampoline :as trampoline]
[reply.main :as reply])) [reply.main :as reply]))
@ -108,10 +108,14 @@
:bind ~(:host cfg) :port ~(:port cfg) :bind ~(:host cfg) :port ~(:port cfg)
:ack-port ~ack-port :ack-port ~ack-port
:handler ~(handler-for project)) :handler ~(handler-for project))
port# (-> server# deref :ss .getLocalPort)] port# (-> server# deref :ss .getLocalPort)
repl-port-file# (io/file ~(if (.exists (io/file
(:target-path project)))
(:target-path project)
(user/leiningen-home)) "repl-port")]
(when ~start-msg? (println "nREPL server started on port" port#)) (when ~start-msg? (println "nREPL server started on port" port#))
(spit ~(str (io/file (:target-path project) "repl-port")) port#) (spit repl-port-file# port#)
(.deleteOnExit (io/file ~(:target-path project) "repl-port")) (.deleteOnExit repl-port-file#)
@(promise)) @(promise))
;; TODO: remove in favour of :injections in the :repl profile ;; TODO: remove in favour of :injections in the :repl profile
`(do ~(when-let [init-ns (init-ns project)] `(do ~(when-let [init-ns (init-ns project)]

3
src/leiningen/update_in.clj
View file

@ -1,6 +1,7 @@
(ns leiningen.update-in (ns leiningen.update-in
(:refer-clojure :exclude [update-in]) (:refer-clojure :exclude [update-in])
(:require [leiningen.core.main :as main] [clojure.core :as clj])) (:require [leiningen.core.main :as main]
[clojure.core :as clj]))
(defn ^:internal parse-args [key-path f args] (defn ^:internal parse-args [key-path f args]
(let [[f-args [_ & task+args]] (split-with #(not= "--" %) args)] (let [[f-args [_ & task+args]] (split-with #(not= "--" %) args)]