Merge branch 'release/0.4.4'

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.3"]
+    :dependencies [clj-ssh "0.4.4"]
 
 or your favourite maven repository aware tool.
 

ReleaseNotes.md

@@ -1,6 +1,13 @@
 # Release Notes
 
-Current release is 0.4.3
+Current release is 0.4.4
+
+## 0.4.4
+
+- Make ssh key test more robust
+  The add-identity-test ssh-agent case was failing for no apparent reason.
+
+- Remove some reflection warnings
 
 ## 0.4.3
 

project.clj

@@ -1,4 +1,4 @@
-(defproject clj-ssh "0.4.3"
+(defproject clj-ssh "0.4.4"
   :description "Library for using SSH from clojure."
   :url "https://github.com/hugoduncan/clj-ssh"
   :license {:name "Eclipse Public License"

src/clj_ssh/keychain.clj

@@ -25,7 +25,8 @@
                 (format "%s" path)
                 "-g")]
     (when (zero? (result :exit))
-      (when-let [pw (second (re-find #"password: \"(.*)\"" (result :err)))]
+      (when-let [^String pw (second
+                             (re-find #"password: \"(.*)\"" (result :err)))]
         (.getBytes pw "UTF-8")))))
 
 (defn passphrase

src/clj_ssh/ssh.clj

@@ -93,9 +93,10 @@
 ;;; Agent
 (defn ssh-agent
   "Create a ssh-agent. By default a system ssh-agent is preferred."
-  [{:keys [use-system-ssh-agent known-hosts-path]
+  [{:keys [use-system-ssh-agent ^String known-hosts-path]
     :or {use-system-ssh-agent true
-         known-hosts-path (str (. System getProperty "user.home") "/.ssh/known_hosts")}}]
+         known-hosts-path (str (. System getProperty "user.home")
+                               "/.ssh/known_hosts")}}]
   (let [agent (JSch.)]
     (when use-system-ssh-agent
       (agent/connect agent))
@@ -145,13 +146,13 @@
                       ;; LocalIdentityRepository is not public, so we can't use
                       ;; instance?
                       (= "com.jcraft.jsch.LocalIdentityRepository"
-                         (.getName (type id-repo))))]
+                         (.getName ^Class (type id-repo))))]
     (cond
      identity
      (.addIdentity agent identity passphrase)
 
      (and public-key private-key)
-     (let [id-repo (id-repository)]
+     (let [^com.jcraft.jsch.IdentityRepository id-repo (id-repository)]
        (if (local-repo? id-repo)
          (.addIdentity agent name private-key public-key passphrase)
          (let [keypair (KeyPair/load agent private-key-path public-key-path)]
@@ -160,7 +161,7 @@
            (.add id-repo (.forSSHAgent keypair)))))
 
      (and public-key-path private-key-path)
-     (let [id-repo (id-repository)]
+     (let [^com.jcraft.jsch.IdentityRepository id-repo (id-repository)]
        (if (local-repo? id-repo)
          (.addIdentity
           agent
@@ -172,7 +173,7 @@
            (.add id-repo (.forSSHAgent keypair)))))
 
      private-key-path
-     (let [id-repo (id-repository)]
+     (let [^com.jcraft.jsch.IdentityRepository id-repo (id-repository)]
        (if (local-repo? id-repo)
          (.addIdentity agent (file-path private-key-path) passphrase)
          (let [keypair (KeyPair/load agent private-key-path)]
@@ -425,7 +426,7 @@ keys.  All other option key pairs will be passed as SSH config options."
           (Thread/sleep 100))
         {:exit (.getExitStatus shell)
          :out (if (= :bytes out)
-                (.toByteArray out-stream)
+                (.toByteArray ^ByteArrayOutputStream out-stream)
                 (.toString out-stream))}))))
 
 (defn ssh-exec
@@ -464,10 +465,10 @@ keys.  All other option key pairs will be passed as SSH config options."
           (Thread/sleep 100))
         {:exit (.getExitStatus exec)
          :out (if (= :bytes out)
-                (.toByteArray out-stream)
+                (.toByteArray ^ByteArrayOutputStream out-stream)
                 (.toString out-stream))
          :err (if (= :bytes out)
-                (.toByteArray err-stream)
+                (.toByteArray ^ByteArrayOutputStream err-stream)
                 (.toString err-stream))}))))
 
 (defn ssh

test/clj_ssh/ssh_test.clj

@@ -60,13 +60,15 @@
     (let [agent (ssh-agent {})]
       (let [n (count (.getIdentityNames agent))
             test-key-comment "key for test clj-ssh"
-            has-key (some #(= (private-key-path) %) (.getIdentityNames agent))]
+            names (vec (.getIdentityNames agent))
+            has-key (some #(= (private-key-path) %) names)]
         (add-identity
          agent
          {:private-key-path (private-key-path)
           :public-key-path (public-key-path)})
-        (is (or has-key (= (inc n) (count (.getIdentityNames agent)))))
-        (is (some #(= (private-key-path) %) (.getIdentityNames agent)))))))
+        (let [names (.getIdentityNames agent)]
+          (is (or has-key (= (inc n) (count names))))
+          (is (some #(= (private-key-path) %) names)))))))
 
 (deftest has-identity?-test
   (let [key (private-key-path)