Call from_secrets_file with a 'flags' argument

from_secrets_file uses a run_flow method from
the oauth2client library and this method now
requires a flags argument.

requirements.txt

@@ -2,7 +2,7 @@ pytz==2013d
 argparse
 python-dateutil
 logstash_formatter
-gapy==1.3.3
+gapy==1.3.4
 lxml>=3.2.0
 dshelpers>=1.0.4
 unicodecsv

tools/generate-ga-credentials.py

@@ -17,8 +17,9 @@
 from os.path import abspath, exists as path_exists
 from os import makedirs
 
+from oauth2client import tools
+
 from gapy.client import from_secrets_file
-import oauth2client.tools
 
 
 def copy_json(input_path, output_path):
@@ -30,18 +31,16 @@ def copy_json(input_path, output_path):
                 indent=2)
 
 
-def generate_google_credentials(client_secret):
-    # Prevent oauth2client from trying to open a browser
-    # This is run from inside the VM so there is no browser
-    oauth2client.tools.FLAGS.auth_local_webserver = False
-
+def generate_google_credentials(args):
+    client_secret = args.client_secret
     if not path_exists(abspath("./creds/ga/")):
         makedirs("./creds/ga")
     storage_path = abspath("./creds/ga/storage.db")
     secret_path = abspath("./creds/ga/client_secret.json")
     from_secrets_file(
         client_secret,
-        storage_path=storage_path)
+        storage_path=storage_path,
+        flags=args)
 
     copy_json(client_secret, secret_path)
 
@@ -56,12 +55,17 @@ def generate_google_credentials(client_secret):
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(
         description=__doc__,
-        formatter_class=argparse.RawTextHelpFormatter)
+        formatter_class=argparse.RawTextHelpFormatter,
+        parents=[tools.argparser])
 
     parser.add_argument(
         'client_secret',
         help='path to the client secrets file from the Google API Console')
 
     args = parser.parse_args()
 
-    generate_google_credentials(args.client_secret)
+    # This script is run from within the VM so
+    # disable need for a browser
+    args.noauth_local_webserver = True
+
+    generate_google_credentials(args)