Fixed setup stuff. Python setuptools really is a pain.

Makefile

@@ -1,11 +1,11 @@
 
 all: genponies
 
-genpngs: ponies/*
+genpngs:
 	mkdir genpngs
 	unpixelterm -d genpngs ponies/*.pony
 
-genponies: pngs/*
+genponies:
-	mkdir genponies
+	mkdir ponysay/ponies
-	pixelterm -d genponies pngs/*.png
+	pixelterm -d ponysay/ponies pngs/*.png
 

ponysay

@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-
-import os, sys, random
-from os.path import dirname, realpath, exists
-import ponysay
-import argparse, textwrap
-
-if __name__ == '__main__':
-	termwidth = 80
-	try:
-		termwidth = os.get_terminal_size()[0]
-	except:
-		pass
-
-	parser = argparse.ArgumentParser(description='Cowsay with ponies')
-	parser.add_argument('-p', '--pony', type=str, default='random', help='The name of the pony to be used. Use "-p list" to list all ponies, "-p random" (default) to use a random pony.')
-	parser.add_argument('-q', '--quote', action='store_true', help='Use a random quote of the pony being displayed as text')
-	parser.add_argument('-c', '--center', action='store_true', help='Use a random quote of the pony being displayed as text')
-	parser.add_argument('-C', '--center-text', action='store_true', help='Center the text in the bubble')
-	parser.add_argument('-w', '--width', type=int, default=termwidth, help='Terminal width. Use 0 for unlimited width. Default: autodetect')
-	parser.add_argument('-b', '--balloon', type=str, default='cowsay', help='Balloon style to use. Use "-b list" to list available styles.')
-	parser.add_argument('text', type=str, nargs='*', help='The text to be placed in the speech bubble')
-	args = parser.parse_args()
-  
-	think = sys.argv[0].endswith('think')
-	if args.pony == "list":
-		print('\n'.join(sorted(ponysay.list_ponies() if not args.quote else ponysay.list_ponies_with_quotes())))
-		sys.exit()
-	if args.balloon == 'list':
-		print('\n'.join([ s.replace('.think', '') for s in ponysay.balloonstyles.keys() if s.endswith('.think') == think ]))
-		sys.exit()
-	pony = args.pony
-	if pony == "random":
-		pony = random.choice(ponysay.list_ponies() if not args.quote else ponysay.list_ponies_with_quotes())
-	text = ' '.join(args.text) or None
-	if text == '-':
-		text = '\n'.join(sys.stdin.readlines())
-	if args.quote:
-		text = ponysay.random_quote(pony)
-
-	balloonstyle = None
-	if think:
-		balloonstyle = ponysay.balloonstyles[args.balloon+'.think']
-	else:
-		balloonstyle = ponysay.balloonstyles[args.balloon]
-
-	print(ponysay.render_pony(pony, text,
-							  balloonstyle=balloonstyle,
-							  width=args.width or sys.maxint,
-							  center=args.center,
-							  centertext=args.center_text))

ponysay-qotd

@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-import random
-from socketserver import ThreadingMixIn, TCPServer, BaseRequestHandler
-import ponysay
-
-# Quote-Of-The-Day protocol implementation using ponysay backend
-# See RFC865 ( https://tools.ietf.org/html/rfc865 ) for details.
-# To prevent traffic amplification attacks we are only providing a TCP service.
-
-class ThreadingTCPServer(ThreadingMixIn, TCPServer): pass
-
-ponylist = ponysay.list_ponies_with_quotes()
-
-class QOTDHandler(BaseRequestHandler):
-	def handle(self):
-		pony = random.choice(ponylist)
-		s = ponysay.render_pony(pony, ponysay.random_quote(pony),
-			balloonstyle=ponysay.balloonstyles['cowsay'],
-			center=True,
-			centertext=False,
-			width=120)
-		self.request.sendall(bytes(s, "UTF-8"))
-
-if __name__ == "__main__":
-	HOST, PORT = "", 8017
-	server = ThreadingTCPServer((HOST, PORT), QOTDHandler)
-	server.serve_forever()

ponysay.py

@@ -1,78 +0,0 @@
-#!/usr/bin/env python3
-
-import os, sys, random
-from os.path import dirname, realpath, exists
-from pkg_resources import resource_string, resource_listdir, resource_exists
-import argparse, textwrap
-try:
-	import re2 as re
-except:
-	import re
-
-# (oneline, multiline, bottom, top, linkl, linkr)
-# {one,multi}line := (left, right)
-# {left,right} := (top, middle, bottom)
-balloonstyles= {'cowsay':		(((' ', '', '< '), (' ', '', '> ')), ((' /', '|', '\\ '), (' \\', '|', '/ ')), '-', '_', '\\', '/'),
-				'cowsay.think':	(((' ', '', '( '), (' ', '', ') ')), ((' (', '(', '( '), (' )', ')', ') ')), '-', '_', 'o', 'o'),
-				'ascii':		(((' /|', '', '\\ '), (' \\|', '', '/ ')), ((' /|', '|', '|\\'), (' \\|', '|', '|/')), '_', '_', '\\', '/'),
-				'ascii.think':	(((' ((', '', '( '), (' ))', '', ') ')), ((' ((', '(', '(('), (' ))', ')', '))')), '_', '_', 'o', 'o'),
-				'unicode':		((('┌││', '', '│└ '), ('┐││', '', '│┘ ')), (('┌││', '│', '││└'), ('┐││', '│', '││┘')), '─', '─', '╲', '╱'),
-				'round':		((('╭││', '', '│╰ '), ('╮││', '', '│╯ ')), (('╭││', '│', '││╰'), ('╮││', '│', '││╯')), '─', '─', '╲', '╱'),
-				'linux-vt':		((('┌││', '', '│└ '), ('┐││', '', '│┘ ')), (('┌││', '│', '││└'), ('┐││', '│', '││┘')), '─', '─', '\\', '/')}
-
-def list_ponies(markQuotes=False):
-	quotes = lambda n: ' (quotes)' if markQuotes and exists(ponypath+'/'+n+'.quotes') else ''
-	return [ f[:-5]+quotes(f[:-5]) for f in resource_listdir(__name__, 'ponies') if not f.endswith('.quotes') ]
-
-def list_ponies_with_quotes():
-	return [ f[:-7] for f in resource_listdir(__name__, 'ponies') if f.endswith('.quotes') ]
-
-def load_pony(name):
-	return str(resource_string(__name__, 'ponies/'+name+'.pony'), 'utf-8').split('\n')
-
-def random_quote(name):
-	quotepath='ponies/'+name+'.quotes'
-	if resource_exists(__name__, quotepath):
-		return random.choice(str(resource_string(__name__, quotepath), 'utf-8').split('\n\n'))
-	else:
-		return None
-
-def render_balloon(text, balloonstyle, minwidth=0, maxwidth=40, pad=str.center):
-	if text is None:
-		return []
-	(oneline, multiline, bottom, top, linkl, linkr) = balloonstyle
-	lines = [ ' '+wrapline+' ' for textline in text.center(minwidth).split('\n') for wrapline in textwrap.wrap(textline, maxwidth) ]
-	width = max([ len(line) for line in lines ]+[minwidth])
-	side = lambda top, middle, bottom: top + middle*(len(lines)-2) + bottom
-	leftside, rightside = oneline if len(lines) == 1 else multiline
-	topextra, bottomextra = len(leftside[0])-2, len(leftside[2])-2
-	leftside, rightside = side(*leftside), side(*rightside)
-	lines = [top*width] + [' '*width]*topextra + [ pad(line, width) for line in lines ] + [' '*width]*bottomextra + [bottom*width]
-	return [ l+m+r for l,m,r in zip(leftside, lines, rightside) ]
-
-def render_pony(name, text, balloonstyle, width=80, center=False, centertext=False):
-	pony = load_pony(name)
-	balloon = link_l = link_r = ''
-	if text:
-		[link_l, link_r] = balloonstyle[-2:]
-	for i,line in enumerate(pony):
-		match = re.search('\$balloon([0-9]*)\$', line)
-		if match:
-			minwidth = int(match.group(1) or '0')
-			pony[i:i+1] = render_balloon(text, balloonstyle, minwidth=minwidth, maxwidth=int(width/2), pad=str.center if centertext else str.ljust)
-			break
-	try:
-		first = pony.index('$$$')
-		second = pony[first+1:].index('$$$')
-		pony[first:] = pony[first+1+second+1:]
-	except:
-		pass
-	pony = [ line.replace('$\\$', link_l).replace('$/$', link_r) for line in pony ]
-	indent = ''
-	if center:
-		ponywidth = max([ len(re.sub(r'\x1B\[[0-9;]+m|\$.*\$', '', line)) for line in pony ])
-		indent = ' '*int((width-ponywidth)/2)
-	wre = re.compile('((\x1B\[[0-9;]+m)*.){0,%s}' % width)
-	reset = '\n'
-	return indent+(reset+indent).join([ wre.search(line).group() for line in pony ])+reset
-