---

mziccard · mziccard · commit 4cdecc91c457 · 2015-09-18T10:11:17.000+02:00
yaml --- r: 6131 b: refs/heads/tswast-patch-1 c: f753b44 h: refs/heads/master i: 6129: afa77ea 6127: 8ec499c
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: e792c2c67795572501a2bd2cc04cb7a183a41a3f
+refs/heads/tswast-patch-1: f753b44d9a2f2b787b4e9fc1f51b67f47a19ba68
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelper.java b/branches/tswast-patch-1/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelper.java
@@ -134,13 +134,8 @@ private static Path installedGcdPath() {
   }
 
   private static String installedGcdVersion() throws IOException, InterruptedException {
-    CommandWrapper gcloudCommand;
-    if (isWindows()) {
-      gcloudCommand = CommandWrapper.cmd();
-    } else {
-      gcloudCommand = CommandWrapper.bash();
-    }
-    Process process = gcloudCommand.command("gcloud", "version").redirectErrorStream().start();
+    Process process =
+        CommandWrapper.create().command("gcloud", "version").redirectErrorStream().start();
     process.waitFor();
     try (BufferedReader reader =
         new BufferedReader(new InputStreamReader(process.getInputStream()))) {
@@ -225,6 +220,14 @@ private static class CommandWrapper {
 
     private CommandWrapper() {
       this.prefix = new ArrayList<>();
+      if (isWindows()) {
+        this.prefix.add("cmd");
+        this.prefix.add("/C");
+        this.nullFilename = "NUL:";
+      } else {
+        this.prefix.add("bash");
+        this.nullFilename = "/dev/null";
+      }
     }
 
     public CommandWrapper command(String... command) {
@@ -275,19 +278,8 @@ public Process start() throws IOException {
       return builder().start();
     }
 
-    public static CommandWrapper cmd() {
-      CommandWrapper wrapper = new CommandWrapper();
-      wrapper.prefix.add("cmd");
-      wrapper.prefix.add("/C");
-      wrapper.nullFilename = "NUL:";
-      return wrapper;
-    }
-
-    public static CommandWrapper bash() {
-      CommandWrapper wrapper = new CommandWrapper();
-      wrapper.prefix.add("bash");
-      wrapper.nullFilename = "/dev/null";
-      return wrapper;
+    public static CommandWrapper create() {
+      return new CommandWrapper();
     }
   }
 
@@ -362,17 +354,11 @@ private void startGcd(Path executablePath) throws IOException, InterruptedExcept
     File datasetFolder = new File(gcdPath.toFile(), projectId);
     deleteRecurse(datasetFolder.toPath());
 
-    // create command wrappers
-    CommandWrapper gcdCreateCommand;
-    CommandWrapper gcdStartCommand;
+    // Get path to cmd executable
     Path gcdAbsolutePath;
     if (isWindows()) {
-      gcdCreateCommand = CommandWrapper.cmd();
-      gcdStartCommand = CommandWrapper.cmd();
       gcdAbsolutePath = executablePath.toAbsolutePath().resolve("gcd.cmd");
     } else {
-      gcdCreateCommand = CommandWrapper.bash();
-      gcdStartCommand = CommandWrapper.bash();
       gcdAbsolutePath = executablePath.toAbsolutePath().resolve("gcd.sh");
     }
 
@@ -381,7 +367,8 @@ private void startGcd(Path executablePath) throws IOException, InterruptedExcept
       log.log(Level.FINE, "Creating datastore for the project: {0}", projectId);
     }
     Process createProcess =
-        gcdCreateCommand.command(gcdAbsolutePath.toString(), "create", "-p", projectId, projectId)
+        CommandWrapper.create()
+            .command(gcdAbsolutePath.toString(), "create", "-p", projectId, projectId)
             .redirectErrorInherit()
             .directory(gcdPath)
             .redirectOutputToNull()
@@ -393,7 +380,7 @@ private void startGcd(Path executablePath) throws IOException, InterruptedExcept
       log.log(Level.FINE, "Starting datastore emulator for the project: {0}", projectId);
     }
     Process startProcess =
-        gcdStartCommand
+        CommandWrapper.create()
             .command(gcdAbsolutePath.toString(), "start", "--testing", "--allow_remote_shutdown",
                 projectId)
             .directory(gcdPath)
