Merge lp:~abentley/charms/precise/juju-reports/gh-token into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

Support gh-token.

This branch adds a gh-token config variable which is inserted into production.ini, as used by lp:~abentley/juju-reports/git-commits.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'config.yaml'
--- config.yaml	2014-07-04 20:45:54 +0000
+++ config.yaml	2014-07-08 20:57:15 +0000
@@ -24,6 +24,10 @@
     type: string
     default: ""
     description: "OAuth credentials for accessing private data on Launchapd."
+  gh-token:
+    type: string
+    default: ""
+    description: "GitHub OAuth token to use for counting revisions."
   dist-clean:
     type: boolean
     default: true

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-07-04 20:45:54 +0000
+++ hooks/common.py	2014-07-08 20:57:15 +0000
@@ -31,13 +31,14 @@
     return config
 
 
-def install_ini(mongo_url):
+def install_ini(mongo_url, gh_token):
     config = ConfigParser()
     path = os.path.join(PROJECT_DIR, INI_TEMPLATE)
     if not os.path.exists(path):
         path = get_ini_path()
     config.read(path)
     config.set('app:main', 'mongo.url', mongo_url)
+    config.set('app:main', 'gh_token', gh_token)
     config.write(open(get_ini_path(), 'w'))
     return config
 
@@ -219,8 +220,8 @@
     if mongo_url == '':
         hookenv.log('No mongodb set up.')
         return
-    ini = install_ini(mongo_url)
-    for key in ['lp-key', 'lp-oauth']:
+    ini = install_ini(mongo_url, config['gh-token'])
+    for key in ['lp-key', 'lp-oauth', 'gh-token']:
         if config[key] == '':
             hookenv.log('Not setting up cron because {} not set.'.format(key))
             break