racoon 0.6.0 → 1.0.0

data/lib/racoon.rb

@@ -8,5 +8,5 @@ require 'racoon/worker'
 require 'racoon/firehose'
 
 module Racoon
-  VERSION = "0.6.0"
+  VERSION = "1.0.0"
 end

data/lib/racoon/apns/connection.rb

@@ -36,6 +36,14 @@ module Racoon
         @sock = nil
       end
 
+      def read
+        errors ||= []
+        while error = @ssl.read(6)
+          errors << parse_tuple(error)
+        end
+        errors
+      end
+
       def write(bytes)
         if host.include? "sandbox"
           notification = Notification.parse(bytes)
@@ -47,6 +55,13 @@ module Racoon
       def connected?
         @ssl
       end
+
+      private
+
+      def parse_tuple(data)
+        packet = data.unpack("c1c1N1")
+        { :command => packet[0], :status => packet[1], :identifier => packet[2] }
+      end
     end
   end
 end

data/lib/racoon/firehose.rb

@@ -32,7 +32,7 @@ module Racoon
 
     private
 
-    def apns(project, bytes, retries=2)
+    def apns(project, bytes, retries=2, &error_callback)
       uri = "gateway.#{project[:sandbox] ? 'sandbox.' : ''}push.apple.com"
       hash = Digest::SHA1.hexdigest("#{project[:name]}-#{project[:certificate]}")
 
@@ -44,6 +44,7 @@ module Racoon
 
         connection.connect! unless connection.connected?
         connection.write(bytes)
+        connection.read.each(&error_callback) unless error_callback.nil?
       rescue Errno::EPIPE, OpenSSL::SSL::SSLError, Errno::ECONNRESET
         connection.disconnect!
         retry if (retries -= 1) > 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: racoon
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70102154456440 !ruby/object:Gem::Requirement
+  requirement: &70296020668120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70102154456440
+  version_requirements: *70296020668120
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70102154455980 !ruby/object:Gem::Requirement
+  requirement: &70296020667620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70102154455980
+  version_requirements: *70296020667620
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: &70102154455520 !ruby/object:Gem::Requirement
+  requirement: &70296020667140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70102154455520
+  version_requirements: *70296020667140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70102154455060 !ruby/object:Gem::Requirement
+  requirement: &70296020666680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70102154455060
+  version_requirements: *70296020666680
 description: A distributed Apple Push Notification Service (APNs) provider developed
   for hosting multiple projects.
 email: jeremy.tregunna@me.com
@@ -67,8 +67,6 @@ extensions: []
 extra_rdoc_files:
 - README.mdown
 files:
-- bin/apnserverd.fedora.init
-- bin/apnserverd.ubuntu.init
 - bin/racoon-firehose
 - bin/racoon-send
 - bin/racoon-worker

data/bin/apnserverd.fedora.init

@@ -1,71 +0,0 @@
-#!/bin/bash
-#
-#       /etc/rc.d/init.d/apnserverd
-# apnserverd    This shell script takes care of starting and stopping
-#               the APN Server Proxy
-#
-# chkconfig: 345 20 80
-# Author: Ben Poweski bpoweski@gmail.com
-#
-# Source function library.
-. /etc/init.d/functions
-
-NAME=apnserverd
-APNSERVERD=/usr/bin/$NAME
-PIDFILE=/var/run/$NAME.pid
-
-if [ -f /etc/sysconfig/$NAME ]; then
-        . /etc/sysconfig/$NAME
-fi
-
-
-start() {
-        echo -n "Starting APN Server:  "
-        if [ -f $PIDFILE ]; then
-                PID=`cat $PIDFILE`
-                echo $NAME already running: $PID
-                exit 2;
-        elif [ -f $PIDFILE ]; then
-                PID=`cat $PIDFILE`
-                echo $NAME already running: $PID
-                exit 2;
-        else
-                daemon $APNSERVERD $OPTIONS
-                RETVAL=$?
-		echo 
-                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$NAME
-                return $RETVAL
-        fi
-
-}
-
-stop() {
-        echo -n "Shutting down APN Server: "
-        echo
-        kill `cat $PIDFILE`
-        echo
-        rm -f /var/lock/subsys/$NAME
-		rm -f $PIDFILE
-        return 0
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    status)
-        status $NAME
-        ;;
-    restart)
-        stop
-        start
-        ;;
-    *)
-        echo "Usage:  {start|stop|status|restart}"
-        exit 1
-        ;;
-esac
-exit $?

data/bin/apnserverd.ubuntu.init

@@ -1,116 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          apnserverd
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Apple Push Notification Server Daemon
-### END INIT INFO
-
-# Author: Philipp Schmid <philipp.schmid@openresearch.com>
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Apple Push Notification Server Daemon"
-NAME=apnserverd
-DAEMON=/usr/bin/$NAME
-PEMPATH=""
-DAEMON_ARGS="--daemon --pem $PEMPATH"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-	  	# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-: