rapns 3.1.0 → 3.2.0

data/spec/unit/daemon_spec.rb

@@ -1,4 +1,4 @@
-require "unit_spec_helper"
+require 'unit_spec_helper'
 
 describe Rapns::Daemon, "when starting" do
   module Rails; end
@@ -7,41 +7,43 @@ describe Rapns::Daemon, "when starting" do
   let(:password) { stub }
   let(:config) { stub(:pid_file => nil, :airbrake_notify => false,
     :foreground => true, :embedded => false, :push => false) }
-  let(:logger) { stub(:info => nil, :error => nil, :warn => nil) }
+  let(:logger) { stub(:logger, :info => nil, :error => nil, :warn => nil) }
 
   before do
     Rapns.stub(:config => config)
+    Rapns::Logger.stub(:new => logger)
     Rapns::Daemon::Feeder.stub(:start)
-    Rapns::Daemon::Logger.stub(:new).and_return(logger)
     Rapns::Daemon::AppRunner.stub(:sync => nil, :stop => nil)
     Rapns::Daemon.stub(:daemonize => nil, :reconnect_database => nil, :exit => nil, :puts => nil)
     File.stub(:open)
     Rails.stub(:root).and_return("/rails_root")
   end
 
-  it "forks into a daemon if the foreground option is false" do
-    config.stub(:foreground => false)
-    ActiveRecord::Base.stub(:establish_connection)
-    Rapns::Daemon.should_receive(:daemonize)
-    Rapns::Daemon.start
-  end
+  unless defined?(JRUBY_VERSION)
+    it "forks into a daemon if the foreground option is false" do
+      config.stub(:foreground => false)
+      ActiveRecord::Base.stub(:establish_connection)
+      Rapns::Daemon.should_receive(:daemonize)
+      Rapns::Daemon.start
+    end
 
-  it "does not fork into a daemon if the foreground option is true" do
-    config.stub(:foreground => true)
-    Rapns::Daemon.should_not_receive(:daemonize)
-    Rapns::Daemon.start
-  end
+    it "does not fork into a daemon if the foreground option is true" do
+      config.stub(:foreground => true)
+      Rapns::Daemon.should_not_receive(:daemonize)
+      Rapns::Daemon.start
+    end
 
-  it "does not fork into a daemon if the push option is true" do
-    config.stub(:push => true)
-    Rapns::Daemon.should_not_receive(:daemonize)
-    Rapns::Daemon.start
-  end
+    it "does not fork into a daemon if the push option is true" do
+      config.stub(:push => true)
+      Rapns::Daemon.should_not_receive(:daemonize)
+      Rapns::Daemon.start
+    end
 
-  it "does not fork into a daemon if the embedded option is true" do
-    config.stub(:embedded => true)
-    Rapns::Daemon.should_not_receive(:daemonize)
-    Rapns::Daemon.start
+    it "does not fork into a daemon if the embedded option is true" do
+      config.stub(:embedded => true)
+      Rapns::Daemon.should_not_receive(:daemonize)
+      Rapns::Daemon.start
+    end
   end
 
   it 'sets up setup signal traps' do
@@ -55,12 +57,6 @@ describe Rapns::Daemon, "when starting" do
     Rapns::Daemon.start
   end
 
-  it 'does not setup signal traps when in push mode' do
-    config.stub(:push => true)
-    Rapns::Daemon.should_not_receive(:setup_signal_traps)
-    Rapns::Daemon.start
-  end
-
   it "writes the process ID to the PID file" do
     Rapns::Daemon.should_receive(:write_pid_file)
     Rapns::Daemon.start
@@ -82,52 +78,6 @@ describe Rapns::Daemon, "when starting" do
     Rapns::Daemon::AppRunner.should_receive(:sync)
     Rapns::Daemon.start
   end
