X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=workitems.py;h=dea7768d32facd932503b2cac1c59a6ad1aa5fc5;hb=1db9933d4649c567932a7bb18785b4a365574254;hp=d5621062e2a58e07da80ac6575bf17b9cfcaeeaf;hpb=5d50bc350abcad898a0d1cc235758dfc3cccfac0;p=bin.git
diff --git a/workitems.py b/workitems.py
index d562106..dea7768 100755
--- a/workitems.py
+++ b/workitems.py
@@ -20,8 +20,13 @@ def get_db(dbpath):
cur = db.cursor()
cur.execute('''CREATE TABLE work_items (
blueprint VARCHAR(255) NOT NULL,
- workitem VARCHAR(255) NOT NULL,
+ workitem VARCHAR(1000) NOT NULL,
status VARCHAR(20) NOT NULL,
+ assignee VARCHAR(200) NOT NULL,
+ date TIMESTAMP NOT NULL)''')
+ cur.execute('''CREATE TABLE status (
+ blueprint VARCHAR(255) NOT NULL,
+ status VARCHAR(1000) NOT NULL,
date TIMESTAMP NOT NULL)''')
db.commit()
@@ -37,6 +42,8 @@ def parse_argv():
help='Path to database', dest='database', metavar='PATH')
optparser.add_option('-r', '--release',
help='Release name', dest='release')
+ optparser.add_option('--milestone',
+ help='Milestone name', dest='milestone')
optparser.add_option('-p', '--pattern', metavar='REGEX',
help='Regex pattern for blueprint name', dest='pattern')
optparser.add_option('-D', '--dump', action='store_true', default=False,
@@ -67,31 +74,60 @@ def parse_argv():
return (opts, args)
-def get_blueprints(url, name_pattern):
+def get_blueprints(url, name_pattern, milestone):
'''Return a list of blueprint URLs for the current release.'''
blueprint_name_filter = re.compile('href="(/ubuntu/\+spec/%s[^"]+)"' %
name_pattern)
result = []
+ scan_tr_end = False
+ found_ms = False
+ bp = None
for l in urllib.urlopen(url):
- m = blueprint_name_filter.search(l)
- if m:
- result.append(blueprints_base_url + m.group(1))
+ if scan_tr_end:
+ if milestone:
+ if ('/+milestone/%s"' % milestone) in l:
+ found_ms = True
+ if '' in l:
+ scan_tr_end = False
+ if bp and (not milestone or found_ms):
+ result.append(bp)
+ bp = None
+ found_ms = False
+ else:
+ m = blueprint_name_filter.search(l)
+ if m:
+ bp = blueprints_base_url + m.group(1)
+ scan_tr_end = True
return result
def get_blueprint_workitems(blueprint_url):
'''Collect work items from a particular blueprint URL.
- This will return a list of ('item', 'status') pairs.
+ This will return a list of ('item', 'status', 'assignee') tuples.
'''
work_items_re = re.compile('(|^)work items:\s*
', re.I)
+ assignee_re = re.compile('')
found_workitems = False
+ found_assignee = False
result = []
+ default_assignee = 'nobody'
for l in urllib.urlopen(blueprint_url):
end = False
+
+ if 'Assignee:' in l:
+ found_assignee = True
+ continue
+
+ if found_assignee and not found_workitems:
+ m = assignee_re.search(l)
+ if m:
+ default_assignee = m.group(1)
+ found_assignee = False
+
if not found_workitems:
if work_items_re.search(l):
found_workitems = True
@@ -123,13 +159,54 @@ def get_blueprint_workitems(blueprint_url):
print >> sys.stderr, 'ERROR: invalid state "%s" for work item "%s"' % (
state, desc)
continue
- result.append((desc, state))
+
+ if desc.startswith('['):
+ try:
+ off = desc.index(']')
+ assignee = desc[1:off]
+ desc = desc[off+1:].strip()
+ except ValueError:
+ print >> sys.stderr, 'ERROR: missing closing "]" for assignee for work item "%s"' % desc
+ else:
+ assignee = default_assignee
+
+ result.append((desc, state, assignee))
if end:
break
return result
+def get_blueprint_status(blueprint_url):
+ '''Collect status from a particular blueprint URL.
+
+ This will return a list of lines.
+ '''
+ status_re = re.compile('(|^)status:\s*
', re.I)
+
+ found_status = False
+ result = []
+ for l in urllib.urlopen(blueprint_url):
+ end = False
+ if not found_status:
+ if status_re.search(l):
+ found_status = True
+ continue
+
+ if '
' in l:
+ end = True
+ l = l.replace('
', '').replace('', '').replace('
', '').strip()
+
+ if not l:
+ break
+
+ result.append(l.strip())
+
+ if end:
+ break
+
+ return "\n".join(result)
+
def get_moin_workitems(url):
'''Collect work items from a moin wiki URL.
@@ -160,33 +237,53 @@ def dump(db):
cur = db.cursor()
cur.execute('SELECT * FROM work_items')
- for (blueprint, workitem, status, date) in cur:
- print '%s [%s]\t%s: %s' % (date, blueprint, workitem, status)
+ print '== Work items: =='
+ for (blueprint, workitem, item_status, assignee, date) in cur:
+ print '%s [%s, %s]\t%s: %s' % (date, blueprint, assignee, workitem, item_status)
+
+ print '\n== Status =='
+ cur = db.cursor()
+ cur.execute('SELECT * FROM status')
+ for (blueprint, status, date) in cur:
+ print '%s: %s [%s]' % (blueprint, status, date)
-def add_work_item(db, blueprint, item, status):
+def add_work_item(db, blueprint, item, status, assignee):
'''Add work item to database.'''
cur = db.cursor()
- cur.execute('INSERT INTO work_items VALUES (?, ?, ?, date(CURRENT_TIMESTAMP))',
- (blueprint, item, status))
+ cur.execute('INSERT INTO work_items VALUES (?, ?, ?, ?, date(CURRENT_TIMESTAMP))',
+ (blueprint, item, status, assignee))
-def import_lp(db, name_pattern, release):
- '''Collect blueprint work items from Launchpad into DB.'''
+def add_status(db, blueprint, status):
+ '''Add blueprint status to database.'''
+
+ if not status:
+ return
+
+ cur = db.cursor()
+ cur.execute('INSERT INTO status VALUES (?, ?, date(CURRENT_TIMESTAMP))',
+ (blueprint, status))
+
+def import_lp(db, name_pattern, release, milestone):
+ '''Collect blueprint work items and status from Launchpad into DB.'''
blueprints = get_blueprints('%s//ubuntu/%s/+specs?batch=300' % (blueprints_base_url,
- opts.release), name_pattern)
+ release), name_pattern, milestone)
cur = db.cursor()
cur.execute('DELETE FROM work_items WHERE date = date(CURRENT_TIMESTAMP)')
+ cur.execute('DELETE FROM status WHERE date = date(CURRENT_TIMESTAMP)')
for bp in blueprints:
#print 'Checking', bp
bpname = bp.split('/')[-1]
work_items = get_blueprint_workitems(bp)
+ status = get_blueprint_status(bp)
if not work_items:
print >> sys.stderr, 'WARNING: %s has no work items' % bpname
- for (item, status) in work_items:
- add_work_item(db, bpname, item, status)
+ for (item, state, assignee) in work_items:
+ add_work_item(db, bpname, item, state, assignee)
+ add_status(db, bpname, status)
def workitems_over_time(db):
'''Calculate work item development over time.
@@ -202,10 +299,10 @@ def workitems_over_time(db):
data.setdefault(date, {})[s] = num
return data
-def blueprint_status(db):
- '''Determine current blueprint status.
+def blueprint_completion(db):
+ '''Determine current blueprint completion.
- Return blueprint -> [todo, done, postponed] mapping.
+ Return blueprint -> [todo, done, postponed, status] mapping.
'''
data = {}
@@ -217,17 +314,43 @@ def blueprint_status(db):
index = 0
for s in valid_states:
cur = db.cursor()
- cur.execute('SELECT blueprint, count(workitem) FROM work_items '
- 'WHERE status = ? AND date = ? GROUP BY blueprint',
+ cur.execute('SELECT w.blueprint, count(w.workitem), s.status FROM work_items w '
+ 'LEFT JOIN status s ON w.blueprint = s.blueprint '
+ 'WHERE w.status = ? AND w.date = ? GROUP BY w.blueprint',
(s, last_date))
- for (bp, num) in cur:
- data.setdefault(bp, [0, 0, 0])[index] = num
+ for (bp, num, status) in cur:
+ data.setdefault(bp, [0, 0, 0, ''])[index] = num
+ data[bp][-1] = status or ''
+ index += 1
+
+ return data
+
+def assignee_completion(db):
+ '''Determine current by-assignee completion.
+
+ Return assignee -> [todo, done, postponed] mapping.
+ '''
+ data = {}
+
+ # last date
+ cur = db.cursor()
+ cur.execute('SELECT max(date) FROM work_items')
+ (last_date,) = cur.fetchone()
+
+ index = 0
+ for s in valid_states:
+ cur = db.cursor()
+ cur.execute('SELECT assignee, count(workitem) FROM work_items '
+ 'WHERE date=? and status=? GROUP BY assignee',
+ (last_date, s))
+ for (a, num) in cur:
+ data.setdefault(a, [0, 0, 0])[index] = num
index += 1
return data
def text(db):
- '''Print work item status as text.'''
+ '''Print work item completion as text.'''
data = workitems_over_time(db)
@@ -235,9 +358,10 @@ def text(db):
for d in sorted(data.keys()):
print d, data[d]
- print '\nBlueprint status:'
- data = blueprint_status(db)
- for (bp, (todo, done, postponed)) in data.iteritems():
+ print '\nBlueprint completion:'
+ data = blueprint_completion(db)
+ for (bp, (todo, done, postponed, status)) in data.iteritems():
+ # TODO print status
print '%s: %i/%i (%i%%)' % (bp, postponed+done, todo+done+postponed,
int(float(postponed+done)/(todo+done+postponed)*100 + 0.5))
@@ -258,6 +382,8 @@ def csv(db, from_date, to_date):
data = workitems_over_time(db)
dates = sorted(data.keys())
+ if not dates:
+ return
f = _fromstr(from_date or dates[0])
t = _fromstr(to_date or dates[-1])
@@ -297,23 +423,49 @@ def html(db):
Status by blueprint
- | Blueprint | todo/postponed/done | Completion |
|---|
+ | Blueprint | todo/postponed/done | Completion | Status |
|---|
'''
- data = blueprint_status(db)
+ data = blueprint_completion(db)
completion = []
- for (bp, (todo, done, postponed)) in data.iteritems():
+ for (bp, (todo, done, postponed, status)) in data.iteritems():
completion.append((bp,
int(float(postponed+done)/(todo+done+postponed)*100 + 0.5)))
completion.sort(key=lambda k: k[1], reverse=True)
for (bp, percent) in completion:
- print ' | %s | %i/%i/%i | %i%% |
' % (
- blueprints_base_url, bp, bp, data[bp][0], data[bp][2],
- data[bp][1], percent)
+ if bp.startswith('http:'):
+ url = bp
+ else:
+ url = '%s/ubuntu/+spec/%s' % (blueprints_base_url, bp)
+ print ' | %s | %i/%i/%i | %i%% | %s |
' % (
+ url, bp, data[bp][0], data[bp][2],
+ data[bp][1], percent,
+ data[bp][-1])
+
+ print '
'
+
+ print '''
+Status by assignee
+
+ | Assignee | todo/postponed/done | Completion |
|---|
+'''
+ data = assignee_completion(db)
+
+ completion = []
+ for (a, (todo, done, postponed)) in data.iteritems():
+ completion.append((a,
+ int(float(postponed+done)/(todo+done+postponed)*100 + 0.5)))
+
+ completion.sort(key=lambda k: k[0], reverse=False)
+ for (a, percent) in completion:
+ url = '%s/~%s/+specs?role=assignee' % (blueprints_base_url, a)
+ print ' | %s | %i/%i/%i | %i%% |
' % (
+ url, a, data[a][0], data[a][2],
+ data[a][1], percent)
print '
'
print '