Use JSON instead of YAML for the play services scripts config

build/android/play_services/update.py

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''
 Script to help uploading and downloading the Google Play services client
 library to and from a Google Cloud storage.
 '''
 
@@ skipping 24 matching lines @@
 # It should be managed by git to provided information about new versions.
 SHA1_DIRECTORY = os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'android',
                               'play_services')
 
 # Default bucket used for storing the files.
 GMS_CLOUD_STORAGE = 'chrome-sdk-extras'
 
 # Path to the default configuration file. It exposes the currently installed
 # version of the library in a human readable way.
 CONFIG_DEFAULT_PATH = os.path.join(constants.DIR_SOURCE_ROOT, 'build',
-                                   'android', 'play_services', 'config.yaml')
+                                   'android', 'play_services', 'config.json')
 
 LICENSE_FILE_NAME = 'LICENSE'
 LIBRARY_FILE_NAME = 'google_play_services_library.zip'
 GMS_PACKAGE_ID = 'extra-google-google_play_services'  # used by sdk manager
 
 LICENSE_PATTERN = re.compile(r'^Pkg\.License=(?P<text>.*)$', re.MULTILINE)
 
 
 def Main():
   parser = argparse.ArgumentParser(
@@ skipping 60 matching lines @@
   '''
   Defines the common arguments on subparser rather than the main one. This
   allows to put arguments after the command: `foo.py upload --debug --force`
   instead of `foo.py --debug upload --force`
   '''
 
   parser.add_argument('--bucket',
                       help='name of the bucket where the files are stored',
                       default=GMS_CLOUD_STORAGE)
   parser.add_argument('--config',
-                      help='YAML Configuration file',
+                      help='JSON Configuration file',
                       default=CONFIG_DEFAULT_PATH)
   parser.add_argument('--dry-run',
                       action='store_true',
                       help=('run the script in dry run mode. Files will be '
                             'copied to a local directory instead of the cloud '
                             'storage. The bucket name will be as path to that '
                             'directory relative to the repository root.'))
   parser.add_argument('-v', '--verbose',
                       action='store_true',
                       help='print debug information')
@@ skipping 13 matching lines @@
 
   new_lib_zip_sha1 = os.path.join(SHA1_DIRECTORY, LIBRARY_FILE_NAME + '.sha1')
   old_lib_zip_sha1 = os.path.join(paths.package, LIBRARY_FILE_NAME + '.sha1')
 
   logging.debug('Comparing library hashes: %s and %s', new_lib_zip_sha1,
                 old_lib_zip_sha1)
   if utils.FileEquals(new_lib_zip_sha1, old_lib_zip_sha1) and not args.force:
     logging.debug('The Google Play services library is up to date.')
     return 0
 
+  config = utils.ConfigParser(args.config)
   bucket_path = _VerifyBucketPathFormat(args.bucket,
-                                        utils.GetVersionNumber(args.config),
+                                        config.version_number,
                                         args.dry_run)
 
   tmp_root = tempfile.mkdtemp()
   try:
     if not os.environ.get('CHROME_HEADLESS'):
       if not os.path.isdir(paths.package):
         os.makedirs(paths.package)
 
       # download license file from bucket/{version_number}/license.sha1
       new_license = os.path.join(tmp_root, LICENSE_FILE_NAME)
@@ skipping 66 matching lines @@
   # and setup related reasons. Also, exceptions here are not caught, so we
   # disable breakpad to avoid spamming the logs.
   breakpad.IS_ENABLED = False
 
   paths = _InitPaths(args.sdk_root)
 
   if not args.skip_git and utils.IsRepoDirty(constants.DIR_SOURCE_ROOT):
     logging.error('The repo is dirty. Please commit or stash your changes.')
     return -1
 
-  old_version_number = utils.GetVersionNumber(args.config)
+  config = utils.ConfigParser(args.config)
 
   version_xml = os.path.join(paths.lib, 'res', 'values', 'version.xml')
   new_version_number = utils.GetVersionNumberFromLibraryResources(version_xml)
   logging.debug('comparing versions: new=%d, old=%s',
-                new_version_number, old_version_number)
-  if new_version_number <= old_version_number and not args.force:
+                new_version_number, config.version_number)
+  if new_version_number <= config.version_number and not args.force:
     logging.info('The checked in version of the library is already the latest '
                  'one. No update needed. Please rerun with --force to skip '
                  'this check.')
     return 0
 
   tmp_root = tempfile.mkdtemp()
   try:
     new_lib_zip = os.path.join(tmp_root, LIBRARY_FILE_NAME)
     new_license = os.path.join(tmp_root, LICENSE_FILE_NAME)
 
     # need to strip '.zip' from the file name here
     shutil.make_archive(new_lib_zip[:-4], 'zip', paths.lib)
     _ExtractLicenseFile(new_license, paths.package)
 
     bucket_path = _VerifyBucketPathFormat(args.bucket, new_version_number,
                                           args.dry_run)
     files_to_upload = [new_lib_zip, new_license]
     logging.debug('Uploading %s to %s', files_to_upload, bucket_path)
     _UploadToBucket(bucket_path, files_to_upload, args.dry_run)
 
     new_lib_zip_sha1 = os.path.join(SHA1_DIRECTORY,
                                     LIBRARY_FILE_NAME + '.sha1')
     new_license_sha1 = os.path.join(SHA1_DIRECTORY,
                                     LICENSE_FILE_NAME + '.sha1')
     shutil.copy(new_lib_zip + '.sha1', new_lib_zip_sha1)
     shutil.copy(new_license + '.sha1', new_license_sha1)
   finally:
     shutil.rmtree(tmp_root)
 
-  utils.UpdateVersionNumber(args.config, new_version_number)
+  config.UpdateVersionNumber(new_version_number)
 
   if not args.skip_git:
     commit_message = ('Update the Google Play services dependency to %s\n'
                       '\n') % new_version_number
     utils.MakeLocalCommit(constants.DIR_SOURCE_ROOT,
-                          [new_lib_zip_sha1, new_license_sha1, args.config],
+                          [new_lib_zip_sha1, new_license_sha1, config.path],
                           commit_message)
 
   return 0
 
 
 def _InitPaths(sdk_root):
   '''
   Initializes the different paths to be used in the update process.
   '''
 
@@ skipping 146 matching lines @@
     logging.debug('Calling command "%s"', str(args))
     return cmd_helper.GetCmdStatusOutputAndError(args)
 
   def check_call(self, *args):
     logging.debug('Calling command "%s"', str(args))
     return cmd_helper.GetCmdStatusOutputAndError(args)
 
 
 if __name__ == '__main__':
   sys.exit(Main())