-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
223 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| {:paths ["src" "test" "resource" "resources" "other"] | ||
| :aliases {:some-alias {:extra-paths ["the-extra-path"] | ||
| :extra-deps {refactor-nrepl/refactor-nrepl {:mvn/version "3.2.0"}}}} | ||
| :deps {org.clojure/clojure {:mvn/version "1.10.3"} | ||
| org.clojars.brenton/google-diff-match-patch {:mvn/version "0.1"} | ||
| org.ow2.asm/asm-all {:mvn/version "5.2"}}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| (ns cider.enrich-classpath.clojure | ||
| (:require | ||
| [cider.enrich-classpath :as enrich-classpath] | ||
| [clojure.java.io :as io] | ||
| [clojure.string :as string] | ||
| [clojure.tools.deps.alpha :as tools.deps]) | ||
| (:import | ||
| (java.io File))) | ||
|
|
||
| (defn commandize [args clojure] | ||
| (->> args | ||
| (apply vector clojure) | ||
| (string/join " "))) | ||
|
|
||
| (defn impl ^String [clojure deps-edn-filename pwd args] | ||
| {:pre [(vector? args)]} ;; for conj | ||
| (let [aliases (into #{} | ||
| (comp (mapcat (fn [^String s] | ||
| (when (-> s (.startsWith "-A")) | ||
| (-> s | ||
| (string/replace #"-A:" "") | ||
| (string/replace #"-A" "") | ||
| (string/split #":"))))) | ||
| (map keyword)) | ||
| args) | ||
| {:keys [paths deps] | ||
| {:keys [extra-paths extra-deps]} :classpath-args | ||
| :as basis} (tools.deps/create-basis {:project (-> pwd (io/file deps-edn-filename) str) | ||
| :aliases aliases}) | ||
| paths (into paths extra-paths) | ||
| deps (into deps extra-deps) | ||
| original-paths-set (set paths) | ||
| original-deps-set (->> deps (map first) set) | ||
| {:keys [dependencies | ||
| resource-paths]} (enrich-classpath/middleware {:dependencies (->> deps | ||
| (keep (fn [[artifact-name {mv :mvn/version}]] | ||
| (when mv | ||
| [artifact-name mv]))) | ||
| (vec)) | ||
| :resource-paths paths}) | ||
| {:keys [classpath]} (tools.deps/calc-basis {:paths paths | ||
| :deps (->> dependencies | ||
| (map (fn [[k v marker classifier]] | ||
| [(cond-> k | ||
| (#{:classifier} marker) | ||
| (str "$" classifier) | ||
|
|
||
| true symbol) | ||
| {:mvn/version v}])) | ||
| (into {}))}) | ||
| ;; Avoids | ||
| ;; `WARNING: Use of :paths external to the project has been deprecated, please remove: ...`: | ||
| classpath (->> resource-paths | ||
| (remove original-paths-set) | ||
| (map (fn [entry] | ||
| {entry {:path-key ::_}})) | ||
| (into classpath)) | ||
| classpath (->> classpath | ||
| (sort-by (fn [[^String entry {:keys [lib-name path-key]}]] | ||
| {:pre [(or lib-name path-key)]} | ||
| (let [original-path? (and path-key (original-paths-set entry))] | ||
| (cond | ||
| (and original-path? | ||
| (-> entry (.contains "src"))) | ||
| [0 entry] | ||
|
|
||
| (and original-path? | ||
| (-> entry (.contains "test"))) | ||
| [1 entry] | ||
|
|
||
| (and original-path? | ||
| (-> entry (.contains "resource"))) | ||
| [3 entry] | ||
|
|
||
| original-path? | ||
| [2 entry] | ||
|
|
||
| ;; Let the original Clojure .clj libs go before any other deps - | ||
| ;; makes it less likely for other libs to overwrite Clojure stuff: | ||
| (and lib-name | ||
| (-> entry (.contains "/org/clojure/")) | ||
| (not (-> lib-name str (.contains "$")))) | ||
| [4 lib-name] | ||
|
|
||
| (original-deps-set lib-name) | ||
| [5 lib-name] | ||
|
|
||
| (and lib-name | ||
| (not (-> lib-name str (.contains "$")))) | ||
| [6 lib-name] | ||
|
|
||
| (and path-key | ||
| (-> entry (.contains "unzipped-jdk-sources"))) | ||
| [11 entry] | ||
|
|
||
| path-key ;; JDK sources | ||
| [7 entry] | ||
|
|
||
| lib-name ;; artifacts with sources or javadocs | ||
| [8 lib-name] | ||
|
|
||
| true ;; shouldn't happen, anyway we leave something reasonable | ||
| [9 (or lib-name path-key)])))) | ||
| (map first) | ||
| (string/join File/pathSeparator))] | ||
| (-> args | ||
| (conj "-Sforce" "-Srepro" "-J-XX:-OmitStackTraceInFastThrow" "-J-Dclojure.main.report=stderr" "-Scp" classpath) | ||
| (commandize clojure)))) | ||
|
|
||
| (defn -main [clojure pwd & args] | ||
| (try | ||
| (println (try | ||
| (impl clojure "deps.edn" pwd (vec args)) | ||
| (catch AssertionError e | ||
| (-> e .printStackTrace) | ||
| (commandize args clojure)) | ||
| (catch Exception e | ||
| (-> e .printStackTrace) | ||
| (commandize args clojure)))) | ||
| (finally | ||
| (shutdown-agents))) | ||
| (System/exit 0)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| #!/usr/bin/env bash | ||
| set -Eeuo pipefail | ||
| # sample usage: src/cider/enrich_classpath/clojure.sh clojure -Asome-alias <<< "(System/getProperty \"java.class.path\")" | ||
|
|
||
| clojure="$1" | ||
| # remove it from "$@"/"$*": | ||
| shift | ||
|
|
||
| file="deps.edn" | ||
|
|
||
| if [ ! -e $file ]; then | ||
| echo "$file not found." | ||
| $clojure "$@" | ||
| elif [[ "$*" == *Spath* ]]; then | ||
| echo "-Spath was passed; skipping enrich-classpath." | ||
| $clojure "$@" | ||
| elif [[ "$*" == *Scp* ]]; then | ||
| echo "-Scp was passed; skipping enrich-classpath." | ||
| $clojure "$@" | ||
| else | ||
|
|
||
| here="$PWD" | ||
|
|
||
| # don't let local deps.edn files interfere: | ||
| cd | ||
|
|
||
| output=$(2>&1 "$clojure" -Sforce -Srepro -J-XX:-OmitStackTraceInFastThrow -J-Dclojure.main.report=stderr -Sdeps '{:deps {mx.cider/enrich-classpath {:mvn/version "1.7.0"}}}' -M -m cider.enrich-classpath.clojure "$clojure" "$here" "$@") | ||
| cmd=$(tail -n1 <(echo "$output")) | ||
|
|
||
| cd "$here" | ||
|
|
||
| if grep --silent "^$clojure" <<< "$cmd"; then | ||
| $cmd | ||
| else | ||
| # Print errors: | ||
| echo "$output" | ||
| $clojure "$@" | ||
| fi | ||
|
|
||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| (ns integration.cider.enrich-classpath.clojure | ||
| (:require | ||
| [cider.enrich-classpath.clojure :as sut] | ||
| [clojure.test :refer [deftest is testing]])) | ||
|
|
||
| (deftest works | ||
| (testing "Returns a valid command with an -Scp specifying an enriched classpath, carefully sorted, and honoring aliases" | ||
| (let [actual (sut/impl "clojure" "sample.deps.edn" | ||
| (System/getProperty "user.dir") | ||
| ["-Asome-alias"])] | ||
| (testing actual | ||
| (is (-> actual (.contains "src:test:other:the-extra-path:resource:resources"))) | ||
| (is (-> actual (.contains "the-extra-path"))) | ||
| (is (-> actual (.contains "refactor-nrepl"))) | ||
| (is (-> actual (.contains "-Scp"))) | ||
| (is (-> actual (.contains "src.zip"))) | ||
| (is (-> actual (.contains "-sources.jar"))) | ||
| (is (-> actual (.contains "-javadoc.jar"))) | ||
| (when (re-find #"^1\.8\." (System/getProperty "java.version")) | ||
| (is (-> actual (.contains "unzipped-jdk-sources")))))))) |