rec 1.1.4 → 1.1.5

data/CHANGELOG

@@ -1,3 +1,6 @@
+=== Version 1.1.5
+- Several fixes in notify.rb
+
 === Version 1.1.4
 - Made dependency on xmpp4r explicit
 - Added some more shortcut actions: Notify_urgently_and_release, Notify_and_release, Notify_urgently_first_only

data/lib/rec/correlator.rb

@@ -57,7 +57,7 @@ class Correlator
 	# and checks the message against the ruleset. Continuously loops until
 	# the log input stream is closed, or interrupted by a signal
 	def run()
-		while @running and !$stdin.eof? do
+		while @running and !$stdin.closed? do
 			logLine = gets()
 			next if logLine.nil?
 			logLine.strip!()

data/lib/rec/notify.rb

@@ -45,12 +45,19 @@ module REC	# :nodoc:
 # While we're on the topic of security, just a reminder that Notify::mail requires no credentials.
 module Notify
 
+	@@workHours = 7...21
+	@@defaultSubject = "Alert"
+
+	# define the working hours during which instant messages are allowed
+	# Note that Notify.work_hours(7,21) means "7am-9pm" as you would assume, so from 07:00 to 20:59
+	def self.work_hours(start, finish)
+		@@workHours = start..finish
+	end
+
 	# Sets the default subject for alerts, overriding the system default of "Alert"
 	def self.default_subject(subject)
 		@@defaultSubject = subject
 	end
-	@@defaultSubject = "Alert"
-
 
 	# provides the credentials needed for sending email
 	def self.smtp_credentials(user, password, domain, server="smtp.gmail.com", port=587)
@@ -87,29 +94,23 @@ module Notify
 	def self.email(alert, recipient=@@emailTo, subject=@@defaultSubject)
 		smtp = Net::SMTP.new(@@emailServer, @@emailPort)
 		smtp.enable_starttls()
-		smtp.start(@@emailDomain, @@emailUsername, @@emailPassword, :plain)
-		smtp.send_message(alert, @@emailUsername, recipient)
+		smtp.start(@@emailDomain, @@emailUser, @@emailPassword, :plain)
+		smtp.send_message(alert, @@emailUser, recipient)
+		smtp.finish()
 	end
 
 	# Send the alert via google talk (or any other XMPP service)
 	def self.jabber(alert, recipient=@@jabberTo, subject=@@defaultSubject)
-		client = Jabber::Client::new(Jabber::JID.new(@@JabberUser))
+		client = Jabber::Client::new(Jabber::JID.new(@@jabberUser))
 		client.connect(@@jabberServer)
 		client.auth(@@jabberPassword)
 		message = Jabber::Message::new(recipient, alert).set_type(:normal).set_id('1').set_subject(subject)
 		client.send(message)
 	end
 
-	# define the working hours during which instant messages are allowed
-	# Note that Notify.work_hours(7,21) means "7am-9pm" as you would assume, so from 07:00 to 20:59
-	def self.work_hours(start, finish)
-		@@workHours = start..finish
-	end
-	@@workHours = 7...21
-
 	# Send an instant message during work hours, else send an email
 	def self.urgent(alert)
-		if @@workhours.include?(Time.now.hour)
+		if @@workHours.include?(Time.now.hour)
 			self.jabber(alert)
 		else
 			self.email(alert)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rec
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Richard Kernahan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-30 00:00:00 Z
+date: 2012-10-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xmpp4r