adammck-rubysms 0.8.1 → 0.8.2

data/bin/rubysms-drb-client

@@ -1,168 +1,43 @@
 #!/usr/bin/env ruby
 
-require "libglade2.rb"
 require "drb.rb"
 
-SERVER_PORT = "1370"
-
-class SmsGui
-	include GetText
-	attr :glade
+class Client
+	SERVER_PORT = "1370"
 	
 	def initialize
-		
-		# if this file is a symlink (which is probably is, since rubygems
-		# automatically symlinks bin files into /usr/bin), find the original
-		# source file, so we can find the glade src relatively
-		this_file = File.symlink?(__FILE__) ? \
-			File.readlink(__FILE__) : __FILE__
-		
-		# find and load up the glade src for the gui
-		glade_src = File.expand_path(File.dirname(this_file) + "/../lib/drb-client.glade")
-		@glade = GladeXML.new(glade_src) do |handler|
-			method(handler)
-		end
-		
-		# for storing outgoing
-		# messages for recall
-		@history = []
-		@hist_pos = 0
-		
-		# fetch references to the gtk widgets
-		@source = @glade.get_widget("entry_source")
-		@entry = @glade.get_widget("entry_message")
-		@log = @glade.get_widget("textview_log")
-		@lb = @log.buffer
-		
-		# create a text mark to keep at the end of
-		# the log, so we can keep scrolling to it
-		@lb.create_mark("end", @lb.end_iter, true)
-		
-		# create colors for incoming and outgoing messages
-		@lb.create_tag("incoming", "family"=>"monospace", "foreground"=>"#AA0000")
-		@lb.create_tag("outgoing", "family"=>"monospace", "foreground"=>"#0000AA")
-		@lb.create_tag("error", "family"=>"monospace", "foreground"=>"#FFFFFF", "background"=>"#FF0000")
-		
-		# prepopulate the source phone number with six digits
 		@src = (1111 + rand(8888)).to_s
-		@source.text = @src
-		
-		# fire up drb, to send outgoing messages to rubysms
-		@injector = DRbObject.new_with_uri("druby://localhost:#{SERVER_PORT}")
-		puts "Connected to RubySMS at: #{@injector.__drburi}"
-		
-		# start listening for incoming messages from rubysms
-		@drb = DRb.start_service("druby://localhost:#{SERVER_PORT}#{@src}", self)
-		puts "Started DRb client at: #{@drb.uri}"
-		
-		# display the GUI
-		@glade.get_widget("window").show
-		@entry.grab_focus
-	end
-	
-	
-	# user closed the window,
-	# so terminate the program
-	def on_quit
-		Gtk.main_quit
+		@outgoing = DRbObject.new_with_uri("druby://localhost:#{SERVER_PORT}")
+		@incoming = DRb.start_service("druby://localhost:#{SERVER_PORT}#{@src}", self)
 	end
-	
-	
-	# user clicked "send", or pressed
-	# enter while in the entry field
-	def on_button_send_clicked
-		msg = @entry.text
-		
-		# do nothing if the message is blank
-		return nil if msg.empty?
-		log ">> #{msg}", "incoming"
 
-		begin
-			# attempt to send the message
-			# to rubysms via drb, as if it
-			# were a real incoming sms
-			@injector.incoming(@src, msg)
-			
-			@hist_pos = 0
-			@history.push(msg)
-			@entry.text = ""
-		
-		# couldn't connect!
-		rescue DRb::DRbConnError
-			log("Connection to RubySMS failed!", "error")
-			#log("Tried URI: #{@injector.__drburi}", "error")
-		rescue => err
-			log(err.message, "error")
-			log("  " + err.backtrace.join("\n  "), "error")
-		end
+	def print(str)
+		$stdout.print(str)
+		$stdout.flush
 	end
