Merge branch 'release/0.5.0'

Author: hugoduncan

README.md

@@ -133,7 +133,7 @@ A: Probably a disk full, or permission error.
 Via [clojars](http://clojars.org) and
 [Leiningen](http://github.com/technomancy/leiningen).
 
-    :dependencies [clj-ssh "0.4.4"]
+    :dependencies [clj-ssh "0.5.0"]
 
 or your favourite maven repository aware tool.
 

ReleaseNotes.md

@@ -1,6 +1,11 @@
 # Release Notes
 
-Current release is 0.4.4
+Current release is 0.5.0
+
+## 0.5.0
+
+- Require clojure 1.4.0
+  Drops usage of slingshot.
 
 ## 0.4.4
 

profiles.clj

@@ -1,12 +1,8 @@
 {:dev {:dependencies [[ch.qos.logback/logback-classic "1.0.0"]]}
- :slingshot-0.10.1 {:dependencies [[slingshot "0.10.1"]
-                                   [org.clojure/clojure "1.2.1"]]}
- :clojure-1.2.1 {:dependencies [[slingshot "0.10.1"]
-                                [org.clojure/clojure "1.2.1"]]}
- :clojure-1.3.0 {:dependencies [[slingshot "0.10.1"]
-                                [org.clojure/clojure "1.3.0"]]}
- :clojure-1.4.0 {:dependencies [[slingshot "0.10.1"]
-                                [org.clojure/clojure "1.4.0-beta1"]]}
+ :clojure-1.2.1 {:dependencies [[org.clojure/clojure "1.2.1"]]}
+ :clojure-1.3.0 {:dependencies [[org.clojure/clojure "1.3.0"]]}
+ :clojure-1.4.0 {:dependencies [[org.clojure/clojure "1.4.0"]]}
+ :clojure-1.5.0 {:dependencies [[org.clojure/clojure "1.5.0-RC4"]]}
  :codox {:codox {:writer codox-md.writer/write-docs
                  :version "0.4"
                  :output-dir "doc/api/0.4"

project.clj

@@ -1,14 +1,12 @@
-(defproject clj-ssh "0.4.4"
+(defproject clj-ssh "0.5.0"
   :description "Library for using SSH from clojure."
   :url "https://github.com/hugoduncan/clj-ssh"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure "1.2.1"]
+  :dependencies [[org.clojure/clojure "1.4.0"]
                  [org.clojure/tools.logging "0.1.2"
                   :exclusions [org.clojure/clojure]]
                  [jsch-agent-proxy "0.0.4"]
                  [jsch-agent-proxy/jsch-agent-proxy-jna "0.0.4"
                   :exclusions [com.jcraft/jsch-agent-proxy]]
-                 [slingshot "0.10.2"
-                  :exclusions [org.clojure/clojure]]
                  [com.jcraft/jsch "0.1.49"]])

release.sh

@@ -38,7 +38,7 @@ echo -n "commiting release notes and readme.  enter to continue:" && read x \
 && git add ReleaseNotes.md README.md project.clj \
 && git commit -m "Updated version, release notes and readme for $version" \
 && echo -n "Peform release.  enter to continue:" && read x \
-&& lein with-profile default:clojure-1.2.1:clojure-1.3.0:clojure-1.4.0 test \
+&& lein with-profile default:+clojure-1.5.0 test \
 && lein deploy clojars \
 && git flow release finish $version \
 && lein with-profile release set-version ${next_version} \

src/clj_ssh/ssh.clj

@@ -29,8 +29,6 @@
    [clojure.java.io :as io]
    [clojure.string :as string]
    [clojure.tools.logging :as logging])
-  (:use
-   [slingshot.slingshot :only [throw+]])
   (:import
    [java.io
     File InputStream OutputStream StringReader
@@ -183,10 +181,11 @@
            (.add id-repo (.forSSHAgent keypair)))))
 
      :else
-     (throw+
-      {:reason :do-not-know-how-to-add-identity
-       :args options}
-      "Don't know how to add identity"))))
+     (throw
+      (ex-info
+       "Don't know how to add identity"
+       {:reason :do-not-know-how-to-add-identity
+        :args options})))))
 
 (defn add-identity-with-keychain
   "Add a private key, only if not already known, using the keychain to obtain
@@ -214,10 +213,11 @@
           (add-identity agent (assoc options :passphrase passphrase))
           (do
             (logging/error "Passphrase required, but none findable.")
-            (throw+
-             {:reason :passphrase-not-found
-              :key-name name}
-             "Passphrase required for key %s, but none findable." name)))
+            (throw
+             (ex-info
+              (str "Passphrase required for key " name ", but none findable.")
+              {:reason :passphrase-not-found
+               :key-name name}) name)))
         (add-identity agent options)))))
 
 ;;; Sessions
@@ -518,7 +518,7 @@ sh returns a map of
       5 (. target#
            (~name (first args#) (second args#) (nth args# 2) (nth args# 3)
                   (nth args# 4)))
-      (throw+
+      (throw
        (java.lang.IllegalArgumentException.
         (str "Too many arguments passed.  Limit 5, passed " (count args#)))))))
 
@@ -564,7 +564,7 @@ sh returns a map of
                       (conj args (sftp-modemap (options :mode)))
                       args)]
            ((memfn-varargs put ChannelSftp) channel args))
-    (throw+
+    (throw
      (java.lang.IllegalArgumentException. (str "Unknown SFTP command " cmd)))))
 
 (defn sftp
@@ -616,15 +616,16 @@ cmd specifies a command to exec.  Valid commands are:
   [^InputStream in]
   (let [code (.read in)]
     (when-not (zero? code)
-      (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"))}))))
+      (throw
+       (ex-info
+        (format
+         "clj-ssh scp failure: %s"
+         (case code
+           1 "scp error"
+           2 "scp fatal error"
+           -1 "disconnect error"
+           "unknown error"))
+        {:type :clj-ssh/scp-failure})))))
 
 (defn- scp-send-command
   "Send command to the specified output stream"
@@ -695,11 +696,11 @@ cmd specifies a command to exec.  Valid commands are:
             (fn [^String path]
               (let [file (File. path)]
                 (when (.isDirectory file)
-                  (throw+
-                   {:type :clj-ssh/scp-directory-copy-requested
-                    :message (format
-                              "Copy of dir %s requested without recursive flag"
-                              path)}))
+                  (throw
+                   (ex-info
+                    (format
+                     "Copy of dir %s requested without recursive flag" path)
+                    {:type :clj-ssh/scp-directory-copy-requested})))
                 file)))]
     (map f paths)))
 
@@ -838,11 +839,10 @@ cmd specifies a command to exec.  Valid commands are:
         _ (when (and (.exists file)
                      (not (.isDirectory file))
                      (> (count remote-paths) 1))
-            (throw+
-             {:type :clj-ssh/scp-copy-multiple-files-to-file-requested
-              :message (format
-                        "Copy of multiple files to file %s requested"
-                        local-path)}))]
+            (throw
+             (ex-info
+              (format "Copy of multiple files to file %s requested" local-path)
+              {:type :clj-ssh/scp-copy-multiple-files-to-file-requested})))]
     (when (and session (not (connected? session)))
       (connect session))
     (let [[^PipedInputStream in