-
-  it "sets up the logger" do
-    config.stub(:airbrake_notify => true)
-    Rapns::Daemon::Logger.should_receive(:new).with(:foreground => true, :airbrake_notify => true)
-    Rapns::Daemon.start
-  end
-
-  it "makes the logger accessible" do
-    Rapns::Daemon.start
-    Rapns::Daemon.logger.should == logger
-  end
-
-  it 'prints a warning if there are no apps' do
-    Rapns::App.stub(:count => 0)
-    logger.should_receive(:warn).any_number_of_times
-    Rapns::Daemon.start
-  end
-
-  it 'prints a warning exists if rapns has not been upgraded' do
-    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
-    Rapns::Daemon.should_receive(:puts).any_number_of_times
-    Rapns::Daemon.should_receive(:exit).with(1)
-    Rapns::Daemon.start
-  end
-
-  it 'does not exit if Rapns has not been upgraded and is embedded' do
-    config.stub(:embedded => true)
-    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
-    Rapns::Daemon.should_receive(:puts).any_number_of_times
-    Rapns::Daemon.should_not_receive(:exit)
-    Rapns::Daemon.start
-  end
-
-  it 'does not exit if Rapns has not been upgraded and is in push mode' do
-    config.stub(:push => true)
-    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
-    Rapns::Daemon.should_receive(:puts).any_number_of_times
-    Rapns::Daemon.should_not_receive(:exit)
-    Rapns::Daemon.start
-  end
-
-  it 'warns if rapns.yml still exists' do
-    File.should_receive(:exists?).with('/rails_root/config/rapns/rapns.yml').and_return(true)
-    logger.should_receive(:warn).with("Since 2.0.0 rapns uses command-line options and a Ruby based configuration file.\nPlease run 'rails g rapns' to generate a new configuration file into config/initializers.\nRemove config/rapns/rapns.yml to avoid this warning.\n")
-    Rapns::Daemon.start
-  end
 end
 
 describe Rapns::Daemon, "when being shutdown" do

data/spec/unit/embed_spec.rb

@@ -23,6 +23,8 @@ describe Rapns, 'embed' do
 end
 
 describe Rapns, 'shutdown' do
+  before { Rapns.config.embedded = true }
+
   it 'shuts down the daemon' do
     Rapns::Daemon.should_receive(:shutdown)
     Rapns.shutdown
@@ -30,6 +32,8 @@ describe Rapns, 'shutdown' do
 end
 
 describe Rapns, 'sync' do
+  before { Rapns.config.embedded = true }
+
   it 'syncs the AppRunner' do
     Rapns::Daemon::AppRunner.should_receive(:sync)
     Rapns.sync
@@ -37,6 +41,8 @@ describe Rapns, 'sync' do
 end
 
 describe Rapns, 'debug' do
+  before { Rapns.config.embedded = true }
+
   it 'debugs the AppRunner' do
     Rapns::Daemon::AppRunner.should_receive(:debug)
     Rapns.debug

data/spec/unit/gcm/app_spec.rb

@@ -1,5 +1,4 @@
 require 'unit_spec_helper'
 
 describe Rapns::Gcm::App do
-  it { should validate_presence_of(:auth_key) }
-end
+end

data/spec/unit/gcm/notification_spec.rb

@@ -10,8 +10,6 @@ describe Rapns::Gcm::Notification do
   let(:data_setter) { 'data=' }
   let(:data_getter) { 'data' }
 
-  it { should validate_presence_of :registration_ids }
-
   it "has a 'data' payload limit of 4096 bytes" do
     notification.data = { :key => "a" * 4096 }
     notification.valid?.should be_false

data/spec/unit/{daemon/logger_spec.rb → logger_spec.rb}

@@ -16,11 +16,11 @@ module HoptoadNotifier
 end
 
 module Airbrake
-  def self.notify(e)
+  def self.notify_or_ignore(e)
   end
 end
 
-describe Rapns::Daemon::Logger do
+describe Rapns::Logger do
   let(:log) { stub(:sync= => true) }
   let(:config) { stub(:airbrake_notify => true) }
 
@@ -29,7 +29,6 @@ describe Rapns::Daemon::Logger do
     @buffered_logger = mock("BufferedLogger", :info => nil, :error => nil, :level => 0, :auto_flushing => 1, :auto_flushing= => nil)
     Rails.logger = @buffered_logger
     ActiveSupport::BufferedLogger.stub(:new).and_return(@buffered_logger)
-    Rapns::Daemon.stub(:config => config)
     File.stub(:open => log)
     STDERR.stub(:puts)
   end
@@ -38,32 +37,32 @@ describe Rapns::Daemon::Logger do
     File.stub(:open).and_raise(Errno::ENOENT)
     STDERR.should_receive(:puts).with(/No such file or directory/)
     STDERR.should_receive(:puts).with(/Logging disabled/)
-    Rapns::Daemon::Logger.new(:foreground => true)
+    Rapns::Logger.new(:foreground => true)
   end
 
   it "should open the a log file in the Rails log directory" do
     File.should_receive(:open).with('/rails_root/log/rapns.log', 'a')
