Rename api.common to humbug

Fixes #482.

(imported from commit 1bd6a7fd993d8d5e225e0311c288dbce0c369a40)
This commit is contained in:
Keegan McAllister 2012-12-03 12:23:06 -05:00
parent f61c26c361
commit bd7b7adb6b
18 changed files with 120 additions and 98 deletions

View File

@ -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"

View File

@ -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":

View File

@ -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)

View File

@ -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)

View File

@ -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')

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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

View File

@ -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({})

View File

@ -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,

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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:

View File

@ -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."})