-	
-	def on_entry_message_key_press(widget, event)
-		if event.keyval == 65362 # up arrow
-			if @hist_pos > -@history.length
-				@hist_pos -= 1
-				@entry.text = @history[@hist_pos]
-				@entry.grab_focus
-			end
-			
-			# prevent default event,
-			# which bumps the focus
-			# upwards to the log
-			return true
-		end
-		
-		if event.keyval == 65364 # down arrow
-			if @hist_pos < -1
-				@hist_pos += 1
-				@entry.text = @history[@hist_pos]
-				@entry.grab_focus
-			end
-			
-			# prevent default
-			return true
+
+	def start
+		while(true)
+			print "< "
+			str = $stdin.gets.strip
+			@outgoing.incoming(@src, str)
+
+			# to allow time for a message to
+			# come back; yes, this is horrible
+			sleep 0.5
 		end
-		
-		# any other key resets
-		# the position in history
-		@hist_pos = 0
-		return false
-	end
-	
-	
-	def log(msg, tag)
-		# prepend a newline, unless this
-		# is the first entry (to avoid a
-		# one-line gap at the top)
-		msg = "\n" + msg\
-			if @lb.char_count > 0
-		
-		# add a single entry to the message log
-		# (using the colors defined in #initialize)
-		@lb.insert(@lb.end_iter, msg, tag)
-		
-		# scroll to the end of the *previous*
-		# message, to bring the top of this
-		# message into view, in case it is long
-		@log.scroll_to_mark(@lb.get_mark("end"), 0, true, 1, 0)
-		
-		# update the position of the end marker,
-		# which we will scroll to (above), when
-		# the next message is logged
-		@lb.move_mark(@lb.get_mark("end"), @lb.end_iter)
-		@lb.end_iter.line_offset = 0
 	end
-	
-	
+
 	def incoming(msg)
-		# we received a message! do nothing
-		# except add it to the message log
-		msg.gsub!(/\n/, "\n   ")
-		log "<< #{msg}", "outgoing"
+		print "> #{msg}\n"
 	end
 end
 
+# exit gracefully if
+# ctrl+c is received
+trap("INT") do
+	puts
+	exit
+end
 
-# initialize, and block
-# until GTK terminates
-gui = SmsGui.new
-Gtk.main
+Client.new.start

data/bin/rubysms-gtk-drb-client

