more on remove installed packages

[teamcity/dotNetPackagesSupport.git] / nuget-server / src / jetbrains / buildServer / nuget / server / toolRegistry / impl / ToolsRegistry.java

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/ToolsRegistry.java b/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/ToolsRegistry.java
index a72f2aaa9abb91c77ed6aa47432a41591b8a0ba7..1859bbf6f3f56687074ba131ca7d3bf84057cff3 100644 (file)
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/ToolsRegistry.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/ToolsRegistry.java
@@ -16,6 +16,7 @@
 \r
 package jetbrains.buildServer.nuget.server.toolRegistry.impl;\r
 \r
+import com.intellij.openapi.diagnostic.Logger;\r
 import jetbrains.buildServer.nuget.server.toolRegistry.NuGetInstalledTool;\r
 import jetbrains.buildServer.util.FileUtil;\r
 import org.jetbrains.annotations.NotNull;\r
@@ -30,10 +31,14 @@ import java.util.Collections;
  * Date: 16.08.11 0:25\r
  */\r
 public class ToolsRegistry {\r
+  private static final Logger LOG = Logger.getInstance(ToolsRegistry.class.getName());\r
   private final ToolPaths myPaths;\r
+  private final PluginNaming myNaming;\r
 \r
-  public ToolsRegistry(@NotNull final ToolPaths paths) {\r
+  public ToolsRegistry(@NotNull final ToolPaths paths,\r
+                       @NotNull final PluginNaming naming) {\r
     myPaths = paths;\r
+    myNaming = naming;\r
   }\r
 \r
   @NotNull\r
@@ -54,7 +59,15 @@ public class ToolsRegistry {
   public void removeTool(@NotNull final String toolId) {\r
     for (InstalledTool tool : getToolsInternal()) {\r
       if (tool.getId().equals(toolId)) {\r
-        tool.delete();\r
+        LOG.info("Removing NuGet plugin: " + tool);\r
+\r
+        final File agentPlugin = myNaming.getAgetToolFilePath(tool);\r
+        LOG.info("Removing NuGet plugin agent tool : " + agentPlugin);\r
+        FileUtil.delete(agentPlugin);\r
+\r
+        final File toolHome = tool.getRootPath();\r
+        LOG.info("Removing NuGet files from: " + toolHome);\r
+        FileUtil.delete(toolHome);\r
         return;\r
       }\r
     }\r
@@ -67,10 +80,9 @@ public class ToolsRegistry {
       myPath = path;\r
     }\r
 \r
-    public void delete() {\r
-      while(myPath.exists()) {\r
-        FileUtil.delete(myPath);\r
-      }\r
+    @NotNull\r
+    public File getRootPath() {\r
+      return myPath;\r
     }\r
 \r
     @NotNull\r
@@ -78,6 +90,11 @@ public class ToolsRegistry {
       return new File(myPath, "tools/NuGet.exe");\r
     }\r
 \r
+    @NotNull\r
+    public String getAgentToolName() {\r
+      return "nuget-commandline-" + getVersion() + ".zip";\r
+    }\r
+\r
     @NotNull\r
     public String getId() {\r
       return myPath.getName();\r