apnmachine 0.1.0 → 0.1.1

data/Gemfile

@@ -4,6 +4,7 @@ gem "em-synchrony"
 gem "daemons"
 gem "activesupport", ">= 3.0.0"
 gem "redis", ">= 2.2.0"
+gem "hiredis", ">= 0.3.1"
 gem "i18n"
 
 # Add dependencies to develop your gem here.

data/README.textile

@@ -1,4 +1,4 @@
-h1. Apple Push Notification Server Toolkit
+h1. Apn Server & Library for Ruby
 
 * http://github.com/jnak/apnmachine
 
@@ -20,18 +20,18 @@ h2. Remaining Tasks
  * Implement feedback service mechanism
  * Write real tests
 
-h2. APN Server Daemon
+h2. ApnMachine Daemon
 
 To start ApnMachine, tell it where is your redis server and the complete path to your PEM file.
 That's it.
 
 <pre>
   <code>
-Usage: apnmachined [options] --pem /path/to/pem
-  --address bind address (defaults to 127.0.0.1)
+Usage: apnmachined [options] --pem /full/path/to/pem
+  --redis-host bind address (defaults to 127.0.0.1)
     address of your redis server
 
-  --port port
+  --redis-port port
     the port of your redis server (defaults to)
 
   --apn-address server
@@ -105,28 +105,6 @@ Adding apnmachine to your Rails application
 
 h2. License
 
+The MIT License - Copyright (c) 2012 Julien Nakache
 Widely Inspired from groupme/em-apn and bpoweski/apnserver
 
-(The MIT License)
-
-Copyright (c) 2012 Julien Nakache
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

data/Rakefile

@@ -12,6 +12,7 @@ end
 require 'rake'
 
 require 'jeweler'
+require './lib/apnmachine/version.rb'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "apnmachine"
@@ -21,6 +22,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{An APN server & library in which EventMachine daemons maintain a persistent connection to Apple servers and Redis acts as the glue with your Apps. See Readme for more info :)}
   gem.email = "julien.nakache@gmail.com"
   gem.authors = ["Julien Nakache"]
+  gem.version = ApnMachine::VERSION
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/apnmachine.gemspec

@@ -4,37 +4,28 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{apnmachine}
-  s.version = "0.1.0"
+  s.name = "apnmachine"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Julien Nakache}]
-  s.date = %q{2012-02-21}
-  s.description = %q{An APN server & library in which EventMachine daemons maintain a persistent connection to Apple servers and Redis acts as the glue with your Apps. See Readme for more info :)}
-  s.email = %q{julien.nakache@gmail.com}
-  s.executables = [%q{apnmachined}]
+  s.authors = ["Julien Nakache"]
+  s.date = "2012-02-21"
+  s.description = "An APN server & library in which EventMachine daemons maintain a persistent connection to Apple servers and Redis acts as the glue with your Apps. See Readme for more info :)"
+  s.email = "julien.nakache@gmail.com"
+  s.executables = ["apnmachined"]
   s.extra_rdoc_files = [
-    "LICENSE.txt",
     "README.textile"
   ]
   s.files = [
-    ".DS_Store",
-    ".document",
     "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
     "README.textile",
     "Rakefile",
-    "VERSION",
     "apnmachine.gemspec",
     "bin/apnmachined",
-    "lib/.DS_Store",
     "lib/apnmachine.rb",
-    "lib/apnmachine/.DS_Store",
     "lib/apnmachine/config.rb",
     "lib/apnmachine/notification.rb",
     "lib/apnmachine/server.rb",
-    "lib/apnmachine/server/.DS_Store",
     "lib/apnmachine/server/client.rb",
     "lib/apnmachine/server/error_response.rb",
     "lib/apnmachine/server/response.rb",
@@ -44,11 +35,11 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_apnmachine.rb"
   ]
