Added an offensive mode, cleaned up a bit.

.gitignore

@@ -1,2 +1,3 @@
 old
 *.pyc
+__pycache__

dirtywords.py

@@ -0,0 +1,18 @@
+"""Filth up the horoscope generator with some stupid words."""
+
+import wordlist
+
+wordlist.avoid.extend([	"poor people",
+			"mamallian flesh",
+			"white people",
+			"black people",
+			"foreigners",
+			"oral sex",
+			"bullshit artists",
+			"cats that look like Jesus",
+			"anarcho-syndicalists",
+			"athesists",
+			"Christians",
+			"Mormons"
+])
+

horoscope.py

@@ -1,16 +1,24 @@
+#!/usr/bin/env python
+
+"""Random Horoscope Generator, by Michael Sproul."""
+
+import argparse
 import random
 
+import wordlist
+
 from datetime import date, timedelta
 from wordlist import *
 
 def horoscope():
-	# Feeling good or bad?
-	statement = choose([positive_statement_s, negative_statement_s])
+	"""Generate a three to four sentence horoscope."""
+	# Pick a mood (usually positive)
+	mood = "good" if random.random() <= 0.8 else "bad"
 
-	openers = [statement, cosmic_implication_s]
-	sentences = [statement, cosmic_implication_s, plain_warning_s]
+	openers = [feeling_statement_s, cosmic_implication_s]
+	sentences = [feeling_statement_s, cosmic_implication_s, warning_s]
 
-	# Pick an opening sentence type and remove it from the latter sentences
+	# Pick an opening sentence and remove it from the latter sentences
 	opener = choose(openers)
 	sentences.remove(opener)
 
@@ -20,78 +28,95 @@ def horoscope():
 
 	# Shuffle the remaining sentence types and evaluate them
 	random.shuffle(sentences)
-	final_text = opener()
+	final_text = opener(mood)
 
 	for sentence in sentences:
-		final_text += " " + sentence()
+		final_text += " " + sentence(mood)
 
 	# Optionally add a date prediction
 	if random.random() <= 0.5:
-		final_text += " " + date_prediction_s()
+		final_text += " " + date_prediction_s(mood)
 
 	return final_text
 
-def random_sentence():
-	sentences = [date_prediction_s, plain_warning_s, cosmic_implication_s,
-			positive_statement_s, negative_statement_s]
-	return choose(sentences)()
 
-def date_prediction_s():
-	today = date.today()
+def date_prediction_s(mood):
+	"""Generate a random prediction sentence containing a date."""
 	days_in_future = random.randint(2, 8)
-	significant_day = today + timedelta(days=days_in_future)
+	significant_day = date.today() + timedelta(days=days_in_future)
 	month = significant_day.strftime("%B")
 	day = significant_day.strftime("%d").lstrip('0')
-	s = "%s %s will be an important day for you" % (month, day)
-	return sentence_case(s)
 
-def positive_statement_s():
-	s = feeling_statement(good_feeling_adj, positive_assertion)
-	exciting = True if random.random() <= 0.5 else False
-	return sentence_case(s, exciting)
+	r = random.random()
+
+	if r <= 0.5:
+		s = "%s %s will be an important day for you" % (month, day)
+	elif r <= 0.8:
+		s = "Interesting things await you on %s %s" % (month, day)
+	else:
+		s = "The events of %s %s have the potential to" % (month, day)
+		s += " change your life"
 
-def negative_statement_s():
-	s = feeling_statement(bad_feeling_adj, negative_assertion)
 	return sentence_case(s)
 
-def feeling_statement(adjectives, ending):
-	adj = choose(adjectives)
+
+def feeling_statement_s(mood):
+	"""Generate a sentence that asserts a mood-based feeling."""
+	if mood == 'good':
+		adj = choose(good_feeling_adj)
+		degree = choose(good_degree, neutral_degree)
+		ending = positive_intensifier
+		exciting = True if random.random() <= 0.5 else False
+	else:
+		adj = choose(bad_feeling_adj)
+		degree = choose(good_degree, neutral_degree)
+		ending = consolation
+		exciting = False
+
 	adj = ing_to_ed(adj)
