Merge branch 'develop'

9to5 · Feb 15, 2016 · 2851c56 · 2851c56
2 parents d0e3fcf + a2cca34
commit 2851c56
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,4 +3,3 @@ rvm:
   - 2.2.2
   - 2.1.1
   - 2.0.0
-  - 1.9.3
diff --git a/lib/pushr-apns/version.rb b/lib/pushr-apns/version.rb
@@ -1,3 +1,3 @@
 module PushrApns
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end
diff --git a/lib/pushr/daemon/apns_support/connection_apns.rb b/lib/pushr/daemon/apns_support/connection_apns.rb
@@ -51,7 +51,7 @@ def close
         end
 
         def read(num_bytes)
-          @ssl_socket.read(num_bytes)
+          @ssl_socket ? @ssl_socket.read(num_bytes) : false
         end
 
         def select(timeout)

diff --git a/pushr-apns.gemspec b/pushr-apns.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
 
   s.add_runtime_dependency 'multi_json'
   s.add_runtime_dependency 'pushr-core'