Fixed usages from powershell commands

src/utils/DockerMachineUtil.js

@@ -3,6 +3,7 @@ import path from 'path';
 import Promise from 'bluebird';
 import fs from 'fs';
 import util from './Util';
+import powershellUtil from './PowershellUtil';
 import child_process from 'child_process';
 
 var DockerMachine = {
@@ -13,9 +14,6 @@ var DockerMachine = {
       return '/usr/local/bin/docker-machine';
     }
   },
-  commandElevated: function () {
-    return 'powershell.exe';
-  },
   name: function () {
     return 'default';
   },
@@ -60,31 +58,29 @@ var DockerMachine = {
       return false;
     });
   },
-  create: function (machineName = this.name(), provider) {
+  create: function (machineName = this.name(), provider = "hyperv", virtualBoxIsInstalled = true) {
     //TODO: check options elements!
     switch (provider){
-        case "virtualbox":{
-          console.log('started create with virtualbox');
-          return util.execFile([this.command(), '-D', 'create', '-d', 'virtualbox', '--virtualbox-memory', '2048', machineName]);
-        }
         case "hyperv":{
-          //The switch may contain spaces!
+          console.log('started create with hyper-v');
           let virtualSwitch = localStorage.getItem('virtualSwitch');
+          console.log('will use this switch ' + virtualSwitch + ' with external')
 
           let args= `"` + `docker-machine.exe -D create --driver hyperv --hyperv-memory 2048 `+
                     `--hyperv-virtual-switch '${virtualSwitch}' ${machineName}` + `"`;
 
-          //TODO: in an ideal world, powershell has its own PowershellUtil.js ;)
-          console.log("cmd: ", args)
-          return util.execFile([this.commandElevated(), 'start-process', 'powershell', '-verb', 'runas', '-wait', '-argumentList', args]).then(stdout => {
-            return Promise.resolve(null);
-          }).catch((error) => {
-            throw new Error(error.message);
-          });
+          return powershellUtil.runCommandWithArgs(args);
         }
-        default:{
+        default: {
+          console.log("virtualboxInstalled: " + virtualBoxIsInstalled);
+          if (virtualBoxIsInstalled === true) {
             console.log('started create with virtualbox');
-            return util.execFile([this.command(), '-D', 'create', '-d', 'virtualbox', '--virtualbox-memory', '2048', machineName]);
+
+            let args= `"docker-machine.exe -D create --driver virtualbox --virtualbox-memory 2048 ` + machineName + `"`;
+            return powershellUtil.runCommandWithArgs(args);
+          } else {
+            throw new Error('virtualbox not installed, so this cannot continue');
+          }
         }
     }
   },

src/utils/HypervBoxUtil.js

@@ -9,9 +9,6 @@ var HypervBox = {
     return 'powershell.exe';
   },
   // TODO: ..We'll probably need a differnt command here in the future. That's why code dupe.
-  commandElevated: function () {
-    return 'powershell.exe';
-  },
   installed: function () {
     return util.execFile([this.command(), '@(Get-Command get-vm).ModuleName']).then(stdout => {
       console.log('stdout: ', stdout);
@@ -31,19 +28,19 @@ var HypervBox = {
   */
 
   hasAdminRights: function() {
-    return util.execFile([this.command(), 'Get-VMHostSupportedVersion']).then(stdout => {
+    return util.execFile([this.command(), 'Get-VMHost']).then(stdout => {
       console.log('stdout: ', stdout);
       // To execute the above command you'll need Admin or Hyper-V-Admin rights.
-      if ( stdout.toUpperCase().indexOf('TRUE') !== -1) {
+      if (stdout.toLowerCase().indexOf('invalidoperation') === -1) {
         return Promise.resolve(true);
       }
+      return Promise.resolve(false);
     }).catch(() => {
       return Promise.resolve(false);
     });
   },
   switchName: function (name) {
-//    return util.execFile([this.command(), '$(Get-VMSwitch | where {$_.SwitchType -eq "external"}).name']).then(out => {
-    return util.execFile([this.command(), '$(Get-VMSwitch).name']).then(out => {
+    return util.execFile([this.command(), '$(Get-VMSwitch | where {$_.SwitchType -eq "external"}).name']).then(out => {
       // We use the same mechanism as docker-machine. Use the first switch we find.
       return (out.replace('\r','').split('\n')[0]);
     }).catch(() => {
@@ -54,9 +51,8 @@ var HypervBox = {
     // there seems to be a problem with elevated execution. see: https://github.com/nodejs/node-v0.x-archive/issues/6797
     // The only easy possibility seems to be to communicat with a file.
 
-      return util.execFile([this.command(), 'Get-VMHostSupportedVersion']).then(stdout => {
-
-        let match = stdout.match(/^(.*) True/im);
+      return util.execFile([this.command(), 'Get-VM | Where {$_.Name -eq "default" -and $_.Version} | select Version']).then(stdout => {
+        let match = stdout.match(/\d+(?:\.\d+)+/g);
         if (match != null) {
             // matched text: match[0]
             // match start: match.index
@@ -76,8 +72,9 @@ var HypervBox = {
   // Needed for consistency check
   vmExists: function (name) {
     return util.execFile([this.command(), "Get-VM | Where {$_.Name -eq '" + name + "'}"]).then(out => {
-      console.log(out)
-      return (out.indexOf(name) !== -1);
+      console.log(out);
+      var machineExists = out.indexOf(name) !== -1;
+      return machineExists;
     }).catch(() => {
       return false;
     });

src/utils/PowershellUtil.js

@@ -0,0 +1,18 @@
+import util from './Util';
+
+var PowershellUtil  = 
+{
+  runCommandWithArgs : function (args) {
+    console.log("cmd: ", args);
+    return util.execFile([this.commandElevated(), 'start-process', 'powershell', '-verb', 'runas', '-wait', '-argumentList', args]).then(stdout => {
+        return Promise.resolve(null);
+    }).catch((error) => {
+        throw new Error(error.message);
+    });
+  },
+  commandElevated: function commandElevated() {
+    return 'powershell.exe';
+  },
+};
+
+module.exports = PowershellUtil;

src/utils/SetupUtil.js

@@ -216,7 +216,7 @@ export default {
 *
 *
 */
-          await machine.create(machine.name(), provider);
+          await machine.create(machine.name(), provider, virtualBoxInstalled);
         } else {
           let state = await machine.status();
           if (state !== 'Running') {