Merge branch 'fixed_require' of file:///Users/plamoni/Dropbox/github/…

…otherSiriProxy/jpipas/SiriProxy

plugins/eliza/eliza.rb

@@ -1,5 +1,5 @@
-require 'tweakSiri'
-require 'siriObjectGenerator'
+require './tweakSiri'
+require './siriObjectGenerator'
 require 'net/http'
 
 

plugins/testproxy/testproxy.rb

@@ -1,5 +1,5 @@
-require 'tweakSiri'
-require 'siriObjectGenerator'
+require './tweakSiri'
+require './siriObjectGenerator'
 
 #######
 # This is a "hello world" style plugin. It simply intercepts the phrase "text siri proxy" and responds

plugins/thermostat/siriThermostat.rb

@@ -1,5 +1,5 @@
-require 'tweakSiri'
-require 'siriObjectGenerator'
+require './tweakSiri'
+require './siriObjectGenerator'
 require 'json' 
 require 'open-uri'
 require 'httparty'

plugins/twitter/siriTweet.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'tweakSiri'
-require 'siriObjectGenerator'
+require './tweakSiri'
+require './siriObjectGenerator'
 require 'twitter'
 
 #######

siriProxy.rb

@@ -3,8 +3,8 @@
 require 'zlib'
 require 'CFPropertyList'
 require 'pp'
-require 'tweakSiri'
-require 'interpretSiri'
+require './tweakSiri'
+require './interpretSiri'
 
 LOG_LEVEL = 1
 

start.rb

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
-$LOAD_PATH << File.dirname(__FILE__)
-$KCODE='u' #setting KCODE to unicode for Ruby 1.8
+KCODE='u' #setting KCODE to unicode for Ruby 1.8
 
-require 'plugins/testproxy/testproxy'
-# require 'plugins/thermostat/siriThermostat'
-# require 'plugins/eliza/eliza'
-# require 'plugins/twitter/siriTweet'
-require 'tweakSiri'
-require 'siriProxy'
+#require './plugins/thermostat/siriThermostat'
+require './plugins/testproxy/testproxy'
+#require './plugins/eliza/eliza'
+#require './plugins/twitter/siriTweet'
+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