Update to slingshot 0.10.0

Author: hugoduncan

pom.xml

@@ -94,7 +94,7 @@
     <dependency>
       <groupId>slingshot</groupId>
       <artifactId>slingshot</artifactId>
-      <version>0.2.0</version>
+      <version>0.10.0</version>
     </dependency>
     <dependency>
       <groupId>org.clojure</groupId>
@@ -144,6 +144,12 @@
         <clojure.version>1.3.0</clojure.version>
       </properties>
     </profile>
+    <profile>
+      <id>clojure-1.4</id>
+      <properties>
+        <clojure.version>1.4.0-alpha3</clojure.version>
+      </properties>
+    </profile>
   </profiles>
 
   <properties>

project.clj

@@ -2,7 +2,7 @@
   :description "ssh from clojure"
   :dependencies [[org.clojure/clojure "1.2.0"]
                  [org.clojure/tools.logging "0.1.2"]
-                 [slingshot "0.2.0"]
+                 [slingshot "0.10.0"]
                  [com.jcraft/jsch "0.1.44-1"]]
   :dev-dependencies [[log4j/log4j "1.2.14"]]
   :autodoc {:name "clj-ssh"

src/clj_ssh/ssh.clj

@@ -42,8 +42,9 @@ Licensed under EPL (http://www.eclipse.org/legal/epl-v10.html)"
    [clj-ssh.reflect :as reflect]
    [clojure.java.io :as io]
    [clojure.string :as string]
-   [clojure.tools.logging :as logging]
-   [slingshot.core :as slingshot])
+   [clojure.tools.logging :as logging])
+  (:use
+   [slingshot.slingshot :only [throw+]])
   (:import [com.jcraft.jsch
             JSch Session Channel ChannelShell ChannelExec ChannelSftp
             Identity IdentityFile Logger KeyPair]))
@@ -510,7 +511,7 @@ Options are
       5 (. target#
            (~name (first args#) (second args#) (nth args# 2) (nth args# 3)
                   (nth args# 4)))
-      (slingshot/throw+
+      (throw+
        (java.lang.IllegalArgumentException.
         (str "Too many arguments passed.  Limit 5, passed " (count args#)))))))
 
@@ -556,7 +557,7 @@ Options are
                       (conj args (sftp-modemap (options :mode)))
                       args)]
            ((memfn-varargs put) channel args))
-    (slingshot/throw+
+    (throw+
      (java.lang.IllegalArgumentException. (str "Unknown SFTP command " cmd)))))
 
 (defn sftp
@@ -628,7 +629,7 @@ Options are
   [in]
   (let [code (.read in)]
     (when-not (zero? code)
-      (slingshot/throw+
+      (throw+
        {:type :clj-ssh/scp-failure
         :message (format
                   "clj-ssh scp failure: %s"
@@ -708,7 +709,7 @@ Options are
             (fn [path]
               (let [file (java.io.File. path)]
                 (when (.isDirectory file)
-                  (slingshot/throw+
+                  (throw+
                    {:type :clj-ssh/scp-directory-copy-requested
                     :message (format
                               "Copy of dir %s requested without recursive flag"
@@ -861,7 +862,7 @@ Options are
         _ (when (and (.exists file)
                      (not (.isDirectory file))
                      (> (count remote-paths) 1))
-            (slingshot/throw+
+            (throw+
              {:type :clj-ssh/scp-copy-multiple-files-to-file-requested
               :message (format
                         "Copy of multiple files to file %s requested"