bpoweski-apnserver 0.0.7 → 0.0.8

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gemspec.authors = ["Ben Poweski"]
     gemspec.add_dependency 'eventmachine'
     gemspec.add_dependency 'daemons'
+    gemspec.add_dependency 'json'
     gemspec.files = FileList['lib/**/*.rb', 'bin/*', '[A-Z]*', 'test/**/*'].to_a
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/apnserver.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apnserver}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Poweski"]
@@ -17,9 +17,7 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
-    "History.txt",
-     "Manifest.txt",
-     "README.rdoc",
+    "README.rdoc",
      "Rakefile",
      "VERSION",
      "apnserver.gemspec",
@@ -58,12 +56,15 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<daemons>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<daemons>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
   end
 end

data/bin/apnsend

@@ -37,7 +37,6 @@ opts = GetoptLong.new(
 port = nil
 server = nil
 notification = ApnServer::Notification.new
-token = nil
 pem = nil
 
 opts.each do |opt, arg|
@@ -60,24 +59,26 @@ opts.each do |opt, arg|
   when '--custom'
     notification.custom = arg
   when '--b64-token'
-    token = Base64::decode64(arg)
+    notification.device_token = Base64::decode64(arg)
   when '--hex-token'
-    token = arg.unpack('H*')
+    notification.device_token  = arg.unpack('H*')
   end
 end
 
 
-if token.nil?
+if notification.device_token.nil?
   usage  
   exit
 end
   
 if pem.nil?
   @client = TCPSocket.new(server || 'localhost', port || 22195)
+  @client.write(notification.to_bytes)  
 else
   @client = ApnServer::Client.new(pem, server || 'gateway.push.apple.com', port || 2195)
+  @client.connect!
+  @client.write(notification)
 end
   
-@client.write(notification.to_bytes)
 
 

data/bin/apnserverd

@@ -15,20 +15,32 @@ def usage
   puts " --help                               this message"
 end
 
+def daemonize
+  Daemonize.daemonize('apnserverd', 'apnserverd')
+  @pid_file = '/var/run/apnserverd.pid'
+  open(@pid_file,"w") {|f| f.write(Process.pid) } # copied from mongrel
+  open(@pid_file,"w") do |f|
+    f.write(Process.pid)
+    File.chmod(0644, @pid_file)
+  end 
+end
+
 opts = GetoptLong.new(
   ["--bind-address", "-b", GetoptLong::REQUIRED_ARGUMENT],
   ["--proxy-port", "-P", GetoptLong::REQUIRED_ARGUMENT],
   ["--server", "-s", GetoptLong::REQUIRED_ARGUMENT],
   ["--port", "-p", GetoptLong::REQUIRED_ARGUMENT],
   ["--pem", "-c", GetoptLong::REQUIRED_ARGUMENT],
-  ["--help", "-h", GetoptLong::NO_ARGUMENT]
+  ["--help", "-h", GetoptLong::NO_ARGUMENT],
+  ["--daemon", "-d", GetoptLong::NO_ARGUMENT]
 )
 
 bind_address = '0.0.0.0'
 proxy_port = 22195
-server = 'gateway.push.apple.com'
+host = 'gateway.push.apple.com'
 port = 2295
 pem = nil
+daemon = false
 
 opts.each do |opt, arg|
   case opt
@@ -37,13 +49,15 @@ opts.each do |opt, arg|
   when '--bind-address'
     bind_address = arg
   when '--proxy-port'
-	proxy_port = arg.to_i
+    proxy_port = arg.to_i
   when '--server'
-  	server = arg
+  	host = arg
   when '--port'
-  	port = arg
+  	port = arg.to_i
   when '--pem'
     pem = arg
+  when '--daemon'
+    daemon = true
   end
 end
 
@@ -51,13 +65,9 @@ if pem.nil?
   usage
   exit 1
 else
-  Daemonize.daemonize('apnserverd', 'apnserverd')
-  @pid_file = '/var/run/apnserverd.pid'
-  open(@pid_file,"w") {|f| f.write(Process.pid) } # copied from mongrel
-  open(@pid_file,"w") do |f|
-	  f.write(Process.pid)
-      File.chmod(0644, @pid_file)
-  end 
+  daemonize if daemon
   server = ApnServer::Server.new(pem, bind_address, proxy_port)
+  server.client.host = host
+  server.client.port = port
   server.start!
 end

data/lib/apnserver/client.rb

@@ -18,7 +18,7 @@ module ApnServer
       @context.cert = OpenSSL::X509::Certificate.new(File.read(self.pem))
       @context.key  = OpenSSL::PKey::RSA.new(File.read(self.pem), self.password)
       
-      @sock         = TCPSocket.new(self.host, self.port)
+      @sock         = TCPSocket.new(self.host, self.port.to_i)
       @ssl          = OpenSSL::SSL::SSLSocket.new(@sock, @context)
       @ssl.connect
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bpoweski-apnserver
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Ben Poweski
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: A toolkit for proxying and sending Apple Push Notifications
 email: bpoweski@3factors.com
 executables: 
@@ -42,8 +52,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- History.txt
-- Manifest.txt
 - README.rdoc
 - Rakefile
 - VERSION

data/History.txt

@@ -1,4 +0,0 @@
-=== 0.0.1 2009-09-10
-
-* 1 major enhancement:
-  * Initial release

data/Manifest.txt

@@ -1,23 +0,0 @@
-History.txt
-Manifest.txt
-PostInstall.txt
-README
-README.rdoc
-Rakefile
-bin/apns
-bin/apnserverd
-lib/apnserver.rb
-lib/apnserver/client.rb
-lib/apnserver/notification.rb
-lib/apnserver/payload.rb
-lib/apnserver/server.rb
-script/console
-script/console.cmd
-script/destroy
-script/destroy.cmd
-script/generate
-script/generate.cmd
-test/notification_test.rb
-test/payload_test.rb
-test/test_apnserver.rb
-test/test_helper.rb