Merge release/0.5.12

Author: pbors

README.md

@@ -163,7 +163,7 @@ Thanks to [Ryan Stradling](http://github.com/rstradling) for these.
 Via [clojars](http://clojars.org) and
 [Leiningen](http://github.com/technomancy/leiningen).
 
-    :dependencies [clj-ssh "0.5.11"]
+    :dependencies [clj-ssh "0.5.12"]
 
 or your favourite maven repository aware tool.
 

ReleaseNotes.md

@@ -1,3 +1,12 @@
+## 0.5.12
+
+- Update jsch and jsch agentproxy
+  jsch 0.1.53 agentproxy-version 0.0.9
+
+- Remove extra arg to throw
+  This makes clj-ssh compatible with Clojure 1.8, which does not allow the
+  extra argument to throw.
+
 ## 0.5.11
 
 - Lock known hosts file

profiles.clj

@@ -2,10 +2,12 @@
  {:dependencies [[ch.qos.logback/logback-classic "1.0.0"]]
   :plugins [[lein-pallet-release "RELEASE"]]
   :aliases {"test" ["with-profile"
-                    "clojure-1.4.0:clojure-1.5.1:clojure-1.6.0"
+                    "clojure-1.4.0:clojure-1.5.1:clojure-1.6.0:clojure-1.7.0:clojure-1.8.0"
                     "test"]}}
  :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.1 {:dependencies [[org.clojure/clojure "1.5.1"]]}
- :clojure-1.6.0 {:dependencies [[org.clojure/clojure "1.6.0"]]}}
+ :clojure-1.6.0 {:dependencies [[org.clojure/clojure "1.6.0"]]}
+ :clojure-1.7.0 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+ :clojure-1.8.0 {:dependencies [[org.clojure/clojure "1.8.0"]]}}

project.clj

@@ -1,6 +1,6 @@
-(def agentproxy-version "0.0.7")
+(def agentproxy-version "0.0.9")
 
-(defproject clj-ssh "0.5.11"
+(defproject clj-ssh "0.5.12"
   :description "Library for using SSH from clojure."
   :url "https://github.com/hugoduncan/clj-ssh"
   :license {:name "Eclipse Public License"
@@ -14,5 +14,5 @@
                  [com.jcraft/jsch.agentproxy.pageant ~agentproxy-version]
                  [com.jcraft/jsch.agentproxy.core ~agentproxy-version]
                  [com.jcraft/jsch.agentproxy.jsch ~agentproxy-version]
-                 [com.jcraft/jsch "0.1.51"]]
+                 [com.jcraft/jsch "0.1.53"]]
   :jvm-opts ["-Djava.awt.headless=true"])

src/clj_ssh/ssh.clj

@@ -298,7 +298,7 @@ keyword argument, or constructed from the other keyword arguments.
              (ex-info
               (str "Passphrase required for key " name ", but none findable.")
               {:reason :passphrase-not-found
-               :key-name name}) name)))
+               :key-name name}))))
         (add-identity agent options)))))
 
 ;;; Sessions

test/clj_ssh/ssh_test.clj

@@ -542,18 +542,19 @@
                       :strict-host-key-checking :no})]
         (is (instance? com.jcraft.jsch.Session session))
         (is (not (connected? session)))
-        (is (not (port-reachable? 2222)))
+        (is (not (port-reachable? 22222)))
         (connect session)
         (is (connected? session))
-        (forward-local-port session 2222 22)
-        (is (port-reachable? 2222))
-        (unforward-local-port session 2222)
-        (forward-local-port session 2222 22 "localhost")
-        (unforward-local-port session 2222)
-        (with-local-port-forward [session 2222 22]
-          (is (port-reachable? 2222)))
-        (with-local-port-forward [session 2222 22 "localhost"]
-          (is (port-reachable? 2222)))))))
+        (forward-local-port session 22222 22)
+        (is (port-reachable? 22222))
+        (unforward-local-port session 22222)
+        (forward-local-port session 22223 22 "localhost")
+        (is (port-reachable? 22223))
+        (unforward-local-port session 22223)
+        (with-local-port-forward [session 22224 22]
+          (is (port-reachable? 22224)))
+        (with-local-port-forward [session 22225 22 "localhost"]
+          (is (port-reachable? 22225)))))))
 
 (deftest forward-remote-port-test
   (testing "minimal test"
@@ -569,18 +570,18 @@
                       :strict-host-key-checking :no})]
         (is (instance? com.jcraft.jsch.Session session))
         (is (not (connected? session)))
-        (is (not (port-reachable? 2222)))
+        (is (not (port-reachable? 22222)))
         (connect session)
         (is (connected? session))
-        (forward-remote-port session 2222 22)
-        (is (port-reachable? 2222))
-        (unforward-remote-port session 2222)
-        (forward-remote-port session 2222 22 "localhost")
-        (unforward-remote-port session 2222)
-        (with-remote-port-forward [session 2222 22]
-          (is (port-reachable? 2222)))
-        (with-remote-port-forward [session 2222 22 "localhost"]
-          (is (port-reachable? 2222)))))))
+        (forward-remote-port session 22222 22)
+        (is (port-reachable? 22222))
+        (unforward-remote-port session 22222)
+        (forward-remote-port session 22222 22 "localhost")
+        (unforward-remote-port session 22222)
+        (with-remote-port-forward [session 22222 22]
+          (is (port-reachable? 22222)))
+        (with-remote-port-forward [session 22222 22 "localhost"]
+          (is (port-reachable? 22222)))))))
 
 (deftest jump-session-test
   (is (let [s (jump-session (ssh-agent {})
@@ -614,8 +615,6 @@
             (is (pos? (count (:out proc))) "no options")))
         (testing ":out :stream"
           (let [proc (ssh s {:cmd "ls" :out :stream :pty true})]
-            (is (connected-channel? (:channel proc))
-                ":channel connected")
             (is (> (count (slurp (:out-stream proc))) 1) ":out-stream")
             (is (not (connected-channel? (:channel proc)))
                 ":channel not connected")
@@ -628,8 +627,6 @@
             (is (zero? (:exit proc)) "zero exit status")))
         (testing ":out stream"
           (let [proc (ssh s {:in "ls" :out :stream})]
-            (is (connected-channel? (:channel proc))
-                ":channel connected")
             (is (> (count (slurp (:out-stream proc))) 1) ":out-stream")
             (is (not (connected-channel? (:channel proc)))
                 ":channel not connected")

test/logback.xml

@@ -20,6 +20,10 @@
     <appender-ref ref="SSHFILE" />
   </logger>
 
+  <logger name="com.jcraft" level="DEBUG">
+    <appender-ref ref="CONSOLE" />
+  </logger>
+
   <root level="INFO">
     <appender-ref ref="CONSOLE" />
   </root>