apnd 0.1.8 → 0.2.0

data/HISTORY.markdown

@@ -0,0 +1,10 @@
+# 0.2.0 - 2011-04-04
+
+Note that v0.2.0 fixes a critical error, and that previous releases of APND
+should not be used.
+
+* Fixes a critical error in `APND::Daemon::Protocol` which caused problems
+  with notifications containing new line characters in their message. Props to
+  [mwotton](https://github.com/mwotton).
+* Merged `apnd` and `apnd-push` CLI tools into `apnd`.
+* Added support for Apple Push Notification Feedback Service

data/README.markdown

@@ -12,8 +12,8 @@ are then sent to Apple over a single connection.
 
 Within ruby applications, `APND::Notification` can be used to send
 notifications to a running APND instance (see **APND Notification** below) or
-directly to Apple. A command line utility, `apnd-push`, can be used to send
-single notifications for testing purposes (see **APND Client** below).
+directly to Apple. The command line can be used to send single notifications
+for testing purposes (see **APND Client** below).
 
 
 ## General Usage
@@ -25,7 +25,7 @@ Apple over a single connection as explained above. The `apnd` command line
 utility is used to start APND.
 
     Usage:
-      apnd [OPTIONS] --apple-cert </path/to/cert>
+      apnd daemon [OPTIONS] --apple-cert </path/to/cert>
 
     Required Arguments:
             --apple-cert      [PATH]     PATH to APN certificate from Apple
@@ -41,18 +41,17 @@ utility is used to start APND.
             --foreground                 Run APND in foreground without daemonizing
 
     Help:
-            --version                    Show version
             --help                       Show this message
 
 
 ### APND Client
 
-APND includes a command line utility, `apnd-push`, which can be used to send
-notifications to a running APND instance, or Apple directly. It is only
-recommended to send notifications directly to Apple for testing purposes.
+APND includes a command line client which can be used to send notifications to
+a running APND instance. It is only recommended to send notifications via
+`apnd push` for testing purposes.
 
     Usage:
-      apnd-push [OPTIONS] --token <token>
+      apnd push [OPTIONS] --token <token>
 
     Required Arguments:
             --token  [TOKEN]             Set Notification's iPhone token to TOKEN
@@ -66,7 +65,6 @@ recommended to send notifications directly to Apple for testing purposes.
             --port   [PORT]              Send Notification on PORT (default is 22195)
 
     Help:
-            --version                    Show version
             --help                       Show this message
 
 
@@ -118,6 +116,40 @@ push notifications to APND.
     )
 
 
+### APND Feedback
+
+Apple Push Notification Service keeps a log when you attempt to deliver
+a notification to a device that has removed your application. A Feedback
+Service is provided which applications should periodically check to remove
+from their databases.
+
+The `APND::Feedback` class can be used within your application to retrieve
+a list of device tokens that you are sending notifications to but have
+removed your application.
+
+    APND::Feedback.upstream_host = 'feedback.push.apple.com'
+    APND::Feedback.upstream_port = 2196
+
+    # Block form
+    APND::Feedback.find_stale_devices do |token, removed_at|
+      device = YourApp::Device.find_by_token(token)
+      unless device.registered_at > removed_at
+        device.push_enabled = 0
+        device.save
+      end
+    end
+
+    # Array form
+    stale = APND::Feedback.find_stale_devices
+    stale.each do |(token, removed_at)|
+      device = YourApp::Device.find_by_token(token)
+      unless device.registered_at > removed_at
+        device.push_enabled = 0
+        device.save
+      end
+    end
+
+
 ## Prerequisites
 
 You must have a valid Apple Push Notification Certificate for your iPhone
@@ -156,6 +188,11 @@ wanted, so I rolled my own using theirs as starting points. If APND doesn't
 suit you, check them out instead.
 
 
