diff --git a/api/bots/check-mirroring b/api/bots/check-mirroring index 39d432213b..e1ab8adb72 100755 --- a/api/bots/check-mirroring +++ b/api/bots/check-mirroring @@ -6,6 +6,7 @@ import os import random import logging import subprocess +from os import path parser = optparse.OptionParser() parser.add_option('--verbose', @@ -33,13 +34,14 @@ mit_user = 'tabbott/extra@ATHENA.MIT.EDU' humbug_user = 'tabbott/extra@mit.edu' sys.path.append(".") -sys.path.append(os.path.dirname(os.path.dirname(__file__))) -import api.common -humbug_client = api.common.HumbugAPI(email=humbug_user, - api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", - verbose=True, - client="test: Humbug API", - site=options.site) +sys.path.append(path.join(path.dirname(__file__), '..')) +import humbug +humbug_client = humbug.HumbugAPI( + email=humbug_user, + api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + verbose=True, + client="test: Humbug API", + site=options.site) # Configure logging log_file = "/home/humbug/check-mirroring-log" diff --git a/api/bots/feedback-bot b/api/bots/feedback-bot index 1845d28e49..7013a82595 100755 --- a/api/bots/feedback-bot +++ b/api/bots/feedback-bot @@ -2,17 +2,20 @@ import sys import os import optparse +from os import path -sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))) -import api.common -prod_client = api.common.HumbugAPI(email="feedback@humbughq.com", - api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", - verbose=True, - site="https://humbughq.com") -staging_client = api.common.HumbugAPI(email="feedback@humbughq.com", - api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", - verbose=True, - site="https://staging.humbughq.com") +sys.path.append(path.join(path.dirname(__file__), '..')) +import humbug +prod_client = humbug.HumbugAPI( + email="feedback@humbughq.com", + api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + verbose=True, + site="https://humbughq.com") +staging_client = humbug.HumbugAPI( + email="feedback@humbughq.com", + api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + verbose=True, + site="https://staging.humbughq.com") def forward_message(message): if message["type"] != "personal": diff --git a/api/bots/gcal-bot b/api/bots/gcal-bot index 8447caa7ee..0eb4c91025 100755 --- a/api/bots/gcal-bot +++ b/api/bots/gcal-bot @@ -10,8 +10,8 @@ import itertools import traceback from os import path -sys.path.append(path.join(path.dirname(__file__), '../..')) -import api.common +sys.path.append(path.join(path.dirname(__file__), '..')) +import humbug parser = optparse.OptionParser(r""" @@ -91,10 +91,11 @@ def get_calendar_url(): calendar_url = get_calendar_url() -humbug = api.common.HumbugAPI(email=options.user, - api_key=options.api_key, - site=options.site, - verbose=True) +humbug = humbug.HumbugAPI( + email=options.user, + api_key=options.api_key, + site=options.site, + verbose=True) def get_events(): feed = CalendarClient().GetCalendarEventFeed(uri=calendar_url) diff --git a/api/bots/humbug_trac.py b/api/bots/humbug_trac.py index c45df8c4c0..3ebec98838 100644 --- a/api/bots/humbug_trac.py +++ b/api/bots/humbug_trac.py @@ -18,11 +18,12 @@ from trac.core import Component, implements from trac.ticket import ITicketChangeListener import sys -sys.path.append("/home/humbug/humbug") -import api.common -client = api.common.HumbugAPI(email="humbug+trac@humbughq.com", - site="https://staging.humbughq.com", - api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") +sys.path.append("/home/humbug/humbug/api") +import humbug +client = humbug.HumbugAPI( + email="humbug+trac@humbughq.com", + site="https://staging.humbughq.com", + api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") def markdown_ticket_url(ticket, heading="ticket"): return "[%s #%s](https://trac.humbughq.com/ticket/%s)" % (heading, ticket.id, ticket.id) diff --git a/api/bots/send-nagios-notification b/api/bots/send-nagios-notification index 77a6b35944..4a6a452a69 100755 --- a/api/bots/send-nagios-notification +++ b/api/bots/send-nagios-notification @@ -3,8 +3,8 @@ import sys import optparse from os import path -sys.path.append(path.join(path.dirname(__file__), '../..')) -import api.common +sys.path.append(path.join(path.dirname(__file__), '..')) +import humbug # Nagios passes the notification details as command line options. # In Nagios, "output" means "first line of output", and "long @@ -43,7 +43,7 @@ if output: # Block-quote any command output. msg['content'] += ('\n\n' + '\n'.join('> ' + ln for ln in output.splitlines())) -client = api.common.HumbugAPI( +client = humbug.HumbugAPI( email = 'humbug+nagios@humbughq.com', api_key = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx', site = 'https://staging.humbughq.com') diff --git a/api/bots/zephyr_mirror_backend.py b/api/bots/zephyr_mirror_backend.py index f9a568049a..917a3a8e7a 100755 --- a/api/bots/zephyr_mirror_backend.py +++ b/api/bots/zephyr_mirror_backend.py @@ -774,7 +774,9 @@ if __name__ == "__main__": (options, args) = parse_args() - sys.path[:0] = [options.root_path, os.path.join(options.root_path, "python-zephyr"), + sys.path[:0] = [options.root_path, + os.path.join(options.root_path, 'api'), + os.path.join(options.root_path, "python-zephyr"), os.path.join(options.root_path, "python-zephyr/build/lib.linux-x86_64-2.6/")] # In case this is an automated restart of the mirroring script, @@ -794,12 +796,13 @@ or specify the --api-key-file option.""" % (options.api_key_file,))) # don't need to read it in os.environ["HUMBUG_API_KEY"] = api_key - import api.common - humbug_client = api.common.HumbugAPI(email=options.user + "@mit.edu", - api_key=api_key, - verbose=True, - client="zephyr_mirror", - site=options.site) + import humbug + humbug_client = humbug.HumbugAPI( + email=options.user + "@mit.edu", + api_key=api_key, + verbose=True, + client="zephyr_mirror", + site=options.site) start_time = time.time() diff --git a/api/examples/get-public-streams b/api/examples/get-public-streams index b999e12884..b73449bccb 100755 --- a/api/examples/get-public-streams +++ b/api/examples/get-public-streams @@ -37,11 +37,12 @@ parser.add_option('--api-key') parser.add_option('--user') (options, args) = parser.parse_args() -sys.path.append(path.join(path.dirname(__file__), '../..')) -import api.common -client = api.common.HumbugAPI(email=options.user, - api_key=options.api_key, - verbose=True, - site=options.site) +sys.path.append(path.join(path.dirname(__file__), '..')) +import humbug +client = humbug.HumbugAPI( + email=options.user, + api_key=options.api_key, + verbose=True, + site=options.site) print client.get_public_streams() diff --git a/api/examples/list-subscriptions b/api/examples/list-subscriptions index 60c2587a99..2e85d762fe 100755 --- a/api/examples/list-subscriptions +++ b/api/examples/list-subscriptions @@ -37,11 +37,12 @@ parser.add_option('--api-key') parser.add_option('--user') (options, args) = parser.parse_args() -sys.path.append(path.join(path.dirname(__file__), '../..')) -import api.common -client = api.common.HumbugAPI(email=options.user, - api_key=options.api_key, - verbose=True, - site=options.site) +sys.path.append(path.join(path.dirname(__file__), '..')) +import humbug +client = humbug.HumbugAPI( + email=options.user, + api_key=options.api_key, + verbose=True, + site=options.site) print client.list_subscriptions() diff --git a/api/examples/print-messages b/api/examples/print-messages index 35568246d3..07b9a84ae9 100755 --- a/api/examples/print-messages +++ b/api/examples/print-messages @@ -37,12 +37,13 @@ parser.add_option('--api-key') parser.add_option('--user') (options, args) = parser.parse_args() -sys.path.append(path.join(path.dirname(__file__), '../..')) -import api.common -client = api.common.HumbugAPI(email=options.user, - api_key=options.api_key, - verbose=True, - site=options.site) +sys.path.append(path.join(path.dirname(__file__), '..')) +import humbug +client = humbug.HumbugAPI( + email=options.user, + api_key=options.api_key, + verbose=True, + site=options.site) def print_message(message): print message diff --git a/api/examples/print-next-message b/api/examples/print-next-message index dd3eea4194..9b12da0b22 100755 --- a/api/examples/print-next-message +++ b/api/examples/print-next-message @@ -37,11 +37,12 @@ parser.add_option('--api-key') parser.add_option('--user') (options, args) = parser.parse_args() -sys.path.append(path.join(path.dirname(__file__), '../..')) -import api.common -client = api.common.HumbugAPI(email=options.user, - api_key=options.api_key, - verbose=True, - site=options.site) +sys.path.append(path.join(path.dirname(__file__), '..')) +import humbug +client = humbug.HumbugAPI( + email=options.user, + api_key=options.api_key, + verbose=True, + site=options.site) print client.get_messages({}) diff --git a/api/examples/send-message b/api/examples/send-message index 15ee25da3c..237ba50916 100755 --- a/api/examples/send-message +++ b/api/examples/send-message @@ -44,12 +44,13 @@ parser.add_option('--type', default='private') if len(args) == 0: parser.error("You must specify recipients") -sys.path.append(path.join(path.dirname(__file__), '../..')) -import api.common -client = api.common.HumbugAPI(email=options.sender, - api_key=options.api_key, - verbose=True, - site=options.site) +sys.path.append(path.join(path.dirname(__file__), '..')) +import humbug +client = humbug.HumbugAPI( + email=options.sender, + api_key=options.api_key, + verbose=True, + site=options.site) message_data = { "type": options.type, diff --git a/api/examples/subscribe b/api/examples/subscribe index d391be1b7c..fd102c737a 100755 --- a/api/examples/subscribe +++ b/api/examples/subscribe @@ -38,12 +38,13 @@ parser.add_option('--site', default='https://humbughq.com') parser.add_option('--streams', default='') (options, args) = parser.parse_args() -sys.path.append(path.join(path.dirname(__file__), '../..')) -import api.common -client = api.common.HumbugAPI(email=options.user, - api_key=options.api_key, - verbose=True, - site=options.site) +sys.path.append(path.join(path.dirname(__file__), '..')) +import humbug +client = humbug.HumbugAPI( + email=options.user, + api_key=options.api_key, + verbose=True, + site=options.site) if options.streams == "": print >>sys.stderr, "Usage:", parser.usage diff --git a/api/examples/unsubscribe b/api/examples/unsubscribe index 0a1ad83b1e..ad3a5ed4bb 100755 --- a/api/examples/unsubscribe +++ b/api/examples/unsubscribe @@ -38,12 +38,13 @@ parser.add_option('--site', default='https://humbughq.com') parser.add_option('--streams', default='') (options, args) = parser.parse_args() -sys.path.append(path.join(path.dirname(__file__), '../..')) -import api.common -client = api.common.HumbugAPI(email=options.user, - api_key=options.api_key, - verbose=True, - site=options.site) +sys.path.append(path.join(path.dirname(__file__), '..')) +import humbug +client = humbug.HumbugAPI( + email=options.user, + api_key=options.api_key, + verbose=True, + site=options.site) if options.streams == "": print >>sys.stderr, "Usage:", parser.usage diff --git a/api/common.py b/api/humbug.py similarity index 100% rename from api/common.py rename to api/humbug.py diff --git a/tools/build-api-tarball b/tools/build-api-tarball index ac0de03946..f6bf498197 100755 --- a/tools/build-api-tarball +++ b/tools/build-api-tarball @@ -4,4 +4,4 @@ if [ -z "$ref" ]; then echo "You must specify the ref to base the API tarball on." exit 1 fi -git archive --prefix=humbug-api/ -o /tmp/humbug-api.tar.gz "$ref" api/examples/ api/common.py api/__init__.py api/README +git archive --prefix=humbug-api/ -o /tmp/humbug-api.tar.gz "$ref" api/examples/ api/humbug.py api/__init__.py api/README diff --git a/tools/inject-messages/inject-messages b/tools/inject-messages/inject-messages index 0433002426..ec25040d50 100755 --- a/tools/inject-messages/inject-messages +++ b/tools/inject-messages/inject-messages @@ -3,6 +3,7 @@ import sys import os import optparse import re +from os import path usage = """inject-messages [options] @@ -15,8 +16,8 @@ parser.add_option("--site", action="store") (options, args) = parser.parse_args() -sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))) -import api.common +sys.path.append(path.join(path.dirname(__file__), '../../api')) +import humbug characters = {'othello': {'api-key': '4e5d97591bec64bf57d2698ffbb563e3', 'intro': ''}, 'iago': {'api-key': 'd43b53c27a8106195b46781abc67901a', 'intro': ''}} @@ -34,10 +35,11 @@ next_user = gen_next_user() def connect_all(users): for user in users: - users[user]['client'] = api.common.HumbugAPI(email=user + '@humbughq.com', - api_key=users[user]['api-key'], - site=options.site, - verbose=True) + users[user]['client'] = humbug.HumbugAPI( + email=user + '@humbughq.com', + api_key=users[user]['api-key'], + site=options.site, + verbose=True) connect_all(characters) connect_all(users) diff --git a/tools/post-receive b/tools/post-receive index 301f74dbe0..1f5580980d 100755 --- a/tools/post-receive +++ b/tools/post-receive @@ -20,13 +20,15 @@ import os import sys import subprocess import time +from os import path -sys.path.append(os.path.dirname(os.path.dirname(os.readlink(__file__)))) -import api.common -client = api.common.HumbugAPI(email="humbug+commits@humbughq.com", - site="https://staging.humbughq.com", - api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", - verbose=False) +sys.path.append(path.join(path.dirname(os.readlink(__file__)), '../api')) +import humbug +client = humbug.HumbugAPI( + email="humbug+commits@humbughq.com", + site="https://staging.humbughq.com", + api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + verbose=False) def check_output(*popenargs, **kwargs): if 'stdout' in kwargs: diff --git a/tools/review b/tools/review index 456c94f33e..20527f877a 100755 --- a/tools/review +++ b/tools/review @@ -298,12 +298,13 @@ def main(args): print >>sys.stdout print >>sys.stdout, msg.get_payload(decode=True), else: - sys.path.append(os.path.dirname(os.path.dirname(__file__))) - import api.common + sys.path.append(os.path.join(os.path.dirname(__file__), '../api')) + import humbug me = get_current_user(repo) - client = api.common.HumbugAPI(email=me[me.index("<") + 1:me.index('>')], - site="https://staging.humbughq.com", - verbose=True) + client = humbug.HumbugAPI( + email=me[me.index("<") + 1:me.index('>')], + site="https://staging.humbughq.com", + verbose=True) client.send_message({'type': "private", 'to': opts.reviewers, 'content': "I just sent you a review request! Check your email for details."})