-  s.homepage = %q{http://github.com/jnak/apnmachine}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{An APN server & library built on top of Redis and EventMachine}
+  s.homepage = "http://github.com/jnak/apnmachine"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.17"
+  s.summary = "An APN server & library built on top of Redis and EventMachine"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -58,6 +49,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<redis>, [">= 2.2.0"])
+      s.add_runtime_dependency(%q<hiredis>, [">= 0.3.1"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@@ -69,6 +61,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<daemons>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<redis>, [">= 2.2.0"])
+      s.add_dependency(%q<hiredis>, [">= 0.3.1"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -81,6 +74,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<daemons>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<redis>, [">= 2.2.0"])
+    s.add_dependency(%q<hiredis>, [">= 0.3.1"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

data/bin/apnmachined

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'getoptlong'
 require 'daemons'
@@ -7,7 +8,7 @@ require 'apnmachine/server'
 
 def usage
   puts "Usage: apnmchined [switches] --pem <path>"
-  puts " --redis-address [127.0.0.1]             bind address of proxy"
+  puts " --redis-host [127.0.0.1]             bind address of proxy"
   puts " --redis-port [6379]                 port proxy listens on"
   puts " --server <gateway.push.apple.com>    the apn server to send messages to"
   puts " --log </var/log/apnmachined.log       the path to store the log"
@@ -26,19 +27,23 @@ def daemonize
 end
 
 opts = GetoptLong.new(
-  ["--redis-address", "-b", GetoptLong::REQUIRED_ARGUMENT],
+  ["--redis-host", "-a", GetoptLong::REQUIRED_ARGUMENT],
   ["--redis-port", "-p", GetoptLong::REQUIRED_ARGUMENT],
-  ["--server", "-s", GetoptLong::REQUIRED_ARGUMENT],
+  ["--apn-host", "-b", GetoptLong::REQUIRED_ARGUMENT],
+  ["--apn-port", "-q", GetoptLong::REQUIRED_ARGUMENT],
   ["--log", "-l", GetoptLong::REQUIRED_ARGUMENT],
-  ["--pem", "-c", GetoptLong::REQUIRED_ARGUMENT],
+  ["--pem", "-c", GetoptLong::REQUIRED_ARGUMENT], 
+  ["--pem-passphrase", "-s", GetoptLong::REQUIRED_ARGUMENT],
   ["--daemon", "-d", GetoptLong::NO_ARGUMENT],
   ["--help", "-h", GetoptLong::NO_ARGUMENT]
 )
 
-redis_address = '127.0.0.1'
+redis_host = '127.0.0.1'
 redis_port = 6379
-host = 'gateway.push.apple.com'
+apn_host = 'gateway.push.apple.com'
+apn_port = 2195
 pem = nil
+pem_passphrase = nil
 daemon = false
 log = STDOUT
 
@@ -47,18 +52,22 @@ opts.each do |opt, arg|
   when '--help'
     usage
     exit 1
-  when '--redis-address'
-    redis_address = arg
-  when '--port'
+  when '--redis-host'
+    redis_host = arg
+  when '--redis-port'
     redis_port = arg.to_i
-  when '--server'
+  when '--apn_host'
     if arg == 'sandbox'
-      host = 'gateway.sandbox.push.apple.com'
+      apn_host = 'gateway.sandbox.push.apple.com'
     else
-      raise 'Wrong --server option. Pass "sandbox" as option to override production servers'
+      apn_host = arg 
     end
+  when '--apn-port'
+    apn_port = arg
   when '--pem'
     pem = arg
+  when '--pem-passphrase'
+    pem_passphrase = arg
   when '--daemon'
     daemon = true
   when '--log'
@@ -71,6 +80,6 @@ if pem.nil?
   exit 1
 else
   daemonize if daemon
-  server = ApnMachine::Server::Server.new(pem, redis_address, redis_port, log)
+  server = ApnMachine::Server::Server.new(pem, pem_passphrase, redis_host, redis_port, apn_host, apn_port, log)
   server.start!
 end

data/lib/apnmachine.rb

@@ -3,5 +3,4 @@ require 'active_support/ordered_hash'
 require 'active_support/json'
 require 'logger'
 require 'apnmachine/config'
-require 'apnmachine/notification'
-
+require 'apnmachine/notification'

data/lib/apnmachine/server.rb

@@ -1,4 +1,3 @@
-require 'openssl'
 require 'em-synchrony'
 require 'redis/connection/synchrony'
 require 'redis'

data/lib/apnmachine/server/client.rb

@@ -1,17 +1,17 @@
 module ApnMachine
   module Server
     class Client
-      attr_accessor :pem, :host, :port, :password, :key, :cert, :close_callback
+      attr_accessor :pem, :apn_host, :apn_port, :password, :key, :cert, :close_callback
 
-      def initialize(pem, host = 'gateway.push.apple.com', port = 2195, pass = nil)
-        @pem, @host, @port, @password = pem, host, port, pass
+      def initialize(pem, password = nil, apn_host = 'gateway.push.apple.com', apn_port = 2195)
+        @pem, @pasword, @apn_host, @apn_port = pem, password, apn_host, apn_port
       end
 
       def connect!
         raise "The path to your pem file is not set." unless @pem
         raise "The path to your pem file does not exist!" unless File.exist?(@pem)
         @key, @cert = @pem, @pem
-        @connection = EM.connect(host, port, ApnMachine::Server::ServerConnection, self)
+        @connection = EM.connect(apn_host, apn_port, ApnMachine::Server::ServerConnection, self)
       end
         
       def disconnect!

data/lib/apnmachine/server/server.rb

@@ -3,10 +3,9 @@ module ApnMachine
     class Server
         attr_accessor :client, :bind_address, :port, :redis
 
-      def initialize(pem, redis_address, redis_port, log = '/apnmachined.log')
-        @client = ApnMachine::Server::Client.new(pem)
-        @bind_address, @port  = bind_address, redis_port
-        @redis = Redis.new
+      def initialize(pem, pem_passphrase = nil, redis_host = '127.0.0.1', redis_port = 6379, apn_host = 'gateway.push.apple.com', apn_port = 2195, log = '/apnmachined.log')
+        @client = ApnMachine::Server::Client.new(pem, pem_passphrase, apn_host, apn_port)
+        @redis = Redis.new(:host => redis_host, :port => redis_port)
     
         #set logging options
         if log == STDOUT
@@ -15,6 +14,8 @@ module ApnMachine
           @flog = File.open(log, File::WRONLY | File::APPEND)
           Config.logger = Logger.new(@flog, 'daily')
         else
+          require 'fileutils'
+          p log
           FileUtils.mkdir_p(File.dirname(log))
   	      @flog = File.open(log, File::WRONLY | File::APPEND | File::CREAT)
           Config.logger = Logger.new(@flog, 'daily')

data/lib/apnmachine/version.rb

@@ -1,3 +1,3 @@
 module ApnMachine
-  VERSION = "0.0.1"
+  VERSION = "0.1.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: apnmachine
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Julien Nakache
@@ -57,30 +57,41 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: hiredis
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: i18n
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: shoulda
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -88,10 +99,10 @@ dependencies:
         version: "3.12"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -99,10 +110,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,10 +121,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,7 +132,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 description: An APN server & library in which EventMachine daemons maintain a persistent connection to Apple servers and Redis acts as the glue with your Apps. See Readme for more info :)
 email: julien.nakache@gmail.com
 executables: 
@@ -129,26 +140,17 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE.txt
 - README.textile
 files: 
-- .DS_Store
-- .document
 - Gemfile
-- Gemfile.lock
-- LICENSE.txt
 - README.textile
 - Rakefile
-- VERSION
 - apnmachine.gemspec
 - bin/apnmachined
-- lib/.DS_Store
 - lib/apnmachine.rb
-- lib/apnmachine/.DS_Store
 - lib/apnmachine/config.rb
 - lib/apnmachine/notification.rb
 - lib/apnmachine/server.rb
-- lib/apnmachine/server/.DS_Store
 - lib/apnmachine/server/client.rb
 - lib/apnmachine/server/error_response.rb
 - lib/apnmachine/server/response.rb
@@ -170,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -105431761613938155
+      hash: 1561694125246031221
       segments: 
       - 0
       version: "0"
@@ -183,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: An APN server & library built on top of Redis and EventMachine

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/Gemfile.lock

@@ -1,41 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.9)
-    daemons (1.1.4)
-    em-synchrony (1.0.0)
-      eventmachine (>= 1.0.0.beta.1)
-    eventmachine (1.0.0.beta.4)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.6.5)
-    multi_json (1.0.4)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    redis (2.2.2)
-    shoulda (2.11.3)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 3.0.0)
-  bundler (~> 1.0.0)
-  daemons
-  em-synchrony
-  i18n
-  jeweler (~> 1.8.3)
-  rdoc (~> 3.12)
-  redis (>= 2.2.0)
-  shoulda
-  simplecov

data/LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2012 Julien Nakache
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +0,0 @@
-0.1.0