consul-rb 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aa41c5c7cdf1de482586293d03c6d636fa2e6fd
-  data.tar.gz: 127fa25ede589e931a54080852c8a8050c3d304b
+  metadata.gz: 4dba1c408a1ba96cbe19fa128f36c912f6e15747
+  data.tar.gz: a63f2fe473601e515155ea70c68312db8ac5a4ee
 SHA512:
-  metadata.gz: d794949c1c7df9bead7048ae1731886d22ef733224bd925467e55fd92413d11dbb4d3edc3360f4d8eda5ba6a59b4abfc79113581bdae905ccf06143aa7e4d5bf
-  data.tar.gz: 2063d204ccbea95806df55bca7f3da8c21b833ac52ec1b72456c58c7e992ac0844cae6e80fba61d33b47b28118dc66f70245b2032615f6f1cc13f6aa8c8f032a
+  metadata.gz: 5654b4a3e177648bba8a11e241a6b54463e5b1dd52f4ac3bc4eca078b2324a572ac1431d9aaf8e5dee5c828f96faae572a4562ffd0faa31c3088b49d84443189
+  data.tar.gz: 609103b6d2e859f6efe27f14e7380be248ed31dc1863e2ed8a0abf39ed28f5f778f5cd05ab36585eda1fcbb4ad8385863291d172eb4aa3b82bcb4403af30e24c

data/lib/consul/client/http.rb

@@ -8,6 +8,8 @@ module Consul
     NotFoundException = Class.new(StandardError)
     ResponseException = Class.new(StandardError)
     RpcErrorException = Class.new(StandardError)
+    TimeoutException = Class.new(StandardError)
+    InavlidArgument = Class.new(StandardError)
 
     class HTTP
       def initialize(host:, port:, logger:)
@@ -16,15 +18,18 @@ module Consul
         @logger = logger
       end
 
-      def get(request_uri)
+      def get(request_uri, recurse: false, raw: false)
         url = base_uri + request_uri
         logger.debug("GET #{url}")
 
         uri = URI.parse(url)
+        uri.query ||= ""
+        uri.query += "&recurse" if recurse
+        uri.query += "&raw" if raw
 
         response = http_request(:get, uri)
 
-        parse_body(response)
+        raw ? response.body : parse_body(response)
       end
 
       def exists?(request_uri)
@@ -49,17 +54,29 @@ module Consul
         uri.query += "&index=#{index}&wait=#{wait}"
         uri.query += "&recurse" if recurse
 
+        wait_timeout = 0
+        case wait
+        when /^(.+)s$/
+          wait_timeout = $1.to_i + 5
+        when /^(.+)m$/
+          wait_timeout = ($1.to_i * 60) + 5
+        else
+          raise InavlidArgument
+        end
+
         while true do
           begin
             logger.debug("GET #{uri}")
 
-            response = http_request(:get, uri)
+            response = http_request(:get, uri, nil, wait_timeout)
             if response['x-consul-index'].to_i > index
-              return { index: response['x-consul-index'], body: parse_body(response) }
+              return { index: response['x-consul-index'].to_i, body: parse_body(response) }
             end
           rescue RpcErrorException
             logger.warn("Got 500 while watching #{uri}")
             sleep 5
+          rescue TimeoutException
+            logger.warn("Got timeout while watching #{uri}")
           end
         end
       end
@@ -87,23 +104,29 @@ module Consul
         JSON.parse("[#{response.body}]")[0]
       end
 
-      def http_request(method, uri, data = nil)
+      def http_request(method, uri, data = nil, timeout = 60)
         method = {
           get: Net::HTTP::Get,
           put: Net::HTTP::Put,
         }.fetch(method)
 
-        http     = Net::HTTP.new(uri.host, uri.port)
-        request  = method.new(uri.request_uri)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.read_timeout = timeout
+        request = method.new(uri.request_uri)
         request.body = data
-        response = http.request(request)
-
-        if response.code.to_i == 404
-          raise NotFoundException, "#{response.code} on #{uri}"
-        elsif response.code.to_i >= 500
-          raise RpcErrorException, "#{response.code} on #{uri}"
-        elsif response.code.to_i >= 400
-          raise ResponseException, "#{response.code} on #{uri}"
+
+        begin
+          response = http.request(request)
+
+          if response.code.to_i == 404
+            raise NotFoundException, "#{response.code} on #{uri}"
+          elsif response.code.to_i >= 500
+            raise RpcErrorException, "#{response.code} on #{uri}"
+          elsif response.code.to_i >= 400
+            raise ResponseException, "#{response.code} on #{uri}"
+          end
+        rescue Net::ReadTimeout
+          raise TimeoutException, "timeout on #{uri}"
         end
 
         response

data/lib/consul/kv.rb

@@ -0,0 +1,5 @@
+module Consul
+	module KV
+		
+	end
+end

data/lib/consul/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Client
-    VERSION ||= '0.0.2'
+    VERSION ||= '0.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Alexander Piavlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -35,6 +35,7 @@ files:
 - consul-rb.gemspec
 - lib/consul/client.rb
 - lib/consul/client/http.rb
+- lib/consul/kv.rb
 - lib/consul/version.rb
 homepage: https://github.com/SupersonicAds/consul-rb
 licenses: