RubyGems - wcc - Versions diffs - 0.0.6 → 0.0.7 - Mend

wcc 0.0.6 → 0.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

data/assets/template.d/mail-body.html.erb +94 -0
data/assets/template.d/mail-body.plain.erb +7 -0
data/assets/template.d/mail.alt.erb +21 -0
data/assets/template.d/mail.plain.erb +3 -2
data/bin/wcc-upgrade +9 -4
data/lib/wcc/diff.rb +143 -0
data/lib/wcc/mail.rb +24 -4
data/lib/wcc.rb +31 -9
metadata +8 -4

data/assets/template.d/mail-body.html.erb ADDED Viewed

@@ -0,0 +1,94 @@
+<html>
+	<head>
+		<title><%= data.site.uri.host %> changed</title>
+		<style type="text/css">
+.msg {
+	font-size: 0.98em;
+}
+.diff {
+	font-size: 12px;
+	font-family: 'Bitstream Vera Sans Mono','Courier',monospace;
+}
+.diff ul {
+	list-style: none;
+	display: table;
+	padding: 0;
+	margin: 0.5em 0 0 0.5em;
+	border: 1px solid #CCCCCC;
+}
+.diff li {
+	padding: 0;
+	display: table-row;
+	margin: 0;
+	background: #f8f8ff;
+}
+.diff .new, .diff .old {
+	color: #999;
+}
+.diff .ins {
+	background: #dfd;
+/*	color: #080;*/
+}
+.diff .ins .hilite {
+	background: #afa;
+	margin: 0;
+	padding: 0;
+}
+.diff .del {
+	background: #fdd;
+/*	color: #b00;*/
+}
+.diff .del .hilite {
+	background: #faa;
+	margin: 0;
+	padding: 0;
+}
+.diff .range {
+	background: #eaf2f5;
+	color: #999;
+}
+.diff .other {
+}
+		</style>
+	</head>
+	<body>
+<% if data.diff.nil? %>
+		<div class="msg">
+			Checked <a href="<%= data.site.uri.to_s %>"><%= data.site.uri.to_s %></a> the first time so no diff was possible.
+		</div>
+<% else %>
+		<div class="msg">
+			Change at <a href="<%= data.site.uri.to_s %>"><%= data.site.uri.to_s %></a> - diff follows:
+		</div>
+		<div class="diff">
+			<ul>
+<% for o in data.diff.di %>
+<% if o.status == :new %>
+				<li class="new">+++<%= o.text %></li>
+<% elsif o.status == :old %>
+				<li class="old">---<%= o.text %></li>
+<% elsif o.status == :range %>
+				<li class="range">@@<%= o.text %></li>
+<% elsif o.status == :ins %>
+				<li class="ins">+<%= o.html_hilite_text %></li>
+<% elsif o.status == :del %>
+				<li class="del">-<%= o.html_hilite_text %></li>
+<% else %>
+				<li class="other"><%= o.text.gsub(/^ /, "&nbsp;") %></li>
+<% end %>
+<% end %>
+			</ul>
+		</div>
+<% end %>
+	</body>
+</html>

data/assets/template.d/mail-body.plain.erb ADDED Viewed

@@ -0,0 +1,7 @@
+<% if data.diff.nil? %>
+Checked <%= data.site.uri.to_s %> the first time so no diff was possible.
+<% else %>
+Change at <%= data.site.uri.to_s %> - diff follows:
+<%= data.diff.to_s %>
+<% end %>

data/assets/template.d/mail.alt.erb ADDED Viewed

@@ -0,0 +1,21 @@
+From: <%= from.name %> <<%= from.address %>>
+To: <%= to %>
+Subject: [<%= data.tag %>] <%= data.site.uri.host %> changed
+Content-Type: multipart/alternative; boundary="<%= data.boundary %>"
+MIME-Version: 1.0
+<% if data.bodies.key?(:plain) %>
+--<%= data.boundary %>
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: base64
+<%= Base64.encode64(data.bodies[:plain]) %>
+<% end %>
+<% if data.bodies.key?(:html) %>
+--<%= data.boundary %>
+Content-Type: text/html; charset="utf-8"
+Content-Transfer-Encoding: base64
+<%= Base64.encode64(data.bodies[:html]) %>
+<% end %>
+--<%= data.boundary %>--

data/assets/template.d/mail.plain.erb CHANGED Viewed

@@ -1,7 +1,8 @@
 From: <%= from.name %> <<%= from.address %>>
 To: <%= to %>
-Subject: <%= data.title.gsub(/\s+/, ' ') %>
+Subject: [<%= data.tag %>] <%= data.site.uri.host %> changed
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: base64
+MIME-Version: 1.0
-<%= Base64.encode64(data.message) %>
+<%= Base64.encode64(data.bodies[:plain]) %>

