bpoweski-apnserver 0.0.14 → 0.0.15

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/bin/apnsend

@@ -9,7 +9,7 @@ require 'apnserver'
 require 'base64'
 require 'socket'
 
-$logger = Logger.new(STDOUT)
+$log = Logger.new(STDOUT)
 
 
 def usage

data/bin/apnserverd

@@ -6,8 +6,6 @@ require 'rubygems'
 require 'daemons'
 require 'apnserver'
 
-$logger = Logger.new(STDOUT)
-
 def usage
   puts "Usage: apnserverd [switches] --pem <path>"
   puts " --bind-address [0.0.0.0]             bind address of proxy"
@@ -60,16 +58,20 @@ opts.each do |opt, arg|
     pem = arg
   when '--daemon'
     daemon = true
-    $logger = Logger.new('/var/log/apnserverd.log', 'weekly')
   end
 end
 
+$log = Logger.new(STDOUT) unless $log
+
 if pem.nil?
   usage
   exit 1
 else
-  daemonize if daemon
-  server = ApnServer::Server.new(pem, bind_address, proxy_port)
+  if daemon
+    daemonize 
+    $stdout = File.new('/var/log/apnserverd', 'a')
+  end
+  server = ApnServer::Server.new(pem, bind_address, proxy_port, $log)
   server.client.host = host
   server.client.port = port
   server.start!

data/lib/apnserver/client.rb

@@ -31,7 +31,7 @@ module ApnServer
     end
     
     def write(notification)
-      $logger.info "[#{host}:#{port}] Device: #{notification.device_token.unpack('H*')} sending #{notification.json_payload}"
+      puts "[#{host}:#{port}] Device: #{notification.device_token.unpack('H*')} sending #{notification.json_payload}"
       @ssl.write(notification.to_bytes)
     end
     

data/lib/apnserver/protocol.rb

@@ -3,11 +3,11 @@ module ApnServer
     
     def post_init
       @address = Socket.unpack_sockaddr_in(self.get_peername)
-      $logger.debug "[#{address.last}:#{address.first}] CONNECT"
+      puts "[#{address.last}:#{address.first}] CONNECT"
     end
     
     def unbind
-      $logger.debug  "[#{address.last}:#{address.first}] DISCONNECT"    
+      puts "[#{address.last}:#{address.first}] DISCONNECT"    
     end
     
     def receive_data(data)

data/lib/apnserver/server.rb

@@ -3,7 +3,7 @@ module ApnServer
   class Server
     attr_accessor :client, :bind_address, :port
     
-    def initialize(pem, bind_address = '0.0.0.0', port = 22195)
+    def initialize(pem, bind_address = '0.0.0.0', port = 22195, log = nil)
       @queue = EM::Queue.new
       @client = ApnServer::Client.new(pem)
       @bind_address, @port = bind_address, port
@@ -11,7 +11,8 @@ module ApnServer
     
     def start!
       EventMachine::run do
-        $logger.info "Starting APN Server on #{bind_address}:#{port}"
+        $log = log || Logger.new(STDOUT)
+        $log.info "Starting APN Server on #{bind_address}:#{port}"
         
         EM.start_server(bind_address, port, ApnServer::ServerConnection) do |s|
           s.queue = @queue

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bpoweski-apnserver
 version: !ruby/object:Gem::Version 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
 - Ben Poweski
@@ -56,7 +56,6 @@ files:
 - README.textile
 - Rakefile
 - VERSION
-- apnserver.gemspec
 - bin/apnsend
 - bin/apnserverd
 - bin/apnserverd.fedora.init

data/apnserver.gemspec

@@ -1,71 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{apnserver}
-  s.version = "0.0.14"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ben Poweski"]
-  s.date = %q{2009-09-17}
-  s.description = %q{A toolkit for proxying and sending Apple Push Notifications}
-  s.email = %q{bpoweski@3factors.com}
-  s.executables = ["apnsend", "apnserverd", "apnserverd.fedora.init"]
-  s.extra_rdoc_files = [
-    "README.textile"
-  ]
-  s.files = [
-    "README.textile",
-     "Rakefile",
-     "VERSION",
-     "apnserver.gemspec",
-     "bin/apnsend",
-     "bin/apnserverd",
-     "bin/apnserverd.fedora.init",
-     "lib/apnserver.rb",
-     "lib/apnserver/client.rb",
-     "lib/apnserver/notification.rb",
-     "lib/apnserver/payload.rb",
-     "lib/apnserver/protocol.rb",
-     "lib/apnserver/server.rb",
-     "lib/apnserver/server_connection.rb",
-     "test/test_client.rb",
-     "test/test_helper.rb",
-     "test/test_notification.rb",
-     "test/test_payload.rb",
-     "test/test_protocol.rb"
-  ]
-  s.homepage = %q{http://github.com/bpoweski/apnserver}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Apple Push Notification Server}
-  s.test_files = [
-    "test/test_client.rb",
-     "test/test_helper.rb",
-     "test/test_notification.rb",
-     "test/test_payload.rb",
-     "test/test_protocol.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    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