+## Contributors
+
+* Mark Wotton ([mwotton](https://github.com/mwotton))
+
+
 ## Copyright
 
-Copyright (c) 2010 Joshua Priddle. See LICENSE for details.
+Copyright (c) 2010-2011 Joshua Priddle. See LICENSE for details.

data/bin/apnd

@@ -1,112 +1,34 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+ARGV << '--help' if ARGV.empty?
 
-require 'apnd'
-
-require 'daemons'
-require 'optparse'
-
-help = <<HELP
-Usage:
-  apnd [OPTIONS] --apple-cert </path/to/cert>
-
-HELP
-
-options = {}
-
-opts = OptionParser.new do |opt|
-  opt.banner = help
-
-  opt.separator "Required Arguments:\n"
-
-  opt.on('--apple-cert      [PATH]', 'PATH to APN certificate from Apple') do |cert|
-    options[:apple_cert] = cert
-  end
-
-  opt.separator "\nOptional Arguments:\n"
-
-  opt.on('--apple-host      [HOST]', "Connect to Apple at HOST (default is gateway.sandbox.push.apple.com)") do |host|
-    options[:apple_host] = host
-  end
-
-  opt.on('--apple-port      [PORT]', 'Connect to Apple on PORT (default is 2195)') do |port|
-    options[:apple_port] = port.to_i
-  end
-
-  opt.on('--apple-cert-pass [PASSWORD]', 'PASSWORD for APN certificate from Apple') do |pass|
-    options[:apple_cert_pass] = pass
-  end
-
-  opt.on('--daemon-port     [PORT]', 'Run APND on PORT (default is 22195)') do |port|
-    options[:daemon_port] = port.to_i
-  end
-
-  opt.on('--daemon-bind     [ADDRESS]', 'Bind APND to ADDRESS (default is 0.0.0.0)') do |bind|
-    options[:daemon_bind] = bind
-  end
-
-  opt.on('--daemon-log-file [PATH]', 'PATH to APND log file (default is /var/log/apnd.log)') do |log|
-    options[:daemon_log_file] = log
-  end
-
-  opt.on('--daemon-timer    [SECONDS]', 'Set APND queue refresh time to SECONDS (default is 30)') do |seconds|
-    options[:daemon_timer] = seconds.to_i
-  end
-
-  opt.on('--foreground', 'Run APND in foreground without daemonizing') do
-    options[:foreground] = true
-  end
-
-  opt.separator "\nHelp:\n"
-
-  opt.on('--version', 'Show version') do
-    puts "APND #{APND::Version}"
-    exit
-  end
-
-  opt.on('--help', 'Show this message') do
-    puts opt
-    exit
-  end
-end
-
-begin
-  opts.parse!
-  if options.empty?
-    puts opts
-    exit
-  end
-
-  unless options[:apple_cert]
-    raise OptionParser::MissingArgument, "must specify --apple-cert"
-  end
-rescue OptionParser::InvalidOption, OptionParser::MissingArgument
-  puts "#{$0}: #{$!.message}"
-  puts "#{$0}: try '#{$0} --help' for more information"
-  exit
+if $0 == __FILE__
+  require 'rubygems'
+  $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 end
 
-APND.configure do |config|
-  # Setup AppleConnection
-  config.apple.cert      = options[:apple_cert]      if options[:apple_cert]
-  config.apple.cert_pass = options[:apple_cert_pass] if options[:apple_cert_pass]
-  config.apple.host      = options[:apple_host]      if options[:apple_host]
-  config.apple.port      = options[:apple_port]      if options[:apple_port]
+require 'apnd'
 
-  # Setup Daemon
-  config.daemon.bind     = options[:daemon_bind]     if options[:daemon_bind]
-  config.daemon.port     = options[:daemon_port]     if options[:daemon_port]
-  config.daemon.log_file = options[:daemon_log_file] if options[:daemon_log_file]
-  config.daemon.timer    = options[:daemon_timer]    if options[:daemon_timer]
-end
+command = ARGV.shift
 
-if APND.settings.apple.cert.nil?
-  puts opts
-  exit
+case command
+when 'daemon'
+  APND::CLI.daemon(ARGV)
+when 'push'
+  APND::CLI.push(ARGV)
+when '--version', '-v'
+  puts "APND v#{APND::Version}"
 else
-  unless options[:foreground]
-    Daemonize.daemonize(APND.settings.daemon.log_file, 'apnd')
-  end
-  APND::Daemon.run!
+  puts "Error: Invalid command" unless %w(-h --help).include?(command)
+  puts <<-HELP
+Usage: apnd COMMAND [ARGS]
+
+Command list:
+        daemon                       Start the APND Daemon
+        push                         Send a single push notification (for development use only)
+
+Help:
+        --version                    Show version
+        --help                       Show this message
+  HELP
 end

data/lib/apnd.rb

@@ -2,10 +2,12 @@ require 'json'
 
 module APND
   autoload :Version,      'apnd/version'
+  autoload :CLI,          'apnd/cli'
   autoload :Errors,       'apnd/errors'
   autoload :Settings,     'apnd/settings'
   autoload :Daemon,       'apnd/daemon'
   autoload :Notification, 'apnd/notification'
+  autoload :Feedback,     'apnd/feedback'
 
   #
   # Returns APND::Settings
@@ -24,7 +26,7 @@ module APND
   #
   # Write message to stdout with date
   #
-  def self.ohai(message) #:nodoc:
+  def self.logger(message) #:nodoc:
     puts "[%s] %s" % [Time.now.strftime("%Y-%m-%d %H:%M:%S"), message]
   end
 

data/lib/apnd/cli.rb

@@ -0,0 +1,195 @@
+require 'daemons'
+require 'optparse'
+
+module APND
+  class CLI #:nodoc: all
+
+    #
+    # Run apnd push
+    #
+    def self.push(argv)
+      help = <<-HELP
+Usage:
+  apnd push [OPTIONS] --token <token>
+
+      HELP
+
+      options = {}
+
+      opts = OptionParser.new do |opt|
+        opt.banner = help
+
+        opt.separator "Required Arguments:\n"
+
+        opt.on('--token  [TOKEN]', "Set Notification's iPhone token to TOKEN") do |token|
+          options[:token] = token
+        end
+
+        opt.separator "\nOptional Arguments:\n"
+
+        opt.on('--alert  [MESSAGE]', "Set Notification's alert to MESSAGE") do |alert|
+          options[:alert] = alert
+        end
+
+        opt.on('--sound  [SOUND]', "Set Notification's sound to SOUND") do |sound|
+          options[:sound] = sound
+        end
+
+        opt.on('--badge  [NUMBER]', "Set Notification's badge number to NUMBER") do |badge|
+          options[:badge] = badge.to_i
+        end
+
+        opt.on('--custom [JSON]', "Set Notification's custom data to JSON") do |custom|
+          begin
+            options[:custom] = JSON.parse(custom)
+          rescue JSON::ParserError => e
+            puts "Invalid JSON: #{e}"
+            exit -1
+          end
+        end
+
+        opt.on('--host   [HOST]', "Send Notification to HOST, usually the one running APND (default is 'localhost')") do |host|
+          options[:host] = host
+        end
+
+        opt.on('--port   [PORT]', 'Send Notification on PORT (default is 22195)') do |port|
+          options[:port] = port.to_i
+        end
+
+        opt.separator "\nHelp:\n"
+
+        opt.on('--help', 'Show this message') do
+          puts opt
+          exit
+        end
+      end
+
+      begin
+        opts.parse!
+        if options.empty?
+          puts opts
+          exit
+        end
+
+        unless options[:token]
+          raise OptionParser::MissingArgument, "must specify --token"
+        end
+      rescue OptionParser::InvalidOption, OptionParser::MissingArgument
+        puts "#{$0}: #{$!.message}"
+        puts "#{$0}: try '#{$0} --help' for more information"
+        exit
+      end
+
+      # Configure Notification upstream host/port
+      APND::Notification.upstream_host = options.delete(:host) if options[:host]
+      APND::Notification.upstream_port = options.delete(:port) if options[:port]
+
+      APND::Notification.create(options)
+    end
+
+    #
+    # Run apnd daemon
+    #
+    def self.daemon(argv)
+      help = <<-HELP
+Usage:
+  apnd daemon --apple-cert </path/to/cert>
+
+      HELP
+
+      options = {}
+
+      opts = OptionParser.new do |opt|
+        opt.banner = help
+
+        opt.separator "Required Arguments:\n"
+
+        opt.on('--apple-cert      [PATH]', 'PATH to APN certificate from Apple') do |cert|
+          options[:apple_cert] = cert
+        end
+
+        opt.separator "\nOptional Arguments:\n"
+
+        opt.on('--apple-host      [HOST]', "Connect to Apple at HOST (default is gateway.sandbox.push.apple.com)") do |host|
+          options[:apple_host] = host
+        end
+
+        opt.on('--apple-port      [PORT]', 'Connect to Apple on PORT (default is 2195)') do |port|
+          options[:apple_port] = port.to_i
+        end
+
+        opt.on('--apple-cert-pass [PASSWORD]', 'PASSWORD for APN certificate from Apple') do |pass|
+          options[:apple_cert_pass] = pass
+        end
+
+        opt.on('--daemon-port     [PORT]', 'Run APND on PORT (default is 22195)') do |port|
+          options[:daemon_port] = port.to_i
+        end
+
+        opt.on('--daemon-bind     [ADDRESS]', 'Bind APND to ADDRESS (default is 0.0.0.0)') do |bind|
+          options[:daemon_bind] = bind
+        end
+
+        opt.on('--daemon-log-file [PATH]', 'PATH to APND log file (default is /var/log/apnd.log)') do |log|
+          options[:daemon_log_file] = log
+        end
+
+        opt.on('--daemon-timer    [SECONDS]', 'Set APND queue refresh time to SECONDS (default is 30)') do |seconds|
+          options[:daemon_timer] = seconds.to_i
+        end
+
+        opt.on('--foreground', 'Run APND in foreground without daemonizing') do
+          options[:foreground] = true
+        end
+
+        opt.separator "\nHelp:\n"
+
+        opt.on('--help', 'Show this message') do
+          puts opt
+          exit
+        end
+      end
+
+      begin
+        opts.parse!
+        if options.empty?
+          puts opts
+          exit
+        end
+
+        unless options[:apple_cert]
+          raise OptionParser::MissingArgument, "must specify --apple-cert"
+        end
+      rescue OptionParser::InvalidOption, OptionParser::MissingArgument
+        puts "#{$0}: #{$!.message}"
+        puts "#{$0}: try '#{$0} --help' for more information"
+        exit
+      end
+
+      APND.configure do |config|
+        # Setup AppleConnection
+        config.apple.cert      = options[:apple_cert]      if options[:apple_cert]
+        config.apple.cert_pass = options[:apple_cert_pass] if options[:apple_cert_pass]
+        config.apple.host      = options[:apple_host]      if options[:apple_host]
+        config.apple.port      = options[:apple_port]      if options[:apple_port]
+
+        # Setup Daemon
+        config.daemon.bind     = options[:daemon_bind]     if options[:daemon_bind]
+        config.daemon.port     = options[:daemon_port]     if options[:daemon_port]
+        config.daemon.log_file = options[:daemon_log_file] if options[:daemon_log_file]
+        config.daemon.timer    = options[:daemon_timer]    if options[:daemon_timer]
+      end
+
+      if APND.settings.apple.cert.nil?
+        puts opts
+        exit
+      else
+        unless options[:foreground]
+          Daemonize.daemonize(APND.settings.daemon.log_file, 'apnd')
+        end
+        APND::Daemon.run!
+      end
+
+    end
+  end
+end

data/lib/apnd/daemon.rb

@@ -35,7 +35,7 @@ module APND
     #
     def run!
       EventMachine::run do
-        APND.ohai "Starting APND Daemon v#{APND::Version} on #{@bind}:#{@port}"
+        APND.logger "Starting APND Daemon v#{APND::Version} on #{@bind}:#{@port}"
         EventMachine::start_server(@bind, @port, APND::Daemon::ServerConnection) do |server|
           server.queue = @queue
         end
@@ -54,19 +54,19 @@ module APND
     def process_notifications!
       count = @queue.size
       if count > 0
-        APND.ohai "Queue has #{count} item#{count == 1 ? '' : 's'}"
+        APND.logger "Queue has #{count} item#{count == 1 ? '' : 's'}"
         @apple.connect!
         count.times do
           @queue.pop do |notification|
             begin
-              APND.ohai "Sending notification for #{notification.token}"
+              APND.logger "Sending notification for #{notification.token}"
               @apple.write(notification.to_bytes)
             rescue Errno::EPIPE, OpenSSL::SSL::SSLError
-              APND.ohai "Error, notification has been added back to the queue"
+              APND.logger "Error, notification has been added back to the queue"
               @queue.push(notification)
               @apple.reconnect!
             rescue RuntimeError => error
-              APND.ohai "Error: #{error}"
+              APND.logger "Error: #{error}"
             end
           end
         end

data/lib/apnd/daemon/protocol.rb

@@ -11,7 +11,7 @@ module APND
     #
     def post_init
       @address = ::Socket.unpack_sockaddr_in(self.get_peername)
-      APND.ohai "#{@address.last}:#{@address.first} opened connection"
+      APND.logger "#{@address.last}:#{@address.first} opened connection"
     end
 
     #
@@ -21,22 +21,33 @@ module APND
     # queued
     #
     def unbind
-      @buffer.chomp.split("\n").each do |line|
-        if notification = APND::Notification.valid?(line)
-          APND.ohai "#{@address.last}:#{@address.first} added new Notification to queue"
+      # totally broken.
+      @buffer.chomp!
+      while(@buffer.length > 0) do
+        # 3 bytes for header
+        # 32 bytes for token
+        # 2 bytes for json length
+        
+        # taking the last is acceptable because we know it's never
+        # longer than 256 bytes from the apple documentation.
+        json_length = @buffer.slice(35,37).unpack('CC').last
+        chunk = @buffer.slice!(0,json_length + 3 + 32 + 2)
+        if notification = APND::Notification.valid?(chunk)
+          APND.logger "#{@address.last}:#{@address.first} added new Notification to queue"
           queue.push(notification)
         else
-          APND.ohai "#{@address.last}:#{@address.first} submitted invalid Notification"
+          APND.logger "#{@address.last}:#{@address.first} submitted invalid Notification"
         end
+        @buffer.strip!
       end
-      APND.ohai "#{@address.last}:#{@address.first} closed connection"
+      APND.logger "#{@address.last}:#{@address.first} closed connection"
     end
 
     #
     # Add incoming notification(s) to @buffer
     #
     def receive_data(data)
-      APND.ohai "#{@address.last}:#{@address.first} buffering data"
+      APND.logger "#{@address.last}:#{@address.first} buffering data"
       (@buffer ||= "") << data
     end
   end

data/lib/apnd/feedback.rb

@@ -0,0 +1,65 @@
+module APND
+  #
+  # APND::Feedback receives feedback from Apple when notifications are
+  # being rejected for a specific token. This is usually due to the user
+  # uninstalling your application.
+  #
+  class Feedback
+
+    class << self
+      #
+      # The host to receive feedback from, usually apple
+      #
+      attr_accessor :upstream_host
+
+      #
+      # The port to connect to upstream_host on
+      #
+      attr_accessor :upstream_port
+    end
+
+    #
+    # Set upstream host/port to default values
+    #
+    self.upstream_host = APND.settings.feedback.host
+    self.upstream_port = APND.settings.feedback.port.to_i
+
+    #
+    # Connect to Apple's Feedback Service and return an array of device
+    # tokens that should no longer receive push notifications
+    #
+    def self.find_stale_devices(&block)
+      feedback = self.new
+      devices  = feedback.receive
+      devices.each { |device| yield *device } if block_given?
+      devices
+    end
+
+    #
+    # Create a connection to Apple's Feedback Service
+    #
+    def initialize
+      @apple = APND::Daemon::AppleConnection.new({
+        :cert      => APND.settings.apple.cert,
+        :cert_pass => APND.settings.apple.cert_pass,
+        :host      => self.class.upstream_host,
+        :port      => self.class.upstream_port.to_i
+      })
+    end
+
+    #
+    # Receive feedback from Apple and return an array of device tokens
+    #
+    def receive
+      tokens = []
+      @apple.open do |sock|
+        while line = sock.gets
+          payload = line.strip.unpack('N1n1H140')
+          tokens << [payload[2].strip, Time.at(payload[0])]
+        end
+      end
+      tokens
+    end
+
+  end
+end

data/lib/apnd/settings.rb

@@ -104,6 +104,32 @@ module APND
       end
     end
 
+    #
+    # Settings for APND::Feedback
+    #
+    class Feedback
+
+      #
+      # Host used to connect to Apple
+      #
+      #   Development: feedback.sandbox.push.apple.com
+      #   Production: feedback.push.apple.com
+      #
+      attr_accessor :host
+
+      #
+      # Port used to connect to Apple
+      #
+      #   Default: 2196
+      #
+      attr_accessor :port
+
+      def initialize
+        @host = 'feedback.sandbox.push.apple.com'
+        @port = 2196
+      end
+    end
+
     #
     # Returns the AppleConnection settings
     #
@@ -158,5 +184,22 @@ module APND
         notification.host = options[:host] if options[:host]
       end
     end
+
+    #
+    # Returns the Feedback settings
+    #
+    def feedback
+      @feedback ||= APND::Settings::Feedback.new
+    end
+
+    #
+    # Mass assign Feedback settings
+    #
+    def feedback=(options = {})
+      if options.respond_to?(:keys)
+        feedback.port = options[:port] if options[:port]
+        feedback.host = options[:host] if options[:host]
+      end
+    end
   end
 end

data/lib/apnd/version.rb

@@ -1,8 +1,8 @@
 module APND
   class Version #:nodoc:
     MAJOR = 0
-    MINOR = 1
-    TINY  = 8
+    MINOR = 2
+    TINY  = 0
 
     def self.to_s
       [MAJOR, MINOR, TINY].join('.')

data/test/apnd_test.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class APNDTest < Test::Unit::TestCase
+  # FIXME: Tests fail if the hash keys here arent in this order. It shouldn't
+  # be so fragile.
   @@bytes = %|\000\000 \376\025\242}]\363\303Gx\336\373\037O8\200&\\\305,\f\004v\202\";\345\237\266\205\000\251\242\000\\{\"location\":\"New York\",\"aps\":{\"badge\":10,\"sound\":\"default\",\"alert\":\"Red Alert, Numba One!\"}}|
 
   context "APND Notification" do
