rapnd 0.1.10 → 0.2.0

data/Gemfile

@@ -4,6 +4,8 @@ gem "hiredis", "~> 0.3.1"
 gem "redis", "~> 2.2.0", :require => ["redis/connection/hiredis", "redis"]
 gem 'activesupport'
 gem 'daemons', '1.1.6'
+gem 'i18n'
+gem 'airbrake'
 
 group :development do
   gem 'mocha'

data/Gemfile.lock

@@ -2,10 +2,15 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.0)
+    airbrake (3.0.9)
+      activesupport
+      builder
+    builder (3.0.0)
     daemons (1.1.6)
     diff-lcs (1.1.3)
     git (1.2.5)
     hiredis (0.3.2)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -30,9 +35,11 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
+  airbrake
   bundler
   daemons (= 1.1.6)
   hiredis (~> 0.3.1)
+  i18n
   jeweler
   mocha
   rcov

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.2.0

data/bin/rapnd

@@ -48,6 +48,10 @@ OptionParser.new do |opts|
   opts.on("--dir=OPTIONAL", "Directory to start in") do |dir|
     options[:dir] = dir
   end
+  
+  opts.on("--airbrake=OPTIONAL", "Airbrake API key") do |airbrake|
+    options[:airbrake] = airbrake
+  end
 
   opts.on('--help', 'Show help') do |help|
     puts opts

data/lib/rapnd/daemon.rb

@@ -4,13 +4,14 @@ require 'socket'
 require 'active_support/ordered_hash'
 require 'active_support/json'
 require 'base64'
+require 'airbrake'
+require 'logger'
 
 module Rapnd
   class Daemon
-    attr_accessor :redis, :host, :apple, :cert, :queue, :connected
+    attr_accessor :redis, :host, :apple, :cert, :queue, :connected, :logger, :airbrake
     
     def initialize(options = {})
-      puts 'Initializing daemon...'
       options[:redis_host]  ||= 'localhost'
       options[:redis_port]  ||= '6379'
       options[:host]        ||= 'gateway.sandbox.push.apple.com'
@@ -18,15 +19,18 @@ module Rapnd
       options[:password]    ||= ''
       raise 'No cert provided!' unless options[:cert]
       
+      Airbrake.configure { |config| config.api_key = options[:airbrake]; @airbrake = true; } if options[:airbrake]
+      
       @redis = Redis.new(:host => options[:redis_host], :port => options[:redis_port])
       @queue = options[:queue]
       @cert = options[:cert]
       @host = options[:host]
-      puts "Listening on queue: #{self.queue}"
+      @logger = Logger.new("#{options[:dir]}/log/#{options[:queue]}.log")
+      @logger.info "Listening on queue: #{self.queue}"
     end
     
     def connect!
-      puts 'Connecting...'
+      @logger.info 'Connecting...'
       @context      = OpenSSL::SSL::SSLContext.new
       @context.cert = OpenSSL::X509::Certificate.new(File.read(@cert))
       @context.key  = OpenSSL::PKey::RSA.new(File.read(@cert), @password)
@@ -37,7 +41,7 @@ module Rapnd
       self.apple.connect
       
       self.connected = true
-      puts 'Connected!'
+      @logger.info 'Connected!'
       
       return @sock, @ssl
     end
@@ -47,10 +51,18 @@ module Rapnd
       if message
         notification = Rapnd::Notification.new(Marshal.load(message.last))
         self.connect! unless self.connected
-        puts "Sending Apple: #{notification.json_payload}"
+        @logger.info "Sending Apple: #{notification.json_payload}"
         self.apple.write(notification.to_bytes)
       end
       self.run!
+    rescue Exception => e
+      if e.class == Interrupt || e.class == SystemExit
+        @logger.info "Shutting down..."
+        exit(0)
+      end
+      Airbrake.notify(e, {:environment_name => self.queue }) if @airbrake
+      @logger.error "Encountered error: #{e}"
+      retry
     end
   end
 end

data/lib/rapnd/notification.rb

@@ -6,7 +6,7 @@ module Rapnd
       [:badge, :alert, :sound, :device_token, :custom].each do |k|
         self.instance_variable_set("@#{k}".to_sym, hash[k]) if hash[k]
       end
-      raise 'Must provide device token' if self.device_token.nil?
+      raise "Must provide device token: #{hash}" if self.device_token.nil?
       self.device_token = self.device_token.delete(' ')
     end
     
@@ -26,7 +26,7 @@ module Rapnd
     
     def json_payload
       j = ActiveSupport::JSON.encode(payload)
-      raise PayloadInvalid.new("The payload is larger than allowed: #{j.length}") if j.size > 256
+      raise "The payload #{j} is larger than allowed: #{j.length}" if j.size > 256
       j
     end
     

data/rapnd.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rapnd"
-  s.version = "0.1.10"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Symonds"]
@@ -50,6 +50,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<redis>, ["~> 2.2.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<daemons>, ["= 1.1.6"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<airbrake>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -60,6 +62,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<redis>, ["~> 2.2.0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<daemons>, ["= 1.1.6"])
+      s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<airbrake>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -71,6 +75,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<redis>, ["~> 2.2.0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<daemons>, ["= 1.1.6"])
+    s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<airbrake>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapnd
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &70362664346760 !ruby/object:Gem::Requirement
+  requirement: &70193136337680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70362664346760
+  version_requirements: *70193136337680
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70362664345260 !ruby/object:Gem::Requirement
+  requirement: &70193136336520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70362664345260
+  version_requirements: *70193136336520
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70362664359820 !ruby/object:Gem::Requirement
+  requirement: &70193136335780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362664359820
+  version_requirements: *70193136335780
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70362664357520 !ruby/object:Gem::Requirement
+  requirement: &70193136334720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,32 @@ dependencies:
         version: 1.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70362664357520
+  version_requirements: *70193136334720
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70193136333620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70193136333620
+- !ruby/object:Gem::Dependency
+  name: airbrake
+  requirement: &70193136332420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70193136332420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70362664355780 !ruby/object:Gem::Requirement
+  requirement: &70193136010220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362664355780
+  version_requirements: *70193136010220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70362664354260 !ruby/object:Gem::Requirement
+  requirement: &70193136009000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362664354260
+  version_requirements: *70193136009000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70362664352960 !ruby/object:Gem::Requirement
+  requirement: &70193136008080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362664352960
+  version_requirements: *70193136008080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70362664367260 !ruby/object:Gem::Requirement
+  requirement: &70193136007000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362664367260
+  version_requirements: *70193136007000
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70362664363840 !ruby/object:Gem::Requirement
+  requirement: &70193136006200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362664363840
+  version_requirements: *70193136006200
 description: redis APN daemon
 email: veraticus@gmail.com
 executables:
@@ -151,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2992434140880509732
+      hash: -2383858397958020777
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: