siriproxy 0.5.2 → 0.5.4

data/README.md

@@ -58,6 +58,7 @@ If you don't already have Ruby 2.0.0 (or at least 1.9.3) installed through RVM,
 		`echo 'export PATH=$HOME/.rvm/bin:$PATH' >> ~/.bashrc`  
 	* Activate changes:  
 		`. ~/.bashrc`   
+
 3. Install Ruby 2.0.0 (if you don't have it already):   
 
 	`rvm install 2.0.0`  
@@ -91,7 +92,7 @@ If you don't already have Ruby 2.0.0 (or at least 1.9.3) installed through RVM,
 FAQ
 ---
 
-**Will this let me run Siri on my iPhone 4, iPod Touch, iPhone 3G, Microwave, etc?**
+**Will this let me run Siri on my none Siri devices (eg. iPhone 4, iPod Touch, iPhone 3G, Microwave, etc)?**
 
 No. Please stop asking. 
 
@@ -119,7 +120,7 @@ No. Don't even ask.
 
 **I'm getting a bunch of "[Info - Guzzoni] Object: SessionValidationFailed" messages. What's wrong?!**
 
-You're probably not using an iPhone 4S. You need to be using an iPhone 4S (or have a UDID you can sub in) in order to make use of SiriProxy. Sorry, this is not designed to be a way around that limitation. (Thanks to [@brownie545](http://www.twitter.com/brownie545) for providing information on what happens when you use a non-iPhone 4S)
+You're probably using a device without an official Siri. You need to be using an official Siri device (or have a UDID you can sub in) in order to make use of SiriProxy. Sorry, this is not designed to be a way around that limitation. (Thanks to [@brownie545](http://www.twitter.com/brownie545) for providing information on what happens when you use a unofficial Siri-devices)
 
 **How do I remove the certificate from my iPhone when I'm done?**
 
@@ -151,36 +152,13 @@ Your network setup may be different. This is THE most complex part of setting up
 Running SiriProxy as an unprivileged user
 -----------------------------------------
 
-Given that SiriProxy is a bit of a hack and very unstable, it's probably a good idea to not run it as root. This is especially true if you're allowing access to your server from outside your network. Doing this isn't actually that hard, as SiriProxy doesn't need access to anything privileged.
-
-The only trick is that Siri expects the server to be running on port 443, and only privileged users can open ports below 1024 on *NIX operating systems. So I work around this by running SiriProxy on port 2000 and redirecting traffic to that port using iptables.
-
-**Step 1: Set up an account**
-
-I just set up an account called "siriproxy". I made sure it wasn't a "sudoer" (on my computer, that means keep it out of the "sudo" group). I also think it's a good idea to refrain from giving it login privileges. But do as I say on that one, not as I do.
-
-**Step 2: Set up iptables/ufw**
-
-I run UFW on my machine, which is pretty much a wrapper on iptables. I tossed in the following at the top of my `/etc/ufw/before.rules`:
-
-	*nat
-	:PREROUTING ACCEPT [0:0]
-	-A PREROUTING --dst 10.0.0.3 -p tcp --dport 443 -j REDIRECT --to-port 2000
-	COMMIT
-
-The IP referenced (10.0.0.3) is the IP of the computer running SiriProxy. Since this computer is being used as a wireless AP, it's important to only redirect traffic targeted directly at the server, otherwise all traffic to 443/tcp on my wifi network would be incorrectly redirected.
-
-I also made sure to open up 2000/tcp to allow traffic:
-
-    sudo ufw allow 2000/tcp
-    
-**Step 3: Set up upstart script**
-
-The full explanation of this is shown below. It's a handy thing to do by itself. It allows me to have SiriProxy start on boot and also allows me to easily control it using commands like `start siriproxy` and `stop siriproxy`.
+This used to be really hard. Now it's very easy. Just run `rvmsudo siriproxy server -u USER` and SiriProxy will set it's userid to `USER`'s userid.
 
 Running SiriProxy via Upstart
 -----------------------------
 
+**NOTE: This section needs to be updated.** It was written before some of the newer features for SiriProxy. It should be much simpler now.
+
 Here's the upstart script I created for my home SiriProxy server. It respawns on a crash because SiriProxy is delicate and likes to crash. My server is running BackTrack 5 (a derivative of Ubuntu 10.04, I believe) and I use it as my wireless access point, making it an obvious location for SiriProxy:
 
 	description	"SiriProxy server"
@@ -193,7 +171,7 @@ Here's the upstart script I created for my home SiriProxy server. It respawns on
 	
 	respawn
 	
-	exec start-stop-daemon --start --chuid siriproxy --exec /home/siriproxy/src/SiriProxy/siriproxy2000.sh
+	exec start-stop-daemon --start --exec /home/siriproxy/src/SiriProxy/siriproxy2000.sh
 
 Here are the contents of `siriproxy2000.sh` (as referenced above):
 

data/lib/siriproxy.rb

@@ -33,7 +33,7 @@ class SiriProxy
       
         retries = 0
         while $APP_CONFIG.server_ip && !$SP_DNS_STARTED && retries <= 5
-          puts "[Info - Server] DNS server is not running yet, waiting #{2**retries} second#{'s' if retries > 0}..."
+          puts "[Info - Server] DNS server is not running yet, waiting #{2**retries} second#{'s' if retries > 1}..."
           sleep 2**retries
           retries += 1
         end

data/lib/siriproxy/connection.rb

@@ -175,6 +175,11 @@ class SiriProxy::Connection < EventMachine::Connection
   end
   
   def prep_received_object(object)
+    #workaround for #143
+    if object["class"] == "FinishSpeech" or object["class"] == "SpeechRecognized"
+      @block_rest_of_session = false
+    end
+    
     if object["refId"] == self.last_ref_id && @block_rest_of_session
       puts "[Info - Dropping Object from Guzzoni] #{object["class"]}" if $LOG_LEVEL > 1
       pp object if $LOG_LEVEL > 3

data/lib/siriproxy/dns.rb

@@ -53,7 +53,7 @@ class SiriProxy::Dns
       RubyDNS::run_server(:listen => @interfaces) do
         @logger.level = log_level
 
-        match(/guzzoni.apple.com/, Resolv::DNS::Resource::IN::A) do |_host, transaction|
+        match(/guzzoni.apple.com/, Resolv::DNS::Resource::IN::A) do |transaction|
           transaction.respond!(server_ip)
         end
 

data/lib/siriproxy/interpret_siri.rb

@@ -44,7 +44,7 @@ class SiriProxy::Interpret
         }
       }
       