@@ -0,0 +1,168 @@
+#!/usr/bin/env ruby
+
+require "libglade2.rb"
+require "drb.rb"
+
+SERVER_PORT = "1370"
+
+class SmsGui
+	include GetText
+	attr :glade
+	
+	def initialize
+		
+		# if this file is a symlink (which is probably is, since rubygems
+		# automatically symlinks bin files into /usr/bin), find the original
+		# source file, so we can find the glade src relatively
+		this_file = File.symlink?(__FILE__) ? \
+			File.readlink(__FILE__) : __FILE__
+		
+		# find and load up the glade src for the gui
+		glade_src = File.expand_path(File.dirname(this_file) + "/../lib/drb-client.glade")
+		@glade = GladeXML.new(glade_src) do |handler|
+			method(handler)
+		end
+		
+		# for storing outgoing
+		# messages for recall
+		@history = []
+		@hist_pos = 0
+		
+		# fetch references to the gtk widgets
+		@source = @glade.get_widget("entry_source")
+		@entry = @glade.get_widget("entry_message")
+		@log = @glade.get_widget("textview_log")
+		@lb = @log.buffer
+		
+		# create a text mark to keep at the end of
+		# the log, so we can keep scrolling to it
+		@lb.create_mark("end", @lb.end_iter, true)
+		
+		# create colors for incoming and outgoing messages
+		@lb.create_tag("incoming", "family"=>"monospace", "foreground"=>"#AA0000")
+		@lb.create_tag("outgoing", "family"=>"monospace", "foreground"=>"#0000AA")
+		@lb.create_tag("error", "family"=>"monospace", "foreground"=>"#FFFFFF", "background"=>"#FF0000")
+		
+		# prepopulate the source phone number with six digits
+		@src = (1111 + rand(8888)).to_s
+		@source.text = @src
+		
+		# fire up drb, to send outgoing messages to rubysms
+		@injector = DRbObject.new_with_uri("druby://localhost:#{SERVER_PORT}")
+		puts "Connected to RubySMS at: #{@injector.__drburi}"
+		
+		# start listening for incoming messages from rubysms
+		@drb = DRb.start_service("druby://localhost:#{SERVER_PORT}#{@src}", self)
+		puts "Started DRb client at: #{@drb.uri}"
+		
+		# display the GUI
+		@glade.get_widget("window").show
+		@entry.grab_focus
+	end
+	
+	
+	# user closed the window,
+	# so terminate the program
+	def on_quit
+		Gtk.main_quit
+	end
+	
+	
+	# user clicked "send", or pressed
+	# enter while in the entry field
+	def on_button_send_clicked
+		msg = @entry.text
+		
+		# do nothing if the message is blank
+		return nil if msg.empty?
+		log ">> #{msg}", "incoming"
+
+		begin
+			# attempt to send the message
+			# to rubysms via drb, as if it
+			# were a real incoming sms
+			@injector.incoming(@src, msg)
+			
+			@hist_pos = 0
+			@history.push(msg)
+			@entry.text = ""
+		
+		# couldn't connect!
+		rescue DRb::DRbConnError
+			log("Connection to RubySMS failed!", "error")
+			#log("Tried URI: #{@injector.__drburi}", "error")
+		rescue => err
+			log(err.message, "error")
+			log("  " + err.backtrace.join("\n  "), "error")
+		end
+	end
+	
+	def on_entry_message_key_press(widget, event)
+		if event.keyval == 65362 # up arrow
+			if @hist_pos > -@history.length
+				@hist_pos -= 1
+				@entry.text = @history[@hist_pos]
+				@entry.grab_focus
+			end
+			
+			# prevent default event,
+			# which bumps the focus
+			# upwards to the log
+			return true
+		end
+		
+		if event.keyval == 65364 # down arrow
+			if @hist_pos < -1
+				@hist_pos += 1
+				@entry.text = @history[@hist_pos]
+				@entry.grab_focus
+			end
+			
+			# prevent default
+			return true
+		end
+		
+		# any other key resets
+		# the position in history
+		@hist_pos = 0
+		return false
+	end
+	
+	
+	def log(msg, tag)
+		# prepend a newline, unless this
+		# is the first entry (to avoid a
+		# one-line gap at the top)
+		msg = "\n" + msg\
+			if @lb.char_count > 0
+		
+		# add a single entry to the message log
+		# (using the colors defined in #initialize)
+		@lb.insert(@lb.end_iter, msg, tag)
+		
+		# scroll to the end of the *previous*
+		# message, to bring the top of this
+		# message into view, in case it is long
+		@log.scroll_to_mark(@lb.get_mark("end"), 0, true, 1, 0)
+		
+		# update the position of the end marker,
+		# which we will scroll to (above), when
+		# the next message is logged
+		@lb.move_mark(@lb.get_mark("end"), @lb.end_iter)
+		@lb.end_iter.line_offset = 0
+	end
+	
+	
+	def incoming(msg)
+		# we received a message! do nothing
+		# except add it to the message log
+		msg.gsub!(/\n/, "\n   ")
+		log "<< #{msg}", "outgoing"
+	end
+end
+
+
+# initialize, and block
+# until GTK terminates
+gui = SmsGui.new
+Gtk.main

data/lib/rubysms/application.rb

@@ -4,6 +4,14 @@
 module SMS
 	class App < Thing
 		
+		NAMED_PRIORITY = {
+			:highest => 100,
+			:high    => 90,
+			:normal  => 50,
+			:low     => 10,
+			:lowest  => 0
+		}
+		
 		# Creates and starts a router to serve only
 		# this application. Handy during development.
 		#
@@ -54,6 +62,83 @@ module SMS
 			router.serve_forever
 		end
 		