+	s = "You are feeling %s %s" % (degree, adj)
+	s += ending()
+	return sentence_case(s, exciting)
 
-	s = "You are feeling %s %s" % (choose(emotional_degree), adj)
-	s += ", " + ending()
-	return s
 
-def positive_assertion():
+def positive_intensifier():
+	"""Extend a positive statement of feeling."""
 	r = random.random()
 
 	if r <= 0.5:
-		return "and there's nothing anyone can %s to stop you" % choose(["say", "do"])
+		verb = choose(["say", "do"])
+		return ", and there's nothing anyone can %s to stop you" % verb
 	elif r <= 0.95:
-		return "and you don't care who knows it"
+		return ", and you don't care who knows it"
 	else:
-		return "and you don't give a fuck"
+		return ", and you don't give a fuck"
 
-def negative_assertion():
-	"Consolations for bad feelings"
+
+def consolation():
+	"""Extend a negative statement of feeling."""
 	r = random.random()
 
-	if r <= 0.7:
-		return "but don't worry, everything will improve %s" % choose(["shortly", "soon", "in due time"])
+	if r <= 0.6:
+		when =  choose(["shortly", "soon", "in due time"])
+		return ", but don't worry, everything will improve %s" % when
+	elif r <= 0.9:
+		return ", perhaps you need a change in your life?"
 	else:
-		return "perhaps you need a change in your life?"
+		return "..."
+
 
-def plain_warning_s():
+def warning_s(mood):
 	r = random.random()
 
 	if r <= 0.5:
 		s = "You would be well advised to avoid " + choose(avoid)
 	else:
-		s = "Avoid " + choose(avoid) + "; you wouldn't want to sabotage your mental wellbeing"
+		s = "Avoid " + choose(avoid) + " at all costs"
 
 	return sentence_case(s)
 
-def cosmic_implication_s():
+
+def cosmic_implication_s(mood):
 	s = cosmic_event()
 	s += " " + choose(prediction_verb)
 	s += " the " + choose(time_point)
@@ -104,6 +129,7 @@ def cosmic_implication_s():
 
 	return sentence_case(s)
 
+
 def cosmic_event():
 	r = random.random()
 
@@ -122,6 +148,7 @@ def cosmic_event():
 		second = choose_uniq({first}, planet, star, ["Moon"])
 		return "The %s/%s %s" % (first, second, choose(aspect))
 
+
 def emotive_event():
 	r = random.random()
 
@@ -133,14 +160,16 @@ def emotive_event():
 		noun = choose(good_emotive_noun, bad_emotive_noun)
 		return choose(time_period) + " of " + noun
 
+
 def choose_uniq(exclude, *args):
+	"""Choose a unique random item from a variable number of lists."""
 	item = choose(*args)
 	while item in exclude:
 		item = choose(*args)
 	return item
 
 def choose(*args):
-	"Choose a random item from a variable number of lists."
+	"""Choose a random item from a variable number of lists."""
 	num_words = 0
 	for list in args:
 		num_words += len(list)
@@ -153,7 +182,9 @@ def choose(*args):
 
 	return args[j][i]
 
+
 def sentence_case(sentence, exciting=False):
+	"""Capitalise the first letter of the sentence and add a full stop."""
 	sentence = sentence[0].upper() + sentence[1:]
 
 	if sentence[-1] in {'.', '!', '?'}:
@@ -164,12 +195,29 @@ def sentence_case(sentence, exciting=False):
 		return sentence + "."
 
 def ing_to_ed(word):
-	"Convert `ing' endings to `ed' endings"
+	"""Convert `ing' endings to `ed' endings."""
 	if word[-3:] == "ing":
 		return (word[:-3] + "ed")
 	else:
 		return word
 
 
