Merged with main repo

Author: Hjalti Jakobsson

README.md

@@ -7,6 +7,11 @@ Siri Proxy is a proxy server for Apple's Siri "assistant." The idea is to allow
 
 The main example I provide is a plugin to control [my thermostat](http://www.radiothermostat.com/latestnews.html#advanced) with Siri. It responds to commands such as, "What's the status of the thermostat?", or "Set the thermostat to 68 degrees", or even "What's the inside temperature?"
 
+Find us on IRC
+--------------
+
+We now have an IRC channel. Check out the #SiriProxy channel on irc.freenode.net.
+
 Demo Videos
 -----------
 
@@ -17,6 +22,8 @@ See it running with the ELIZA plugin here: [http://www.youtube.com/watch?v=uTiLv
 Other Plugins
 -------------
 
+While we encourage people to create SiriProxy plguins, please note that the project is still in very early stages and the **plugin API is still in flux** and may undergo radical changes.
+
 **Sam Lu's Hockey Scores plugin**  
 Source: [https://github.com/senmu/SiriProxy/tree/hockeyscores](https://github.com/senmu/SiriProxy/tree/hockeyscores)  
 Video: [http://vimeo.com/32431965](http://vimeo.com/32431965)
@@ -45,7 +52,7 @@ Currently, setup requires a pretty solid knowledge of certificates and openssl (
 )
 4. Install the requisite Ruby gems:
 	* httparty
-	* open-uri
+	* open-uri (you may not need this on newer versions of Ruby)
 	* json
 	* CFPropertyList
 	* uuidtools

interpretSiri.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 ######
 # The idea behind this class is that you can call the different
 # methods to get different interpretations of a Siri object.

plugins/thermostat/siriThermostat.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'tweakSiri'
 require 'siriObjectGenerator'
 require 'json' 

plugins/twitter/siriTweet.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'tweaksiri'
-require 'siriobjectgenerator'
+require 'tweakSiri'
+require 'siriObjectGenerator'
 require 'twitter'
 
 #######

siriObjectGenerator.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'rubygems'
 require 'uuidtools'
 

siriProxy.rb

@@ -1,8 +1,7 @@
-#!/usr/bin/env ruby
 require 'rubygems'
 require 'eventmachine'
 require 'zlib'
-require 'cfpropertylist'
+require 'CFPropertyList'
 require 'pp'
 require 'tweakSiri'
 require 'interpretSiri'

start.rb

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
+$LOAD_PATH << File.dirname(__FILE__)
 $KCODE='u' #setting KCODE to unicode for Ruby 1.8
 
-require 'plugins/thermostat/siriThermostat'
 require 'plugins/testproxy/testproxy'
-require 'plugins/eliza/eliza'
-require 'plugins/twitter/siriTweet'
+# require 'plugins/thermostat/siriThermostat'
+# require 'plugins/eliza/eliza'
+# require 'plugins/twitter/siriTweet'
 require 'plugins/plex/siriPlex'
-require './tweakSiri'
-require './siriProxy'
+require 'tweakSiri'
+require 'siriProxy'
 
 #Also try Eliza -- though it should really not be run "before" anything else.
 #Also try Twitter -- must first configure keys in siriTweet.rb