+		# Sets or returns the priority of this application **class**. Returning
+		# this value isn't tremendously useful by itself, and mostly exists for
+		# the sake of completeness, and to be called by Application#priority.
+		# The value returned is obtained by finding the first ancestor of this
+		# class which has a @priority (yes, it looks inside other classes
+		# instance variables. I'm sorry.), and converts it to a number via
+		# the SMS::App::NAMED_PRIORITY constant.
+		#
+		#   class One < SMS::App
+		#     priority :high
+		#   end
+		#   
+		#   class Two < One
+		#   end
+		#   
+		#   class Three < Two
+		#     priority 36
+		#   end
+		#
+		#   One.priority   => 90 # set via NAMED_PRIORITY
+		#   Two.priority   => 90 # inherited from One
+		#   Three.priority => 36 # set literally
+		#
+		def self.priority(priority=nil)
+		
+			# set the priority of this class if an argument
+			# were provided, and allow execution to continue
+			# to check it's validity
+			unless priority.nil?
+				@priority = priority
+			end
+			
+			# find the first ancestor with a priority
+			# (Class.ancestors *includes* self)
+			self.ancestors.each do |klass|
+				if klass.instance_variable_defined?(:@priority)
+					prio = klass.instance_variable_get(:@priority)
+					
+					# literal numbers are okay, although
+					# that probably isn't such a good idea
+					if prio.is_a?(Numeric)
+						return prio
+					
+					# if this class has a named priority,
+					# resolve and return it's value
+					elsif prio.is_a?(Symbol)
+						if NAMED_PRIORITY.has_key?(prio)
+							return NAMED_PRIORITY[prio]
+						
+						# don't allow invalid named priorites.
+						# i can't think of a use case, especially
+						# since the constant can be monkey-patched
+						# if it's really necessary
+						else
+							raise(
+								NameError,
+								"Invalid named priority #{prio.inspect} " +\
+								"of {klass}. Valid named priorties are: " +\
+								NAMED_PRIORITY.keys.join(", "))
+						end
+					end
+				end
+			end
+			
+			# no ancestor has a priority, so assume
+			# that this app is of "normal" priority
+			return NAMED_PRIORITY[:normal]
+		end
+		
+		def priority=(level)
+			@priority = level
+		end
+		
+		def priority
+			@priority or self.class.priority
+		end
+		
 		def incoming(msg)
 			if services = self.class.instance_variable_get(:@services)
 				

data/lib/rubysms/backend/clickatell.rb

@@ -0,0 +1,95 @@
+#!/usr/bin/env ruby
+# vim: noet
+
+
+require "rubygems"
+require "clickatell"
+require "mongrel"
+require "rack"
+
+
+module SMS::Backend
+	class Clickatell < Base
+		PORT = 1280
+		
+		# just store the arguments until the
+		# backend is ready to be started
+		def initialize(key, username, password)
+			@username = username
+			@password = password
+			@key = key
+		end
+		
+		def start
+			@api = ::Clickatell::API.authenticate(@key, @username, @password)
+			balance = @api.account_balance
+			
+			# start a separate thread to receive
+			# the incoming messages from clickatell
+			@rack_thread = Thread.new do
+				Rack::Handler::Mongrel.run(
+					method(:rack_app), :Port=>PORT)
+			end
+			
+			# nothing went wrong this time
+			# so dump some useful info
+			log [
+				"Started #{label} Backend",
+				"  Account balance: #{balance}"
+			], :init
+		end
+		
+		def send_sms(msg)
+			begin
+				@api.send_message(msg.phone_number, msg.text)
+				super
+
+			# sending failed, for some reason. i've
+			# never seen this happen, so just log it
+			rescue Clickatell::API::Error => err
+				log_exception err, "Message sending FAILED"
+			end
+		end
+		
+		def rack_app(env)
+			req = Rack::Request.new(env)
+			post = req.GET
+			
+			# only a single (obscure) url is valid, which
+			# must be entered into the clickatell admin
+			return resp(404, "Not Found") unless\
+				req.path_info == "/sms/receive"
+			
+			# check that the required parameters were
+			# provided, and abort if any are missing
+			return resp(500, "Missing Parameters") unless\
+				post["from"] && post["timestamp"] && post["text"]
+			
+			begin
+				# attempt to parse the timestamp
+				# (it's a mySQL timestamp... ?!)
+				time = Date.strptime(
+					post["timestamp"],
+					"%Y-%m-%d%H:%M:%S")
+			
+			# timestamp parsing fail
+			rescue Exception => err
+				log_exception err, "Invalid timestamp: #{post["timestamp"]}"
+				return resp(500, "Invalid timestamp")
+			end
+			
+			# everything looks fine, so notify rubysms of
+			# the incoming message, and acknowledge clickatell
+			router.incoming(
+				SMS::Incoming.new(
+					self, post["from"], time, post["text"]))
+			resp(200, "Message Accepted")
+		end
+		
+		private
+		
+		def resp(code, text)
+			[code, {"content-type" => "text/plain"}, text]
+		end
+	end
+end

