Version 0.8.10.8

dart/editor/tools/plugins/com.google.dart.tools.debug.ui/src/com/google/dart/tools/debug/ui/launch/DeployPolymerAppHandler.java

Index: dart/editor/tools/plugins/com.google.dart.tools.debug.ui/src/com/google/dart/tools/debug/ui/launch/DeployPolymerAppHandler.java
===================================================================
--- dart/editor/tools/plugins/com.google.dart.tools.debug.ui/src/com/google/dart/tools/debug/ui/launch/DeployPolymerAppHandler.java	(revision 30037)
+++ dart/editor/tools/plugins/com.google.dart.tools.debug.ui/src/com/google/dart/tools/debug/ui/launch/DeployPolymerAppHandler.java	(working copy)
@@ -14,26 +14,17 @@
 package com.google.dart.tools.debug.ui.launch;
 
 import com.google.dart.tools.core.DartCore;
-import com.google.dart.tools.core.MessageConsole;
-import com.google.dart.tools.core.dart2js.ProcessRunner;
-import com.google.dart.tools.core.model.DartSdkManager;
+import com.google.dart.tools.core.analysis.model.PubFolder;
+import com.google.dart.tools.core.pub.RunPubJob;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Run the build.dart with deploy option which compiles the Polymer app to JavaScript.
  */
@@ -50,76 +41,17 @@
       if (selection instanceof IStructuredSelection) {
         Object selectedObject = ((IStructuredSelection) selection).getFirstElement();
         if (selectedObject instanceof IResource) {
-          IContainer parent = ((IResource) selectedObject).getParent();
-          while (parent != null) {
-            IResource buildFile = parent.findMember("build.dart");
-            if (buildFile != null) {
-              runBuildFile(buildFile);
-              return null;
-            }
-            parent = parent.getParent();
+          PubFolder folder = DartCore.getProjectManager().getPubFolder((IResource) selectedObject);
+          if (folder != null) {
+            RunPubJob job = new RunPubJob(folder.getResource(), RunPubJob.BUILD_NOMINIFY_COMMAND);
+            job.schedule(0);
+            return null;
           }
           DartCore.getConsole().println(
-              "Error: Could not find build.dart file for " + ((IResource) selectedObject).getName());
+              "Error: Could not run pub build. Use Run Tools > Pub Build to build Polymer app");
         }
       }
     }
     return null;
   }
-
-  private void runBuildFile(IResource buildFile) {
-
-    MessageConsole console = DartCore.getConsole();
-
-    ProcessBuilder builder = new ProcessBuilder();
-    builder.redirectErrorStream(true);
-    List<String> args = new ArrayList<String>();
-
-    String vmExecPath = "";
-    if (DartSdkManager.getManager().hasSdk()) {
-      File vmExec = DartSdkManager.getManager().getSdk().getVmExecutable();
-
-      if (vmExec != null) {
-        vmExecPath = vmExec.getAbsolutePath().toString();
-      }
-    }
-
-    if (vmExecPath.length() == 0) {
-      String message = "Could not find the Dart VM executable";
-      console.print(message);
-      DartCore.logError("Deploy Polymer app - " + message);
-    }
-
-    args.add(vmExecPath);
-    args.add(buildFile.getLocation().toFile().getAbsolutePath());
-    args.add("--deploy");
-
-    builder.command(args);
-    builder.directory(buildFile.getParent().getLocation().toFile());
-
-    ProcessRunner runner = new ProcessRunner(builder);
-
-    try {
-      runner.runSync(new NullProgressMonitor());
-    } catch (IOException e) {
-      String message = "Failed to run " + buildFile.getLocation().toString() + e.toString();
-      console.print(message);
-      DartCore.logError(message, e);
-    }
-
-    StringBuilder stringBuilder = new StringBuilder();
-
-    if (!runner.getStdOut().isEmpty()) {
-      stringBuilder.append(runner.getStdOut().trim() + "\n"); //$NON-NLS-1$
-    }
-
-    console.printSeparator("build.dart --deploy");
-    console.print(stringBuilder.toString());
-    try {
-      buildFile.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
-    } catch (CoreException e) {
-      // do nothing
-    }
-  }
-
 }