Merge pull request #157 from Microsoft/dev

Merge latest dev to master

Author: tedchamb

README.md

@@ -1,4 +1,4 @@
-[![Visual Studio Team services](https://mseng.visualstudio.com/_apis/public/build/definitions/698eacea-9ea2-4eb8-80a4-d06170edf6bc/5908/badge)]()
+[![Visual Studio Team services](https://mseng.visualstudio.com/_apis/public/build/definitions/698eacea-9ea2-4eb8-80a4-d06170edf6bc/5908/badge)](https://mseng.visualstudio.com/vsts-cli/_build/index?context=mine&path=%5C&definitionId=6169&_a=completed)
 [![Python](https://img.shields.io/pypi/pyversions/vsts-cli.svg)](https://pypi.python.org/pypi/vsts-cli)
 
 # Microsoft Visual Studio Team Services CLI 
@@ -46,6 +46,10 @@ Create a personal access token and provide to the VSTS CLI via the login command
 vsts login --instance https://MYACCOUNT.visualstudio.com --token MYTOKEN
 ```
 
+### Using VSTS CLI Behind a Proxy
+
+The VSTS CLI picks the network proxy configuration from the environment variables `HTTP_PROXY`, and `HTTPS_PROXY`. 
+
 ### Configure defaults, Git aliases, and more
 
 You can change your default settings using the `vsts configure` command, for example you can set the default output format for all commands. The options are:

packaged_releases/windows/scripts/build_local.cmd

@@ -10,9 +10,9 @@ set "PATH=%PATH%;%ProgramFiles%\Git\bin;%ProgramFiles%\Git\usr\bin"
 
 if "%CLIVERSION%"=="" (
     if "%BUILD_BUILDID%" == "" (
-        set CLIVERSION=0.1.0
+        set CLIVERSION=0.1.1
     ) else (
-        set CLIVERSION=0.1.0.%BUILD_BUILDID%
+        set CLIVERSION=0.1.1.%BUILD_BUILDID%
     )
 )
 set PYTHON_VERSION=3.6.3
@@ -25,7 +25,10 @@ set OUTPUT_DIR=%~dp0..\out
 if exist "%OUTPUT_DIR%" (
     echo Deleting directory: %OUTPUT_DIR%
     rmdir /s /q "%OUTPUT_DIR%"
-    if %errorlevel% neq 0 goto ERROR
+)
+if exist "%OUTPUT_DIR%" (
+    echo Failed to delete directory: %OUTPUT_DIR%
+    goto ERROR
 )
 
 echo Creating output directory: %OUTPUT_DIR%
@@ -83,6 +86,7 @@ mkdir %BUILDING_DIR%
 if %errorlevel% neq 0 goto ERROR
 
 if exist "%TEMP_SCRATCH_FOLDER%" rmdir /s /q "%TEMP_SCRATCH_FOLDER%"
+
 if exist "%TEMP_SCRATCH_FOLDER%" (
     echo Failed to delete %TEMP_SCRATCH_FOLDER%.
     goto ERROR
@@ -93,21 +97,11 @@ if %errorlevel% neq 0 goto ERROR
 ::ensure wix is available
 if exist "%WIX_DIR%" (
     echo *** Using existing Wix at %WIX_DIR%
+) else (
+    goto INSTALLWIX
 )
-if not exist "%WIX_DIR%" (
-    mkdir "%WIX_DIR%"
-    if %errorlevel% neq 0 goto ERROR
-    pushd "%WIX_DIR%"
-    echo *** Downloading Wix.
-    curl -o wix-archive.zip %WIX_DOWNLOAD_URL% -k
-    if %errorlevel% neq 0 goto ERROR
-    unzip -q wix-archive.zip
-    if %errorlevel% neq 0 goto ERROR
-    del wix-archive.zip
-    if %errorlevel% neq 0 goto ERROR
-    echo *** Wix downloaded and extracted successfully.
-    popd
-)
+
+:WIXINSTALLED
 
 :: Use the Python version on the machine that creates the MSI
 robocopy %PYTHON_DIR% "%BUILDING_DIR%" /s /NFL /NDL
@@ -173,9 +167,26 @@ if "%msbuildpath%" == "" (
 "%msbuildpath%" /t:rebuild /p:Configuration=Release "%REPO_ROOT%\packaged_releases\windows\vsts-cli.wixproj"
 if %errorlevel% neq 0 goto ERROR
 
-start "%OUTPUT_DIR%"
+dir /s /b "%OUTPUT_DIR%"\*.msi
+
+goto end
+
+:INSTALLWIX
+
+mkdir "%WIX_DIR%"
+if %errorlevel% neq 0 goto ERROR
+pushd "%WIX_DIR%"
+echo *** Downloading Wix.
+curl -o wix-archive.zip %WIX_DOWNLOAD_URL% -k
+if %errorlevel% neq 0 goto ERROR
+unzip -q wix-archive.zip
+if %errorlevel% neq 0 goto ERROR
+del wix-archive.zip
+if %errorlevel% neq 0 goto ERROR
+echo *** Wix downloaded and extracted successfully.
+popd
 
-goto END
+GOTO WIXINSTALLED
 
 :ERROR
 echo Error occurred, please check the output for details.

scripts/dev_setup.py

@@ -25,6 +25,10 @@ def exec_command(command):
         print(err, file=sys.stderr)
         sys.exit(1)
 
+
+exec_command('python -m pip install --upgrade pip')
+exec_command('python -m pip install --upgrade wheel')
+
 packages = []
 
 # VSTS Python SDK package (from either local directory or latest)

scripts/generate_command_inventory.py

@@ -11,26 +11,10 @@
 import sys
 import os
 
-
 from knack import CLI
 from vsts.cli.vsts_cli_help import VstsCLIHelp
 from vsts.cli.vsts_commands_loader import VstsCommandsLoader
 
-class Exporter(json.JSONEncoder):
-
-    def default(self, o):#pylint: disable=method-hidden
-        try:
-            return super(Exporter, self).default(o)
-        except TypeError:
-            return str(o)
-
-parser = argparse.ArgumentParser(description='Command Table Parser')
-parser.add_argument('--commands', metavar='N', nargs='+', help='Filter by first level command (OR)')
-parser.add_argument('--params', metavar='N', nargs='+', help='Filter by parameters (OR)')
-args = parser.parse_args()
-cmd_set_names = args.commands
-param_names = args.params
-
 # ignore the params passed in now so they aren't used by the cli
 sys.argv = sys.argv[:1]
 
@@ -43,30 +27,26 @@ def default(self, o):#pylint: disable=method-hidden
 
 loader = vstscli.commands_loader_cls()
 loader.__init__(vstscli)
-loader.load_command_table([])
+cmd_table = loader.load_command_table([])
 for command in loader.command_table:
     loader.load_arguments(command)
 
-cmd_table = loader.load_command_table([])
-cmd_list = [cmd_name for cmd_name in cmd_table.keys() if cmd_set_names is None or cmd_name.split()[0] in cmd_set_names]
-results = []
+vstsclihelp = vstscli.help_cls(cli_ctx=vstscli)
+
+global_parser = vstscli.parser_cls.create_global_parser(cli_ctx=vstscli)
+parser = vstscli.parser_cls(cli_ctx=vstscli, prog=vstscli.name, parents=[global_parser])
+parser.load_command_table(cmd_table)
+
+cmd_list = cmd_table.keys()
+
+results = {}
+
+for cmd_name in cmd_list:
+    cmd_args = cmd_table[cmd_name].arguments
+    args = []
+    for arg in cmd_args:
+        args.append(arg)
+    results[cmd_name] = args
 
-if param_names:
-    for name in cmd_list:
-        cmd_name = [x for x in cmd_table.keys() if name == x][0]
-        cmd_args = cmd_table[cmd_name]['arguments']
-        match = False
-        for arg in cmd_args:
-            if match:
-                break
-            arg_name = re.sub('--','', arg['name']).split(' ')[0]
-            if arg_name in param_names:
-                results.append(name)
-                match = True
-else:
-    results = cmd_list
+print(json.dumps(results, indent=1))
 
-heading = '=== COMMANDS IN {} PACKAGE(S) WITH {} PARAMETERS ==='.format(
-    cmd_set_names or 'ANY', param_names or 'ANY')
-print('\n{}\n'.format(heading))
-print('\n'.join(results))

scripts/windows/init.ps1

@@ -5,14 +5,14 @@ param (
 $tempFile = [IO.Path]::GetTempFileName()
 cmd.exe /C "$PSScriptRoot\init.cmd && set>$tempFile"
 $lines = [System.IO.File]::ReadAllLines("$tempFile")
-$curLoc = get-location
-$lines|ForEach-Object -Begin { set-location env: } -End { set-location $curLoc } -Process {
+$curLoc = Get-Location
+$lines | ForEach-Object -Begin { Set-Location env: } -End { Set-Location $curLoc } -Process {
     $var = $_.Split('=')
     if ($var.length -gt 1 -and $var[0] -ne "") {
-        set-item -path $var[0] -value $var[1]
+        Set-Item -path $var[0] -value $var[1]
     }
 }
-remove-item $tempFile
+Remove-Item $tempFile
 
 # Set up aliases
 
@@ -24,10 +24,10 @@ if ((Get-Module PSReadLine) -and ($KeepPsReadLine -eq $false)) {
     Remove-Module PSReadLine 
 
     # note: using doskey because Set-Alias is not as powerful
-    # NOTE commands in macros.txt work in both Powershell and cmd. Keep it that way!
-    # Only add macros to macros.ps.txt when the same macro cannot be used in both Powershell and cmd.
+    # NOTE commands in macros.txt work in both PowerShell and cmd. Keep it that way!
+    # Only add macros to macros.ps.txt when the same macro cannot be used in both PowerShell and cmd.
     # In that case, add equivalent macros to both macros.ps.txt and macros.cmd.txt, to ensure that
-    # the Powershell and cmd development environments remain functionally identical.
+    # the PowerShell and cmd development environments remain functionally identical.
     doskey /exename=powershell.exe /MACROFILE="$PSScriptRoot\macros.txt"
     doskey /exename=powershell.exe /MACROFILE="$PSScriptRoot\macros.ps.txt"
 }

src/command_modules/vsts-cli-build/setup.py

@@ -6,7 +6,7 @@
 from setuptools import setup, find_packages
 
 NAME = 'vsts-cli-build'
-VERSION = '0.1.0b3'
+VERSION = '0.1.1'
 
 # To install the library, run the following
 #
@@ -16,8 +16,8 @@
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-    'knack==0.2.0',
-    'python-dateutil',
+    'knack==0.3.3',
+    'python-dateutil==2.7.3',
     'vsts-cli-build-common==' + VERSION
 ]
 

src/command_modules/vsts-cli-build/vsts/cli/build/_format.py

@@ -8,7 +8,6 @@
 
 
 from collections import OrderedDict
-from vsts.cli.common.git import REF_HEADS_PREFIX
 
 
 def transform_builds_table_output(result):
@@ -24,6 +23,7 @@ def transform_build_table_output(result):
 
 
 def _transform_build_row(row):
+    from vsts.cli.common.git import REF_HEADS_PREFIX
     table_row = OrderedDict()
     table_row['ID'] = row['id']
     table_row['Number'] = row['buildNumber']
@@ -34,10 +34,15 @@ def _transform_build_row(row):
         table_row['Result'] = ' '
     table_row['Definition ID'] = row['definition']['id']
     table_row['Definition Name'] = row['definition']['name']
-    source_branch = row['sourceBranch']
-    if source_branch[0:len(REF_HEADS_PREFIX)] == REF_HEADS_PREFIX:
-        source_branch = source_branch[len(REF_HEADS_PREFIX):]
-    table_row['Source Branch'] = source_branch
+
+    if row['sourceBranch']:
+        source_branch = row['sourceBranch']
+        if source_branch[0:len(REF_HEADS_PREFIX)] == REF_HEADS_PREFIX:
+            source_branch = source_branch[len(REF_HEADS_PREFIX):]
+        table_row['Source Branch'] = source_branch
+    else:
+        table_row['Source Branch'] = ' '
+
     queued_time = dateutil.parser.parse(row['queueTime']).astimezone(dateutil.tz.tzlocal())
     table_row['Queued Time'] = str(queued_time.date()) + ' ' + str(queued_time.time())
     table_row['Reason'] = row['reason']

src/command_modules/vsts-cli-build/vsts/cli/build/arguments.py

@@ -22,6 +22,7 @@ def load_build_arguments(cli_command_loader):
 
     with ArgumentsContext(cli_command_loader, 'build queue') as ac:
         ac.argument('definition_id', type=int)
+        ac.argument('variables', nargs='*')
 
     with ArgumentsContext(cli_command_loader, 'build show') as ac:
         ac.argument('build_id', options_list='--id', type=int)

src/command_modules/vsts-cli-build/vsts/cli/build/commands.py

@@ -7,22 +7,21 @@
                       transform_builds_table_output,
                       transform_definition_table_output,
                       transform_definitions_table_output)
-from knack.commands import CommandSuperGroup
+from knack.commands import CommandGroup
 
 
 def load_build_commands(cli_command_loader):
-    with CommandSuperGroup(__name__, cli_command_loader, 'vsts.cli.build.common.custom#{}') as sg:
-        with sg.group('build') as g:
-            # basic vsts_cli_build commands
-            g.command('list', 'build_list',
-                      table_transformer=transform_builds_table_output)
-            g.command('queue', 'build_queue',
-                      table_transformer=transform_build_table_output)
-            g.command('show', 'build_show',
-                      table_transformer=transform_build_table_output)
+    with CommandGroup(cli_command_loader, 'build', 'vsts.cli.build.common.{}') as g:
+        # basic vsts_cli_build commands
+        g.command('list', 'build#build_list',
+                  table_transformer=transform_builds_table_output)
+        g.command('queue', 'build#build_queue',
+                  table_transformer=transform_build_table_output)
+        g.command('show', 'build#build_show',
+                  table_transformer=transform_build_table_output)
 
-            # basic vsts_cli_build definition commands
-            g.command('definition list', 'build_definition_list',
-                      table_transformer=transform_definitions_table_output)
-            g.command('definition show', 'build_definition_show',
-                      table_transformer=transform_definition_table_output)
+        # basic vsts_cli_build definition commands
+        g.command('definition list', 'build_definition#build_definition_list',
+                  table_transformer=transform_definitions_table_output)
+        g.command('definition show', 'build_definition#build_definition_show',
+                  table_transformer=transform_definition_table_output)

src/command_modules/vsts-cli-code/setup.py

@@ -6,7 +6,7 @@
 from setuptools import setup, find_packages
 
 NAME = 'vsts-cli-code'
-VERSION = '0.1.0b3'
+VERSION = '0.1.1'
 
 # To install the library, run the following
 #
@@ -16,8 +16,8 @@
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-    'knack==0.2.0',
-    'python-dateutil',
+    'knack==0.3.3',
+    'python-dateutil==2.7.3',
     'vsts-cli-code-common==' + VERSION
 ]
 

src/command_modules/vsts-cli-code/vsts/cli/code/_format.py

@@ -7,10 +7,6 @@
 import dateutil.parser
 import dateutil.tz
 
-from vsts.cli.common.identities import (ensure_display_names_in_cache,
-                                        get_display_name_from_identity_id)
-from vsts.cli.common.git import get_branch_name_from_ref
-from vsts.cli.common.services import get_first_vss_instance_uri
 
 _PR_TITLE_TRUNCATION_LENGTH = 50
 _WORK_ITEM_TITLE_TRUNCATION_LENGTH = 70
@@ -138,6 +134,9 @@ def _get_vote_from_vote_number(number):
 
 
 def transform_policies_table_output(result):
+    from vsts.cli.common.identities import (ensure_display_names_in_cache,
+                                            get_display_name_from_identity_id)
+    from vsts.cli.common.services import get_first_vss_instance_uri
     table_output = []
     reviewer_ids = []
     for item in result:
@@ -241,6 +240,7 @@ def transform_repo_table_output(result):
 
 
 def _transform_repo_row(row):
+    from vsts.cli.common.git import get_branch_name_from_ref
     table_row = OrderedDict()
     table_row['ID'] = row['id']
     table_row['Name'] = row['name']