spns 0.2.12 → 0.2.13

data/VERSION

@@ -1 +1 @@
-0.2.12
+0.2.13

data/lib/spns.rb

@@ -15,20 +15,20 @@ require 'yaml'
 ############################################################
 ## Initilization Setup
 ############################################################
-lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-root_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-unless $LOAD_PATH.include?(lib_dir)
-  $LOAD_PATH << lib_dir
+LIBDIR = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+ROOTDIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+unless $LOAD_PATH.include?(LIBDIR)
+  $LOAD_PATH << LIBDIR
 end
 
 unless File.exist?("#{Dir.pwd}/spns.yml") then
   puts 'create config file: spns.yml'
-  system "cp #{root_dir}/spns.yml #{Dir.pwd}/spns.yml"
+  system "cp #{ROOTDIR}/spns.yml #{Dir.pwd}/spns.yml"
 end
 
 unless File.exist?("#{Dir.pwd}/cron") then
   puts "create a demo 'cron' script"
-  system "cp #{root_dir}/cron #{Dir.pwd}/cron"
+  system "cp #{ROOTDIR}/cron #{Dir.pwd}/cron"
 end
 
 ############################################################
@@ -40,8 +40,7 @@ $timer = "#{config['timer']}".to_i
 $cron = config['cron'] || 'cron'
 $port = config['port'] || 4567
 $mode = config['mode'] || env
-ROOTDIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-VERSION = File.open("#{ROOTDIR}/VERSION", "rb").read
+$VERSION = File.open("#{ROOTDIR}/VERSION", "rb").read
 $apps = config['apps'] || []
 
 ############################################################
@@ -77,10 +76,10 @@ unless check_cert then
   exit
 else
   puts "*"*80
-  puts "Simple Push Notification Server is Running (#{VERSION}) ..."
+  puts "Simple Push Notification Server(#{$VERSION}) is Running ..."
   puts "Mode: #{$mode}"
   puts "Port: #{$port}"
-  puts "Cron Job: '#{Dir.pwd}/#{$cron}' script is running every #{$timer} #{($timer == 1) ? 'minute' : 'minutes'} " unless "#{$timer}".squeeze.strip == "0"
+  puts "Cron Job: '#{Dir.pwd}/#{$cron}' script is running every #{$timer} #{($timer == 1) ? 'minute' : 'minutes'} " unless "#{$timer}".to_i == 0
   puts "*"*80
 end
 
@@ -88,8 +87,6 @@ end
 ## Sequel Database Setup
 ############################################################
 
-$DB;
-
 unless File.exist?("#{Dir.pwd}/push.db") then
   $DB = Sequel.connect("sqlite://#{Dir.pwd}/push.db")
 
@@ -123,27 +120,24 @@ unless $timer == 0 then
     system "./#{$cron}"
   end
 else
+  puts "1: How to register notification? (Client Side)"
   puts
-  puts "*"*80
-  puts "How to register notification?"
-  puts
-  puts "iOS Client: in AppDelegate file, didRegisterForRemoteNotificationsWithDeviceToken method should access url below:"
+  puts "In AppDelegate file, inside didRegisterForRemoteNotificationsWithDeviceToken method access url below to register device token:"
   $apps.each { |app|
     puts "'#{app}'s registration url:  http://serverIP:#{$port}/v1/apps/#{app}/DeviceToken"
   }
   puts
-  puts "How to send push notification?"
+  puts "2: How to send push notification? (Server Side)"
   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 "param1 (message): push notification message you want to send, remember the message should be html escaped"
+  puts "param2 (pid    ): unique string to mark the message, for example current timestamp or md5/sha1 digest"
   puts
   puts "*"*80
-  puts
 end
 
 ############################################################
@@ -154,7 +148,7 @@ class App < Sinatra::Base
 
   set :port, "#{$port}".to_i
   
-  if $mode == 'development' then
+  if "#{$mode}".strip == 'development' then
     set :show_exceptions, true
     set :dump_errors, true
   else
@@ -163,7 +157,8 @@ class App < Sinatra::Base
   end
 
   get '/' do
-    puts "Simple Push Notification Server"
+    puts "Simple Push Notification Server #{$VERSION}"
+    puts "written by Eiffel(Q) eiffelqiu@gmail.com"
   end
 
   $apps.each { |app|
@@ -186,10 +181,9 @@ class App < Sinatra::Base
 
       @push = Token.where(:app => app)
       @exist = Push.first(:pid => pid)
-      
-      openSSLContext = $certkey["#{app}"]
-      
+
       unless @exist
+        openSSLContext = $certkey["#{app}"]
         # Connect to port 2195 on the server.
         sock = nil
         if $mode == 'production' then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spns
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +187,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +330,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2341524814472371474
+      hash: -42604517742237939
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: