Merge pull request #566 from metasim/metasim/fix-563

Additional tests and fix for #563.

src/main/scala/com/typesafe/sbt/packager/jdkpackager/JDKPackagerHelper.scala

@@ -79,6 +79,12 @@ object JDKPackagerHelper {
       .map(c ⇒ Map("-appclass" -> c))
       .getOrElse(Map.empty)
 
+    val vendorArg = if (maintainer.nonEmpty)
+      Map("-vendor" -> maintainer) else Map.empty
+
+    val descriptionArg = if (description.nonEmpty)
+      Map("-description" -> description) else Map.empty
+
     // Make a setting?
     val jvmOptsFile = (sourceDir ** JavaAppPackaging.appIniLocation).getPaths.headOption.map(file)
 
@@ -104,10 +110,8 @@ object JDKPackagerHelper {
       "-srcdir" -> sourceDir.getAbsolutePath,
       "-native" -> packageType,
       "-outdir" -> outputDir.getAbsolutePath,
-      "-outfile" -> basename,
-      "-description" -> description,
-      "-vendor" -> maintainer
-    ) ++ mainClassArg
+      "-outfile" -> basename
+    ) ++ mainClassArg ++ vendorArg ++ descriptionArg
 
     val singles = Seq(
       s"-BappVersion=$version",

src/sbt-test/jdkpackager/test-package-image/build.sbt

@@ -23,5 +23,6 @@ TaskKey[Unit]("checkImage") <<= (target in JDKPackager, name, streams) map { (ba
         case _ ⇒ ""
     }
     val expectedImage = base / "bundles" / (name + extension)
+    println(s"Checking for '${expectedImage.getAbsolutePath}'")
     assert(expectedImage.exists, s"Expected image file to be found at '$expectedImage'")
 }

src/sbt-test/jdkpackager/test-package-image/test

@@ -1,4 +1,3 @@
 # Run the jdkpackager packaging
 > jdkPackager:packageBin
 > checkImage
-

src/sbt-test/jdkpackager/test-package-minimal/build.sbt

@@ -0,0 +1,16 @@
+// Tests plugin behavior when none of the metadata keys are set.
+
+enablePlugins(JDKPackagerPlugin)
+
+mainClass in Compile := Some("ExampleApp")
+
+TaskKey[Unit]("checkImage") <<= (target in JDKPackager, name, streams) map { (base, name, streams) ⇒
+    val extension = sys.props("os.name").toLowerCase match {
+        case os if os.contains("mac") ⇒ ".app"
+        case os if os.contains("win") ⇒ ".exe"
+        case _ ⇒ ""
+    }
+    val expectedImage = base / "bundles" / (name + extension)
+    println(s"Checking for '${expectedImage.getAbsolutePath}'")
+    assert(expectedImage.exists, s"Expected image file to be found at '$expectedImage'")
+}

src/sbt-test/jdkpackager/test-package-minimal/project/plugins.sbt

@@ -0,0 +1,9 @@
+{
+    val pluginVersion = sys.props("project.version")
+    if (pluginVersion == null)
+        throw new RuntimeException(
+            """|The system property 'plugin.version' is not defined.
+               |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
+    else
+        addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version"))
+}

src/sbt-test/jdkpackager/test-package-minimal/src/main/scala/test/Test.scala

@@ -0,0 +1,5 @@
+package test
+
+object Test extends App {
+  println("SUCCESS!")
+}

src/sbt-test/jdkpackager/test-package-minimal/test

@@ -0,0 +1,3 @@
+# Run the jdkpackager packaging
+> jdkPackager:packageBin
+> checkImage