wcc 1.3.0 → 2.0.0

data/README.md

@@ -1,17 +1,22 @@
 web change checker
 ==================
 
-This is a simple ruby script to track changes of websites and get notified via mail on
+This is a powerful ruby program to track changes of websites and get notified via mail on
 change with configurable scope of adresses per website. All mails contain a unified diff
 from old content to new content so minor changes produce only few lines of text even on large sites.
 
-Note: wcc relies on native `diff` command to produce the unified diff shown in mails -
-plans are to remove this dependency by using [something like this](https://github.com/samg/diffy) later...
+Since version 2.0 wcc has a completely rewritten notification system so emails are now only *one*
+way to recieve notifications - the currently supported other are XMPP/Jabber and the Syslog.
+These changes are reflected in 'conf.yml' as well so take care of migrating it (that basically
+means to create a *recipients* section and update your site entries from *emails* to *notify*).
+
+Note: wcc relies on native `diff` command to produce the unified diff shown in mails and native
+`syslog` command as well as user information from /etc/login.
 
 Setup
 -----
 
-You need Ruby (preferably version 1.8.7) and Rubygems installed
+You need Ruby (preferably version 1.8.7, Ruby 1.9 untested) and Rubygems installed
 (consider using [rvm](http://beginrescueend.com/)). Install wcc:
 
 	gem install wcc
@@ -46,13 +51,18 @@ can itself be given on command line as last argument. Each option has a hard-cod
 (e.g. the configuration file name is assumed to be './conf.yml'). Command line options
 overwrite configuration file entries.
 
-The core option is the From: mail address and the SMTP configuration for sending emails.
-It is highly encouraged to use the configuration file for all rare changing things
-(even because you have to specify the list of tracked sites there anyways).
+To see how such a configuration might look open 'conf.yml' in your '/my/conf' directory after
+doing `wcc-init` - it contains a bunch of comments that describe your options. The basic structure
+is made up from three sections: generic entries in *conf*, user profiles in *recipients* and a
+list of sites to check for changes in *sites*. Each site entry should contain an URL and a
+list of user profile names to notify on change.
+
+An example crontab entry that runs wcc every 5 minutes might look like this:
 
-An example crontab entry that runs wcc every 10 minutes might look like this:
+	*/5 *  * * *   root    cd /my/conf;./wcc
 
-	*/10 *  * * *   root    cd /path/to/dir/with/conf;./wcc
+Since you can configure an individual check_interval per site these 5 minutes in crontab are only
+the least common multiple for wcc check if each sites check_interval has passed.
 
 By default wcc only outputs ERROR and FATAL messages to avoid your cron daemon spammin' around.
 It is recommended to place 'conf.yml' (and optionally the 'filter.d' and 'template.d') within

data/assets/conf.yml

@@ -1,43 +1,73 @@
 # web-change-checker
 
 conf:
-  from_addr: root@localhost
 #  # /var/tmp won't get ereased on restart!
 #  cache_dir: /var/tmp/wcc
 #  tag: wcc
-#  use_syslog: yes
 #  filterd: ./filter.d
 #  templated: ./template.d
 #  email:
 #    smtp:
+#      from: root@localhost
 #      host: localhost
 #      port: 25
-# ...or for TESTING purposes:
+#  # ... or for TESTING purposes only:
 #  email:
-#    fake_file
+#    fake_file:
+#      from: root@localhost
+#  # this allows wcc to send IM messages via
+#  # it's own jabber account
+#  jabber:
+#    jid: wcc@example.org/wcc
+#    password: s3cr3t
+
+# a recipient is like a user profile, it says in which ways wcc
+# might contact you and provides a central place where to change
+# email addresses etc.
+recipients:
+  - me:
+    - email: me@my.place
+    - jabber: me@jabber.org
+  - my_friend:
+    - email: mail@example.com
+  # 'syslog' profile that notifies syslog on change
+  - syslog:
+    - syslog
 
 sites:
   - url: http://google.com/
-    emails:
-      - mail@example.com
-      - mail2@example.com
+    notify:
+      - me
+      - my_friend
+      - syslog
+  
+  # Filters
+  - url: http:/filter-test.com/
+    #notify: ...
+    # These filters will be executed and every single one has to
+    # return 'true' for the user to be notified
     filters:
       - test
       - arg-test: {number: 5, hello: world}
       - only_changes_of: {at_least: 4, t: lines}
       # Regex filter that performs matching against <scope> (one of full or diff)
       - matches: {regex: '(normal|regex)[!]+', flags: i, scope: diff}
-      # readable, isn't it?
+  
+  # HTTP Basic Auth
   - url: https://my.secret.place/
-    emails:
-      - me@my.place
-    # only supports basic auth currently
+    #notify: ...
+    # Only supports basic auth currently
     auth: {type: basic, username: me, password: secret}
+  
+  # (Session) Cookie
   - url: http://your.cms.com/
-    #emails: ...
+    #notify: ...
     # Don't add trailing newline just the pure bytes of your cookie
     cookie: file.cookie
+  
+  # Check interval
   - url: http://heavily.loaded.site/
-    # this will check at most every 30 minutes
+    #notify: ...
+    # This will check at most every 30 minutes
     # (or next time ´wcc´ gets called after 30mins passed)
     check_interval: 30

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

@@ -1,5 +1,5 @@
-From: <%= from.name %> <<%= from.address %>>
-To: <%= to %>
+From: <%= data.from.name %> <<%= data.from.address %>>
+To: <%= data.to %>
 Subject: [<%= data.tag %>] <%= data.site.uri.host %> changed
 Content-Type: multipart/alternative; boundary="<%= data.boundary %>"
 MIME-Version: 1.0

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

@@ -1,5 +1,5 @@
-From: <%= from.name %> <<%= from.address %>>
-To: <%= to %>
+From: <%= data.from.name %> <<%= data.from.address %>>
+To: <%= data.to %>
 Subject: [<%= data.tag %>] <%= data.site.uri.host %> changed
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: base64

data/assets/template.d/xmpp-body.plain.erb

@@ -0,0 +1,9 @@
+<% 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 %>
+
+nHunks: <%= data.diff.nhunks %>, nIns: <%= data.diff.ninsertions %>, nDel: <%= data.diff.ndeletions %>, nLinesC: <%= data.diff.nlinesc %>, nCharsC: <%= data.diff.ncharsc %>
+<% end %>

data/lib/wcc.rb

@@ -2,6 +2,7 @@
 require 'base64'
 require 'digest/md5'
 require 'erb'
+require 'etc'
 require 'iconv'
 require 'logger'
 require 'net/http'
@@ -18,12 +19,16 @@ require 'yaml'
 # ruby gem dependencies
 require 'diff-lcs'
 require 'htmlentities'
+require 'xmpp4r/client'
 
 # wcc
 require 'wcc/diff'
 require 'wcc/filter'
 require 'wcc/mail'
 require 'wcc/site'
+require 'wcc/syslog'
+require 'wcc/version'
+require 'wcc/xmpp'
 
 class String
 	# Remove all HTML tags with at least one character name and
@@ -45,8 +50,6 @@ end
 
 module WCC
 
-	VERSION = "1.3.0"
-
 	DIFF_TIME_FMT = '%Y-%m-%d %H:%M:%S %Z'
 	
 	# logging via WCC.logger.blub
@@ -62,6 +65,8 @@ module WCC
 	class Conf
 		include Singleton
 		
+		attr_reader :recipients
+		
 		# use Conf like a hash containing all options
 		def [](key)
 			@options[key.to_sym] || Conf.default[key.to_sym]
@@ -80,12 +85,8 @@ module WCC
 				# when you want to use ./tmp it must be writeable
 				:cache_dir => '/var/tmp/wcc',
 				:tag => 'wcc',
-				:syslog => false,
 				:filter_dir => './filter.d',
 				:template_dir => './template.d',
-				:mailer => 'smtp',
-				:smtp_host => 'localhost',
-				:smtp_port => 25
 			}
 		end
 		
@@ -101,10 +102,7 @@ module WCC
 				opts.on('-s', '--simulate', 'Check for update but do not save hash or diff files') do self[:simulate] = true end
 				opts.on('--clean', 'Remove all saved hash and diff files') do self[:clean] = true end
 				opts.on('-t', '--tag TAG', 'Set TAG used in output') do |t| self[:tag] = t end
-				opts.on('-n', '--no-mails', 'Do not send any emails') do self[:nomails] = true end
-				opts.on('-f', '--from MAIL', 'Set From: mail address') do |m| self[:from_mail] = m end
-				opts.on('--host HOST', 'Set SMTP host') do |h| self[:host] = h end
-				opts.on('--port PORT', 'Set SMTP port') do |p| self[:port] = p end
+				opts.on('-n', '--no-mails', 'Do not notify users in any way') do self[:nomails] = true end
 				opts.on('--show-config', 'Show config after loading config file (debug purposes)') do self[:show_config] = true end
 				opts.on('-h', '-?', '--help', 'Display this screen') do
 					puts opts
@@ -139,28 +137,14 @@ module WCC
 			# may be false if file is empty
 			yaml = YAML.load_file(self[:conf])
 			if yaml.is_a?(Hash) and (yaml = yaml['conf']).is_a?(Hash)
-				@options[:from_mail] ||= yaml['from_addr']
 				@options[:cache_dir] ||= yaml['cache_dir']
 				@options[:tag] ||= yaml['tag']
-				@options[:syslog] ||= yaml['use_syslog']
 				@options[:filter_dir] ||= yaml['filterd']
 				@options[:template_dir] ||= yaml['templated']
 				
-				if yaml['email'].is_a?(Hash)
-					if yaml['email']['smtp'].is_a?(Hash)
-						@options[:mailer] = 'smtp'
-						@options[:smtp_host] ||= yaml['email']['smtp']['host']
-						# yaml parser should provide an integer here
-						@options[:smtp_port] ||= yaml['email']['smtp']['port']
-					end
-				elsif yaml['email'] == 'fake_file'
-					@options[:mailer] = 'fake_file'
-				end
-			end
-			
-			if self[:from_mail].to_s.empty?
-				WCC.logger.fatal "No sender mail address given! See help."
-				exit 1
+				MailNotificator.parse_conf(yaml['email']).each { |k,v| @options[k] ||= v }
+				XMPPNotificator.parse_conf(yaml['jabber']).each { |k,v| @options[k] ||= v }
+				SyslogNotificator.parse_conf(yaml['syslog']).each { |k,v| @options[k] ||= v }
 			end
 			
 			if self[:show_config]
@@ -170,6 +154,29 @@ module WCC
 				exit 0
 			end
 			
+			@recipients = {}
+			WCC.logger.debug "Load recipients from '#{self[:conf]}'"
+			# may be *false* if file is empty
+			yaml = YAML.load_file(self[:conf])
+			if not yaml
+				WCC.logger.info "No recipients loaded"
+			else
+				yaml['recipients'].to_a.each do |yaml_rec|
+					name = yaml_rec.keys.first
+					rec = []
+					yaml_rec[name].to_a.each do |yaml_way|
+						# TODO: find options and pass them to every notificator
+						if yaml_way.is_a?(Hash)
+							rec << XMPPNotificator.new(yaml_way['jabber']) if yaml_way.key?('jabber')
+							rec << MailNotificator.new(yaml_way['email']) if yaml_way.key?('email')
+						elsif yaml_way == 'syslog'
+							rec << SyslogNotificator.new
+						end
+					end
+					@recipients[name] = rec
+				end
+			end
+			
 			# attach --no-mails filter
 			WCC::Filters.add '--no-mails' do |data|
 				!self[:nomails]
@@ -182,10 +189,8 @@ module WCC
 			@sites = []
 			
 			WCC.logger.debug "Load sites from '#{Conf[:conf]}'"
-			
 			# may be *false* if file is empty
 			yaml = YAML.load_file(Conf[:conf])
-			
 			if not yaml
 				WCC.logger.info "No sites loaded"
 				return @sites
@@ -209,10 +214,11 @@ module WCC
 					cookie = File.open(yaml_site['cookie'], 'r') { |f| f.read }
 				end
 				
+
 				@sites << Site.new(
 					yaml_site['url'], 
 					yaml_site['strip_html'] || true,
-					yaml_site['emails'].map { |m| MailAddress.new(m) } || [],
+					yaml_site['notify'] || [],
 					frefs,
 					yaml_site['auth'] || {},
 					cookie,
@@ -225,17 +231,8 @@ module WCC
 			@sites
 		end
 		
-		def self.mailer
-			return @mailer unless @mailer.nil?
-
-			# smtp mailer
-			if Conf[:mailer] == 'smtp'
-				@mailer = SmtpMailer.new(Conf[:smtp_host], Conf[:smtp_port])
-			elsif Conf[:mailer] == 'fake_file'
-				@mailer = FakeFileMailer.new
-			end
-
-			@mailer
+		def self.recipients
+			return Conf.instance.recipients
 		end
 		
 		def self.file(path = nil) File.join(self[:cache_dir], path) end
@@ -332,8 +329,6 @@ module WCC
 				diff = %x[diff -U 1 --label "#{old_label}" --label "#{new_label}" #{old_site_file.path} #{Conf.file(site.id + '.site')}]
 			end
 			
-			system("logger -t '#{Conf[:tag]}' 'Change at #{site.uri.to_s} (tag #{site.id}) detected'") if Conf[:syslog]
-			
 			# construct the data made available to filters and templates
 			data = OpenStruct.new
 			data.site = site
@@ -343,7 +338,14 @@ module WCC
 			# HACK: there *was* an update but no notification is required
 			return false if not Filters.accept(data, site.filters)
 			
-			Conf.mailer.send(data, @@mail_plain, @@mail_bodies, MailAddress.new(Conf[:from_mail]), site.emails)
+			site.notify.each do |name|
+				rec = Conf.recipients[name]
+				if rec.nil?
+					WCC.logger.error "Could not notify recipient #{name} - not found!"
+				else
+					rec.each { |way| way.notify!(data) }
+				end
+			end
 			
 			true
 		end
@@ -364,6 +366,7 @@ module WCC
 				Dir.foreach(Conf[:cache_dir]) do |f|
 					File.delete(Conf.file(f)) if f =~ /^.*\.(md5|site)$/
 				end
+				# TODO: delete timestamps on clean?
 			end
 			
 			# read filter.d
@@ -386,13 +389,6 @@ module WCC
 				@@timestamps = {}
 			end
 			
-			# templates
-			@@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|
 				ts_old = get_timestamp(site)
 				ts_new = Time.now.to_i
@@ -411,10 +407,13 @@ module WCC
 			
 			# save timestamps
 			File.open(cache_file, 'w+') do |f| YAML.dump({"timestamps" => @@timestamps}, f) end
+			
+			# shut down notificators
+			MailNotificator.shut_down
+			XMPPNotificator.shut_down
+			SyslogNotificator.shut_down
 		end
 		
-		private
-		
 		def self.load_template(name)
 			t_path = File.join(Conf[:template_dir], name)
 			t = File.open(t_path, 'r') { |f| f.read }
@@ -422,6 +421,8 @@ module WCC
 			ERB.new(t, 0, "<>")
 		end
 		
+		private
+		
 		def self.get_timestamp(site)
 			@@timestamps[site.uri.to_s] || 0
 		end

data/lib/wcc/mail.rb

@@ -1,5 +1,6 @@
 
 module WCC
+	
 	# An email address container with internal conversion
 	# routines.
 	class MailAddress
@@ -36,78 +37,116 @@ module WCC
 		
 		def to_s; @email end
 	end
-
-	# SmtpMailer is a specific implementation of an mail deliverer that
-	# does plain SMTP to host:port using [Net::SMTP].
-	class SmtpMailer
-		def initialize(host, port)
-			@host = host
-			@port = port
-			WCC.logger.info "Send mail via SMTP to #{@host}:#{@port}"
+	
+	class MailNotificator
+		@@main = nil
+		@@bodies = nil
+		
+		def initialize(opts)
+			@to = MailAddress.new(opts)
 		end
 		
 		# 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 = [])
+		# @param [Object] data used to construct ERB binding
+		def notify!(data)
+			# from/to addresses
+			data.from = Conf[:from_mail]
+			data.to = @to
 			# 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)
+			# generate message
+			data.bodies = {}
+			# eval all body templates
+			self.class.get_bodies.each do |name,template|
+				data.bodies[name] = template.result(binding)
 			end
-			# send messages
-			Net::SMTP.start(@host, @port) do |smtp|
-				msgs.each do |to,msg|
-					smtp.send_message(msg, from.address, to.address)
+			# eval main template
+			msg = self.class.get_main.result(binding)
+			
+			case Conf[:mailer]
+			when 'smtp'
+				self.class.send_smtp(msg, Conf[:from_mail], @to, Conf[:smtp_host], Conf[:smtp_port])
+			when 'fake_file'
+				self.class.send_fake_file(msg, Conf[:from_mail], @to)
+			end
+		end
+		
+		def self.parse_conf(conf)
+			if conf.is_a?(Hash)
+				if conf['smtp'].is_a?(Hash)
+					from_mail = MailAddress.new(conf['smtp']['from'] || "#{Etc.getlogin}@localhost")
+					return {
+						:mailer => 'smtp',
+						:from_mail => from_mails,
+						:smtp_host => conf['smtp']['host'] || 'localhost',
+						:smtp_port => conf['smtp']['port'] || 25
+					}
+				elsif conf['fake_file'].is_a?(Hash)
+					return {
+						:mailer => 'fake_file',
+						:from_mail => conf['fake_file']['from'] || "#{Etc.getlogin}@localhost"
+					}
 				end
 			end
-		rescue
-			WCC.logger.fatal "Cannot send mails via SMTP to #{@host}:#{@port} : #{$!.to_s}"
+			# default is smtp
+			return {
+				:mailer => 'smtp',
+				:from_mail => MailAddress.new("#{Etc.getlogin}@localhost"),
+				:smtp_host => 'localhost',
+				:smtp_port => 25
+			}
 		end
-	end
+		
+		def self.shut_down; end
 	
-	# This "mailer" just dumps a mail's contents into eml files in the current
-	# working directory. This should be for TESTING ONLY as it doesn't
-	# take care of standards and stuff like that...
-	class FakeFileMailer
-		def initialize
-			WCC.logger.info "Write mail to eml-files in #{Dir.getwd}"
+		# This is a specific implementation of an mail deliverer that
+		# does plain SMTP to host:port using [Net::SMTP].
+		#
+		# @param [String] msg the mail
+		# @param [MailAddress] from the From: address
+		# @param [MailAddress] to array of To: address
+		# @param [String] host the SMTP host
+		# @param [Integer] port the SMTP port
+		def self.send_smtp(msg, from, to, host, port)
+			# send message
+			Net::SMTP.start(host, port) do |smtp|
+				smtp.send_message(msg, from.address, to.address)
+			end
+		rescue => ex
+			WCC.logger.fatal "Cannot send mail via SMTP to #{host}:#{port} : #{ex}"
+		end
+	
+		# This just dumps a mail's contents into an eml file in the current
+		# working directory. This should be for TESTING ONLY as it doesn't
+		# take care of standards and stuff like that...
+		#
+		# @param [String] msg the mail
+		# @param [MailAddress] from the From: address
+		# @param [MailAddress] to array of To: address
+		def self.send_fake_file(msg, from, to)
+			# dump mail to eml-file
+			filename = "#{Time.new.strftime('%Y%m%d-%H%M%S')} #{to.name}.eml"
+			File.open(filename, 'w') { |f| f.write(msg) }
 		end
 		
-		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)
+		# template loading
+		def self.get_main
+			if @@main.nil?
+				@@main = WCC::Prog.load_template('mail.alt.erb')
 			end
-			# dump mails to eml-files
-			i = 0
-			msgs.each do |to,msg|
-				filename = "#{Time.new.strftime('%Y%m%d-%H%M%S')} to_#{i}.eml"
-				File.open(filename, 'w') { |f| f.write(msg) }
-				i += 1
+			@@main
+		end
+		
+		def self.get_bodies
+			if @@bodies.nil?
+				@@bodies = {
+					:plain => WCC::Prog.load_template('mail-body.plain.erb'),
+					:html => WCC::Prog.load_template('mail-body.html.erb')
+				}
 			end
+			@@bodies
 		end
 	end
 end

data/lib/wcc/site.rb

@@ -1,12 +1,12 @@
 
 module WCC
 	class Site
-		attr_reader :uri, :emails, :filters, :auth, :cookie, :check_interval, :id
+		attr_reader :uri, :notify, :filters, :auth, :cookie, :check_interval, :id
 
-		def initialize(url, strip_html, emails, filters, auth, cookie, check_interval)
+		def initialize(url, strip_html, notify, filters, auth, cookie, check_interval)
 			@uri = URI.parse(url)
 			@strip_html = strip_html
-			@emails = emails.is_a?(Array) ? emails : [emails]
+			@notify = notify.is_a?(Array) ? notify : [notify]
 			@filters = filters.is_a?(Array) ? filters : [filters]
 			@auth = auth
 			@cookie = cookie

data/lib/wcc/syslog.rb

@@ -0,0 +1,15 @@
+
+module WCC
+	class SyslogNotificator
+		def initialize
+		end
+		
+		def notify!(data)
+			system("logger -t '#{data.tag}' 'Change at #{data.site.uri.to_s} (tag #{data.site.id}) detected'")
+		end
+		
+		def self.parse_conf(conf); {} end
+		
+		def self.shut_down; end
+	end
+end

data/lib/wcc/version.rb

@@ -0,0 +1,4 @@
+
+module WCC
+	VERSION = "2.0.0"
+end

data/lib/wcc/xmpp.rb

@@ -0,0 +1,69 @@
+
+module WCC
+	class XMPPNotificator
+		@@client = nil
+		@@template = nil
+		
+		def initialize(opts)
+			@jid = Jabber::JID.new(opts)
+		end
+		
+		def notify!(data)
+			# prepare message
+			subject = "[#{data.tag}] #{data.site.uri.host} changed"
+			body = self.class.get_template.result(binding)
+			m = Jabber::Message.new(@jid, body)
+			m.type = :normal
+			m.subject = subject
+			# send it
+			c = self.class.get_client
+			c.send(m) unless c.nil?
+		end
+		
+		def self.parse_conf(conf)
+			if conf.is_a?(Hash)
+				if conf['jid'].nil?
+					WCC.logger.fatal "Missing jabber ID!"
+					return {:xmpp_jid => nil}
+				elsif conf['password'].nil?
+					WCC.logger.fatal "Missing jabber password!"
+				else
+					return {
+						:xmpp_jid => Jabber::JID.new(conf['jid']),
+						:xmpp_password => conf['password']
+					}
+				end
+			end
+		end
+		
+		def self.shut_down
+			if not @@client.nil?
+				#@@client.send(Jabber::Presence.new.set_type(:unavailable))
+				@@client.close
+			end
+		end
+		
+		def self.get_client
+			if @@client.nil? and not Conf[:xmpp_jid].nil?
+				@@client = Jabber::Client.new(Conf[:xmpp_jid])
+				@@client.connect
+				begin
+					@@client.auth(Conf[:xmpp_password])
+					@@client.send(Jabber::Presence.new.set_status('At your service every night.'))
+				rescue Jabber::ClientAuthenticationFailure => ex
+					WCC.logger.fatal "Wrong jabber password for #{Conf[:xmpp_jid]}!"
+					@@client.close
+					@@client = nil
+				end
+			end
+			@@client
+		end
+		
+		def self.get_template
+			if @@template.nil?
+				@@template = WCC::Prog.load_template('xmpp-body.plain.erb')
+			end
+			@@template
+		end
+	end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wcc
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 15
   prerelease: 
   segments: 
-  - 1
-  - 3
+  - 2
   - 0
-  version: 1.3.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Christian Nicolai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-15 00:00:00 Z
+date: 2011-10-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: htmlentities
@@ -23,18 +23,34 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 29
         segments: 
-        - 0
-        version: "0"
+        - 4
+        - 3
+        version: "4.3"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: xmpp4r
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,8 +60,8 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id002
-description: wcc tracks changes of websites and notifies you by email.
+  version_requirements: *id003
+description: wcc tracks changes of websites and notifies you by email and as of version 2.0 via XMPP/Jabber too.
 email: chrnicolai@gmail.com
 executables: 
 - wcc
@@ -70,6 +86,7 @@ files:
 - assets/template.d/mail-body.html.erb
 - assets/template.d/mail-body.plain.erb
 - assets/template.d/mail.plain.erb
+- assets/template.d/xmpp-body.plain.erb
 - bin/wcc
 - bin/wcc-init
 - bin/wcc-upgrade
@@ -78,6 +95,9 @@ files:
 - lib/wcc/filter.rb
 - lib/wcc/mail.rb
 - lib/wcc/site.rb
+- lib/wcc/syslog.rb
+- lib/wcc/version.rb
+- lib/wcc/xmpp.rb
 - lib/wcc.rb
 - LICENSE
 - README.md