spns 0.2.4 → 0.2.6

data/README.md

@@ -3,23 +3,12 @@ spns
 Simple Push Notification Server written with Sinatra and Sequel(Sqlite3)
 
 Feature:
-1: rubygem, simple to install.
-2: provide pem file is the only requirement.
-3: no need to setup database, using sqlite3.
-4: provide default config file(spns.yml) with default value.
+* rubygem, simple to install.
+* provide pem file is the only requirement.
+* no need to setup database, using sqlite3.
+* provide default config file(spns.yml) with default value.
 
-Prerequisites
-=======
-
-Ruby
--------
-spns is a ruby gem, require ruby installed on your mac machine. Since now all Mac OSX system preinstalled ruby enviroment, that's not a big issue. 
-
-Rubygem(latest)
--------
-spns require latest rubygem installed, so you need to update your rubygem to latest version, run command below to update your rubygem to the latest one.
-
-	$ sudo gem update --system  # double dash option
+Requirement
 	
 Sqlite3
 -------
@@ -36,17 +25,18 @@ Installation
 	
 Usage
 =======
-1. under the current directory, provide single pem file combined with certificate and key, HOWTO ([Check this link](http://www.raywenderlich.com/3443/apple-push-notification-services-tutorial-part-12))
+* under the current directory, provide single pem file combined with certificate and key, HOWTO ([Check this link](http://www.raywenderlich.com/3443/apple-push-notification-services-tutorial-part-12))
 
-2. edit spns.yml. (when you run spns first time, it will generate this file) ([Check this link](https://raw.github.com/eiffelqiu/spns/master/spns.yml))
+* edit spns.yml. (when you run spns first time, it will generate this file) ([Check this link](https://raw.github.com/eiffelqiu/spns/master/spns.yml))
 
-3. provide a cron script under current directory, default named "cron" according to spns.yml
+* provide a cron script under current directory, default named "cron" according to spns.yml
 
-4. start spns server, default port is 4567(sinatra's default port)
+* start spns server, default port is 4567(sinatra's default port)
 
 ![spns usage](https://raw.github.com/eiffelqiu/spns/master/doc/capture1.png)
 
-== Contributing to spns
+Contributing to spns
+=======
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
@@ -56,8 +46,8 @@ Usage
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+Copyright
+== 
 
-Copyright (c) 2012 Eiffel Qiu. See LICENSE.txt for
-further details.
+Copyright (c) 2012 Eiffel Qiu. See LICENSE.txt for further details.
 

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.6

data/bin/spns

@@ -1,5 +1,5 @@
-# -*- coding: utf-8 -*-
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 require 'rubygems' unless defined?(Gem) 
 require 'sinatra/base'
@@ -23,7 +23,7 @@ unless File.exist?("#{Dir.pwd}/spns.yml") then
 end
 
 unless File.exist?("#{Dir.pwd}/cron") then
-  puts "create a demo 'cron' script under current directory"
+  puts "create a demo 'cron' script"
   system "cp #{root_dir}/cron #{Dir.pwd}/cron"
 end
 

data/cron

@@ -3,6 +3,7 @@
 
 require 'yaml'
 require 'cgi'
+require 'digest/sha2'
 
 ###########################################################################
 ####
@@ -17,13 +18,19 @@ require 'cgi'
 env = ENV['SINATRA_ENV'] || "development"
 config = YAML.load_file("#{Dir.pwd}/spns.yml")
 $port = config['port'] || 4567
- 
+$apps = config['apps'] || []
+
 ############################################################
 ## Using curl command to send push notification message
 ############################################################
 
 @message = CGI::escape("sample push notification message")
+
+#@pid = Digest::SHA2.hexdigest("#{Time.now.to_i}")
 @pid = "#{Time.now.to_i}"
 
-puts "curl http://localhost:#{$port}/v1/app/push/#{@message}/#{@pid}"
-system "curl http://localhost:#{$port}/v1/app/push/#{@message}/#{@pid}"
+$apps.each { |app|
+  sleep 1
+  puts "curl http://localhost:#{$port}/v1/apps/#{app}/push/#{@message}/#{@pid}"
+  system "curl http://localhost:#{$port}/v1/apps/#{app}/push/#{@message}/#{@pid}"
+}

data/lib/spns.rb

@@ -22,8 +22,9 @@ $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__),'..'))
+ROOTDIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 VERSION = File.open("#{ROOTDIR}/VERSION", "rb").read
+$apps = config['apps'] || []
 
 ############################################################
 ## Certificate Key Setup
@@ -31,7 +32,7 @@ VERSION = File.open("#{ROOTDIR}/VERSION", "rb").read
 
 unless File.exist?("#{Dir.pwd}/#{$certificate}") then
   puts "1: please provide certificate key pem file under current directory"
-  puts "2: edit your spns.yml under current directory first"
+  puts "2: edit your spns.yml under current directory"
   puts "3: run spns"
   puts "4: Client: in AppDelegate file, didRegisterForRemoteNotificationsWithDeviceToken method should access this url:  http://serverIP:#{$port}/v1/app/DeviceToken"
   puts "5: Server: cron should access 'curl http://localhost:#{$port}/v1/app/push/#{messages}/#{pid}' to send push message"
@@ -42,7 +43,7 @@ else
   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'} "
+  puts "Cron Job: '#{Dir.pwd}/#{$cron}' script is running every #{$timer} #{($timer == 1) ? 'minute' : 'minutes'} " unless "#{$timer}".squeeze.strip == "0"
   puts "*"*80
 end
 
@@ -78,68 +79,91 @@ Push = DB[:pushes]
 ############################################################
 scheduler = Rufus::Scheduler.start_new
 
-scheduler.every "#{$timer}m" do
-  puts "running job: '#{Dir.pwd}/#{$cron}' every #{$timer} #{($timer == 1) ? 'minute' : 'minutes'}"
-  system "./#{$cron}"
-end 
+unless "#{$timer}".squeeze.strip == "0"
+  scheduler.every "#{$timer}m" do
+    puts "running job: '#{Dir.pwd}/#{$cron}' every #{$timer} #{($timer == 1) ? 'minute' : 'minutes'}"
+    system "./#{$cron}"
+  end
+else
+  puts
+  puts "*"*80
+  puts
+  puts "How to send push notification?"
+  puts
+  $apps.each { |app|
+    puts "curl http://localhost:#{$port}/v1/apps/#{app}/push/{message}/{pid}"
+  }
+  puts
+  puts "Note:"
+  puts "message: notification message you want to send, remember the message should be html escaped"
+  puts "pid: unique id that you mark the message, for example current timestamp"
+  puts
+  puts "*"*80
+  puts
+end
 
 ############################################################
 ## Simple Push Notification Server based on Sinatra
 ############################################################
 
 class App < Sinatra::Base
-  
-  set :port, "#{$port}".to_i 
-  
+
+  set :port, "#{$port}".to_i
+
   get '/' do
     puts "Simple Push Notification Server"
   end
 
-  get '/v1/app/:token' do
-    o = Token.first(:token => params[:token])
-    unless o
-      Token.insert(
-          :app => 'app',
-          :token => params[:token]
-      )
+  $apps.each { |app|
+    get "/v1/apps/#{app}/:token" do
+      puts "#{:token} was added to #{app}"
+      o = Token.first(:token => params[:token])
+      unless o
+        Token.insert(
+            :app => app,
+            :token => params[:token]
+        )
+      end
     end
-  end
 
-  get '/v1/app/push/:message/:pid' do
-    message = CGI::unescape(params[:message])
-    pid = params[:pid]
-    @push = Token.where(:app => 'app')
-    @exist = Push.first(:pid => pid )
-
-    unless @exist
-      # Connect to port 2195 on the server.
-      sock = nil
-      if $mode == 'production' then
-        sock = TCPSocket.new('gateway.push.apple.com', 2195)
-      else
-        sock = TCPSocket.new('gateway.sandbox.push.apple.com', 2195)
+    get "/v1/apps/#{app}/push/:message/:pid" do
+      message = CGI::unescape(params[:message])
+      pid = params[:pid]
+
+      puts "'#{message}' was sent to (#{app}) with pid: [#{pid}]"
+
+      @push = Token.where(:app => app)
+      @exist = Push.first(:pid => pid)
+
+      unless @exist
+        # Connect to port 2195 on the server.
+        sock = nil
+        if $mode == 'production' then
+          sock = TCPSocket.new('gateway.push.apple.com', 2195)
+        else
+          sock = TCPSocket.new('gateway.sandbox.push.apple.com', 2195)
+        end
+        # do our SSL handshaking
+        sslSocket = OpenSSL::SSL::SSLSocket.new(sock, $openSSLContext)
+        sslSocket.connect
+        #Push.create( :pid => pid )
+        Push.insert(:pid => pid)
+        # write our packet to the stream
+        @push.each do |o|
+          tokenText = o[:token]
+          # pack the token to convert the ascii representation back to binary
+          tokenData = [tokenText].pack('H*')
+          # construct the payload
+          payload = "{\"aps\":{\"alert\":\"#{message}\", \"badge\":1}}"
+          # construct the packet
+          packet = [0, 0, 32, tokenData, 0, payload.length, payload].pack("ccca*cca*")
+          # read our certificate and set up our SSL context
+          sslSocket.write(packet)
+        end
+        # cleanup
+        sslSocket.close
+        sock.close
       end
-      # do our SSL handshaking
-      sslSocket = OpenSSL::SSL::SSLSocket.new(sock, $openSSLContext)
-      sslSocket.connect
-      #Push.create( :pid => pid )
-      Push.insert( :pid => pid )
-      # write our packet to the stream
-      @push.each do |o|
-        tokenText = o[:token]
-        # pack the token to convert the ascii representation back to binary
-        tokenData = [tokenText].pack('H*')
-        # construct the payload
-        payload = "{\"aps\":{\"alert\":\"#{message}\", \"badge\":1}}"
-        # construct the packet
-        packet = [0, 0, 32, tokenData, 0, payload.length, payload].pack("ccca*cca*")
-        # read our certificate and set up our SSL context
-        sslSocket.write(packet)
-      end
-      # cleanup
-      sslSocket.close
-      sock.close
     end
-  end
-
+  }
 end

data/spns.yml

@@ -1,8 +1,11 @@
 port: 4567
 mode: development
 cron: cron
-timer: 1	# minute
+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.4
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -315,7 +315,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1770229218471308952
+      hash: -4363883423968780376
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: