Curl install improvements

scripts/curl_install_pypi/install

@@ -9,18 +9,11 @@
 # Bash script to install the Azure CLI
 #
 INSTALL_SCRIPT_URL="https://azurecliprod.blob.core.windows.net/install.py"
-COMPLETION_SCRIPT_URL="https://azurecliprod.blob.core.windows.net/setup_completion.py"
 _TTY=/dev/tty
 
 install_script=$(mktemp -t azure_cli_install_tmp_XXXX) || exit
 echo "Downloading Azure CLI install script from $INSTALL_SCRIPT_URL to $install_script."
 curl -# $INSTALL_SCRIPT_URL > $install_script || exit
 chmod 775 $install_script
 echo "Running install script."
-
-if [[ -z "$AZURE_CLI_DISABLE_PROMPTS" && -t 1 ]]; then
-    $install_script $COMPLETION_SCRIPT_URL < $_TTY
-else
-    export AZURE_CLI_DISABLE_PROMPTS=1
-    $install_script $COMPLETION_SCRIPT_URL
-fi
+$install_script < $_TTY

scripts/curl_install_pypi/install.py

@@ -9,14 +9,10 @@
 # This script will install the CLI into a directory and create an executable
 # at a specified file path that is the entry point into the CLI.
 #
-# By default, the latest versions of all CLI command packages will be installed.
+# The latest versions of all CLI command packages will be installed.
 #
-# - Optional Environment Variables Available
-#     AZURE_CLI_DISABLE_PROMPTS  - Disable prompts during installation and use the defaults
-#
-# Tab completion info
-#    Call this script with the url to the completion setup script as an argument (i.e. sys.argv[1])
-#    This script will download the setup file and then execute it.
+
+#pylint: disable=line-too-long
 
 from __future__ import print_function
 import os
@@ -25,7 +21,8 @@
 import stat
 import tarfile
 import tempfile
-from subprocess import check_call
+import shutil
+import subprocess
 try:
     # Attempt to load python 3 module
     from urllib.request import urlretrieve
@@ -41,27 +38,70 @@
     pass
 
 AZ_DISPATCH_TEMPLATE = """#!/usr/bin/env bash
-{install_dir}/{bin_dir_name}/python -m azure.cli "$@"
+{install_dir}/bin/python -m azure.cli "$@"
 """
 
-DEFAULT_INSTALL_DIR = os.path.join(os.path.sep, 'usr', 'local', 'az')
-DEFAULT_EXEC_DIR = os.path.join(os.path.sep, 'usr', 'local', 'bin')
+DEFAULT_INSTALL_DIR = os.path.expanduser(os.path.join('~', 'lib', 'azure-cli'))
+DEFAULT_EXEC_DIR = os.path.expanduser(os.path.join('~', 'bin'))
 VIRTUALENV_VERSION = '15.0.0'
-BIN_DIR_NAME = 'Scripts' if platform.system() == 'Windows' else 'bin'
 EXECUTABLE_NAME = 'az'
 
