apn_sender 0.0.6 → 0.0.7

data/VERSION

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

data/apn_sender.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apn_sender}
-  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 = ["Kali Donovan"]
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "apn_sender.gemspec",
      "contrib/apn_sender.monitrc",
-     "generators/apple_push_notification_generator.rb",
+     "generators/apn_sender_generator.rb",
      "generators/templates/script",
      "init.rb",
      "lib/apn.rb",

data/generators/{apple_push_notification_generator.rb → apn_sender_generator.rb}

@@ -1,4 +1,4 @@
-class ApplePushNotificationGenerator < Rails::Generator::Base
+class ApnSenderGenerator < Rails::Generator::Base
 
   def manifest
     record do |m|

data/generators/templates/script

@@ -3,5 +3,8 @@
 # Daemons sets pwd to /, so we have to explicitly set RAILS_ROOT
 RAILS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
-require File.join(File.dirname(__FILE__), *%w(.. vendor plugins apple_push_notification lib apple_push_notification sender_daemon))
+require 'rubygems'
+require 'apn'
+require 'apn/sender_daemon'
+
 APN::SenderDaemon.new(ARGV).daemonize

data/lib/apn/connection/base.rb

@@ -11,7 +11,7 @@ module APN
         @opts = opts
 
         setup_logger
-        apn_log(:info, "APN::Sender initializing. Establishing connections first...") if @opts[:verbose]
+        log(:info, "APN::Sender initializing. Establishing connections first...") if @opts[:verbose]
         setup_paths
 
         super( APN::QUEUE_NAME ) if self.class.ancestors.include?(Resque::Worker)
@@ -33,8 +33,19 @@ module APN
         end
       end
       
-      def apn_log(level, message)
-        return false unless self.logger
+      # Log message to any logger provided by the user (e.g. the Rails logger).
+      # Accepts +log_level+, +message+, since that seems to make the most sense,
+      # and just +message+, to be compatible with Resque's log method and to enable
+      # sending verbose and very_verbose worker messages to e.g. the rails logger.#
+      #
+      # Perhaps a method definition of +message, +level+ would make more sense, but
+      # that's also the complete opposite of what anyone comming from rails would expect.
+      alias_method(:resque_log, :log) if defined?(log)
+      def log(level, message = nil)
+        level, message = 'info', level if message.nil? # Handle only one argument if called from Resque, which expects only message
+
+        resque_log(message) if defined?(resque_log)
+        return false unless self.logger && self.logger.respond_to?(level)
         self.logger.send(level, "#{Time.now}: #{message}")
       end
       
@@ -71,24 +82,24 @@ module APN
         @socket.sync = true
         @socket.connect
       rescue SocketError => error
-        apn_log(:error, "Error with connection to #{apn_host}: #{error}")
+        log(:error, "Error with connection to #{apn_host}: #{error}")
         raise "Error with connection to #{apn_host}: #{error}"      
       end
 
       # Close open sockets
       def teardown_connection
-        apn_log(:info, "Closing connections...") if @opts[:verbose]
+        log(:info, "Closing connections...") if @opts[:verbose]
 
         begin
           @socket.close if @socket
         rescue Exception => e
-          apn_log(:error, "Error closing SSL Socket: #{e}")
+          log(:error, "Error closing SSL Socket: #{e}")
         end
 
         begin
           @socket_tcp.close if @socket_tcp
         rescue Exception => e
-          apn_log(:error, "Error closing TCP Socket: #{e}")
+          log(:error, "Error closing TCP Socket: #{e}")
         end
       end
       

data/lib/apn/feedback.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/connection/base')
+require 'apn/connection/base'
 
 module APN
   # Encapsulates data returned from the {APN Feedback Service}[http://developer.apple.com/iphone/library/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingWIthAPS/CommunicatingWIthAPS.html#//apple_ref/doc/uid/TP40008194-CH101-SW3].

data/lib/apn/sender.rb

@@ -24,7 +24,7 @@ module APN
       
       self.socket.write( notification.to_s )
     rescue SocketError => error
-      apn_log(:error, "Error with connection to #{apn_host} (attempt #{attempt}): #{error}")
+      log(:error, "Error with connection to #{apn_host} (attempt #{attempt}): #{error}")
       
       # Try reestablishing the connection
       teardown_connection

data/lib/apn/sender_daemon.rb

@@ -5,11 +5,9 @@ require 'optparse'
 
 module APN
   class SenderDaemon
-    attr_accessor :worker_count
     
     def initialize(args)
-      @options = {:quiet => true}
-      @worker_count = 1
+      @options = {:quiet => true, :worker_count => 1, :environment => :development}
       
       opts = OptionParser.new do |opts|
         opts.banner = "Usage: #{File.basename($0)} [options] start|stop|restart|run"
@@ -24,16 +22,29 @@ module APN
         opts.on('--cert-path=NAME', '--certificate-path=NAME', 'Path to directory containing apn .pem certificates.') do |path|
           @options[:cert_path] = path
         end
-        opts.on('-n', '--number_of_workers=workers', "Number of unique workers to spawn") do |worker_count|
-          @worker_count = worker_count.to_i rescue 1
+        opts.on('-n', '--number_of_workers=WORKERS', "Number of unique workers to spawn") do |worker_count|
+          @options[:worker_count] = worker_count.to_i rescue 1
+        end
+        opts.on('-v', '--verbose', "Turn on verbose mode") do
+          @options[:verbose] = true
+        end
+        opts.on('-V', '--very_verbose', "Turn on very verbose mode") do
+          @options[:very_verbose] = true
+        end
+        opts.on('-d', '--delay=D', "Delay between rounds of work (seconds)") do |d|
+          @options[:delay] = d
         end
       end
-      @args = opts.parse!(args)
+      
+      # If no arguments, give help screen
+      @args = optparse.parse!(args.empty? ? ['-h'] : args)
+      
+      puts "OPTS: #{@options.inspect}"
     end
   
     def daemonize
-      worker_count.times do |worker_index|
-        process_name = worker_count == 1 ? "apn_sender" : "apn_sender.#{worker_index}"
+      @options[:worker_count].times do |worker_index|
+        process_name = @options[:worker_count] == 1 ? "apn_sender" : "apn_sender.#{worker_index}"
         Daemons.run_proc(process_name, :dir => "#{::RAILS_ROOT}/tmp/pids", :dir_mode => :normal, :ARGV => @args) do |*args|
           run process_name
         end
@@ -49,14 +60,14 @@ module APN
       logger.level = ActiveRecord::Base.logger.level
       ActiveRecord::Base.logger = logger
       ActiveRecord::Base.clear_active_connections!
-      APN::Sender.logger = logger
       
       worker = APN::Sender.new(@options)
+      worker.logger = logger
       worker.verbose = @options[:verbose]
       worker.very_verbose = @options[:very_verbose]
-      worker.work(@options[:delay] || 5)
+      worker.work(@options[:delay])
     rescue => e
-      logger.fatal e
+      logger.fatal(e) if logger.respond_to?(:fatal)
       STDERR.puts e.message
       exit 1
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: apn_sender
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Kali Donovan
@@ -50,7 +50,7 @@ files:
 - VERSION
 - apn_sender.gemspec
 - contrib/apn_sender.monitrc
-- generators/apple_push_notification_generator.rb
+- generators/apn_sender_generator.rb
 - generators/templates/script
 - init.rb
 - lib/apn.rb