@@ -51,6 +53,8 @@ class APNDTest < Test::Unit::TestCase
       end
     end
 
+
+
   end
 
   context "APND Daemon" do
@@ -77,6 +81,25 @@ class APNDTest < Test::Unit::TestCase
         end
         assert_equal 0, @daemon.queue.size
       end
+
+
+      context "newlines" do
+        should "be able to parse a notification with an embedded newline character" do
+          @newline_notification = APND::Notification.new({
+            # :token  => 'fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2',
+            :token  => '74b2a2197d7727a70f939de05a4c7fe8bd4a7d960a77ef4701a80cb7b293ee23',
+            :alert  => 'Red Alert, Numba One!',
+            :sound  => 'default',
+            :badge  => 10,
+            :custom => { 'location' => 'New York' }
+          })
+          @daemon.receive_data(@newline_notification.to_bytes)
+          @daemon.unbind
+          assert_equal 1, @daemon.queue.size
+
+        end
+      end
+
     end
   end
 

data/test/test_helper.rb

@@ -23,5 +23,5 @@ class TestDaemon
 
 end
 
-# Silence APND.ohai in testing
-def APND.ohai(*args); end
+# Silence APND.logger in testing
+def APND.logger(*args); end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apnd
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 8
-  version: 0.1.8
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Joshua Priddle
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 -05:00
+date: 2011-04-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,7 +84,6 @@ description: "    APND (Apple Push Notification Daemon) is a ruby library to sen
 email: jpriddle@nevercraft.net
 executables: 
 - apnd