-DISABLE_PROMPTS = os.environ.get('AZURE_CLI_DISABLE_PROMPTS')
+USER_BASH_RC = os.path.expanduser(os.path.join('~', '.bashrc'))
+USER_BASH_PROFILE = os.path.expanduser(os.path.join('~', '.bash_profile'))
+COMPLETION_FILENAME = 'az.completion'
+PYTHON_ARGCOMPLETE_CODE = """
+
+_python_argcomplete() {
+    local IFS='\v'
+    COMPREPLY=( $(IFS="$IFS"                   COMP_LINE="$COMP_LINE"                   COMP_POINT="$COMP_POINT"                   _ARGCOMPLETE_COMP_WORDBREAKS="$COMP_WORDBREAKS"                   _ARGCOMPLETE=1                   "$1" 8>&1 9>&2 1>/dev/null 2>/dev/null) )
+    if [[ $? != 0 ]]; then
+        unset COMPREPLY
+    fi
+}
+complete -o nospace -F _python_argcomplete "az"
+"""
+
+class CLIInstallError(Exception):
+    pass
+
+def print_status(msg=''):
+    print('-- '+msg)
+
+def prompt_input(msg):
+    return input('\n===> '+msg)
+
+def prompt_input_with_default(msg, default):
+    if default:
+        return prompt_input("{} (leave blank to use '{}'): ".format(msg, default)) or default
+    else:
+        return prompt_input('{}: '.format(msg))
+
+def prompt_y_n(msg, default=None):
+    if default not in [None, 'y', 'n']:
+        raise ValueError("Valid values for default are 'y', 'n' or None")
+    y = 'Y' if default == 'y' else 'y'
+    n = 'N' if default == 'n' else 'n'
+    while True:
+        ans = prompt_input('{} ({}/{}): '.format(msg, y, n))
+        if ans.lower() == n.lower():
+            return False
+        if ans.lower() == y.lower():
+            return True
+        if default and not ans:
+            return default == y.lower()
 
 def exec_command(command_list, cwd=None, env=None):
-    print('Executing: '+str(command_list))
-    check_call(command_list, cwd=cwd, env=env)
+    print_status('Executing: '+str(command_list))
+    subprocess.check_call(command_list, cwd=cwd, env=env)
 
 def create_tmp_dir():
-    return tempfile.mkdtemp()
+    tmp_dir = tempfile.mkdtemp()
+    return tmp_dir
 
-def create_dir(directory):
-    if not os.path.isdir(directory):
-        os.makedirs(directory)
+def create_dir(dir):
+    if not os.path.isdir(dir):
+        print_status("Creating directory '{}'.".format(dir))
+        os.makedirs(dir)
 
 def create_virtualenv(tmp_dir, version, install_dir):
     file_name = 'virtualenv-'+version+'.tar.gz'
@@ -77,69 +117,215 @@ def create_virtualenv(tmp_dir, version, install_dir):
     exec_command(cmd, cwd=working_dir)
 
 def install_cli(install_dir, tmp_dir):
-    path_to_pip = os.path.join(install_dir, BIN_DIR_NAME, 'pip')
+    path_to_pip = os.path.join(install_dir, 'bin', 'pip')
     cmd = [path_to_pip, 'install', '--cache-dir', tmp_dir, 'azure-cli', '--upgrade']
     exec_command(cmd)
 
 def create_executable(exec_dir, install_dir):
     create_dir(exec_dir)