+def main():
+	# Parse command-line arguments
+	parser = argparse.ArgumentParser(description=__doc__)
+
+	parser.add_argument("--dirty", action='store_true',
+				help="Enable offensive horoscopes")
+
+	parser.add_argument("--starsign", type=str, metavar="starsign",
+				help="Generate a starsign specific horoscope")
+
+	arguments = vars(parser.parse_args())
+
+	if arguments["dirty"]:
+		import dirtywords
+
+	print(horoscope())
+
 if __name__ ==  "__main__":
-	print horoscope()
+	main()

wordlist.py

@@ -1,47 +1,64 @@
 # Astrological words
-planet = ["Mercury", "Venus", "Mars", "Jupiter", "Saturn",
-		"Uranus", "Neptune", "Pluto"]
+planet = ["Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Uranus",
+		"Neptune", "Pluto"]
 
 star = ["Proxima Centauri", "Barnard's Star", "Sirius A", "Epsilon Eridani"]
 
 aspect = ["conjunction", "sextile", "square", "trine", "opposition"]
 
-wanky_event = ["a large Electromagnetic disturbance", "Quantum Flux", "the upcoming Solar eclipse",
-		"Unusual planetary motion"]
+wanky_event = ["a large Electromagnetic disturbance", "Quantum Flux",
+		"the upcoming Solar eclipse", "Unusual planetary motion"]
 
-# Prediction words
-prediction_verb = ["heralds", "marks", "foreshadows", "signifies"]
 
-# Time related words
+# Time words
 time_point = ["arrival", "beginning", "start", "end", "death"]
 
 time_period = ["interlude", "period", "week", "day"]
 
-# Emotive adjectives
-good_feeling_adj = ["romantic", "emotional", "reflective", "irreverent", "subversive",
-			"spiritual", "creative", "intellectual", "adventurous",
-			"enlightening"]
-
-good_emotive_adj = ["cathartic", "healing", "mystical"]
+# Feeling adjectives
+good_feeling_adj = ["romantic", "emotional", "reflective", "irreverent",
+			"subversive", "spiritual", "creative", "intellectual",
+			"adventurous", "enlightening", "fantastic"]
 
 bad_feeling_adj = ["bitter", "disappointing", "frustrating"]
 
+
+good_emotive_adj = ["cathartic", "healing", "mystical"]
+
 bad_emotive_adj = ["anti-climactic"]
 
+# Intensifiers for use in front of feeling adjectives
+good_degree = ["ridiculously", "amazingly"]
+neutral_degree = ["a little bit", "fairly", "pretty", "curiously"]
+bad_degree = ["worringly", "distressingly"]
+
 # Emotive nouns
 good_emotive_noun = ["love", "reflection", "romance", "enlightenment",
 			"healing", "catharsis", "mysticism", "joy", "desire",
 			"transcendence", "creativity", "metamorphosis"]
 
-bad_emotive_noun = ["bitterness", "disappointment", "sadness", "frustration", "anger", "failure", "boredom"]
+bad_emotive_noun = ["bitterness", "disappointment", "sadness", "frustration",
+			"anger", "failure", "boredom"]
 
 # Misc
 vowels = {'a', 'e', 'i', 'o', 'u'}
+prediction_verb = ["heralds", "marks", "foreshadows", "signifies"]
 
-emotional_degree = ["a little bit", "pretty", "ridiculously", "amazingly", "curiously"]
-
-# "You would be well advised to avoid..."
-avoid = ["shopping", "engaging strangers in conversation", "swimming",
-		"making too many jokes", "eating seafood", "rigorous physical activity",
-		"staying inside for extended periods of time", "alienating your friends",
-		"making life-changing decisions", "prolonging the inevitable"]
+# You would be well advised to avoid...
+avoid = [	"shopping",
+		"swimming",
+		"starchy carbs",
+		"engaging strangers in conversation",
+		"making too many jokes",
+		"eating seafood",
+		"rigorous physical activity",
+		"operating heavy machinery",
+		"staying inside for extended periods of time",
+		"alienating your friends",
+		"making life-changing decisions",
+		"prolonging the inevitable",
+		"places of worship",
+		"people who are likely to annoy you",
+		"drinking heavily this weekend",
+		"hard drugs"
+]