precis 1.0.2 → 1.1.0

data/bin/precis

@@ -8,10 +8,12 @@
 # Author: Rob Miller <rob@bigfish.co.uk>
 
 require 'date'
+require 'erb'
+require 'letters'
 
 require_relative '../lib/precis'
 
-output = ""
+template = ERB.new File.new(File.dirname(__FILE__) + "/../templates/email.html.erb").read, nil, "%"
 
 period = ARGV.shift
 unless ["daily", "weekly", "monthly"].include? period
@@ -41,9 +43,6 @@ end
 
 since = since.strftime("%Y-%m-%d")
 
-output += "Oh joy! It's the #{period} Git update.\n"
-output += "These are the stats since #{since}.\n\n"
-
 repos = []
 
 ARGV.each do |path|
@@ -52,27 +51,28 @@ ARGV.each do |path|
 	end
 end
 
+with_commits = []
 zero_commits = []
 
 repos.each do |repo|
 	Dir.chdir(repo)
 
+	# Take the last two parts of the path as the short version of the
+	# repo.
+	nice_name = File.basename(File.dirname(repo)) + "/" + File.basename(repo)
+
 	total_commits = `git log --oneline --since="#{since}" | wc -l`.strip
 
 	if total_commits == "0"
-		zero_commits << File.basename(repo)
+		zero_commits << nice_name
 	else
-		total_commits = total_commits == "1" ? "was #{total_commits} commit" : "were #{total_commits} commits"
-
-		output += "There #{total_commits} in #{File.basename(repo)}:\n\n"
-		output += `git shortlog -ne --since="#{since}"`.strip.indent("\t")
+		log_output = `git shortlog -ne --since="#{since}"`.strip.indent("\t")
 
-		output += "\n\n"
+		with_commits << { :path => repo, :nice_name => nice_name, :num_commits => total_commits, :log => log_output }
 	end
 end
 
-# Display the repositories with zero commits at the bottom.
-output += "Repositories with zero commits: #{zero_commits.join(', ')}"
+output = template.result(binding)
 
 emails.each do |email|
 	send_email email, :subject => "#{period.capitalize} Git update", :body => output

data/lib/precis.rb

@@ -19,6 +19,8 @@ def send_email(to, opts = {})
 	msg = <<END_OF_MESSAGE
 From: #{opts[:from_alias]} <#{opts[:from]}>
 To: <#{to}>
+MIME-Version: 1.0
+Content-type: text/html; charset=UTF-8
 Subject: #{opts[:subject]}
 
 #{opts[:body]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: precis
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies: []
 description: Watches the Git repositories you tell it to, and then emails you a weekly
   summary of activity.