-    Rapns::Daemon::Logger.new(:foreground => true)
+    Rapns::Logger.new(:foreground => true)
   end
 
   it 'sets sync mode on the log descriptor' do
     log.should_receive(:sync=).with(true)
-    Rapns::Daemon::Logger.new(:foreground => true)
+    Rapns::Logger.new(:foreground => true)
   end
 
   it 'instantiates the BufferedLogger' do
     ActiveSupport::BufferedLogger.should_receive(:new).with(log, Rails.logger.level)
-    Rapns::Daemon::Logger.new(:foreground => true)
+    Rapns::Logger.new(:foreground => true)
   end
 
   it "should print out the msg if running in the foreground" do
-    logger = Rapns::Daemon::Logger.new(:foreground => true)
+    logger = Rapns::Logger.new(:foreground => true)
     STDOUT.should_receive(:puts).with(/hi mom/)
     logger.info("hi mom")
   end
 
   it "should not print out the msg if not running in the foreground" do
-    logger = Rapns::Daemon::Logger.new(:foreground => false)
+    logger = Rapns::Logger.new(:foreground => false)
     STDOUT.should_not_receive(:puts).with(/hi mom/)
     logger.info("hi mom")
   end
@@ -71,19 +70,19 @@ describe Rapns::Daemon::Logger do
   it "should prefix log lines with the current time" do
     now = Time.now
     Time.stub(:now).and_return(now)
