bpoweski-apnserver 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/apnserver.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apnserver}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Poweski"]
-  s.date = %q{2009-09-14}
+  s.date = %q{2009-09-15}
   s.description = %q{A toolkit for proxying and sending Apple Push Notifications}
   s.email = %q{bpoweski@3factors.com}
-  s.executables = ["apns", "apnsend", "apnserverd"]
+  s.executables = ["apnsend", "apnserverd"]
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "apnserver.gemspec",
-     "bin/apns",
      "bin/apnsend",
      "bin/apnserverd",
      "lib/apnserver.rb",

data/bin/apnsend

@@ -5,9 +5,79 @@ require 'getoptlong'
 require 'rubygems'
 require 'apnserver'
 require 'base64'
+require 'socket'
+
+def usage
+  puts "Usage: apnsend [switches] (--b64-token | --hex-token) <token>"
+  puts " --server <localhost>                 the apn server defaults to a locally running apnserverd"
+  puts " --port <2195>                        the port of the apn server"
+  puts " --pem <path>                         the path to the pem file, if a pem is supplied the server defaults to gateway.push.apple.com:2195"
+  puts " --alert <message>                    the message to send"
+  puts " --sound <default>                    the sound to play, defaults to 'default'"
+  puts " --badge <number>                     the badge number"
+  puts " --custom <json string>               a custom json string to be added to the main object"  
+  puts " --b64-token <token>                  a base 64 encoded device token"
+  puts " --hex-token <token>                  a hex encoded device token"  
+  puts " --help                               this message"
+end
+
+opts = GetoptLong.new(
+  ["--server", "-s", GetoptLong::REQUIRED_ARGUMENT],
+  ["--port", "-p", GetoptLong::REQUIRED_ARGUMENT],
+  ["--pem", "-c", GetoptLong::REQUIRED_ARGUMENT],
+  ["--alert", "-a", GetoptLong::REQUIRED_ARGUMENT],
+  ["--sound", "-S", GetoptLong::REQUIRED_ARGUMENT],
+  ["--badge", "-b", GetoptLong::REQUIRED_ARGUMENT],
+  ["--custom", "-j", GetoptLong::REQUIRED_ARGUMENT],  
+  ["--b64-token", "-B", GetoptLong::REQUIRED_ARGUMENT],
+  ["--hex-token", "-H", GetoptLong::REQUIRED_ARGUMENT],
+  ["--help", "-h", GetoptLong::NO_ARGUMENT]
+)
+
+port = nil
+server = nil
+notification = ApnServer::Notification.new
+token = nil
+pem = nil
+
+opts.each do |opt, arg|
+  case opt
+  when '--help'
+    usage
+    exit
+  when '--server'
+    server = arg
+  when '--port'
+    port = arg
+  when '--pem'
+    pem = arg
+  when '--alert'
+    notification.alert = arg
+  when '--sound'
+    notification.sound = arg
+  when '--badge'
+    notification.badge = arg
+  when '--custom'
+    notification.custom = arg
+  when '--b64-token'
+    token = Base64::decode64(arg)
+  when '--hex-token'
+    token = arg.unpack('H*')
+  end
+end
+
+
+if token.nil?
+  usage  
+  exit
+end
+  
+if pem.nil?
+  @client = TCPSocket.new(server || 'localhost', port || 22195)
+else
+  @client = ApnServer::Client.new(pem, server || 'gateway.push.apple.com', port || 2195)
+end
+  
+@client.write(notification.to_bytes)
 
-client = ApnServer::Client.new(ARGV.first)
-client.connect!
 
-token = Base64.decode64(ARGV.last)
-client.write("\0\0 #{token}\0#{22.chr}{\"aps\":{\"alert\":\"Hi\"}}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bpoweski-apnserver
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Ben Poweski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-14 00:00:00 -07:00
+date: 2009-09-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,6 @@ dependencies:
 description: A toolkit for proxying and sending Apple Push Notifications
 email: bpoweski@3factors.com
 executables: 
-- apns
 - apnsend
 - apnserverd
 extensions: []
@@ -49,7 +48,6 @@ files:
 - Rakefile
 - VERSION
 - apnserver.gemspec
-- bin/apns
 - bin/apnsend
 - bin/apnserverd
 - lib/apnserver.rb
@@ -66,6 +64,7 @@ files:
 - test/test_protocol.rb
 has_rdoc: false
 homepage: http://github.com/bpoweski/apnserver
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -86,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Apple Push Notification Server

data/bin/apns

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'socket'
-require 'base64'
-require 'rubygems'
-
-socket = TCPSocket.new('localhost', 22195)
-token = Base64.decode64(ARGV.last)
-socket.write("\0\0 #{token}\0#{22.chr}{\"aps\":{\"alert\":\"Hi\"}}")
-socket.close