wcc-xmpp-notificator 0.0.1 → 0.0.2

data/README.md

@@ -0,0 +1,24 @@
+wcc-xmpp-notificator
+====================
+
+This adds XMPP/Jabber support to [wcc](https://github.com/cmur2/wcc) encapsuled
+in a separate gem.
+
+Note: This notificator does not need to have an (and even not supports establishing some)
+authorization/subscription to talk to the recipients jabber accounts.
+
+What you need to add to your conf.yml:
+
+	conf:
+	  [...]
+	  # jid is the address wcc will talk from
+	  xmpp:
+	    jid: wcc@example.com/wcc
+	    password: s3cr3t
+	
+	recipients:
+	  [...]
+	  - me:
+	    [...]
+	    # address to be notified via Jabber
+	    - xmpp: me@mydomain.com

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

@@ -1,9 +1,6 @@
 <% 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.site.uri.to_s %> changed:
 <%= 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-xmpp-notificator.rb

@@ -3,8 +3,7 @@ require 'xmpp4r/client'
 
 class XMPPNotificator
 	@@client = nil
-	@@subject_tpl = nil
-	@@body_tpl = nil
+	@@tpl = {}
 		
 	def initialize(opts)
 		@jid = Jabber::JID.new(opts)
@@ -12,11 +11,9 @@ class XMPPNotificator
 	
 	def notify!(data)
 		# prepare message
-		subject = self.class.get_subject_tpl.result(binding)
-		body = self.class.get_body_tpl.result(binding)
+		body = self.class.get_tpl(:body, 'xmpp-body.plain.erb').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?
@@ -63,38 +60,21 @@ class XMPPNotificator
 		@@client
 	end
 	
-	def self.get_subject_tpl
-		if @@subject_tpl.nil?
-			@@subject_tpl = WCC::Prog.load_template('xmpp-subject.plain.erb')
-			if @@subject_tpl.nil?
-				src_path = Pathname.new(__FILE__) + "../../assets/template.d/xmpp-subject.plain.erb"
+	def self.get_tpl(id, name)
+		if @@tpl[id].nil?
+			@@tpl[id] = WCC::Prog.load_template(name)
+			if @@tpl[id].nil?
+				src_path = Pathname.new(__FILE__) + "../../assets/template.d/#{name}"
 				t = File.open(src_path, 'r') { |f| f.read }
-				WCC::Prog.save_template('xmpp-subject.plain.erb', t)
+				WCC::Prog.save_template(name, t)
 				# retry load
-				@@subject_tpl = WCC::Prog.load_template('xmpp-subject.plain.erb')
+				@@tpl[id] = WCC::Prog.load_template(name)
 			end
-			if @@subject_tpl.nil?
-				@@subject_tpl = ERB.new("ERROR LOADING TEMPLATE 'xmpp-subject.plain.erb'!", 0, "<>")
+			if @@tpl[id].nil?
+				@@tpl[id] = ERB.new("ERROR LOADING TEMPLATE '#{name}'!", 0, "<>")
 			end
 		end
-		@@subject_tpl
-	end
-	
-	def self.get_body_tpl
-		if @@body_tpl.nil?
-			@@body_tpl = WCC::Prog.load_template('xmpp-body.plain.erb')
-			if @@body_tpl.nil?
-				src_path = Pathname.new(__FILE__) + "../../assets/template.d/xmpp-body.plain.erb"
-				t = File.open(src_path, 'r') { |f| f.read }
-				WCC::Prog.save_template('xmpp-body.plain.erb', t)
-				# retry load
-				@@body_tpl = WCC::Prog.load_template('xmpp-body.plain.erb')
-			end
-			if @@body_tpl.nil?
-				@@body_tpl = ERB.new("ERROR LOADING TEMPLATE 'xmpp-body.plain.erb'!", 0, "<>")
-			end
-		end
-		@@body_tpl
+		@@tpl[id]
 	end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wcc-xmpp-notificator
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Christian Nicolai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 Z
+date: 2011-11-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xmpp4r
@@ -23,12 +23,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
-        version: "0"
+        - 5
+        version: "0.5"
   type: :runtime
   version_requirements: *id001
 description: 
@@ -40,9 +41,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- assets/template.d/xmpp-subject.plain.erb
 - assets/template.d/xmpp-body.plain.erb
 - lib/wcc-xmpp-notificator.rb
+- README.md
 homepage: https://github.com/cmur2/wcc-xmpp-notificator
 licenses: []
 

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

@@ -1 +0,0 @@
-BLAH [<%= data.tag %>] <%= data.site.uri.host %> changed