Merge release/0.5.8

Author: pbors

.gitignore

@@ -5,5 +5,5 @@ lib
 classes
 autodoc/**
 doc/**
-.lein-deps-sum
-.lein-failures
+.lein-*
+.nrepl-*

.travis.yml

@@ -1,17 +1,19 @@
 language: clojure
 lein: lein2
 before_script:
-  - ssh-keygen -N "" -f ~/.ssh/id_rsa
-  - cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
-  - ssh-keygen -f ~/.ssh/clj_ssh -t rsa -C "key for test clj-ssh" -N ""
-  - ssh-keygen -f ~/.ssh/clj_ssh_pp -t rsa -C "key for test clj-ssh" -N "clj-ssh"
-  - echo "from=\"127.0.0.1,localhost,0.0.0.0\" $(cat ~/.ssh/clj_ssh.pub)" >> ~/.ssh/authorized_keys
-  - echo "from=\"127.0.0.1,localhost,0.0.0.0\" $(cat ~/.ssh/clj_ssh_pp.pub)" >> ~/.ssh/authorized_keys
-  - eval $(ssh-agent)
-  - echo "clj-ssh" > pp
-  - chmod +x pp
-  - setsid ssh-add ~/.ssh/clj_ssh_pp < pp # add the key to the keychain
-
+- ssh-keygen -N "" -f ~/.ssh/id_rsa
+- cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+- ssh-keygen -f ~/.ssh/clj_ssh -t rsa -C "key for test clj-ssh" -N ""
+- ssh-keygen -f ~/.ssh/clj_ssh_pp -t rsa -C "key for test clj-ssh" -N "clj-ssh"
+- echo "from=\"127.0.0.1,localhost,0.0.0.0\" $(cat ~/.ssh/clj_ssh.pub)" >> ~/.ssh/authorized_keys
+- echo "from=\"127.0.0.1,localhost,0.0.0.0\" $(cat ~/.ssh/clj_ssh_pp.pub)" >> ~/.ssh/authorized_keys
+- eval $(ssh-agent)
+- echo "clj-ssh" > pp
+- chmod +x pp
+- setsid ssh-add ~/.ssh/clj_ssh_pp < pp
 script: lein2 test
-# notifications:
-#   irc: "irc.freenode.org#pallet"
+after_success:
+- lein2 pallet-release push
+env:
+  global:
+    secure: eOBqYhJhOJMtRiMKs9ZgG4pEHFy7YqiBZ5NUEWUYD6qav6sMRHqqR5F04NRI37SmnIupzeTChqfRgX0DOwHeTl4u+QJnwRDH2z3avu75FbtZWgiGrxzE39SESpVj/zsyDrEUzT7ZiMayXKyNa3ObiJ8vBUFT7x/OZyRp/1rJxHU=

README.md

@@ -115,6 +115,26 @@ SSH tunneling is also supported:
             (comment do something with port 8080 here)))))
 ```
 
+Jump hosts can be used with the `jump-session`.  Once the session is
+connected, the `the-session` function can be used to obtain a session
+that can be used with `ssh-exec`, etc.  The `the-session` function can
+be used on a session returned by `session`, so you can write code that
+works with both a `jump-session` session and a single host session.
+
+```clj
+(let [s (jump-session
+         (ssh-agent {})
+         [{:hostname "host1" :username "user"
+           :strict-host-key-checking :no}
+          {:hostname "final-host" :username "user"
+           :strict-host-key-checking :no}]
+         {})]
+  (with-connection s
+    (ssh-exec (the-session s) "ls" "" "" {}))
+```
+
+
+
 ## Documentation
 
 [Annotated source](http:/hugoduncan.github.com/clj-ssh/0.5/annotated/uberdoc.html).
@@ -143,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.7"]
+    :dependencies [clj-ssh "0.5.8"]
 
 or your favourite maven repository aware tool.
 

ReleaseNotes.md

@@ -1,4 +1,34 @@
-# Release Notes
+## 0.5.8
+
+- Enable introspection of sessions
+  Adds the session? predicate for testing for a Session object, an the
+  session-hostname and session-port functions for querying a session.
+
+- Enable copying identities between agents
+  The copy-identities can be used to copy identities from one agent to
+  another.  This is useful to allow copying identities from a system agent
+  to a non system agent.
+
+- Add support for jump hosts
+  The jump-session function is used to obtain a session that can be
+  connected across jump hosts.
+
+  The `the-session` function is added to obtain a jsch session from a
+  connected jump-session, or a connected jsch Session, and can be used in
+  code that wants to support jump sessions.
+
+- Add fingerprint function on keypairs
+
+- Allow keypair construction from just a public key
+
+- Update tools.logging to 0.2.6
+
+- Update to jsch 0.1.51
+  Adds support for private keys in PKCS#8 format.
+
+  Fixes several session crash issues.
+
+- Update to jsch.agentproxy 0.0.7
 
 ## 0.5.7
 

profiles.clj

@@ -1,8 +1,17 @@
-{:dev {:dependencies [[ch.qos.logback/logback-classic "1.0.0"]]}
+{:dev
+ {:dependencies [[ch.qos.logback/logback-classic "1.0.0"]]
+  :plugins [[lein-pallet-release "RELEASE"]]
+  :pallet-release
+  {:url "https://pbors:${GH_TOKEN}@github.com/hugoduncan/clj-ssh.git",
+   :branch "master"}
+  :aliases {"test" ["with-profile"
+                    "clojure-1.4.0:clojure-1.5.1:clojure-1.6.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.0 {:dependencies [[org.clojure/clojure "1.5.0-RC4"]]}
+ :clojure-1.5.1 {:dependencies [[org.clojure/clojure "1.5.1"]]}
+ :clojure-1.6.0 {:dependencies [[org.clojure/clojure "1.6.0"]]}
  :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"]
@@ -13,10 +22,4 @@
                :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
-  {:updates [{:path "README.md"
-              :no-snapshot true
-              :search-regex #"clj-ssh \"\d+\.\d+\.\d+\""}]}}}
+                 "doc" ["do" "codox," "marg"]}}}

project.clj

@@ -1,15 +1,17 @@
-(defproject clj-ssh "0.5.7"
+(def agentproxy-version "0.0.7")
+
+(defproject clj-ssh "0.5.8"
   :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.1.2"
+                 [org.clojure/tools.logging "0.2.6"
                   :exclusions [org.clojure/clojure]]
-                 [com.jcraft/jsch.agentproxy.usocket-jna "0.0.6"]
-                 [com.jcraft/jsch.agentproxy.usocket-nc "0.0.6"]
-                 [com.jcraft/jsch.agentproxy.sshagent "0.0.6"]
-                 [com.jcraft/jsch.agentproxy.pageant "0.0.6"]
-                 [com.jcraft/jsch.agentproxy.core "0.0.6"]
-                 [com.jcraft/jsch.agentproxy.jsch "0.0.6"]
-                 [com.jcraft/jsch "0.1.50"]])
+                 [com.jcraft/jsch.agentproxy.usocket-jna ~agentproxy-version]
+                 [com.jcraft/jsch.agentproxy.usocket-nc ~agentproxy-version]
+                 [com.jcraft/jsch.agentproxy.sshagent ~agentproxy-version]
+                 [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"]])