data/lib/rubysms/backend/gsm.rb

@@ -10,7 +10,8 @@
 #  - rubygsms
 #  - rubygsm
 begin
-	dev_dir = "#{dir}/../../../rubygsm"
+	dir = File.dirname(__FILE__)
+	dev_dir = "#{dir}/../../../../rubygsm"
 	dev_path = "#{dev_dir}/lib/rubygsm.rb"
 	require File.expand_path(dev_path)
 	
@@ -52,40 +53,37 @@ module SMS::Backend
 		end
 		
 		def start
-			
-			# lock the threads during modem initialization,
-			# simply to avoid the screen log being mixed up
-			Thread.exclusive do
-				begin
-					@gsm = ::Gsm::Modem.new(@port)
-					@gsm.use_pin(@pin) unless @pin.nil?
-					@gsm.receive method(:incoming)
-					
-					#bands = @gsm.bands_available.join(", ")
-					#log "Using GSM Band: #{@gsm.band}MHz"
-					#log "Modem supports: #{bands}"
-					
-					log "Waiting for GSM network..."
-					str = @gsm.wait_for_network
-					log "Signal strength is: #{str}"
-					
-				# couldn't open the port. this usually means
-				# that the modem isn't plugged in to it...
-				rescue Errno::ENOENT, ArgumentError
-					log "Couldn't open #{@port}", :err
-					raise IOError
-					
-				# something else went wrong
-				# while initializing the modem
-				rescue ::Gsm::Modem::Error => err
-					log ["Couldn't initialize the modem",
-						   "RubyGSM Says: #{err.desc}"], :err
-					raise RuntimeError
-				end
+			begin
+				@gsm = ::Gsm::Modem.new(@port)
+				@gsm.use_pin(@pin) unless @pin.nil?
+				@gsm.receive method(:incoming)
+				str = @gsm.wait_for_network
+				
+				#bands = @gsm.bands_available.join(", ")
+				#log "Modem supports: #{bands}"
+				
+			# couldn't open the port. this usually means
+			# that the modem isn't plugged in to it...
+			rescue Errno::ENOENT, ArgumentError => err
+				log_exception err,\
+					"Couldn't connect to " +\
+					"modem on port: #{@port}"
 				
-				# rubygsm didn't blow up?!
-				log "Started GSM Backend", :init
+			# something else went wrong
+			# while initializing the modem
+			rescue ::Gsm::Modem::Error => err
+				log_exception err,\
+					"Couldn't initialize the " +\
+					"modem on port: #{@port}"
 			end
+			
+			# nothing went wrong this time
+			# so dump some useful info
+			log [
+				"Started #{label} Backend",
+				"  Signal strength: #{str}",
+				"  Port: #{@gsm.port}"
+			], :init
 		end
 		
 		def send_sms(msg)
@@ -94,8 +92,11 @@ module SMS::Backend
 			# send the message to the modem via rubygsm, and log
 			# if it failed. TODO: needs moar info from rubygsm
 			# on *why* sending failed
