lispy-clojure.clj (use-package): Remove

* le-clojure.el (lispy-cider-jack-in-dependencies): Default to nil.

Fixes #615

Author: abo-abo

le-clojure.el

@@ -118,12 +118,7 @@
   (remove-hook 'nrepl-connected-hook
                'lispy--clojure-eval-hook-lambda))
 
-(defvar lispy-cider-jack-in-dependencies
-  '(("me.raynes/fs" "1.4.6")
-    ("compliment" "0.3.11")
-    ("com.cemerick/pomegranate" "0.4.0")
-    ("org.tcrawley/dynapath" "0.2.5")
-    ("nrepl" "0.8.2")))
+(defvar lispy-cider-jack-in-dependencies nil)
 
 (defvar cider-jack-in-cljs-dependencies)
 (defvar cider-jack-in-dependencies)
@@ -439,9 +434,12 @@ Besides functions, handles specials, keywords, maps, vectors and sets."
                    cider-jdk-src-paths
                    "\n  "))))
             (lispy--eval-clojure-cider sources-expr)))
-        (when lispy-clojure-middleware-tests
-          (lispy-message
-           (lispy--eval-clojure-cider "(lispy.clojure/run-lispy-tests)")))))))
+        (let ((test-fname (expand-file-name "lispy-clojure-test.clj"
+                                           lispy-site-directory)))
+          (when (and lispy-clojure-middleware-tests
+                     (file-exists-p test-fname))
+            (lispy-message
+             (lispy--eval-clojure-cider (format "(load-file \"%s\")" test-fname)))))))))
 
 (defun lispy-flatten--clojure (_arg)
   "Inline a Clojure function at the point of its call."

lispy-clojure-test.clj

@@ -18,20 +18,20 @@
 ;; see <http://www.gnu.org/licenses/>.
 
 (ns lispy-clojure-test
-  (:use [clojure.test :only [is deftest]]
-        [lispy.clojure :only [add-location-to-defn
-                              add-location-to-def
-                              debug-step-in
-                              dest
-                              expand-home
-                              get-func-args
-                              get-func-args-def
-                              guess-intent
-                              object-members
-                              position
-                              reader=
-                              reval
-                              symbol-function]]))
+  (:require
+   [clojure.test :refer [is deftest]]
+   [lispy.clojure :refer [add-location-to-defn
+                          add-location-to-def
+                          debug-step-in
+                          dest
+                          get-func-args
+                          get-func-args-def
+                          guess-intent
+                          object-members
+                          position
+                          reader=
+                          reval
+                          symbol-function]]))
 
 (deftest get-func-args-test
   (is (= (get-func-args (symbol-function 'string?) 1) '[x]))
@@ -76,7 +76,7 @@
 
 (deftest debug-step-in-test
   (is (= (debug-step-in
-           '(expand-home (str "/foo" "/bar")))
+           '(lispy.clojure/expand-home (str "/foo" "/bar")))
          {:path "/foo/bar"}))
   (is
     (=
@@ -145,7 +145,6 @@
            ["/foo/bar.clj" 42]))))
 
 (deftest guess-intent-test
-  (is (= (guess-intent '(defproject) nil) '(lispy.clojure/fetch-packages)))
   (is (= (guess-intent 'x '[x y]) 'x))
   (is (= (guess-intent '*ns* '*ns*) '*ns*))
   (is (= (guess-intent '(+ 1 2) '[(+ 1 2) (+ 3 4) (+ 5 6)])

lispy-clojure.clj

@@ -21,26 +21,12 @@
   (:require [clojure.repl :as repl]
             [clojure.pprint]
             [clojure.java.io :as io]
-            [clojure.string :as str]
-            [cemerick.pomegranate :refer [add-dependencies]])
+            [clojure.string :as str])
   (:import
    (java.io File LineNumberReader InputStreamReader
             PushbackReader FileInputStream)
    (clojure.lang RT)))
 
-(defn use-package [name version]
-  (add-dependencies
-    :coordinates [[name version]]
-    :repositories (merge cemerick.pomegranate.aether/maven-central
-                         {"clojars" "https://clojars.org/repo"})
-    :classloader (. (. (. Compiler/LOADER deref) getParent) getParent)))
-
-(defn expand-file-name [name dir]
-  (. (io/file dir name) getCanonicalPath))
-
-(use-package 'me.raynes/fs "1.4.6")
-(require '[me.raynes.fs :as fs])
-
 (defmacro xcond
   "Common Lisp style `cond'.
 
@@ -58,23 +44,11 @@ malleable to refactoring."
            (xcond
              ~@(next clauses)))))))
 
-(defn fetch-packages []
-  (xcond ((fs/exists? "deps.edn")
-          (println "fixme"))
-         ((fs/exists? "project.clj")
-          (let [deps (->> (slurp "project.clj")
-                          (read-string)
-                          (drop 3)
-                          (partition 2)
-                          (map vec)
-                          (into {})
-                          :dependencies)]
-            (doseq [[name ver] deps]
-              (use-package name ver))))
-         (:else
-          (throw
-            (ex-info "Found no project.clj or deps.edn"
-                     {:cwd fs/*cwd*})))))
+(defn file-exists? [f]
+  (. (io/file f) exists))
+
+(defn expand-file-name [name dir]
+  (. (io/file dir name) getCanonicalPath))
 
 (defn expand-home
   [path]
@@ -431,8 +405,6 @@ malleable to refactoring."
     expr
     (let [idx (position expr context reader=)]
       (xcond
-        ((#{'defproject} (first expr))
-         `(fetch-packages))
         ((nil? idx)
          expr)
         ;; [x |(+ 1 2) y (+ 3 4)] => {:x 3}
@@ -532,7 +504,7 @@ malleable to refactoring."
                  (clojure.core/str "error: " ~ 'e)))))))
 
 (defn file->elisp [f]
-  (if (fs/exists? f)
+  (if (file-exists? f)
     f
     (. (io/resource f) getPath)))
 
@@ -560,9 +532,3 @@ malleable to refactoring."
            (fn [v]
              (let [m (meta v)]
                (str v "\n" (:arglists m) "\n" (:doc m))))))))
-
-(defn run-lispy-tests []
-  (let [dd (fs/parent (:file (meta #'use-package)))
-        fname (java.io.File. dd "lispy-clojure-test.clj")]
-    (when (fs/exists? fname)
-      (load-file (str fname)))))