spns 0.2.11 → 0.2.12

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.2.12

data/lib/spns.rb

@@ -40,7 +40,6 @@ $timer = "#{config['timer']}".to_i
 $cron = config['cron'] || 'cron'
 $port = config['port'] || 4567
 $mode = config['mode'] || env
-$certificate = config["#{$mode}"][0]['certificate'] || 'ck.pem'
 ROOTDIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 VERSION = File.open("#{ROOTDIR}/VERSION", "rb").read
 $apps = config['apps'] || []
@@ -49,8 +48,25 @@ $apps = config['apps'] || []
 ## Certificate Key Setup
 ############################################################
 
-unless File.exist?("#{Dir.pwd}/#{$certificate}") then
-  puts "1: please provide certificate key pem file under current directory"
+$certkey = {}
+def check_cert
+  $apps.each { |app|
+    unless File.exist?("#{Dir.pwd}/#{app}_#{$mode}.pem") then
+      puts "Please provide #{app}_#{$mode}.pem under '#{Dir.pwd}/' directory"
+      return false;
+    else
+      certfile = File.read("#{Dir.pwd}/#{app}_#{$mode}.pem")
+      openSSLContext = OpenSSL::SSL::SSLContext.new
+      openSSLContext.cert = OpenSSL::X509::Certificate.new(certfile)
+      openSSLContext.key = OpenSSL::PKey::RSA.new(certfile)   
+      $certkey["#{app}"] = openSSLContext       
+    end
+  }  
+  return true
+end
+
+unless check_cert then
+  puts "1: please provide certificate key pem file under current directory, name should be: appid_dev.pem for development and appid_prod.pem for production"
   puts "2: edit your spns.yml under current directory"
   puts "3: run spns"
   puts "4: iOS Client: in AppDelegate file, didRegisterForRemoteNotificationsWithDeviceToken method should access url below:"
@@ -64,43 +80,37 @@ else
   puts "Simple Push Notification Server is Running (#{VERSION}) ..."
   puts "Mode: #{$mode}"
   puts "Port: #{$port}"
-  puts "Certificate File: '#{Dir.pwd}/#{$certificate}'"
   puts "Cron Job: '#{Dir.pwd}/#{$cron}' script is running every #{$timer} #{($timer == 1) ? 'minute' : 'minutes'} " unless "#{$timer}".squeeze.strip == "0"
   puts "*"*80
 end
 
-$cert = File.read("#{Dir.pwd}/#{$certificate}")
-$openSSLContext = OpenSSL::SSL::SSLContext.new
-$openSSLContext.cert = OpenSSL::X509::Certificate.new($cert)
-$openSSLContext.key = OpenSSL::PKey::RSA.new($cert)
-
 ############################################################
 ## Sequel Database Setup
 ############################################################
 
-DB = nil;
+$DB;
 
 unless File.exist?("#{Dir.pwd}/push.db") then
-  DB = Sequel.connect("sqlite://#{Dir.pwd}/push.db")
+  $DB = Sequel.connect("sqlite://#{Dir.pwd}/push.db")
 
-  DB.create_table :tokens do
+  $DB.create_table :tokens do
     primary_key :id
     String :app, :unique => true, :null => false
     String :token, :unique => true, :null => false, :size => 100
     index [:app, :token]
   end
 
-  DB.create_table :pushes do
+  $DB.create_table :pushes do
     primary_key :id
     String :pid, :unique => true, :null => false, :size => 100
     index :pid
   end
 else
-  DB = Sequel.connect("sqlite://#{Dir.pwd}/push.db")
+  $DB = Sequel.connect("sqlite://#{Dir.pwd}/push.db")
 end
 
-Token = DB[:tokens]
-Push = DB[:pushes]
+Token = $DB[:tokens]
+Push = $DB[:pushes]
 
 ############################################################
 ## Timer Job Setup
@@ -143,6 +153,14 @@ end
 class App < Sinatra::Base
 
   set :port, "#{$port}".to_i
+  
+  if $mode == 'development' then
+    set :show_exceptions, true
+    set :dump_errors, true
+  else
+    set :show_exceptions, false
+    set :dump_errors, false      
+  end
 
   get '/' do
     puts "Simple Push Notification Server"
@@ -168,7 +186,9 @@ class App < Sinatra::Base
 
       @push = Token.where(:app => app)
       @exist = Push.first(:pid => pid)
-
+      
+      openSSLContext = $certkey["#{app}"]
+      
       unless @exist
         # Connect to port 2195 on the server.
         sock = nil
@@ -178,7 +198,7 @@ class App < Sinatra::Base
           sock = TCPSocket.new('gateway.sandbox.push.apple.com', 2195)
         end
         # do our SSL handshaking
-        sslSocket = OpenSSL::SSL::SSLSocket.new(sock, $openSSLContext)
+        sslSocket = OpenSSL::SSL::SSLSocket.new(sock, openSSLContext)
         sslSocket.connect
         #Push.create( :pid => pid )
         Push.insert(:pid => pid)

data/spns.yml

@@ -2,10 +2,5 @@ port: 4567
 mode: development
 cron: cron
 timer: 0	# minute
-development:
-    - certificate   : ck_dev.pem
-production:
-    - certificate   : ck_prod.pem
 apps:
 - app1
-- app2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spns
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -266,8 +266,7 @@ files:
 - cron
 - lib/spns.rb
 - spns.yml
-- !binary |-
-  YmluL3NwbnM=
+- bin/spns
 homepage: http://github.com/eiffelqiu/spns
 licenses:
 - MIT
@@ -283,7 +282,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1511614879207501753
+      hash: 2341524814472371474
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -292,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: spns
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple Push Notification Server