Merge branch 'v2-bundle-ac-index' into v2

* v2-bundle-ac-index:
  Include generate autocomplete index with CLI bundle

Author: jamesls

MANIFEST.in

@@ -1,6 +1,7 @@
 include README.rst
 include LICENSE.txt
 include requirements.txt
+include awscli/data/ac.index
 recursive-include awscli/examples *.rst
 recursive-include awscli/data *.json
 recursive-include awscli/customizations/wizard/wizards *.yml

awscli/autocomplete/main.py

@@ -29,11 +29,17 @@
 # dir.
 INDEX_DIR = os.path.expanduser(os.path.join('~', '.aws', 'cli', 'cache'))
 INDEX_FILE = os.path.join(INDEX_DIR, '%s.index' % cli_version)
+BUILTIN_INDEX_FILE = os.path.join(
+    os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+    'data', 'ac.index'
+)
 
 
-def create_autocompleter(index_filename=INDEX_FILE, custom_completers=None):
+def create_autocompleter(index_filename=None, custom_completers=None):
     if custom_completers is None:
         custom_completers = custom.get_custom_completers()
+    if index_filename is None:
+        index_filename = _get_index_filename()
     index = model.ModelIndex(index_filename)
     cli_parser = parser.CLIParser(index)
     completers = [
@@ -44,6 +50,12 @@ def create_autocompleter(index_filename=INDEX_FILE, custom_completers=None):
     return cli_completer
 
 
+def _get_index_filename():
+    if os.path.isfile(INDEX_FILE):
+        return INDEX_FILE
+    return BUILTIN_INDEX_FILE
+
+
 def autocomplete(command_line, position=None):
     completer = create_autocompleter()
     results = completer.autocomplete(command_line, position)

awscli/data/ac.index

@@ -3,22 +3,34 @@
 
 """
 import os
+import argparse
 
 from awscli.autocomplete.local import indexer
 from awscli.autocomplete.serverside.indexer import APICallIndexer
 from awscli.autocomplete import db
-from awscli.autocomplete.main import INDEX_DIR, INDEX_FILE
+from awscli.autocomplete.main import INDEX_DIR, INDEX_FILE, BUILTIN_INDEX_FILE
 from awscli.autocomplete import generator
 from awscli import clidriver
 
 
 def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--include-builtin-index', action='store_true',
+                        help=("Also generate builtin index as well as the "
+                              "index in the CLI cache dir."))
+    args = parser.parse_args()
     if not os.path.isdir(INDEX_DIR):
         os.makedirs(INDEX_DIR)
     # Using a temporary name so if the index already exists, we'll
     # only replace the entire file once we successfully regenerate the
     # index.
-    temp_name = '%s.temp' % INDEX_FILE
+    _generate_index(INDEX_FILE)
+    if args.include_builtin_index:
+        _generate_index(BUILTIN_INDEX_FILE)
+
+
+def _generate_index(filename):
+    temp_name = '%s.temp' % filename
     db_connection = db.DatabaseConnection(temp_name)
     indexers = [
         indexer.ModelIndexer(db_connection),
@@ -30,7 +42,7 @@ def main():
         index_gen.generate_index(driver)
     finally:
         db_connection.close()
-    os.rename(temp_name, INDEX_FILE)
+    os.rename(temp_name, filename)
 
 
 if __name__ == '__main__':

scripts/gen-ac-index

@@ -45,7 +45,8 @@ def find_version(*file_paths):
              'bin/aws_bash_completer'],
     packages=find_packages(exclude=['tests*']),
     package_data={'awscli': ['data/*.json', 'examples/*/*.rst',
-                             'examples/*/*/*.rst', 'topics/*.rst',
+                             'data/ac.index', 'examples/*/*/*.rst',
+                             'topics/*.rst',
                              'customizations/wizard/wizards/*/*.yml',
                              'topics/*.json']},
     install_requires=requires,