envoy-proxy 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71f47aa6186498d65fe216a62f4d6b12739954ad
-  data.tar.gz: 1f2d01c51e737379378f0015996a843997736ad6
+  metadata.gz: d9e12a9dc7bdb8e9ed83fd43ed0721c7c24fe93c
+  data.tar.gz: 960a0a5cb549bb9bd9c5800bdf241cb3d1c75006
 SHA512:
-  metadata.gz: 2de124ad4d7063e9013bef55a2a48c90a0fb905ac0ea3c0bcedd60d854242f0cfed7e0405ada4e4a1a14772dbdbe1c858c12bce3554d265a4a98e99bb0011da6
-  data.tar.gz: aa27e4cd74e3ef97b01f8fd9ab73d0b74231d9f9d81f2bebf27dfdeca436ae2a679107e9707d63ae82412756fa6624b8fea85c11b3ad51ffea20f8406bc8ab1f
+  metadata.gz: 8cc30bd5f5b6b967bef9ee9ee97635a94c489c48c3cc82642e0d8f00da73890bfb7c67ae2f1605975647c9029aab459dbaa8494b3b84dec7990249ecbd9be579
+  data.tar.gz: aafbf07d55daea5fdb3eb0e0ee98037c204e6f65f53c89ce3dbebc16ac42fc217f9ec1e7e00d4d38053881d8617b04f213f57e2b4bdc0ddf54d9b85a3d0082b6

data/envoy-proxy.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   
-  spec.add_dependency('eventmachine', '>= 1.0.3')
-  spec.add_dependency('bert', '>= 1.1.6')
+  spec.add_dependency('eventmachine', '~> 1.0')
+  spec.add_dependency('bert', '~> 1.1')
   
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/envoy/server/trunk.rb

@@ -32,6 +32,10 @@ module Envoy
       end
       
       def receive_pong
+        EM.add_timer 5 do
+          log "ping"
+          send_object :ping
+        end
       end
       
       def receive_close id, code = nil
@@ -62,16 +66,17 @@ module Envoy
         close_connection(true)
       end
       
+      def version? *requirement
+        Gem::Requirement.new(*requirement) =~ Gem::Version.new(@options[:version])
+      end
+      
       def receive_options options
         @options = options
-        if (@options[:version].split(".").map(&:to_i) <=> [0, 1, 0]) > -1
-          EM.add_periodic_timer 5 do
-            send_object :ping
-          end
-        else
-          EM.add_periodic_timer 20 do
-            send_object :message, "Checking client is still here. Upgrade to hide this message."
-          end
+        if version? "~> 0.1"
+          receive_pong
+        end
+        if version? "< #{Envoy::VERSION}"
+          send_object :message, "Your client is out of date. Please upgrade to #{Envoy::VERSION}."
         end
         if @key and @key != @options[:key]
           halt "Key is invalid"

data/lib/envoy/version.rb

@@ -1,3 +1,3 @@
 module Envoy
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envoy-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nathan Baum
@@ -14,30 +14,30 @@ dependencies:
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bert
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement