From: Eugene.Petrenko <eugene.petrenko@gmail.com>
Date: Tue, 23 Aug 2011 09:16:48 +0000 (+0200)
Subject: implement view pack parameters,
X-Git-Url: https://git.jetbrains.org/?p=teamcity%2FdotNetPackagesSupport.git;a=commitdiff_plain;h=2e621c1d001c7913e4d835db87f3b2046f28369a

implement view pack parameters,
---

diff --git a/nuget-server/resources/pack/viewPack.jsp b/nuget-server/resources/pack/viewPack.jsp
index f536bae..e6e62c6 100644
--- a/nuget-server/resources/pack/viewPack.jsp
+++ b/nuget-server/resources/pack/viewPack.jsp
@@ -19,4 +19,46 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <jsp:useBean id="ib" class="jetbrains.buildServer.nuget.server.pack.PackBean" scope="request"/>
 
-TBD
\ No newline at end of file
+
+<div class="parameter">
+  Path to NuGet.exe: <strong><props:displayValue name="${ib.nuGetPathKey}"/></strong>
+</div>
+
+
+<div class="parameter">
+  Specification file: <strong><props:displayValue name="${ib.packSpecFile}"/></strong>
+</div>
+
+<div class="parameter">
+  Version: <strong><props:displayValue name="${ib.packVersion}"/></strong>
+</div>
+
+<div class="parameter">
+  Base Directory: <strong><props:displayValue name="${ib.packBaseDirectory}"/></strong>
+</div>
+
+<div class="parameter">
+  Output Directory: <strong><props:displayValue name="${ib.packOutputDirectory}"/></strong>
+</div>
+
+<div class="parameter">
+  Exclude files: <props:displayValue name="${ib.packExcludePatterns}" showInPopup="${true}"/>
+</div>
+
+<div class="parameter">
+  Properties: <props:displayValue name="${ib.packProperties}" showInPopup="${true}"/>
+</div>
+
+<div class="parameter">
+  Create tool package: <strong><props:displayCheckboxValue name="${ib.packAsTool}"/></strong>
+</div>
+
+<div class="parameter">
+  Include symbols and sources: <strong><props:displayCheckboxValue name="${ib.packSources}"/></strong>
+</div>
+
+<div class="parameter">
+  Custom commandline: <strong><props:displayValue name="${ib.packCustomCommandline}" showInPopup="${true}"/></strong>
+</div>
+
+
diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackRunType.java b/nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackRunType.java
index 425ba6b..bf484e1 100644
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackRunType.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/pack/PackRunType.java
@@ -17,17 +17,21 @@
 package jetbrains.buildServer.nuget.server.pack;
 
 import jetbrains.buildServer.agent.ServerProvidedProperties;
+import jetbrains.buildServer.nuget.common.DotNetConstants;
 import jetbrains.buildServer.nuget.common.PackagesConstants;
+import jetbrains.buildServer.nuget.server.util.BasePropertiesProcessor;
+import jetbrains.buildServer.parameters.ReferencesResolverUtil;
+import jetbrains.buildServer.requirements.Requirement;
+import jetbrains.buildServer.requirements.RequirementType;
 import jetbrains.buildServer.serverSide.InvalidProperty;
 import jetbrains.buildServer.serverSide.PropertiesProcessor;
 import jetbrains.buildServer.serverSide.RunType;
 import jetbrains.buildServer.web.openapi.PluginDescriptor;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+
+import static jetbrains.buildServer.nuget.common.PackagesConstants.*;
 
 /**
  * @author Eugene Petrenko (eugene.petrenko@gmail.com)
@@ -56,12 +60,30 @@ public class PackRunType extends RunType {
     return "Creates NuGet package from a given spec file";
   }
 
+  @NotNull
+  @Override
+  public String describeParameters(@NotNull Map<String, String> parameters) {
+    StringBuilder sb = new StringBuilder();
+
+    sb.append("Pack: ").append(parameters.get(PackagesConstants.NUGET_PACK_SPEC_FILE)).append("\n");
+    sb.append("Version: ").append(parameters.get(PackagesConstants.NUGET_PACK_VERSION)).append("\n");
+    return sb.toString();
+  }
+
   @Override
   public PropertiesProcessor getRunnerPropertiesProcessor() {
-    return new PropertiesProcessor() {
-      public Collection<InvalidProperty> process(Map<String, String> properties) {
-        final ArrayList<InvalidProperty> result = new ArrayList<InvalidProperty>();
-        return result;
+    return new BasePropertiesProcessor() {
+      @Override
+      protected void checkProperties(@NotNull Map<String, String> map, @NotNull Collection<InvalidProperty> result) {
+        notEmpty(NUGET_PATH, "Path to nuget.exe must be specified", map, result);
+        notEmpty(NUGET_PACK_SPEC_FILE, "Package definition file must be specified", map, result);
+        notEmpty(NUGET_PACK_OUTPUT_DIR, "Package creation output directory must be specified", map, result);
+        final String version = notEmpty(NUGET_PACK_VERSION, "Version must be specified", map, result);
+        if (version != null && !ReferencesResolverUtil.containsReference(version) && !version.matches("\\d+(\\.\\d+){0,3}")) {
+          result.add(new InvalidProperty(NUGET_PACK_VERSION, "Version must be in assmebly version format: D[.D[.D[.D]]], i.e. 1.2.3 or 5.4.3.2"));
+        }
+
+        //TODO: check properties are well-formed
       }
     };
   }
@@ -82,4 +104,11 @@ public class PackRunType extends RunType {
       put(PackagesConstants.NUGET_PACK_VERSION, "%" + ServerProvidedProperties.BUILD_NUMBER_PROP + "%");
     }};
   }
+
+  @Override
+  public List<Requirement> getRunnerSpecificRequirements(@NotNull Map<String, String> runParameters) {
+    List<Requirement> list = new ArrayList<Requirement>(super.getRunnerSpecificRequirements(runParameters));
+    list.add(new Requirement(DotNetConstants.DOT_NET_FRAMEWORK_4_x86, null, RequirementType.EXISTS));
+    return list;
+  }
 }