Added requirements, fixed syntax

elibixby · elibixby · commit 416320d3994e · 2015-07-20T11:19:46.000-07:00
diff --git a/resourcemanager/create_project.py b/resourcemanager/create_project.py
@@ -1,39 +1,48 @@
-from utils import build_client, wait_for_active
-from googleapiclient.errors import HttpError
-import httplib2
-import random
 import argparse
 import json
+import random
+
+from googleapiclient.errors import HttpError
+from random_words import RandomWords
+from utils import build_client, wait_for_active
+
 
+rw = RandomWords()
 
-def create_project(name, id, **labels):
-    return client.projects().create(body={
-            'projectId': pid_candidate,
-            'name': name
+
+def create_project(client, name, id, **labels):
+    return client.projects().create(
+        body={
+            'projectId': id,
+            'name': name,
             'labels': labels
-            }).execute()
+            }
+        ).execute()
 
 
-    def run(name, id=None, **labels):
-        project = None
+def run(name, id=None, **labels):
+    client = build_client()
+    project = None
     if id is None:
         while project is None:
-            id = "{}-{}-{}".format(*rw.random_words(count=2),
+            words = rw.random_words(count=2)
+            id = "{}-{}-{}".format(words[0],
+                                   words[1],
                                    random.randint(100, 999))[:30]
             try:
                 project = create_project(client, name, id, **labels)
             except HttpError as e:
                 code, uri, reason = str(e).parse(
-                        '<HttpError %s when requesting %s returned "%s">')
+                    '<HttpError %s when requesting %s returned "%s">')
                 if not reason == "Requested entity already exists":
                     raise e
     else:
         project = create_project(client, name, id, **labels)
 
-    return wait_for_active(project)
+    return wait_for_active(client, project)
 
 
-parser = argparse.ArgumentParser(description = 'Create a Google Cloud Project')
+parser = argparse.ArgumentParser(description='Create a Google Cloud Project')
 parser.add_argument('--name',
                     type=str,
                     help='Human readable name of the project',
@@ -47,9 +56,9 @@ def run(name, id=None, **labels):
                     type=json.loads,
                     help='Json formatted dictionary of labels')
 
-if __name__=='__main__':
+if __name__ == '__main__':
     args = parser.parse_args()
-   if args.labels:
-       run(args.name, id=args.id, **args.labels)
-   else:
-       run(args.name, id=args.id)
+    if args.labels:
+        run(args.name, id=args.id, **args.labels)
+    else:
+        run(args.name, id=args.id)
diff --git a/resourcemanager/delete_project.py b/resourcemanager/delete_project.py
@@ -1,6 +1,7 @@
-from utils import build_client
 import argparse
 
+from utils import build_client
+
 
 def run(id):
     client = build_client()
diff --git a/resourcemanager/requirements.txt b/resourcemanager/requirements.txt
@@ -0,0 +1,2 @@
+random_words
+googleapiclient
diff --git a/resourcemanager/utils.py b/resourcemanager/utils.py
@@ -1,7 +1,8 @@
+from time import sleep
+
 from googleapiclient.discovery import build
-from oauth2client.client import GoogleCredentials
 import httplib2
-from time import sleep
+from oauth2client.client import GoogleCredentials
 
 
 def build_client():
@@ -12,10 +13,12 @@ def build_client():
                  http=httplib2.Http(timeout=90))
 
 
-def wait_for_active(project):
+def wait_for_active(client, project):
     timeout = 1
     while project['lifecycleState'] != 'ACTIVE':
         sleep(timeout)
         timeout = timeout*2
-        project = client.projects().get(projectId=project_id).execute()
+        project = client.projects().get(
+            projectId=project['projectId']
+            ).execute()
     return project