data/bin/wcc-upgrade CHANGED Viewed

@@ -19,10 +19,15 @@ def traverse(root, dst_root, path)
 			src = root + rel
 			dst = dst_root + rel
 			if dst.exist?
-				print "Do you want to overwrite #{dst}? (y/n): "
-				answer = $stdin.gets
-				if answer == "y\n"
-					FileUtils.cp src, dst, :verbose => true
+				# do compare
+				same = FileUtils.compare_file(src, dst)
+				# do nothing when same
+				if not same
+					print "Do you want to overwrite #{dst}? (y/n): "
+					answer = $stdin.gets
+					if answer == "y\n"
+						FileUtils.cp src, dst, :verbose => true
+					end
 				end
 			else
 				FileUtils.cp src, dst, :verbose => true

data/lib/wcc/diff.rb ADDED Viewed

@@ -0,0 +1,143 @@
+module WCC
+	class DiffItem
+		attr_accessor :status, :text, :hilite
+		def initialize(line)
+			if line.start_with?('+++')
+				@status = :new
+				@text = line.substring(3)
+			elsif line.start_with?('---')
+				@status = :old
+				@text = line.substring(3)
+			elsif line.start_with?('@@')
+				@status = :range
+				@text = line.substring(2)
+			elsif line.start_with?('+')
+				@status = :ins
+				@text = line.substring(1)
+			elsif line.start_with?('-')
+				@status = :del
+				@text = line.substring(1)
+			else
+				@status = :other
+				@text = line
+			end
+			@text.gsub!(/\n/, '')
+			@hilite = nil
+		end
+		def html_hilite_text(css_klass = 'hilite')
+			return @text if @hilite.nil?
+			i = 1
+			new_text = ''
+			in_span = false
+			@text.chars.to_a.each do |c|
+				if @hilite.include?(i)
+					if not in_span
+						new_text += "<span class=\"#{css_klass}\">"
+					end
+					new_text += c
+					in_span = true
+				else
+					if in_span
+						new_text += "</span>"
+					end
+					new_text += c
+					in_span = false
+				end
+				i += 1
+			end
+			new_text += "</span>" if in_span
+			new_text
+		end
+		def rchar
+			case status
+			when :new
+				'N'
+			when :old
+				'O'
+			when :range
+				'@'
+			when :ins
+				'i'
+			when :del
+				'd'
+			when :other
+				'_'
+			end
+		end
+		def to_s
+			case status
+			when :new
+				'+++'+text
+			when :old
+				'---'+text
+			when :range
+				'@@'+text
+			when :ins
+				'+'+text
+			when :del
+				'-'+text
+			when :other
+				text
+			end
+		end
+	end
+	class Differ
+		attr_reader :di
+		def initialize(dstring)
+			@di = []
+			dstring.lines.each do |line|
+				# parse line
+				@di << DiffItem.new(line)
+			end
+			# TODO: compute_hilite, wrong +/- detection
+		end
+		def compute_hilite
+			s = rchar
+			puts s
+			mds = []
+			md = s.match(/(@|_)di(@|_)/)
+			while not md.nil?
+				mds << md
+				s = s.substring(md.begin(2)+1)
+				md = s.match(/(@|_)di(@|_)/)
+			end
+			offset = 0
+			mds.each do |md|
+				i = offset+md.begin(1)+1
+				offset = md.begin(2)+1
+				ranges = Diff::LCS.diff(@di[i].text, @di[i+1].text)
+				@di[i].hilite = []
+				@di[i+1].hilite = []
+				ranges.each do |chg|
+					chg.each do |c|
+						if c.action == '-' and c.element != ''
+							@di[i].hilite << c.position
+						end
+						if c.action == '+' and c.element != ''
+							@di[i+1].hilite << c.position
+						end
+					end
+				end
+			end
+		end
+		def rchar
+			@di.map { |o| o.rchar }.join
+		end
+		def to_s
+			@di.map { |o| o.to_s }.join("\n")
+		end
+	end
+end

data/lib/wcc/mail.rb CHANGED Viewed

@@ -45,11 +45,31 @@ module WCC
 			@port = port
 		end
-		def send(data, template, from, tos = [])
+		# Sends a mail built up from some [ERB] templates to the
+		# specified adresses.
+		#
+		# @param [OpenStruct] data used to construct ERB binding
+		# @param [ERB] main the main template
+		# @param [Hash] bodies :name, ERB template pairs
+		# @param [String] from the From: address
+		# @param [Array] tos array of To: addresses
+		def send(data, main, bodies, from, tos = [])
+			# generate a boundary that may be used for multipart
+			data.boundary = "frontier-#{data.site.id}"
+			# generate messages
+			msgs = {}
+			tos.each do |to|
+				data.bodies = {}
+				# eval all body templates
+				bodies.each do |name,template|
+					data.bodies[name] = template.result(binding)
+				end
+				# eval main template
+				msgs[to] = main.result(binding)
+			end
+			# send messages
 			Net::SMTP.start(@host, @port) do |smtp|
