Merge release/0.5.13

Author: pbors

README.md

@@ -58,7 +58,7 @@ The `clj-ssh.ssh` namespace should be used for SSH from functional code.
     (with-connection session
       (let [result (ssh session {:in "echo hello"})]
         (println (result :out)))
-      (let [result (ssh session {:cmd "ls"}]
+      (let [result (ssh session {:cmd "ls"})]
         (println (second result)))))))
 ```
 
@@ -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.12"]
+    :dependencies [clj-ssh "0.5.13"]
 
 or your favourite maven repository aware tool.
 

ReleaseNotes.md

@@ -1,3 +1,21 @@
+## 0.5.13
+
+- Make clojure dependency have provided scope
+  Closes #25
+
+- Fix race condition in ssh-exec function when command finishes before we
+  enter with-channel-connection
+
+- ssh/download: fix :recursive and :preserve flags arity errors.
+  Recursive still doesn't work correctly: clj-ssh writes every file into the
+  same output.
+
+- Fixed recursive scp invocation.
+
+- fix trace/tracef mixup.
+
+- Fix missing parens
+
 ## 0.5.12
 
 - Update jsch and jsch agentproxy

project.clj

@@ -1,12 +1,11 @@
 (def agentproxy-version "0.0.9")
 
-(defproject clj-ssh "0.5.12"
+(defproject clj-ssh "0.5.13"
   :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.4.0"]
-                 [org.clojure/tools.logging "0.2.6"
+  :dependencies [[org.clojure/tools.logging "0.2.6"
                   :exclusions [org.clojure/clojure]]
                  [com.jcraft/jsch.agentproxy.usocket-jna ~agentproxy-version]
                  [com.jcraft/jsch.agentproxy.usocket-nc ~agentproxy-version]
@@ -15,4 +14,5 @@
                  [com.jcraft/jsch.agentproxy.core ~agentproxy-version]
                  [com.jcraft/jsch.agentproxy.jsch ~agentproxy-version]
                  [com.jcraft/jsch "0.1.53"]]
-  :jvm-opts ["-Djava.awt.headless=true"])
+  :jvm-opts ["-Djava.awt.headless=true"]
+  :profiles {:provided {:dependencies [[org.clojure/clojure "1.4.0"]]}})

src/clj_ssh/ssh.clj

@@ -686,16 +686,15 @@ config options."
       {:channel exec
        :out-stream out-inputstream
        :err-stream err-inputstream}
-      (with-channel-connection exec
-        (while (connected-channel? exec)
-          (Thread/sleep 100))
-        {:exit (.getExitStatus exec)
-         :out (if (= :bytes out)
-                (.toByteArray ^ByteArrayOutputStream out-stream)
-                (.toString out-stream))
-         :err (if (= :bytes out)
-                (.toByteArray ^ByteArrayOutputStream err-stream)
-                (.toString err-stream))}))))
+      (do (while (connected-channel? exec)
+            (Thread/sleep 100))
+          {:exit (.getExitStatus exec)
+           :out (if (= :bytes out)
+                  (.toByteArray ^ByteArrayOutputStream out-stream)
+                  (.toString out-stream))
+           :err (if (= :bytes out)
+                  (.toByteArray ^ByteArrayOutputStream err-stream)
+                  (.toString err-stream))}))))
 
 (defn ssh
   "Execute commands over ssh.
@@ -856,7 +855,7 @@ cmd specifies a command to exec.  Valid commands are:
 (defn- scp-send-command
   "Send command to the specified output stream"
   [^OutputStream out ^InputStream in ^String cmd-string]
-  (.write out (.getBytes cmd-string))
+  (.write out (.getBytes (str cmd-string "\n")))
   (.flush out)
   (logging/tracef "Sent command %s" cmd-string)
   (scp-receive-ack in)
@@ -882,38 +881,34 @@ cmd specifies a command to exec.  Valid commands are:
 
 (defn- scp-copy-file
   "Send acknowledgement to the specified output stream"
-  [send recv ^File file {:keys [mode buffer-size preserve]
+  [^OutputStream send ^InputStream recv ^File file {:keys [mode buffer-size preserve]
                    :or {mode 0644 buffer-size 1492 preserve false}}]
-  (logging/tracef "Sending %s" (.getAbsolutePath file))
+
   (when preserve
     (scp-send-command
      send recv
-     (format "P %d 0 %d 0\n" (.lastModified file) (.lastModified file))))
+     (format "P%d 0 %d 0" (.lastModified file) (.lastModified file))))
   (scp-send-command
    send recv
-   (format "C%04o %d %s\n" mode (.length file) (.getName file)))
-  (with-open [fs (FileInputStream. file)]
-    (io/copy fs send :buffer-size buffer-size))
+   (format "C%04o %d %s" mode (.length file) (.getName file)))
+  (logging/tracef "Sending %s" (.getAbsolutePath file))
+  (io/copy file send :buffer-size buffer-size)
   (scp-send-ack send)
-  (logging/trace "Sent ACK after send")
-  (scp-receive-ack recv)
-  (logging/trace "Received ACK after send"))
+  (logging/trace "Receiving ACK after send")
+  (scp-receive-ack recv))
 
 (defn- scp-copy-dir
   "Send acknowledgement to the specified output stream"
   [send recv ^File dir {:keys [dir-mode] :or {dir-mode 0755} :as options}]
-  (logging/trace "Sending directory %s" (.getAbsolutePath dir))
+  (logging/tracef "Sending directory %s" (.getAbsolutePath dir))
   (scp-send-command
    send recv
    (format "D%04o 0 %s" dir-mode (.getName dir)))
   (doseq [^File file (.listFiles dir)]
     (cond
      (.isFile file) (scp-copy-file send recv file options)
      (.isDirectory file) (scp-copy-dir send recv file options)))
-  (scp-send-ack send)
-  (logging/trace "Sent ACK after send")
-  (scp-receive-ack recv)
-  (logging/trace "Received ACK after send"))
+  (scp-send-command send recv "E"))
 
 (defn- scp-files
   [paths recursive]
@@ -1025,7 +1020,7 @@ cmd specifies a command to exec.  Valid commands are:
       (connect session))
     (let [[^PipedInputStream in
            ^PipedOutputStream send] (streams-for-in)
-          cmd (format "scp %s -t %s" (:remote-flags opts "") remote-path)
+          cmd (format "scp %s %s -t %s" (:remote-flags opts "") (if recursive "-r" "") remote-path)
           _ (logging/tracef "scp-to: %s" cmd)
           {:keys [^ChannelExec channel ^PipedInputStream out-stream]}
           (ssh-exec session cmd in :stream opts)
@@ -1084,8 +1079,9 @@ cmd specifies a command to exec.  Valid commands are:
                  (->>
                   (select-keys opts [:recursive :preserve])
                   (filter val)
-                  (map (fn [k v] (k flags))))))
+                  (map (comp flags key)))))
                (string/join " " remote-paths))
+          _ (println cmd)
           _ (logging/tracef "scp-from: %s" cmd)
           {:keys [^ChannelExec channel
                   ^PipedInputStream out-stream]}

test/clj_ssh/ssh_test.clj

@@ -616,6 +616,8 @@
         (testing ":out :stream"
           (let [proc (ssh s {:cmd "ls" :out :stream :pty true})]
             (is (> (count (slurp (:out-stream proc))) 1) ":out-stream")
+            (while (connected-channel? (:channel proc))
+              (Thread/sleep 100))
             (is (not (connected-channel? (:channel proc)))
                 ":channel not connected")
             (is (zero? (exit-status (:channel proc)))
@@ -628,6 +630,8 @@
         (testing ":out stream"
           (let [proc (ssh s {:in "ls" :out :stream})]
             (is (> (count (slurp (:out-stream proc))) 1) ":out-stream")
+            (while (connected-channel? (:channel proc))
+              (Thread/sleep 100))
             (is (not (connected-channel? (:channel proc)))
                 ":channel not connected")
             (is (zero? (exit-status (:channel proc)))