-			unless @gsm.send_sms(msg.recipient.phone_number, msg.text)
-				log "Message sending FAILED", :warn
+			begin
+				@gsm.send_sms!(msg.recipient.phone_number, msg.text)
+				
+			rescue => err
+				log_exception err, "Message sending FAILED"
 			end
 		end
 		

data/lib/rubysms/backend/http.rb

@@ -41,7 +41,7 @@ module SMS::Backend
 			
 			# add a screen log message, which is kind of
 			# a lie, because we haven't started anything yet
-			uri = "http://localhost:#{@port}"
+			uri = "http://localhost:#{@port}/"
 			log ["Started HTTP Offline Backend", "URI: #{uri}"], :init
 			
 			# this is goodbye
@@ -390,7 +390,8 @@ SMS::Backend::HTTP::HTML = <<EOF
 					 * reload the load to include it */
 					$("send").set("send", {
 						"url": "/" + session_id + "/send",
-						"onComplete": update
+						"onComplete": function() {
+							update.delay(100); }
 				
 					/* submit the form via ajax,
 					 * and cancel the full-page */

data/lib/rubysms/logger.rb

@@ -54,6 +54,7 @@ module SMS
 		
 		LogColors = {
 			:init => 46,
+			:stop => 44,
 			:info => 40,
 			:warn => 41,
 			:err  => 41,

data/lib/rubysms/router.rb

@@ -27,13 +27,6 @@ module SMS
 		def log_exception(error, prefix_message=nil)
 			msgs = [error.class, error.message]
 			
-			# if a prefix was provided (to give a litle
-			# more info on what went wrong), prepend it
-			# to the output with a blank line
-			unless prefix_message.nil?
-				msg.shift prefix_message, ""
-			end
-			
 			# add each line until the current frame is within
 			# rubysms (the remainder will just be from gems)
 			catch(:done) do
@@ -48,6 +41,15 @@ module SMS
 				end
 			end
 			
+			# if a prefix was provided (to give a litle
+			# more info on what went wrong), prepend it
+			# to the output and indent the rest
+			unless prefix_message.nil?
+				msgs = [prefix_message] + msgs.collect do |msg|
+					"  " + msg.to_s
+				end
+			end
+			
 			@log.event msgs, :warn
 		end
 		
@@ -74,7 +76,7 @@ module SMS
 			# the output, disable the "echoctl" option in your terminal
 			# (i added "stty -echoctl" to my .bashrc)
 			trap("INT") do
-				log "Shutting down", :init
+				log "Shutting down", :stop
 			
 				# fire the "stop" method of
 				# each application and backend
@@ -142,8 +144,9 @@ module SMS
 		#   router.add_backend(:GSM, "/dev/ttyS0", 1234)
 		#   router.add_backend(:GSM, "/dev/ttyS1", 5678)
 		#   router.serve_forever
+		#
 		def add_backend(backend, *args)
-			
+				
 			# if a backend object was given, add it to this router
 			# TODO: this modifies the argument just slightly. would
 			# it be better to duplicate the object first?
@@ -153,8 +156,15 @@ module SMS
 			
 			# if it's a named backend, spawn it (along
 			# with the optional arguments) and recurse
-			elsif backend.is_a?(Symbol)
-				add_backend SMS::Backend.create(backend, *args)
+			elsif backend.is_a?(Symbol) or backend.is_a?(String)
+				add_backend SMS::Backend.create(backend.to_sym, nil, *args)
+			
+			# no idea what this
+			# backend is = boom
+			else
+				raise RuntimeError,
+					"Router#add_backend doesn't know what " +\
+					"to do with #{backend} (#{backend.klass})"
 			end
 		end
 		
@@ -163,20 +173,38 @@ module SMS
 		def incoming(msg)
 			log_with_time "[#{msg.backend.label}] #{msg.sender.key}: #{msg.text} (#{msg.text.length})", :in
 			
+			# iterate apps starting with
+			# the highest numeric priority
+			sorted = @apps.sort_by { |a| a.priority }.reverse
+			
 			# notify each application of the message.
-			# they may or may not respond to it
-			@apps.each do |app|
-				begin
-					app.incoming msg
-				
-				# something went boom in the app
-				# log it, and continue with the next
-				rescue StandardError => err
-					log_exception(err)
+			# they may or may not respond to it, and
+			# may throw the :halt symbol to stop the
+			# notifying further apps. this is useful
+			# in conjunction with App.priority
+			catch(:halt) do
+				sorted.each do |app|
+					begin
+						catch(:continue) do
+							app.incoming msg
+							
+							# if the app responded to the message, cancel
+							# further processing - unless :continue was
+							# thrown, which jumps over this check
+							unless msg.responses.empty?
+								throw :halt
+							end
+						end
 					
-				#	if msg.responses.empty?
-				#		msg.respond("Sorry, there was an error while processing your message.")
-				#	end
+					# something went boom in the app
+					# log it, and continue with the next
+					rescue StandardError => err
+						log_exception(err)
+				
+					#	if msg.responses.empty?
+					#		msg.respond("Sorry, there was an error while processing your message.")
+					#	end
+					end
 				end
 			end
 		end
@@ -186,11 +214,15 @@ module SMS
 		def outgoing(msg)
 			log_with_time "[#{msg.backend.label}] #{msg.recipient.key}: #{msg.text} (#{msg.text.length})", :out
 			log("Outgoing message exceeds 140 characters", :warn) if msg.text.length > 140
-			cancelled = false
+			
+			# iterate apps starting with the loest numeric priority (the
+			# opposite to #incoming,so a :highest priority app gets the
+			# first look at incoming, and the last word on what goes out)
+			sorted = @apps.sort_by { |a| a.priority }
 			
 			# notify each app of the outgoing sms
 			# note that the sending can still fail
-			@apps.each do |app|
+			sorted.each do |app|
 				app.outgoing msg
 			end
 		end

data/rubysms.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 	s.name     = "rubysms"
-	s.version  = "0.8.1"
-	s.date     = "2009-03-16"
+	s.version  = "0.8.2"
+	s.date     = "2009-04-10"
 	s.summary  = "Develop and deploy SMS applications with Ruby"
 	s.email    = "amckaig@unicef.org"
 	s.homepage = "http://github.com/adammck/rubysms"
@@ -13,7 +13,8 @@ Gem::Specification.new do |s|
 		"README.rdoc",
 		"lib/rubysms.rb",
 		
-		# gtk gui
+		# drb clients
+		"bin/rubysms-gtk-drb-client",
 		"bin/rubysms-drb-client",
 		"lib/drb-client.glade",
 		
@@ -28,6 +29,7 @@ Gem::Specification.new do |s|
 		
 		# backends
 		"lib/rubysms/backend/cellphone.ico",
+		"lib/rubysms/backend/clickatell.rb",
 		"lib/rubysms/backend/drb.rb",
 		"lib/rubysms/backend/gsm.rb",
 		"lib/rubysms/backend/http.rb",
@@ -38,6 +40,7 @@ Gem::Specification.new do |s|
 	]
 	
 	s.executables = [
+		"rubysms-gtk-drb-client",
 		"rubysms-drb-client"
 	]
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adammck-rubysms
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Adam Mckaig
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-16 00:00:00 -07:00
+date: 2009-04-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ dependencies:
 description: 
 email: amckaig@unicef.org
 executables: 
+- rubysms-gtk-drb-client
 - rubysms-drb-client
 extensions: []
 
@@ -54,6 +55,7 @@ files:
 - rubysms.gemspec
 - README.rdoc
 - lib/rubysms.rb
+- bin/rubysms-gtk-drb-client
 - bin/rubysms-drb-client
 - lib/drb-client.glade
 - lib/rubysms/application.rb
@@ -64,6 +66,7 @@ files:
 - lib/rubysms/person.rb
 - lib/rubysms/thing.rb
 - lib/rubysms/backend/cellphone.ico
+- lib/rubysms/backend/clickatell.rb
 - lib/rubysms/backend/drb.rb
 - lib/rubysms/backend/gsm.rb
 - lib/rubysms/backend/http.rb