Update CLI

Author: meliaj

bin/clever

@@ -5,7 +5,6 @@ import os
 import re
 import subprocess
 import sys
-import base64
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
 import clever
@@ -46,9 +45,9 @@ class APIResourceClient(object):
       term = ' \\'
     else:
       term = ''
-    api_key = clever.get_api_key()
+    api_token = clever.get_token()
     curl = ['curl %s%s -H "Authorization: Basic %s"%s' %
-            (clever.api_base, url, base64.b64encode(api_key), term)]
+            (clever.api_base, url, api_token, term)]
     if isinstance(ordered_params, list):
       for i, (k, v) in enumerate(ordered_params):
         if i == len(ordered_params) - 1:
@@ -124,6 +123,9 @@ class TeacherClient(ListableAPIResourceClient):
 class EventClient(ListableAPIResourceClient):
   client_for = clever.Event
 
+class ContactClient(ListableAPIResourceClient):
+  client_for = clever.Contact
+
 def main():
   klasses = {
     'district' : DistrictClient,
@@ -134,6 +136,7 @@ def main():
     'student' : StudentClient,
     'teacher' : TeacherClient,
     'event' : EventClient,
+    'contact': ContactClient,
   }
   klasses_plural = { '{0}s'.format(key) : value for key, value in klasses.iteritems() }
   klasses = dict(klasses.items() + klasses_plural.items())
@@ -170,11 +173,15 @@ teacher
   retrieve
 
 event
+  all
+  retrieve
+
+contact
   all
   retrieve""")
   parser.add_option('-v', '--verbosity', help='Verbosity of debugging output.',
                     dest='verbosity', action='count', default=0)
-  parser.add_option('-k', '--api-key', help="API key.  Defaults to value of environment variable CLEVER_API_KEY", dest='api_key')
+  parser.add_option('-t', '--api-token', help="API token.  Defaults to value of environment variable CLEVER_API_TOKEN", dest='api_token')
   parser.add_option('-b', '--api-base', help='API base URL', dest='api_base')
   parser.add_option('-i', '--id', help="Object ID", dest='id')
   opts, args = parser.parse_args()
@@ -188,11 +195,11 @@ event
 
   klass_name = args[0]
   method_name = args[1]
-  api_key = opts.api_key or os.environ.get('CLEVER_API_KEY')
-  if not api_key:
-    parser.error('No API key provided (use -k option or set the CLEVER_API_KEY environment variable')
+  api_token = opts.api_token or os.environ.get('CLEVER_API_TOKEN')
+  if not api_token:
+    parser.error('No API token provided (use -t option or set the CLEVER_API_TOKEN environment variable')
     return 1
-  clever.set_api_key(api_key)
+  clever.set_token(api_token)
 
   if opts.api_base:
     clever.api_base = opts.api_base