-      phrase
+      phrase.strip
     end
   end
 end

data/lib/siriproxy/plugin_manager.rb

@@ -25,9 +25,9 @@ class SiriProxy::PluginManager < Cora
             plugin.plugin_name = className
             plugin.manager = self
             @plugins << plugin
-          rescue
+          rescue Exception=>e
             if pluginConfig['name']
-              puts "[Error] Failed to load plugin: #{pluginConfig['name']}"
+              puts "[Error] Failed to load plugin: #{pluginConfig['name']} reason: #{e.message}"
             else
               puts "[Error] Failed to load a plugin that has no name, check your config.yml"
             end 

data/lib/siriproxy/version.rb

@@ -1,3 +1,3 @@
 class SiriProxy
-  VERSION = "0.5.2"
+  VERSION = "0.5.4"
 end

data/siriproxy.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "cora", "=0.0.4"
   s.add_runtime_dependency "bundler"
   s.add_runtime_dependency "rake"
-  s.add_runtime_dependency "rubydns"
+  s.add_runtime_dependency "rubydns", "~> 0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: siriproxy
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -114,17 +114,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 description: Siri Proxy is a proxy server for Apple's Siri "assistant." The idea is
   to allow for the creation of custom handlers for different actions. This can allow
   developers to easily add functionality to Siri.