Merge branch 'release/0.5.0'

Author: sirthias

README.markdown

@@ -11,14 +11,16 @@ It builds on [sshj] to provide the following features:
 
 ## Installation
 
-There is no official release yet. Publishing of release artifacts on <http://scala-tools.org> is pending.
-If you use [SBT] you will be able to pull in the _scala-ssh_ artifacts with:
+The current release is *0.5.0*, it's available from <http://repo.spray.cc>.
+If you use [SBT] you can pull in the _scala-ssh_ artifacts with:
+
+    resolvers += "spray repo" at "http://repo.spray.cc"
 
     libraryDependencies += "com.decodified" %% "scala-ssh" % "0.5.0"
 
 [sshj] uses [SLF4J] for logging, so you might want to also add [logback] to your dependencies:
 
-    libraryDependencies += "ch.qos.logback" % "logback-classic" % "0.9.29"
+    libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.0.0"
 
 Additionally, in many cases you will need the following two artifacts, which provide additional cypher and compression
 support:
@@ -124,4 +126,5 @@ _scala-ssh_ project under the project’s open source license.
   [sshj]: https://github.com/shikhar/sshj
   [SBT]: https://github.com/harrah/xsbt/wiki
   [SLF4J]: http://www.slf4j.org/
-  [logback]: http://logback.qos.ch/
+  [logback]: http://logback.qos.ch/
+  [APL 2.0]: http://www.apache.org/licenses/LICENSE-2.0

build.sbt

@@ -1,21 +1,65 @@
 name := "scala-ssh"
 
+version := "0.5.0"
+
 organization := "com.decodified"
 
-version := "0.5.0-SNAPSHOT"
+organizationHomepage := Some(new URL("http://decodified.com"))
+
+description := "A Scala library providing remote shell access via SSH"
+
+homepage := Some(new URL("https://github.com/sirthias/scala-ssh"))
+
+startYear := Some(2011)
+
+licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
 
 scalaVersion := "2.9.1"
 
+scalacOptions := Seq("-deprecation", "-encoding", "utf8")
+
 libraryDependencies ++= Seq(
-	"net.schmizz" % "sshj" % "0.6.1",
-	"org.slf4j" % "slf4j-api" % "1.6.1",
+	"net.schmizz" % "sshj" % "0.7.0",
+	"org.slf4j" % "slf4j-api" % "1.6.4",
 	"org.bouncycastle" % "bcprov-jdk16" % "1.46" % "provided",
 	"com.jcraft" % "jzlib" % "1.0.7" % "provided",
-	"org.specs2" %% "specs2" % "1.6.1" % "test",
-	"ch.qos.logback" % "logback-classic" % "0.9.29" % "test"
+	"org.specs2" %% "specs2" % "1.7.1" % "test",
+	"ch.qos.logback" % "logback-classic" % "1.0.0" % "test"
 )
 
 resolvers ++= Seq(
-    "Akka Repository" at "http://akka.io/repository/",
-    "Jsch Reposiroty" at "http://jsch.sourceforge.net/maven2/"
-)
+    "Akka repo" at "http://akka.io/repository/"
+)
+
+
+///////////////
+// publishing
+///////////////
+
+credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
+
+publishMavenStyle := true
+
+publishTo <<= version { version =>
+  Some {
+    "spray nexus" at {
+      // public uri is repo.spray.cc, we use an SSH tunnel to the nexus here
+      "http://localhost:42424/content/repositories/" + {
+        if (version.trim.endsWith("SNAPSHOT")) "snapshots/" else"releases/"
+      }
+    }
+  }
+}
+
+
+///////////////
+// ls-sbt
+///////////////
+
+seq(lsSettings:_*)
+
+(LsKeys.tags in LsKeys.lsync) := Seq("ssh")
+
+(LsKeys.docsUrl in LsKeys.lsync) := Some(new URL("https://github.com/sirthias/scala-ssh/"))
+
+(externalResolvers in LsKeys.lsync) := Seq("spray repo" at "http://repo.spray.cc")

notes/0.5.0.markdown

@@ -0,0 +1,11 @@
+_scala-ssh_ is a Scala library providing remote shell access via SSH.
+It builds on [sshj][] to provide the following features:
+
+* Remote execution of one or more shell commands
+* Access to `stdin`, `stdout`, `stderr` and exitcode of remote shell commands
+* Authentication via password or public key
+* Host key verification via `known_hosts` file or explicit fingerprint
+* Convenient configuration of remote host properties via config file, resource or directly in code
+* Scala-idiomatic API
+
+  [sshj]: https://github.com/shikhar/sshj

notes/about.markdown

@@ -0,0 +1 @@
+_scala-ssh_ is a Scala library providing remote shell access via SSH.

project/build.properties

@@ -1 +1 @@
-sbt.version=0.11.0
+sbt.version=0.11.2

project/plugins.sbt

@@ -0,0 +1,6 @@
+addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.1")
+
+resolvers ++= Seq(
+  "less is" at "http://repo.lessis.me",
+  "coda" at "http://repo.codahale.com"
+)

src/main/ls/0.5.0.json

@@ -0,0 +1,34 @@
+
+{
+ "organization":"com.decodified",
+ "name":"scala-ssh",
+ "version":"0.5.0",
+ "description":"A Scala library providing remote shell access via SSH",
+ "site":"https://github.com/sirthias/scala-ssh",
+ "tags":["ssh"],
+ "docs":"https://github.com/sirthias/scala-ssh/",
+ "licenses": [{
+   "name": "Apache 2",
+   "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+  }],
+ "resolvers": ["http://repo.spray.cc"],
+ "dependencies": [{
+   "organization":"net.schmizz",
+   "name": "sshj",
+   "version": "0.7.0"
+  },{
+   "organization":"org.slf4j",
+   "name": "slf4j-api",
+   "version": "1.6.4"
+  },{
+   "organization":"org.bouncycastle",
+   "name": "bcprov-jdk16",
+   "version": "1.46"
+  },{
+   "organization":"com.jcraft",
+   "name": "jzlib",
+   "version": "1.0.7"
+  }],
+ "scalas": ["2.9.1"],
+ "sbt": false
+}

src/main/scala/com/decodified/scalassh/Command.scala

@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2011 Mathias Doenitz
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.decodified.scalassh
 
 import net.schmizz.sshj.connection.channel.direct.Session

src/main/scala/com/decodified/scalassh/HostConfig.scala

@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2011 Mathias Doenitz
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.decodified.scalassh
 
 import net.schmizz.sshj.{DefaultConfig, Config}
@@ -77,13 +93,16 @@ abstract class FromStringsHostConfigProvider extends HostConfigProvider {
   }
 
   private def keyfileLogin(settings: Map[String, String], source: String) = {
+    import PublicKeyLogin._
     setting("username", settings, source).right.map { user =>
       val keyfile = setting("keyfile", settings, source).right.toOption
       val passphrase = setting("passphrase", settings, source).right.toOption
       PublicKeyLogin(
         user,
         passphrase.map(SimplePasswordProducer),
-        keyfile.map(_ :: Nil).getOrElse(PublicKeyLogin.DefaultKeyLocations)
+        keyfile.map { kf =>
+          if (kf.startsWith("+")) kf.tail :: DefaultKeyLocations else kf :: Nil
+        }.getOrElse(DefaultKeyLocations)
       )
     }
   }

src/main/scala/com/decodified/scalassh/PasswordProducer.scala

@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2011 Mathias Doenitz
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.decodified.scalassh
 
 import net.schmizz.sshj.userauth.password.{Resource, PasswordFinder}