Merge pull request #127 from mesosphere/jason_yuriy/windows_adapt2

Windows compatibility work

dcos/api/subcommand.py

@@ -38,6 +38,9 @@ def command_executables(subcommand, dcos_path):
     return (executables[0], None)
 
 
+BIN_DIRECTORY = 'Scripts' if util.is_windows_platform() else 'bin'
+
+
 def list_paths(dcos_path):
     """List the real path to executable dcos subcommand programs.
 
@@ -48,7 +51,7 @@ def list_paths(dcos_path):
     """
 
     # Let's get all the default subcommands
-    binpath = os.path.join(dcos_path, 'bin')
+    binpath = os.path.join(dcos_path, BIN_DIRECTORY)
     commands = [
         os.path.join(binpath, filename)
         for filename in os.listdir(binpath)
@@ -61,20 +64,20 @@ def list_paths(dcos_path):
         constants.DCOS_SUBCOMMAND_SUBDIR)
 
     subcommands = [
-        os.path.join(subcommand_directory, package, 'bin', filename)
+        os.path.join(subcommand_directory, package, BIN_DIRECTORY, filename)
 
 
         for package in distributions(dcos_path)
 
         for filename in os.listdir(
-            os.path.join(subcommand_directory, package, 'bin'))
+            os.path.join(subcommand_directory, package, BIN_DIRECTORY))
 
         if (filename.startswith(constants.DCOS_COMMAND_PREFIX) and
             os.access(
                 os.path.join(
                     subcommand_directory,
                     package,
-                    'bin',
+                    BIN_DIRECTORY,
                     filename),
                 os.X_OK))
     ]
@@ -154,7 +157,8 @@ def noun(executable_path):
     """
 
     basename = os.path.basename(executable_path)
-    return basename[len(constants.DCOS_COMMAND_PREFIX):]
+    noun = basename[len(constants.DCOS_COMMAND_PREFIX):].replace('.exe', '')
+    return noun
 
 
 def install(distribution_name, install_operation, dcos_path):
@@ -182,7 +186,7 @@ def install(distribution_name, install_operation, dcos_path):
     if 'pip' in install_operation:
         return _install_with_pip(
             distribution_name,
-            os.path.join(dcos_path, 'bin'),
+            os.path.join(dcos_path, BIN_DIRECTORY),
             package_directory,
             install_operation['pip'])
     else:
@@ -230,7 +234,8 @@ def _install_with_pip(
 
     new_package_dir = not os.path.exists(package_directory)
 
-    if not os.path.exists(os.path.join(package_directory, 'bin', 'pip')):
+    pip_path = os.path.join(package_directory, BIN_DIRECTORY, 'pip')
+    if not os.path.exists(pip_path):
         cmd = [os.path.join(bin_directory, 'virtualenv'), package_directory]
 
         if _execute_command(cmd) != 0:
@@ -245,7 +250,7 @@ def _install_with_pip(
                 print(line, file=requirements_file)
 
         cmd = [
-            os.path.join(package_directory, 'bin', 'pip'),
+            os.path.join(package_directory, BIN_DIRECTORY, 'pip'),
             'install',
             '--requirement',
             requirement_path,

dcos/api/util.py

@@ -2,6 +2,7 @@ import contextlib
 import json
 import logging
 import os
+import platform
 import re
 import shutil
 import sys
@@ -273,6 +274,15 @@ def render_mustache_json(template, data):
     return load_jsons(rendered)
 
 
+def is_windows_platform():
+    """
+    :returns: True is program is running on Windows platform, False
+     in other case
+    :rtype: boolean
+    """
+    return platform.system() == "Windows"
+
+
 class CustomJsonRenderer(pystache.Renderer):
     def str_coerce(self, val):
         """