-    logger = Rapns::Daemon::Logger.new(:foreground => false)
+    logger = Rapns::Logger.new(:foreground => false)
     @buffered_logger.should_receive(:info).with(/#{Regexp.escape("[#{now.to_s(:db)}]")}/)
     logger.info("blah")
   end
 
   it "should prefix error logs with the ERROR label" do
-    logger = Rapns::Daemon::Logger.new(:foreground => false)
+    logger = Rapns::Logger.new(:foreground => false)
     @buffered_logger.should_receive(:error).with(/#{Regexp.escape("[ERROR]")}/)
     logger.error("eeek")
   end
 
   it "should prefix warn logs with the WARNING label" do
-    logger = Rapns::Daemon::Logger.new(:foreground => false)
+    logger = Rapns::Logger.new(:foreground => false)
     @buffered_logger.should_receive(:warn).with(/#{Regexp.escape("[WARNING]")}/)
     logger.warn("eeek")
   end
@@ -91,7 +90,7 @@ describe Rapns::Daemon::Logger do
   it "should handle an Exception instance" do
     e = RuntimeError.new("hi mom")
     e.stub(:backtrace => [])
-    logger = Rapns::Daemon::Logger.new(:foreground => false)
+    logger = Rapns::Logger.new(:foreground => false)
     @buffered_logger.should_receive(:error).with(/RuntimeError, hi mom/)
     logger.error(e)
   end
@@ -99,7 +98,7 @@ describe Rapns::Daemon::Logger do
   it "should notify Airbrake of the exception" do
     e = RuntimeError.new("hi mom")
     e.stub(:backtrace => [])
-    logger = Rapns::Daemon::Logger.new(:foreground => false, :airbrake_notify => true)
+    logger = Rapns::Logger.new(:foreground => false, :airbrake_notify => true)
     Airbrake.should_receive(:notify_or_ignore).with(e)
     logger.error(e)
   end
@@ -111,7 +110,7 @@ describe Rapns::Daemon::Logger do
 
     after do
       module Airbrake
-        def self.notify(e)
+        def self.notify_or_ignore(e)
         end
       end
     end
@@ -119,7 +118,7 @@ describe Rapns::Daemon::Logger do
     it "should notify using HoptoadNotifier" do
       e = RuntimeError.new("hi mom")
       e.stub(:backtrace => [])
-      logger = Rapns::Daemon::Logger.new(:foreground => false, :airbrake_notify => true)
+      logger = Rapns::Logger.new(:foreground => false, :airbrake_notify => true)
       HoptoadNotifier.should_receive(:notify_or_ignore).with(e)
       logger.error(e)
     end
@@ -128,7 +127,7 @@ describe Rapns::Daemon::Logger do
   it "should not notify Airbrake of the exception if the airbrake_notify option is false" do
     e = RuntimeError.new("hi mom")
     e.stub(:backtrace => [])
-    logger = Rapns::Daemon::Logger.new(:foreground => false, :airbrake_notify => false)
+    logger = Rapns::Logger.new(:foreground => false, :airbrake_notify => false)
     Airbrake.should_not_receive(:notify_or_ignore).with(e)
     logger.error(e)
   end
@@ -136,13 +135,13 @@ describe Rapns::Daemon::Logger do
   it "should not notify Airbrake if explicitly disabled in the call to error" do
     e = RuntimeError.new("hi mom")
     e.stub(:backtrace => [])
-    logger = Rapns::Daemon::Logger.new(:foreground => false, :airbrake_notify => true)
+    logger = Rapns::Logger.new(:foreground => false, :airbrake_notify => true)
     Airbrake.should_not_receive(:notify_or_ignore).with(e)
     logger.error(e, :airbrake_notify => false)
   end
 
   it "should not attempt to notify Airbrake of the error is not an Exception" do
-    logger = Rapns::Daemon::Logger.new(:foreground => false)
+    logger = Rapns::Logger.new(:foreground => false)
     Airbrake.should_not_receive(:notify_or_ignore)
     logger.error("string error message")
   end
@@ -150,7 +149,7 @@ describe Rapns::Daemon::Logger do
   it 'defaults auto_flushing to true if the Rails logger does not respond to auto_flushing' do
     rails_logger = mock(:info => nil, :error => nil, :level => 0)
     Rails.logger = rails_logger
-    logger = Rapns::Daemon::Logger.new({})
+    logger = Rapns::Logger.new({})
     @buffered_logger.auto_flushing.should be_true
   end
 end

data/spec/unit/notification_spec.rb

@@ -1,6 +1,4 @@
 require "unit_spec_helper"
 
 describe Rapns::Notification do
-  it { should validate_numericality_of(:expiry) }
-  it { should validate_presence_of(:app) }
-end
+end

data/spec/unit/push_spec.rb

@@ -1,9 +1,10 @@
 require 'unit_spec_helper'
 
 describe Rapns, 'push' do
-    before do
-    Rapns::Daemon.stub(:start)
-    Rapns::Daemon.stub(:shutdown)
+  before do
+    Rapns::Upgraded.stub(:check => nil)
+    Rapns::Daemon::AppRunner.stub(:sync => nil, :wait => nil)
+    Rapns::Daemon::Feeder.stub(:start => nil)
   end
 
   it 'sets the push config option to true' do
@@ -11,18 +12,28 @@ describe Rapns, 'push' do
     Rapns.config.push.should be_true
   end
 
-  it 'starts the daemon' do
-    Rapns::Daemon.should_receive(:start)
+  it 'syncs the app runner' do
+    Rapns::Daemon::AppRunner.should_receive(:sync)
     Rapns.push
   end
 
-  it 'shuts down the daemon' do
-    Rapns::Daemon.should_receive(:shutdown).with(true)
+  it 'starts the feeder' do
+    Rapns::Daemon::Feeder.should_receive(:start)
+    Rapns.push
+  end
+
+  it 'waits on the app runner' do
+    Rapns::Daemon::AppRunner.should_receive(:wait)
+    Rapns.push
+  end
+
+  it 'stops on the app runner' do
+    Rapns::Daemon::AppRunner.should_receive(:stop)
     Rapns.push
   end
 
   it 'overrides the default config options with those given as a hash' do
-    Rapns.config.push_poll = 4
-    expect { Rapns.push(:push_poll => 2) }.to change(Rapns.config, :push_poll).to(2)
+    Rapns.config.batch_size = 20
+    expect { Rapns.push(:batch_size => 10) }.to change(Rapns.config, :batch_size).to(10)
   end
 end

data/spec/unit/rapns_spec.rb

@@ -0,0 +1,9 @@
+require 'unit_spec_helper'
+
+describe Rapns do
+  it "lazy initializes the logger" do
+    Rapns.config.stub(:airbrake_notify => true, :foreground => true)
+    Rapns::Logger.should_receive(:new).with(:foreground => true, :airbrake_notify => true)
+    Rapns.logger
+  end
+end

data/spec/unit/upgraded_spec.rb

@@ -0,0 +1,46 @@
+require 'unit_spec_helper'
+
+describe Rapns::Upgraded do
+  let(:logger) { stub(:logger, :warn => nil) }
+  let(:config) { stub(:config) }
+
+  before do
+    Rails.stub(:root).and_return('/rails_root')
+    Rapns.stub(:logger => logger, :config => config)
+  end
+
+  it 'prints a warning if there are no apps' do
+    Rapns::App.stub(:count => 0)
+    Rapns.logger.should_receive(:warn).any_number_of_times
+    Rapns::Upgraded.check(:exit => false)
+  end
+
+  it 'prints a warning and exists if rapns has not been upgraded' do
+    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
+    Rapns::Upgraded.should_receive(:puts).any_number_of_times
+    Rapns::Upgraded.should_receive(:exit).with(1)
+    Rapns::Upgraded.check(:exit => true)
+  end
+
+  it 'does not exit if Rapns has not been upgraded and :exit is false' do
+    Rapns.config.stub(:embedded => true)
+    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
+    Rapns::Upgraded.should_receive(:puts).any_number_of_times
+    Rapns::Upgraded.should_not_receive(:exit)
+    Rapns::Upgraded.check(:exit => false)
+  end
+
+  it 'does not exit if Rapns has not been upgraded and is in push mode' do
+    Rapns.config.stub(:push => true)
+    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
+    Rapns::Upgraded.should_receive(:puts).any_number_of_times
+    Rapns::Upgraded.should_not_receive(:exit)
+    Rapns::Upgraded.check(:exit => false)
+  end
+
+  it 'warns if rapns.yml still exists' do
+    File.should_receive(:exists?).with('/rails_root/config/rapns/rapns.yml').and_return(true)
+    Rapns.logger.should_receive(:warn).with("Since 2.0.0 rapns uses command-line options and a Ruby based configuration file.\nPlease run 'rails g rapns' to generate a new configuration file into config/initializers.\nRemove config/rapns/rapns.yml to avoid this warning.\n")
+    Rapns::Upgraded.check(:exit => false)
+  end
+end

data/spec/unit_spec_helper.rb

@@ -49,7 +49,6 @@ end
 require 'bundler'
 Bundler.require(:default)
 
-require 'shoulda'
 require 'database_cleaner'
 
 DatabaseCleaner.strategy = :truncation
@@ -69,7 +68,11 @@ RSpec.configure do |config|
   #   PerfTools::CpuProfiler.stop
   # end
 
-  config.before(:each) { DatabaseCleaner.clean }
+  config.before(:each) do
+    DatabaseCleaner.clean
+  end
+
+  config.after(:each) { Rapns.logger = nil }
 end
 
 # a test certificate that contains both an X509 certificate and

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapns
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -69,6 +69,7 @@ files:
 - lib/rapns/apns/feedback.rb
 - lib/rapns/apns/notification.rb
 - lib/rapns/apns/required_fields_validator.rb
+- lib/rapns/apns_feedback.rb
 - lib/rapns/app.rb
 - lib/rapns/configuration.rb
 - lib/rapns/daemon.rb
@@ -91,7 +92,6 @@ files:
 - lib/rapns/daemon/gcm/delivery.rb
 - lib/rapns/daemon/gcm/delivery_handler.rb
 - lib/rapns/daemon/interruptible_sleep.rb
-- lib/rapns/daemon/logger.rb
 - lib/rapns/daemon/reflectable.rb
 - lib/rapns/deprecatable.rb
 - lib/rapns/deprecation.rb
@@ -101,6 +101,7 @@ files:
 - lib/rapns/gcm/notification.rb
 - lib/rapns/gcm/payload_data_size_validator.rb
 - lib/rapns/gcm/registration_ids_count_validator.rb
+- lib/rapns/logger.rb
 - lib/rapns/multi_json_helper.rb
 - lib/rapns/notification.rb
 - lib/rapns/patches.rb
@@ -108,6 +109,7 @@ files:
 - lib/rapns/patches/rails/3.1.1/postgresql_adapter.rb
 - lib/rapns/push.rb
 - lib/rapns/reflection.rb
+- lib/rapns/upgraded.rb
 - lib/rapns/version.rb
 - lib/tasks/cane.rake
 - lib/tasks/test.rake
@@ -121,6 +123,7 @@ files:
 - spec/unit/apns/app_spec.rb
 - spec/unit/apns/feedback_spec.rb
 - spec/unit/apns/notification_spec.rb
+- spec/unit/apns_feedback_spec.rb
 - spec/unit/app_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/daemon/apns/app_runner_spec.rb
@@ -140,7 +143,6 @@ files:
 - spec/unit/daemon/gcm/delivery_handler_spec.rb
 - spec/unit/daemon/gcm/delivery_spec.rb
 - spec/unit/daemon/interruptible_sleep_spec.rb
-- spec/unit/daemon/logger_spec.rb
 - spec/unit/daemon/reflectable_spec.rb
 - spec/unit/daemon_spec.rb
 - spec/unit/deprecatable_spec.rb
@@ -148,10 +150,13 @@ files:
 - spec/unit/embed_spec.rb
 - spec/unit/gcm/app_spec.rb
 - spec/unit/gcm/notification_spec.rb
+- spec/unit/logger_spec.rb
 - spec/unit/notification_shared.rb
 - spec/unit/notification_spec.rb
 - spec/unit/push_spec.rb
+- spec/unit/rapns_spec.rb
 - spec/unit/reflection_spec.rb
+- spec/unit/upgraded_spec.rb
 - spec/unit_spec_helper.rb
 - bin/rapns
 homepage: https://github.com/ileitch/rapns
@@ -166,15 +171,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3688702007568166292
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3688702007568166292
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Professional grade APNs and GCM for Ruby
@@ -189,6 +200,7 @@ test_files:
 - spec/unit/apns/app_spec.rb
 - spec/unit/apns/feedback_spec.rb
 - spec/unit/apns/notification_spec.rb
+- spec/unit/apns_feedback_spec.rb
 - spec/unit/app_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/daemon/apns/app_runner_spec.rb
@@ -208,7 +220,6 @@ test_files:
 - spec/unit/daemon/gcm/delivery_handler_spec.rb
 - spec/unit/daemon/gcm/delivery_spec.rb
 - spec/unit/daemon/interruptible_sleep_spec.rb
-- spec/unit/daemon/logger_spec.rb
 - spec/unit/daemon/reflectable_spec.rb
 - spec/unit/daemon_spec.rb
 - spec/unit/deprecatable_spec.rb
@@ -216,8 +227,11 @@ test_files:
 - spec/unit/embed_spec.rb
 - spec/unit/gcm/app_spec.rb
 - spec/unit/gcm/notification_spec.rb
+- spec/unit/logger_spec.rb
 - spec/unit/notification_shared.rb
 - spec/unit/notification_spec.rb
 - spec/unit/push_spec.rb
+- spec/unit/rapns_spec.rb
 - spec/unit/reflection_spec.rb
+- spec/unit/upgraded_spec.rb
 - spec/unit_spec_helper.rb

data/lib/rapns/daemon/logger.rb

@@ -1,68 +0,0 @@
-module Rapns
-  module Daemon
-    class Logger
-      def initialize(options)
-        @options = options
-
-        begin
-          log = File.open(File.join(Rails.root, 'log', 'rapns.log'), 'a')
-          log.sync = true
-          @logger = ActiveSupport::BufferedLogger.new(log, Rails.logger.level)
-          @logger.auto_flushing = Rails.logger.respond_to?(:auto_flushing) ? Rails.logger.auto_flushing : true
-        rescue Errno::ENOENT, Errno::EPERM => e
-          @logger = nil
-          error(e)
-          error('Logging disabled.')
-        end
-      end
-
-      def info(msg)
-        log(:info, msg)
-      end
-
-      def error(msg, options = {})
-        airbrake_notify(msg) if notify_via_airbrake?(msg, options)
-        log(:error, msg, 'ERROR', STDERR)
-      end
-
-      def warn(msg)
-        log(:warn, msg, 'WARNING', STDERR)
-      end
-
-      private
-
-      def log(where, msg, prefix = nil, io = STDOUT)
-        if msg.is_a?(Exception)
-          formatted_backtrace = msg.backtrace.join("\n")
-          msg = "#{msg.class.name}, #{msg.message}\n#{formatted_backtrace}"
-        end
-
-        formatted_msg = "[#{Time.now.to_s(:db)}] "
-        formatted_msg << "[#{prefix}] " if prefix
-        formatted_msg << msg
-
-        if io == STDERR
-          io.puts formatted_msg
-        elsif @options[:foreground]
-          io.puts formatted_msg
-        end
-
-        @logger.send(where, formatted_msg) if @logger
-      end
-
-      def airbrake_notify(e)
-        return unless @options[:airbrake_notify] == true
-
-        if defined?(Airbrake)
-          Airbrake.notify_or_ignore(e)
-        elsif defined?(HoptoadNotifier)
-          HoptoadNotifier.notify_or_ignore(e)
-        end
-      end
-
-      def notify_via_airbrake?(msg, options)
-        msg.is_a?(Exception) && options[:airbrake_notify] != false
-      end
-    end
-  end
-end