From 7b9dcb0c0790c860498e7859a8ba97d94329b902 Mon Sep 17 00:00:00 2001
From: Manfred Endres <manfred.endres@tslarusso.de>
Date: Tue, 13 Mar 2018 11:17:07 +0100
Subject: [PATCH] Refactor PaketPack task properties

Description
===========

The internal usage of `packageID` property was confusing. This pr
changes the handling of `packageID` provided by `paket.template`

Changes
=======

![IMPROVE] `PaketPack` properties
---
 .../wooga/gradle/paket/pack/PaketPackPlugin.groovy  |  3 +--
 .../pack/internal/PaketPublishingArtifact.groovy    |  2 +-
 .../wooga/gradle/paket/pack/tasks/PaketPack.groovy  | 13 +++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/groovy/wooga/gradle/paket/pack/PaketPackPlugin.groovy b/src/main/groovy/wooga/gradle/paket/pack/PaketPackPlugin.groovy
index 166e672..72f322d 100644
--- a/src/main/groovy/wooga/gradle/paket/pack/PaketPackPlugin.groovy
+++ b/src/main/groovy/wooga/gradle/paket/pack/PaketPackPlugin.groovy
@@ -107,9 +107,8 @@ class PaketPackPlugin implements Plugin<Project> {
 
             packTask = tasks.create(taskName, PaketPack.class)
             packTask.group = BasePlugin.BUILD_GROUP
-            packTask.description = "Pack package ${templateReader.getPackageId()}"
+            packTask.description = "Pack package ${packageID}"
             packTask.templateFile = file
-            packTask.packageId = packageID
 
             PublishArtifact artifact = PaketPublishingArtifact.fromTask(packTask)
 
diff --git a/src/main/groovy/wooga/gradle/paket/pack/internal/PaketPublishingArtifact.groovy b/src/main/groovy/wooga/gradle/paket/pack/internal/PaketPublishingArtifact.groovy
index d61a938..f03c823 100644
--- a/src/main/groovy/wooga/gradle/paket/pack/internal/PaketPublishingArtifact.groovy
+++ b/src/main/groovy/wooga/gradle/paket/pack/internal/PaketPublishingArtifact.groovy
@@ -27,7 +27,7 @@ class PaketPublishingArtifact implements PublishArtifact {
 
     @Override
     String getName() {
-        return task.packageId
+        return task.getPackageId()
     }
 
     @Override
diff --git a/src/main/groovy/wooga/gradle/paket/pack/tasks/PaketPack.groovy b/src/main/groovy/wooga/gradle/paket/pack/tasks/PaketPack.groovy
index 7ff2cb1..83e764e 100644
--- a/src/main/groovy/wooga/gradle/paket/pack/tasks/PaketPack.groovy
+++ b/src/main/groovy/wooga/gradle/paket/pack/tasks/PaketPack.groovy
@@ -39,8 +39,12 @@ import wooga.gradle.paket.base.utils.internal.PaketTemplate
  */
 class PaketPack extends AbstractPaketTask {
 
-    @Internal
-    def packageId
+    /**
+     * @return the packageId of the nuget to be packed.
+     */
+    String getPackageId() {
+        new PaketTemplate(getTemplateFile()).getPackageId()
+    }
 
     /**
      * The nuget package version.
@@ -48,7 +52,6 @@ class PaketPack extends AbstractPaketTask {
     @Input
     String version
 
-
     @Optional
     @InputFile
     def templateFile
@@ -73,9 +76,7 @@ class PaketPack extends AbstractPaketTask {
      */
     @OutputFile
     File getOutputFile() {
-        def templateReader = new PaketTemplate(getTemplateFile())
-        def packageID = templateReader.getPackageId()
-        project.file({"$outputDir/${packageID}.${getVersion()}.nupkg"})
+        project.file({"$outputDir/${getPackageId()}.${getVersion()}.nupkg"})
     }
 
     PaketPack() {