-- apnd-push
 extensions: []
 
 extra_rdoc_files: 
@@ -92,13 +91,15 @@ extra_rdoc_files:
 files: 
 - Rakefile
 - README.markdown
+- HISTORY.markdown
 - bin/apnd
-- bin/apnd-push
+- lib/apnd/cli.rb
 - lib/apnd/daemon/apple_connection.rb
 - lib/apnd/daemon/protocol.rb
 - lib/apnd/daemon/server_connection.rb
 - lib/apnd/daemon.rb
 - lib/apnd/errors.rb
+- lib/apnd/feedback.rb
 - lib/apnd/notification.rb
 - lib/apnd/settings.rb
 - lib/apnd/version.rb
@@ -135,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: "APND: Apple Push Notification Daemon sends Apple Push Notifications to iPhones"

data/bin/apnd-push

@@ -1,90 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-
-require 'apnd'
-
-require 'optparse'
-
-help = <<HELP
-Usage:
-  apnd-push [OPTIONS] --token <token>
-
-HELP
-
-options = {}
-
-opts = OptionParser.new do |opt|
-  opt.banner = help
-
-  opt.separator "Required Arguments:\n"
-
-  opt.on('--token  [TOKEN]', "Set Notification's iPhone token to TOKEN") do |token|
-    options[:token] = token
-  end
-
-  opt.separator "\nOptional Arguments:\n"
-
-  opt.on('--alert  [MESSAGE]', "Set Notification's alert to MESSAGE") do |alert|
-    options[:alert] = alert
-  end
-
-  opt.on('--sound  [SOUND]', "Set Notification's sound to SOUND") do |sound|
-    options[:sound] = sound
-  end
-
-  opt.on('--badge  [NUMBER]', "Set Notification's badge number to NUMBER") do |badge|
-    options[:badge] = badge.to_i
-  end
-
-  opt.on('--custom [JSON]', "Set Notification's custom data to JSON") do |custom|
-    begin
-      options[:custom] = JSON.parse(custom)
-    rescue JSON::ParserError => e
-      puts "Invalid JSON: #{e}"
-      exit -1
-    end
-  end
-
-  opt.on('--host   [HOST]', "Send Notification to HOST, usually the one running APND (default is 'localhost')") do |host|
-    options[:host] = host
-  end
-
-  opt.on('--port   [PORT]', 'Send Notification on PORT (default is 22195)') do |port|
-    options[:port] = port.to_i
-  end
-
-  opt.separator "\nHelp:\n"
-
-  opt.on('--version', 'Show version') do
-    puts "APND #{APND::Version}"
-    exit
-  end
-
-  opt.on('--help', 'Show this message') do
-    puts opt
-    exit
-  end
-end
-
-begin
-  opts.parse!
-  if options.empty?
-    puts opts
-    exit
-  end
-
-  unless options[:token]
-    raise OptionParser::MissingArgument, "must specify --token"
-  end
-rescue OptionParser::InvalidOption, OptionParser::MissingArgument
-  puts "#{$0}: #{$!.message}"
-  puts "#{$0}: try '#{$0} --help' for more information"
-  exit
-end
-
-# Configure Notification upstream host/port
-APND::Notification.upstream_host = options.delete(:host) if options[:host]
-APND::Notification.upstream_port = options.delete(:port) if options[:port]
-
-APND::Notification.create(options)