apple_push 0.1.1 → 0.1.2

data/bin/apple_push

@@ -7,32 +7,34 @@ require 'eventmachine'
 require 'thin'
 require 'apple_push'
 
+def terminate(message, exit_code=1)
+  STDERR.puts(message)
+  exit(exit_code)
+end
+
 config_path = ARGV.shift.to_s.strip
 
 if config_path.empty?
-  STDERR.puts "Error: Configuration file required!"
-  exit(1)
+  terminate("Configuration file required!")
 end
 
 config = nil
+
 begin
   config = ApplePush::Configuration.load_file(config_path)
-rescue ArgumentError => ex
-  STDERR.puts "Error: #{ex.message}"
-  puts ex.backtrace
-  exit(1)
+rescue StandardError => ex
+  terminate(ex.message)
 end
 
 EM.run do
   begin
     ApplePush.configure(config)
-  rescue Exception => ex
-    STDERR.puts "Error: #{ex.message}"
-    exit(1)
+  rescue StandardError => ex
+    terminate(ex.message)
   end
   
   host = ApplePush.configuration[:host]
   port = ApplePush.configuration[:port]
   
   Thin::Server.start(ApplePush::Server, host, port)
-end
+end

data/lib/apple_push.rb

@@ -15,8 +15,9 @@ module ApplePush
     config = ApplePush::Configuration.new(options)
     
     @@options.merge!(
-      :host => config.host || '127.0.0.1',
-      :port => config.port || '27000'
+      :host    => config.host    || '127.0.0.1',
+      :port    => config.port    || '27000',
+      :timeout => config.timeout || 5
     )
     
     if !config.sandbox? && !config.live?
@@ -53,9 +54,12 @@ module ApplePush
     raise ArgumentError, "Path to certificate file required." if !config.cert?      
     raise ArgumentError, "Path to key file required." if !config.cert_key?
   
-    pool_size = Integer(config.pool || 1)
-    
-    @@pools[env] = ConnectionPool.new(:size => pool_size, :timeout => 5) do
+    opts = {
+      :size => (Integer(config.pool || 1) rescue 1),
+      :timeout => configuration[:timeout]
+    }
+
+    @@pools[env] = ConnectionPool.new(opts) do
       EM::APN::Client.connect(
         :gateway => env == 'live' ? LIVE_URL : SANDBOX_URL,
         :cert    => File.expand_path(config.cert),

data/lib/apple_push/configuration.rb

@@ -9,11 +9,12 @@ module ApplePush
     #
     def self.load_file(path)
       path = File.expand_path(path)
+
       if !File.exists?(path)
         raise ArgumentError, "File \"#{path}\" does not exist."
       end
-      data = YAML.load_file(path)
-      Configuration.new(data)
+      
+      Configuration.new(YAML.load_file(path))
     end
   end
 end

data/lib/apple_push/version.rb

@@ -1,3 +1,3 @@
 module ApplePush
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple_push
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000Z
+date: 2012-04-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70349632289120 !ruby/object:Gem::Requirement
+  requirement: &70222318304700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349632289120
+  version_requirements: *70222318304700
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70349632287660 !ruby/object:Gem::Requirement
+  requirement: &70222318304180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349632287660
+  version_requirements: *70222318304180
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70349632284240 !ruby/object:Gem::Requirement
+  requirement: &70222318303680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349632284240
+  version_requirements: *70222318303680
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  requirement: &70349632283260 !ruby/object:Gem::Requirement
+  requirement: &70222318303160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349632283260
+  version_requirements: *70222318303160
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70349632226680 !ruby/object:Gem::Requirement
+  requirement: &70222318302640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349632226680
+  version_requirements: *70222318302640
 - !ruby/object:Gem::Dependency
   name: hashr
-  requirement: &70349632225640 !ruby/object:Gem::Requirement
+  requirement: &70222318302120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349632225640
+  version_requirements: *70222318302120
 - !ruby/object:Gem::Dependency
   name: em-apn
-  requirement: &70349632224840 !ruby/object:Gem::Requirement
+  requirement: &70222318301600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349632224840
+  version_requirements: *70222318301600
 description: Sinatra-based server to deliver Apple Push Notifications
 email:
 - dan.sosedoff@gmail.com
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Simple API to send APN notifications