Merge branch 'release/0.5.4'

Author: hugoduncan

README.md

@@ -117,8 +117,8 @@ SSH tunneling is also supported:
 
 ## Documentation
 
-[Annotated source](http:/hugoduncan.github.com/clj-ssh/api/0.4/uberdoc.html).
-[API](http:/hugoduncan.github.com/clj-ssh/api/0.4/index.html).
+[Annotated source](http:/hugoduncan.github.com/clj-ssh/0.5/annotated/uberdoc.html).
+[API](http:/hugoduncan.github.com/clj-ssh/0.5/api/index.html).
 
 ## FAQ
 
@@ -128,12 +128,22 @@ during an sftp transfer signify?
 
 A: Probably a disk full, or permission error.
 
+### TTY's and background processes
+
+Some useful links about ssh and background processes:
+
+- [Snail book](http://www.snailbook.com/faq/background-jobs.auto.html)
+- [ssh -t question on stackoverflow](http://stackoverflow.com/questions/14679178/why-does-ssh-wait-for-my-subshells-without-t-and-kill-them-with-t)
+- [sudo and tty question on stackoverflow](http://stackoverflow.com/questions/8441637/to-run-sudo-commands-on-a-ec2-instance)
+
+Thanks to [Ryan Stradling](http://github.com/rstradling) for these.
+
 ## Installation
 
 Via [clojars](http://clojars.org) and
 [Leiningen](http://github.com/technomancy/leiningen).
 
-    :dependencies [clj-ssh "0.5.3"]
+    :dependencies [clj-ssh "0.5.4"]
 
 or your favourite maven repository aware tool.
 

ReleaseNotes.md

@@ -1,6 +1,14 @@
 # Release Notes
 
-Current release is 0.5.3
+Current release is 0.5.4
+
+## 0.5.4
+
+- Ensure literal keys get a non-blank comment
+  When adding a literal key, use "Added by clj-ssh" as the comment.
+
+- Ensure literal key strings are handled correctly
+
 
 ## 0.5.3
 

profiles.clj

@@ -3,12 +3,17 @@
  :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"
-                 :exclude [clj-ssh.agent clj-ssh.reflect clj-ssh.keychain]}
-         :dependencies [[codox-md "0.1.0" :exclusions [org.clojure/clojure]]]}
- :marginalia {:marginalia {:dir "doc/api/0.4"}}
+ :doc {:dependencies [[com.palletops/pallet-codox "0.1.0-SNAPSHOT"]
+                      [codox-md "0.2.0" :exclusions [org.clojure/clojure]]]
+       :plugins [[codox/codox.leiningen "0.6.4"]
+                 [lein-marginalia "0.7.1"]]
+       :codox {:writer codox-md.writer/write-docs
+               :output-dir "doc/0.5/api"
+               :src-dir-uri "https://github.com/hugoduncan/clj-ssh/blob/develop"
+               :src-linenum-anchor-prefix "L"}
+       :aliases {"marg" ["marg" "-d" "doc/0.5/annotated"]
+                 "codox" ["doc"]
+                 "doc" ["do" "codox," "marg"]}}
  :release
  {:plugins [[lein-set-version "0.2.1"]]
   :set-version

project.clj

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

src/clj_ssh/ssh.clj

@@ -162,12 +162,14 @@
      private-key
      (let [^com.jcraft.jsch.IdentityRepository id-repo (id-repository)]
        (if (local-repo? id-repo)
-         (.addIdentity agent name private-key public-key passphrase)
+         (.addIdentity
+          agent name (as-bytes private-key) (as-bytes public-key) passphrase)
          (let [^KeyPair keypair
                (KeyPair/load
                 agent (as-bytes private-key) (as-bytes public-key))]
            (when passphrase
              (.decrypt keypair passphrase))
+           (.setPublicKeyComment keypair "Added by clj-ssh")
            (.add id-repo (.forSSHAgent keypair)))))
 
      (and public-key-path private-key-path)