Clean up name delegation in the plugin. A few rules:

* Each configuration should have its own `name` and `normalizedName` instance
* Debian/Rpm delegate to Linux which delegates to project name.
* Universal has its own name, which is used for generating BASH/BAT files
* Separate key for the package filename now
* Windows has its own name/normalized name which delegates to raw.

Fixes sbt#188

Author: jsuereth

src/main/scala/com/typesafe/sbt/packager/archetypes/JavaApp.scala

@@ -64,7 +64,7 @@ object JavaAppPackaging {
         s <- script.toSeq
       } yield s -> ("bin/" + name + ".bat")
     },
-    linuxPackageMappings in Debian <+= (normalizedName, defaultLinuxInstallLocation, target in Debian) map {
+    linuxPackageMappings in Debian <+= (normalizedName in Debian, defaultLinuxInstallLocation, target in Debian) map {
       (name, installLocation, target) =>
         // create empty var/log directory
         val d = target / installLocation

src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala

@@ -89,28 +89,28 @@ object JavaServerAppPackaging {
    */
   def linuxSettings: Seq[Setting[_]] = Seq(
     // === logging directory mapping ===
-    linuxPackageMappings <+= (normalizedName, defaultLinuxLogsLocation, daemonUser in Linux, daemonGroup in Linux) map {
+    linuxPackageMappings <+= (normalizedName in Linux, defaultLinuxLogsLocation, daemonUser in Linux, daemonGroup in Linux) map {
       (name, logsDir, user, group) => packageTemplateMapping(logsDir + "/" + name)() withUser user withGroup group withPerms "755"
     },
-    linuxPackageSymlinks <+= (normalizedName, defaultLinuxInstallLocation, defaultLinuxLogsLocation) map {
+    linuxPackageSymlinks <+= (normalizedName in Linux, defaultLinuxInstallLocation, defaultLinuxLogsLocation) map {
       (name, install, logsDir) => LinuxSymlink(install + "/" + name + "/logs", logsDir + "/" + name)
     },
     // === etc config mapping ===
-    bashScriptConfigLocation <<= normalizedName map (name => Some("/etc/default/" + name)),
+    bashScriptConfigLocation <<= (normalizedName in Linux) map (name => Some("/etc/default/" + name)),
     linuxEtcDefaultTemplate <<= sourceDirectory map { dir =>
       val overrideScript = dir / "templates" / "etc-default"
       if (overrideScript.exists) overrideScript.toURI.toURL
       else etcDefaultTemplateSource
     },
-    makeEtcDefault <<= (normalizedName, target in Universal, linuxEtcDefaultTemplate, linuxScriptReplacements)
+    makeEtcDefault <<= (normalizedName in Linux, target in Universal, linuxEtcDefaultTemplate, linuxScriptReplacements)
       map makeEtcDefaultScript,
     linuxPackageMappings <++= (makeEtcDefault, normalizedName) map { (conf, name) =>
       conf.map(c => LinuxPackageMapping(Seq(c -> ("/etc/default/" + name)),
         LinuxFileMetaData(Users.Root, Users.Root)).withConfig()).toSeq
     },
 
     // === /var/run/app pid folder ===
-    linuxPackageMappings <+= (normalizedName, daemonUser in Linux, daemonGroup in Linux) map { (name, user, group) =>
+    linuxPackageMappings <+= (normalizedName in Linux, daemonUser in Linux, daemonGroup in Linux) map { (name, user, group) =>
       packageTemplateMapping("/var/run/" + name)() withUser user withGroup group withPerms "755"
     })
 

src/main/scala/com/typesafe/sbt/packager/linux/Keys.scala

@@ -47,5 +47,7 @@ trait Keys {
 }
 
 object Keys extends Keys {
+  def name = sbt.Keys.name
+  def normalizedName = sbt.Keys.normalizedName
   def sourceDirectory = sbt.Keys.sourceDirectory
 }

src/main/scala/com/typesafe/sbt/packager/linux/LinuxPlugin.scala

@@ -34,7 +34,9 @@ trait LinuxPlugin extends Plugin {
     },
     packageSummary in Linux <<= packageSummary,
     packageDescription in Linux <<= packageDescription,
-    daemonUser in Linux <<= normalizedName,
+    name in Linux <<= name,
+    normalizedName in Linux <<= (name in Linux) apply Project.normalizeModuleID,
+    daemonUser in Linux <<= normalizedName in Linux,
     daemonGroup in Linux <<= daemonUser in Linux,
     daemonShell in Linux := "/bin/false",
     defaultLinuxInstallLocation := "/usr/share",
@@ -44,7 +46,7 @@ trait LinuxPlugin extends Plugin {
     linuxJavaAppStartScriptBuilder := JavaAppStartScript.Debian,
     // This one is begging for sbt 0.13 syntax...
     linuxScriptReplacements <<= (
-      maintainer in Linux, packageSummary in Linux, daemonUser in Linux, daemonGroup in Linux, daemonShell in Linux, normalizedName,
+      maintainer in Linux, packageSummary in Linux, daemonUser in Linux, daemonGroup in Linux, daemonShell in Linux, normalizedName in Linux,
       sbt.Keys.version, defaultLinuxInstallLocation, linuxJavaAppStartScriptBuilder)
       apply { (author, descr, daemonUser, daemonGroup, daemonShell, name, version, installLocation, builder) =>
         val appDir = installLocation + "/" + name

src/main/scala/com/typesafe/sbt/packager/rpm/Keys.scala

@@ -61,6 +61,7 @@ trait RpmKeys {
 object Keys extends RpmKeys {
   // METADATA keys.
   def name = sbt.Keys.name
+  def normalizedName = sbt.Keys.normalizedName
   def version = sbt.Keys.version
   def maintainer = linux.Keys.maintainer
   def packageArchitecture = linux.Keys.packageArchitecture

src/main/scala/com/typesafe/sbt/packager/rpm/RpmPlugin.scala

@@ -41,10 +41,13 @@ trait RpmPlugin extends Plugin with LinuxPlugin {
     rpmPostun := None,
     rpmBrpJavaRepackJars := false,
     rpmScriptsDirectory <<= sourceDirectory apply (_ / "rpm" / Names.Scriptlets),
+    // Explicitly defer  default settings to generic Linux Settings.
     packageSummary in Rpm <<= packageSummary in Linux,
     packageDescription in Rpm <<= packageDescription in Linux,
-    target in Rpm <<= target(_ / "rpm")
+    target in Rpm <<= target(_ / "rpm"),
+    name in Rpm <<= name in Linux
   ) ++ inConfig(Rpm)(Seq(
+      normalizedName <<= name apply Project.normalizeModuleID,
       packageArchitecture := "noarch",
       rpmMetadata <<=
         (name, version, rpmRelease, rpmPrefix, packageArchitecture, rpmVendor, rpmOs, packageSummary, packageDescription, rpmAutoprov, rpmAutoreq) apply RpmMetadata,

src/main/scala/com/typesafe/sbt/packager/universal/Keys.scala

@@ -5,6 +5,7 @@ package universal
 import sbt._
 
 trait UniversalKeys {
+  val packageFilename = SettingKey[String]("package-filename", "The base filename for the universal packages.")
   val packageZipTarball = TaskKey[File]("package-zip-tarball", "Creates a tgz package.")
   val packageXzTarball = TaskKey[File]("package-xz-tarball", "Creates a txz package.")
   val packageOsxDmg = TaskKey[File]("package-osx-dmg", "Creates a dmg package for OSX (only on osx).")

src/main/scala/com/typesafe/sbt/packager/universal/UniversalPlugin.scala

@@ -21,7 +21,10 @@ trait UniversalPlugin extends Plugin {
       dist <<= dist in Universal,
       stage <<= stage in Universal,
       // TODO - New default to naming, is this right?
-      name in Universal <<= (normalizedName, version) apply (_ + "-" + _)
+      // TODO - We may need to do this for UniversalSrcs + UnviersalDocs
+      name in Universal <<= name,
+      name in UniversalDocs <<= name in Universal,
+      name in UniversalSrc <<= name in Universal
     ) ++
       makePackageSettingsForConfig(Universal) ++
       makePackageSettingsForConfig(UniversalDocs) ++
@@ -34,6 +37,8 @@ trait UniversalPlugin extends Plugin {
       makePackageSettings(packageZipTarball, config)(makeTgz) ++
       makePackageSettings(packageXzTarball, config)(makeTxz) ++
       inConfig(config)(Seq(
+        normalizedName <<= name apply Project.normalizeModuleID,
+        packageFilename <<= (normalizedName, version) apply (_ + "-" + _),
         mappings <<= sourceDirectory map findSources,
         dist <<= (packageBin, streams) map printDist,
         stagingDirectory <<= target apply (_ / "stage"),
@@ -74,7 +79,7 @@ trait UniversalPlugin extends Plugin {
   private[this] def makePackageSettings(packageKey: TaskKey[File], config: Configuration)(packager: Packager): Seq[Setting[_]] =
     inConfig(config)(Seq(
       mappings in packageKey <<= mappings map checkMappings,
-      packageKey <<= (target, name, mappings in packageKey) map packager
+      packageKey <<= (target, packageFilename, mappings in packageKey) map packager
     ))
 
   /** check that all mapped files actually exist */

src/main/scala/com/typesafe/sbt/packager/windows/WindowsPlugin.scala

@@ -11,6 +11,7 @@ trait WindowsPlugin extends Plugin {
   def windowsSettings: Seq[Setting[_]] = Seq(
     sourceDirectory in Windows <<= sourceDirectory(_ / "windows"),
     target in Windows <<= target apply (_ / "windows"),
+    // TODO - Should this use normalized name like the linux guys?
     name in Windows <<= name,
     // Defaults so that our simplified building works
     candleOptions := Seq("-ext", "WixUtilExtension"),

src/sbt-test/debian/test-mapping/build.sbt

@@ -6,6 +6,8 @@ mapGenericFilesToLinux
 
 name := "debian-test"
 
+name in Debian := "debian-test-override"
+
 version := "0.1.0"
 
 maintainer := "Josh Suereth <[email protected]>"

src/sbt-test/debian/upstart-deb/build.sbt

@@ -11,6 +11,8 @@ mainClass in Compile := Some("empty")
 
 name := "debian-test"
 
+name in Debian := "debian-test"
+
 version := "0.1.0"
 
 maintainer := "Josh Suereth <[email protected]>"

src/sbt-test/universal/test-mapping-helpers/test

@@ -1,5 +1,5 @@
 # Run the universal packaging.
-> universal:package-bin
+> show universal:package-bin
 $ exists target/universal/simple-test-0.1.0.zip
 
 > unzip