-    exec_filename = os.path.join(exec_dir, EXECUTABLE_NAME)
-    with open(exec_filename, 'w') as exec_file:
-        exec_file.write(AZ_DISPATCH_TEMPLATE.format(
-            install_dir=install_dir,
-            bin_dir_name=BIN_DIR_NAME))
-    cur_stat = os.stat(exec_filename)
-    os.chmod(exec_filename, cur_stat.st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
-    return exec_filename
-
-def prompt_input(message):
-    return None if DISABLE_PROMPTS else input(message)
+    exec_filepath = os.path.join(exec_dir, EXECUTABLE_NAME)
+    with open(exec_filepath, 'w') as exec_file:
+        exec_file.write(AZ_DISPATCH_TEMPLATE.format(install_dir=install_dir))
+    cur_stat = os.stat(exec_filepath)
+    os.chmod(exec_filepath, cur_stat.st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
+    print_status("The executable is available at '{}'.".format(exec_filepath))
+    return exec_filepath
 
 def get_install_dir():
-    prompt_message = 'In what directory would you like to place the install? (leave blank to use {}): '.format(DEFAULT_INSTALL_DIR)
-    install_dir = prompt_input(prompt_message) or DEFAULT_INSTALL_DIR
-    install_dir = os.path.realpath(os.path.expanduser(install_dir))
-    if not os.path.isdir(install_dir):
-        print("Directory '{}' does not exist. Creating directory...".format(install_dir))
-        create_dir(install_dir)
-    print("We will install at '{}'.".format(install_dir))
+    install_dir = None
+    while not install_dir:
+        prompt_message = 'In what directory would you like to place the install?'
+        install_dir = prompt_input_with_default(prompt_message, DEFAULT_INSTALL_DIR)
+        install_dir = os.path.realpath(os.path.expanduser(install_dir))
+        if ' ' in install_dir:
+            print_status("The install directory '{}' cannot contain spaces.".format(install_dir))
+            install_dir = None
+        else:
+            create_dir(install_dir)
+            if os.listdir(install_dir):
+                print_status("'{}' is not empty and may contain a previous installation.".format(install_dir))
+                ans_yes = prompt_y_n('Remove this directory?', 'n')
+                if ans_yes:
+                    shutil.rmtree(install_dir)
+                    print_status("Deleted '{}'.".format(install_dir))
+                    create_dir(install_dir)
+                else:
+                    # User opted to not delete the directory so ask for install directory again
+                    install_dir = None
+    print_status("We will install at '{}'.".format(install_dir))
     return install_dir
 
 def get_exec_dir():
-    prompt_message = 'In what directory would you like to place the executable? (leave blank to use {}): '.format(DEFAULT_EXEC_DIR)
-    exec_dir = prompt_input(prompt_message) or DEFAULT_EXEC_DIR
-    exec_dir = os.path.realpath(os.path.expanduser(exec_dir))
-    if not os.path.isdir(exec_dir):
-        print("Directory '{}' does not exist. Creating directory...".format(exec_dir))
-        create_dir(exec_dir)
-    print("The executable will be in '{}'.".format(exec_dir))
+    exec_dir = None
+    while not exec_dir:
+        prompt_message = "In what directory would you like to place the '{}' executable?".format(EXECUTABLE_NAME)
+        exec_dir = prompt_input_with_default(prompt_message, DEFAULT_EXEC_DIR)
+        exec_dir = os.path.realpath(os.path.expanduser(exec_dir))
+        if ' ' in exec_dir:
+            print_status("The executable directory '{}' cannot contain spaces.".format(exec_dir))
+            exec_dir = None
+    create_dir(exec_dir)
+    print_status("The executable will be in '{}'.".format(exec_dir))
     return exec_dir
 
-def handle_tab_completion(completion_script_url, tmp_dir, install_dir):
-    ans = prompt_input('Enable shell/tab completion? [y/N]: ')
-    if ans is not None and ans.lower() == 'y':
-        path_to_completion_script = os.path.join(tmp_dir, 'completion_script')
-        urlretrieve(completion_script_url, path_to_completion_script)
-        check_call(['python', path_to_completion_script, install_dir])
+def _backup_rc(rc_file):
+    try:
+        shutil.copyfile(rc_file, rc_file+'.backup')
+        print_status("Backed up '{}' to '{}'".format(rc_file, rc_file+'.backup'))
+    except (OSError, IOError):
+        pass
+
+def _get_default_rc_file():
+    bashrc_exists = os.path.isfile(USER_BASH_RC)
+    bash_profile_exists = os.path.isfile(USER_BASH_PROFILE)
+    if not bashrc_exists and bash_profile_exists:
+        return USER_BASH_PROFILE
+    return USER_BASH_RC if bashrc_exists else None
+
+def _find_line_in_file(file_path, search_pattern):
+    try:
+        with open(file_path, 'r') as search_file:
+            for line in search_file:
+                if search_pattern in line:
+                    return True
+    except (OSError, IOError):
+        pass
+    return False
+
+def _modify_rc(rc_file_path, line_to_add):
+    if not _find_line_in_file(rc_file_path, line_to_add):
+        with open(rc_file_path, 'a') as rc_file:
+            rc_file.write('\n'+line_to_add+'\n')
+
+def create_tab_completion_file(filename):
+    with open(filename, 'w') as completion_file:
+        completion_file.write(PYTHON_ARGCOMPLETE_CODE)
+    print_status("Created tab completion file at '{}'".format(filename))
+
+def get_rc_file_path():
+    rc_file_path = None
+    while not rc_file_path:
+        rc_file = prompt_input_with_default('Enter a path to an rc file to update', _get_default_rc_file())
+        rc_file_path = os.path.realpath(os.path.expanduser(rc_file))
+        if not os.path.isfile(rc_file_path):
+            # Ask user again as it is not a file
+            rc_file_path = None
+    return rc_file_path
+
+def warn_other_azs_on_path(exec_dir, exec_filepath):
+    env_path = os.environ.get('PATH')
+    conflicting_paths = []
+    if env_path:
+        for p in env_path.split(':'):
+            p_to_az = os.path.join(p, EXECUTABLE_NAME)
+            if p != exec_dir and os.path.isfile(p_to_az):
+                conflicting_paths.append(p_to_az)
+    if conflicting_paths:
+        print_status()
+        print_status("** WARNING: Other '{}' executables are on your $PATH. **".format(EXECUTABLE_NAME))
+        print_status("Conflicting paths: {}".format(', '.join(conflicting_paths)))
+        print_status("You can run this installation of the CLI with '{}'.".format(exec_filepath))
+
+def handle_path_and_tab_completion(completion_file_path, exec_filepath, exec_dir):
+    ans_yes = prompt_y_n('Modify profile to update your $PATH and enable shell/tab completion now?', 'y')
+    if ans_yes:
+        rc_file_path = get_rc_file_path()
+        _backup_rc(rc_file_path)
+        line_to_add = "export PATH=$PATH:{}".format(exec_dir)
+        _modify_rc(rc_file_path, line_to_add)
+        line_to_add = "source '{}'".format(completion_file_path)
+        _modify_rc(rc_file_path, line_to_add)
+        print_status('Tab completion set up complete.')
+        print_status("If tab completion is not activated, verify that '{}' is sourced by your shell.".format(rc_file_path))
+        warn_other_azs_on_path(exec_dir, exec_filepath)
+        print_status()
+        print_status('** Run `exec -l $SHELL` to restart your shell. **')
+        print_status()
+    else:
+        print_status("If you change your mind, add 'source {}' to your rc file and restart your shell to enable tab completion.".format(completion_file_path))
+        print_status("You can run the CLI with '{}'.".format(exec_filepath))
+
+def verify_python_version():
+    print_status('Verifying Python version.')
+    v = sys.version_info
+    if v < (2, 7):
+        raise CLIInstallError('The CLI does not support Python versions less than 2.7.')
+    print_status('Python version {}.{}.{} okay.'.format(v.major, v.minor, v.micro))
+
+def _native_dependencies_for_dist(verify_cmd_args, install_cmd_args, dep_list):
+    try:
+        print_status("Executing: '{} {}'".format(' '.join(verify_cmd_args), ' '.join(dep_list)))
+        subprocess.check_output(verify_cmd_args + dep_list, stderr=subprocess.STDOUT)
+        print_status('Native dependencies okay.')
+    except subprocess.CalledProcessError:
+        err_msg = 'One or more of the following native dependencies are not currently installed and may be required.\n'
+        err_msg += '"{}"'.format(' '.join(install_cmd_args + dep_list))
+        print_status(err_msg)
+        ans_yes = prompt_y_n('Attempt to continue anyway?', 'n')
+        if not ans_yes:
+            raise CLIInstallError('Please install the native dependencies and try again.')
+
+def verify_native_dependencies():
+    distname, version, _ = platform.linux_distribution()
+    if not distname:
+        # There's no distribution name so can't determine native dependencies required / or they may not be needed like on OS X
+        return
+    print_status('Verifying native dependencies.')
+    distname = distname.lower().strip()
+    verify_cmd_args = None
+    install_cmd_args = None
+    dep_list = None
+    if any(x in distname for x in ['ubuntu', 'debian']):
+        verify_cmd_args = ['dpkg', '-s']
+        install_cmd_args = ['apt-get', 'update', '&&', 'apt-get', 'install', '-y']
+        if distname == 'ubuntu' and version in ['12.04', '14.04'] or distname == 'debian' and version.startswith('7'):
+            dep_list = ['libssl-dev', 'libffi-dev', 'python-dev']
+        elif distname == 'ubuntu' and version in ['15.10', '16.04']or distname == 'debian' and version.startswith('8'):
+            dep_list = ['libssl-dev', 'libffi-dev', 'python-dev', 'build-essential']
+    elif any(x in distname for x in ['centos', 'rhel', 'red hat']):
+        verify_cmd_args = ['rpm', '-q']
+        install_cmd_args = ['yum', 'check-update', ';', 'yum', 'install', '-y']
+        dep_list = ['gcc', 'libffi-devel', 'python-devel', 'openssl-devel']
+    elif any(x in distname for x in ['opensuse', 'suse']):
+        verify_cmd_args = ['rpm', '-q']
+        install_cmd_args = ['zypper', 'refresh', '&&', 'zypper', '--non-interactive', 'install']
+        dep_list = ['gcc', 'libffi-devel', 'python-devel', 'openssl-devel']
+    if verify_cmd_args and install_cmd_args and dep_list:
+        _native_dependencies_for_dist(verify_cmd_args, install_cmd_args, dep_list)
+    else:
+        print_status("Unable to verify native dependencies. dist={}, version={}. Continuing...".format(distname, version))
+
+def verify_install_dir_exec_path_conflict(install_dir, exec_path):
+    if install_dir == exec_path:
+        raise CLIInstallError("The executable file '{}' would clash with the install directory of '{}'. Choose either a different install directory or directory to place the executable.".format(exec_path, install_dir))
 
 def main():
+    verify_python_version()
+    verify_native_dependencies()
     tmp_dir = create_tmp_dir()
     install_dir = get_install_dir()
     exec_dir = get_exec_dir()
     exec_path = os.path.join(exec_dir, EXECUTABLE_NAME)
-    if install_dir == exec_path:
-        print("ERROR: The executable file '{}' would clash with the install directory of '{}'. Choose either a different install directory or directory to place the executable.".format(exec_path, install_dir), file=sys.stderr)
-        sys.exit(1)
+    verify_install_dir_exec_path_conflict(install_dir, exec_path)
     create_virtualenv(tmp_dir, VIRTUALENV_VERSION, install_dir)
     install_cli(install_dir, tmp_dir)
     exec_filepath = create_executable(exec_dir, install_dir)
-    print("Installation successful.")
+    completion_file_path = os.path.join(install_dir, COMPLETION_FILENAME)
+    create_tab_completion_file(completion_file_path)
     try:
-        completion_script_url = sys.argv[1]
-        handle_tab_completion(completion_script_url, tmp_dir, install_dir)
+        handle_path_and_tab_completion(completion_file_path, exec_filepath, exec_dir)
     except Exception as e:
-        print("Unable to set up tab completion.", e)
-    print("Run the CLI with {} --help".format(exec_filepath))
+        print_status("Unable to set up tab completion. ERROR: {}".format(str(e)))
+    shutil.rmtree(tmp_dir)
+    print_status("Installation successful.")
+    print_status("Run the CLI with {} --help".format(exec_filepath))
 
 if __name__ == '__main__':
-    main()
+    try:
+        main()
+    except CLIInstallError as cie:
+        print('ERROR: '+str(cie), file=sys.stderr)
+        sys.exit(1)
+    except KeyboardInterrupt:
+        print('\n\nExiting...')
+        sys.exit(1)