Remove use of monolithic contrib

In preparation for clojure 1.3.
Use slingshot instead of contrib.condition.
Use local copy of contrib.reflect.

Author: hugoduncan

pom.xml

@@ -90,12 +90,12 @@
     <dependency>
       <groupId>org.clojure</groupId>
       <artifactId>clojure</artifactId>
-      <version>1.2.0</version>
+      <version>${clojure.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.clojure</groupId>
-      <artifactId>clojure-contrib</artifactId>
-      <version>1.2.0</version>
+      <groupId>slingshot</groupId>
+      <artifactId>slingshot</artifactId>
+      <version>0.2.0</version>
     </dependency>
     <dependency>
       <groupId>org.clojure</groupId>
@@ -110,18 +110,19 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-        <version>1.2.14</version>
+      <version>1.2.14</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>swank-clojure</groupId>
       <artifactId>swank-clojure</artifactId>
-      <version>1.2.1</version>
+      <version>1.3.1</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <profiles>
     <profile>
       <id>testuser</id>
@@ -138,8 +139,16 @@
 	</plugins>
       </build>
     </profile>
+    <profile>
+      <id>clojure-1.3</id>
+      <properties>
+        <clojure.version>1.3.0-beta1</clojure.version>
+      </properties>
+    </profile>
   </profiles>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <clojure.version>1.2.0</clojure.version>
   </properties>
 </project>

project.clj

@@ -1,13 +1,14 @@
-(defproject clj-ssh "0.2.0"
+(defproject clj-ssh "0.3.0"
   :description "ssh from clojure"
-  :dependencies [[org.clojure/clojure "1.1.0"]
-                 [org.clojure/clojure-contrib "1.1.0"]
-                 [com.jcraft/jsch "0.1.42"]]
+  :dependencies [[org.clojure/clojure "1.2.0"]
+                 [org.clojure/tools.logging "0.1.2"]
+                 [slingshot "0.2.0"]
+                 [com.jcraft/jsch "0.1.44-1"]]
   :dev-dependencies [[swank-clojure "1.2.1"]
                      [autodoc "0.7.1"]
                      [log4j/log4j "1.2.14"]]
   :autodoc {:name "clj-ssh"
             :description "Library for using SSH from clojure."
-            :copyright "Copyright Hugo Duncan 2010. All rights reserved."
+            :copyright "Copyright Hugo Duncan 2010, 2011. All rights reserved."
             :web-src-dir "http://github.com/hugoduncan/clj-ssh/blob/"
             :web-home "http://hugoduncan.github.com/clj-ssh/" })

src/clj_ssh/keychain.clj

@@ -3,7 +3,7 @@
    moment."
   (:require
    [clojure.tools.logging :as logging]
-   [clojure.contrib.shell :as shell]))
+   [clojure.java.shell :as shell]))
 
 (defn ask-passphrase [path]
   (when-let [console (. System console)]
@@ -21,7 +21,6 @@
 (defmethod keychain-passphrase "Mac OS X"
   [system path]
   (let [result (shell/sh
-                :return-map true
                 "/usr/bin/security" "find-generic-password" "-a"
                 (format "%s" path)
                 "-g")]

src/clj_ssh/ssh.clj

@@ -37,21 +37,24 @@ Leiningen (http://github.com/technomancy/leiningen).
 ## License
 
 Licensed under EPL (http://www.eclipse.org/legal/epl-v10.html)"
-  (:use
-   [clojure.contrib.def :only [defvar defvar- defunbound]])
   (:require
    [clj-ssh.keychain :as keychain]
-   [clojure.contrib.condition :as condition]
-   [clojure.tools.logging :as logging]
-   [clojure.contrib.reflect :as reflect]
+   [clj-ssh.reflect :as reflect]
    [clojure.java.io :as io]
-   [clojure.string :as string])
+   [clojure.string :as string]
+   [clojure.tools.logging :as logging]
+   [slingshot.core :as slingshot])
   (:import [com.jcraft.jsch
             JSch Session Channel ChannelShell ChannelExec ChannelSftp
             Identity IdentityFile Logger KeyPair]))
 
-(defunbound *ssh-agent* "SSH agent used to manage identities.")
-(defvar *default-session-options* {} "Default SSH options")
+(def ^{:doc "SSH agent used to manage identities." :dynamic true}
+  *ssh-agent*)
+
+(def
+  ^{:doc "Default SSH options"
+    :dynamic true}
+  *default-session-options* {})
 
 (def ^{:dynamic true}
   ssh-log-levels
@@ -97,7 +100,7 @@ Licensed under EPL (http://www.eclipse.org/legal/epl-v10.html)"
 (defn- default-user []
   (. System getProperty "user.name"))
 
-(def ^String *default-identity*
+(def ^{:dynamic true} ^String *default-identity*
      (.getPath (io/file (. System getProperty "user.home") ".ssh" "id_rsa")))
 
 (defmacro with-default-identity
@@ -261,8 +264,13 @@ keys.  All other option key pairs will be passed as SSH config options."
 
 (defn disconnect
   "Disconnect a session."
-  ([session]
-     (.disconnect session)))
+  [session]
+  (.disconnect session)
+  (when (instance? com.jcraft.jsch.Session session)
+    (when-let [t (reflect/get-field
+                  com.jcraft.jsch.Session 'connectThread session)]
+      (when (.isAlive t)
+        (.interrupt t)))))
 
 (defn connected?
   "Predicate used to test for a connected session."
@@ -275,10 +283,11 @@ keys.  All other option key pairs will be passed as SSH config options."
   [session & body]
   `(let [session# ~session]
      (try
-      (when-not (connected? session#)
-        (connect session#))
-      ~@body
-      (finally (disconnect session#)))))
+       (when-not (connected? session#)
+         (connect session#))
+       ~@body
+       (finally
+        (disconnect session#)))))
 
 (defn open-channel
   "Open a channel of the specified type in the session."
@@ -478,10 +487,9 @@ Options are
       5 (. target#
            (~name (first args#) (second args#) (nth args# 2) (nth args# 3)
                   (nth args# 4)))
-      (throw
+      (slingshot/throw+
        (java.lang.IllegalArgumentException.
-        (str
-         "too many arguments passed.  Limit 5, passed " (count args#)))))))
+        (str "Too many arguments passed.  Limit 5, passed " (count args#)))))))
 
 (def sftp-modemap { :overwrite ChannelSftp/OVERWRITE
                     :resume ChannelSftp/RESUME
@@ -525,8 +533,8 @@ Options are
                       (conj args (sftp-modemap (options :mode)))
                       args)]
            ((memfn-varargs put) channel args))
-    (throw (java.lang.IllegalArgumentException.
-            (str "Unknown SFTP command " cmd)))))
+    (slingshot/throw+
+     (java.lang.IllegalArgumentException. (str "Unknown SFTP command " cmd)))))
 
 (defn sftp
   "Execute SFTP commands.
@@ -597,15 +605,15 @@ Options are
   [in]
   (let [code (.read in)]
     (when-not (zero? code)
-      (condition/raise
-       :type :clj-ssh/scp-failure
-       :message (format
-                 "clj-ssh scp failure: %s"
-                 (case code
-                   1 "scp error"
-                   2 "scp fatal error"
-                   -1 "disconnect error"
-                   "unknown error"))))))
+      (slingshot/throw+
+       {:type :clj-ssh/scp-failure
+        :message (format
+                  "clj-ssh scp failure: %s"
+                  (case code
+                    1 "scp error"
+                    2 "scp fatal error"
+                    -1 "disconnect error"
+                    "unknown error"))}))))
 
 (defn- scp-send-command
   "Send command to the specified output stream"
@@ -677,11 +685,11 @@ Options are
             (fn [path]
               (let [file (java.io.File. path)]
                 (when (.isDirectory file)
-                  (condition/raise
-                   :type :clj-ssh/scp-directory-copy-requested
-                   :message (format
-                             "Copy of dir %s requested without recursive flag"
-                             path)))
+                  (slingshot/throw+
+                   {:type :clj-ssh/scp-directory-copy-requested
+                    :message (format
+                              "Copy of dir %s requested without recursive flag"
+                              path)}))
                 file)))]
     (map f paths)))
 
@@ -830,11 +838,11 @@ Options are
         _ (when (and (.exists file)
                      (not (.isDirectory file))
                      (> (count remote-paths) 1))
-            (condition/raise
-             :type :clj-ssh/scp-copy-multiple-files-to-file-requested
-             :message (format
-                       "Copy of multiple files to file %s requested"
-                       local-path)))
+            (slingshot/throw+
+             {:type :clj-ssh/scp-copy-multiple-files-to-file-requested
+              :message (format
+                        "Copy of multiple files to file %s requested"
+                        local-path)}))
         session-given (instance? com.jcraft.jsch.Session session-or-hostname)
         session (if session-given
                   session-or-hostname
@@ -878,7 +886,7 @@ Options are
        (when-not session-given
          (disconnect session))))))
 
-(defvar- key-types {:rsa KeyPair/RSA :dsa KeyPair/DSA})
+(def ^{:private true} key-types {:rsa KeyPair/RSA :dsa KeyPair/DSA})
 
 (defn generate-keypair
   "Generate a keypair, returned as [private public] byte arrays.