-				tos.each do |to|
-					# eval ERB
-					msg = template.result(binding)
+				msgs.each do |to,msg|
 					smtp.send_message(msg, from.address, to.address)
 				end
 			end

data/lib/wcc.rb CHANGED Viewed

@@ -16,9 +16,11 @@ require 'uri'
 require 'yaml'
 # ruby gem dependencies
+#require 'diff-lcs'
 require 'htmlentities'
 # wcc
+require 'wcc/diff'
 require 'wcc/filter'
 require 'wcc/mail'
 require 'wcc/site'
@@ -31,6 +33,14 @@ class String
 	def strip_html
 		HTMLEntities.new.decode(self.gsub(/<[^>]+>/, ' '))
 	end
+	# Returns all characters from the i-th to the end.
+	#
+	# @param [Integer] i offset to start substring
+	# @return [String] slice(i...length)
+	def substring(i)
+		slice(i...length)
+	end
 end
 module WCC
@@ -262,7 +272,7 @@ module WCC
 			[text, "\n"].join
 		end
 	end
 	class Prog
 		def self.checkForUpdate(site)
 			WCC.logger.info "Requesting '#{site.uri.to_s}'"
@@ -308,8 +318,8 @@ module WCC
 			if site.new?
 				site.hash, site.content = new_hash, new_content
-				# set custom diff message
-				diff = "Site was first checked so no diff was possible."
+				# signal that no diff was posible
+				diff = nil
 			else
 				# save old site to tmp file
 				old_site_file = Tempfile.new("wcc-#{site.id}-")
@@ -330,10 +340,11 @@ module WCC
 			return false if not Filter.accept(diff, site.filters)
 			data = OpenStruct.new
-			data.title = "[#{Conf[:tag]}] #{site.uri.host} changed"
-			data.message = "Change at #{site.uri.to_s} - diff follows:\n\n#{diff}"
+			data.site = site
+			data.diff = diff.nil? ? nil : WCC::Differ.new(diff)
+			data.tag = Conf[:tag]
-			Conf.mailer.send(data, @@mail_plain, MailAddress.new(Conf[:from_mail]), site.emails)
+			Conf.mailer.send(data, @@mail_plain, @@mail_bodies, MailAddress.new(Conf[:from_mail]), site.emails)
 			system("logger -t '#{Conf[:tag]}' 'Change at #{site.uri.to_s} (tag #{site.id}) detected'") if Conf[:syslog]
@@ -345,9 +356,11 @@ module WCC
 			# first use of Conf initializes it
 			WCC.logger = Logger.new(STDOUT)
-			mp_path = File.join(Conf[:template_dir], 'mail.plain.erb')
-			mp = File.open(mp_path, 'r') { |f| f.read }
-			@@mail_plain = ERB.new(mp)
+			@@mail_plain = load_template('mail.alt.erb')
+			@@mail_bodies = {
+				:plain => load_template('mail-body.plain.erb'),
+				:html => load_template('mail-body.html.erb')
+			}
 			Conf.sites.each do |site|
 				if checkForUpdate(site)
@@ -357,5 +370,14 @@ module WCC
 				end
 			end
 		end
+		private
+		def self.load_template(name)
+			t_path = File.join(Conf[:template_dir], name)
+			t = File.open(t_path, 'r') { |f| f.read }
+			# <> omit newline for lines starting with <% and ending in %>
+			ERB.new(t, 0, "<>")
+		end
 	end
 end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wcc
 version: !ruby/object:Gem::Version
-  hash: 19
+  hash: 17
   prerelease:
   segments:
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors:
 - Christian Nicolai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00 Z
+date: 2011-10-09 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -46,11 +46,15 @@ files:
 - assets/conf.yml
 - assets/filter.d/arg-test.rb
 - assets/filter.d/test.rb
+- assets/template.d/mail.alt.erb
+- assets/template.d/mail-body.html.erb
+- assets/template.d/mail-body.plain.erb
 - assets/template.d/mail.plain.erb
 - bin/wcc
 - bin/wcc-init
 - bin/wcc-upgrade
 - doc/Filters.md
+- lib/wcc/diff.rb
 - lib/wcc/filter.rb
 - lib/wcc/mail.rb
 - lib/wcc/site.rb