offline_consul-client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a224f7ff4d5849b3da62357983eff37d340dd34
-  data.tar.gz: e81df1790630c58fbe9351895be6e3e01f66c2b9
+  metadata.gz: e581d353ceef2e170fae3f52957cc6a04a017ae4
+  data.tar.gz: e3091c3965da1981d52b672555814ca53b5cdcf0
 SHA512:
-  metadata.gz: 76b3156624259716fd1f1716fbc519b3470f4ea62a66b45c18ae77dededac9af5a7ce10374d0145882db441ed70de977e4ce4883551cfe18ce118265f1198a9a
-  data.tar.gz: b06c3496e34238d6aa3ddd024285c9fc4ef454396638e94880627129943862318ef995ae0268eb412e7f2d474d2187c6889979e829b61c68038f948cac8a1592
+  metadata.gz: 55e1354375b9dd7c8bee244d97d2b4345180261c13cba7d769f2a51dca98b2341a2cb59f4834317a967a7a880e24a9ed947ed60e2a9f2c39cb44e1ee08c01d1e
+  data.tar.gz: b70b527b7248849c3212e8b3ce86d97ef47fe9e9c4ed6c559100dcd7f09cc0062311609f770073fad3ae7f43188ec5bee0d63683212e634a8f10786f587def51

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /pkg/
 /coverage/

data/Gemfile.lock

@@ -0,0 +1,57 @@
+PATH
+  remote: .
+  specs:
+    offline_consul-client (0.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.4.0)
+    coderay (1.1.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.2.5)
+    hashdiff (0.2.3)
+    method_source (0.8.2)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    psych (2.0.8)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.4.2)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.4.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    safe_yaml (1.0.4)
+    slop (3.6.0)
+    vcr (2.9.3)
+    webmock (1.22.3)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.9)
+  offline_consul-client!
+  pry (~> 0.10)
+  psych (~> 2.0)
+  rake (~> 10.0)
+  rspec (~> 3.3)
+  vcr (~> 2.9)
+  webmock (~> 1.9)
+
+BUNDLED WITH
+   1.13.1

data/README.md

@@ -23,11 +23,9 @@ The main methods to use are `Consul::Client.read` and `Consul::Client.write`, th
 ```ruby
 >> Consul::Client.config.namespace = "/bags"
 >> mydata = {foo:1, bar:[1,2,:three], baz:false, bat:{one:1, two:2, three:3}}
-=> {:foo=>1, :bar=>[1, 2, :three], :baz=>false, :bat=>{:one=>1, :two=>2, :three=>3}}
->> consul::Client.write('/some/key', mydata)
-=> #<Consul::Response:0x007fec1c893180
->> Consul::Client.read('/some/key')
-=> {:foo=>1, :bar=>[1, 2, :three], :baz=>false, :bat=>{:one=>1, :two=>2, :three=>3}}
+>> consul::Client.write('/some/key', mydata) 
+>> puts Consul::Client.read('/some/key')
+{:foo=>1, :bar=>[1, 2, :three], :baz=>false, :bat=>{:one=>1, :two=>2, :three=>3}}
 
 ```
 
@@ -46,6 +44,22 @@ curl "http://consul:8500/v1/kv/bags/some/key?raw"
   :three: 3
 ```
 
+`Consul::Client` can also be instantiated so that you can have multiple different configs that don't stomp on eachother
+```ruby
+>> c = Consul::Client
+>> f = Consul::Client.new
+>> b = Consul::Client.new
+>> f.config.namespace = "/foo"
+>> b.config.namespace = "/bar"
+>> puts c.read("key")
+I am /bags/key
+>> puts f.read("key)
+I am /foo/key
+>> puts b.read("key")
+I am /bar/key
+
+```
+
 ###Tweakables
 
 ```ruby

data/lib/consul/client/connection.rb

@@ -0,0 +1,167 @@
+require "psych"
+require "fileutils"
+
+module Consul::Client
+  class Connection
+
+    def config
+      @config ||= Config.new
+    end
+
+    def online_read(keypath, opts={})
+      response = http.get("/kv" + path(keypath) + (opts[:recursive] ? '?recurse' : ''))
+    end
+
+    def offline_read(keypath, opts={})
+      files = if opts[:recursive]
+                Dir.glob(File.join(local_path, path(keypath) + '*'))
+              else
+                [File.join(local_path, path(keypath) + ".yaml")]
+              end
+
+      key_data = files.map do |filename|
+        {}.tap do |data|
+          data['LockIndex']   = 0
+          data['Key']         = File.basename(filename).sub(/\.yaml$/, '')
+          data['Flags']       = 0
+          data['Value']       = Base64.encode64(File.read(filename))
+          data['CreateIndex'] = 0
+          data['ModifyIndex'] = 0
+        end
+      end
+
+      response = Consul::Response.new(Consul::Client::FakeNetHttpResponse.new(Psych.dump(key_data)))
+    end
+
+    def read_obj(keypath, opts={})
+      keyname = File.basename(keypath)
+      response = if is_online?
+                   online_read(keypath, opts)
+                 else
+                   offline_read(keypath, opts)
+                 end
+
+      if response.length == 1 && response.keys.first == keyname
+        response[keyname]
+      else
+        Hash[response.map{ |k,v| [k, v.value] }]
+      end
+    end
+
+    def read(keypath, opts={})
+      obj = read_obj(keypath, opts)
+      if obj.respond_to?(:value)
+        obj.value
+      else
+        obj
+      end
+    end
+
+    def online_delete(keypath, opts={})
+      response = http.delete("/kv" + path(keypath) + (opts[:recursive] ? '?recurse' : '')).value
+    end
+
+    def offline_delete(keypath, opts={})
+      #do nothing, lets not delete our local files
+      true
+    end
+
+    def delete(keypath, opts={})
+      if is_online?
+        online_delete(keypath, opts={})
+      else
+        offline_delete(keypath, opts={})
+      end
+    end
+
+    def online_write(keypath,data=nil,path_mimic=false)
+      data = encode(data)
+      http.put("/kv" + path(keypath), data)
+    end
+
+    def offline_write(keypath,data=nil)
+      data = encode(data)
+      filename = File.join(local_path, path(keypath) + ".yaml")
+      dirname = File.dirname(filename)
+
+      unless File.directory?(dirname)
+        FileUtils.mkdir_p(dirname)
+      end
+      File.open(filename, 'w') { |f| f.write(data) }
+      Consul::Response.new(Consul::Client::FakeNetHttpResponse.new)
+    end
+
+    def write(keypath,data=nil)
+      if is_online?
+        online_write(keypath,data)
+      else
+        offline_write(keypath,data)
+      end
+    end
+
+
+    #def lock(keypath, data=nil)
+    #  write(keypath + "?acquire=#{session_id}", data)
+    #end
+
+    #def unlock(keypath, data=nil)
+    #  write(keypath + "?release=#{session_id}", data)
+    #end
+
+    #def session_id
+    #  @@session_id ||= http.put("/session/create")
+    #end
+
+    #def has_lock?(keypath)
+    #  read("/kv/" + keypath).session == session_id
+    #end
+
+    def http
+      @http ||= Consul::Http.new
+    end
+
+    def local_path
+      ENV['CONSUL_CLIENT_YAML_PATH'] || "/tmp/consul_client"
+    end
+
+    def path(keypath)
+      File.join("/" + config.namespace,  keypath).gsub(%r{//}, '/')
+    end
+
+    def is_online?
+      if defined?(Chef)
+        !::Chef::Config[:solo]
+      else
+        false
+      end
+    end
+
+    def decode_r(data)
+      if data.respond_to?(:keys)
+        Hash[ data.map{ |k,v| [k,decode_r(v)] } ]
+      else
+        decode(data.value)
+      end
+    end
+
+    def decode(value)
+      Psych.safe_load(value, [Symbol])
+    end
+
+    def encode(value)
+      encoded = Psych.dump(value)
+      if decode(encoded) != value
+        raise TypeError, "Unable to relaibly decode #{value.class}"
+      end
+      encoded
+    end
+
+    def encode_r(data)
+      if data.respond_to?(:keys)
+        Hash[ data.map{ |k,v| [k, encode_r(v)] } ]
+      else
+        encode(data)
+      end
+    end
+  end
+end

data/lib/consul/client/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Client
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/consul/client.rb

@@ -1,155 +1,29 @@
 require "consul/client/version"
 require "consul/client/config"
+require "consul/client/connection"
 require "consul/client/fake_http_response"
 require "consul/http"
 require "consul/response"
 require "consul/data"
 
-require "psych"
-require "fileutils"
+require "forwardable"
 
 module Consul
   module Client
-    def self.config
-      @@config ||= Config.new
-    end
 
-    def self.online_read(keypath, opts={})
-      response = http.get("/kv" + path(keypath) + (opts[:recursive] ? '?recurse' : ''))
-    end
+    class << self
+      extend Forwardable
 
-    def self.offline_read(keypath, opts={})
-      files = if opts[:recursive]
-                Dir.glob(File.join(local_path, path(keypath) + '*'))
-              else
-                [File.join(local_path, path(keypath) + ".yaml")]
-              end
+      def_delegators :connection, *(Connection.instance_methods - Object.instance_methods)
 
-      key_data = files.map do |filename|
-        {}.tap do |data|
-          data['LockIndex']   = 0
-          data['Key']         = File.basename(filename).sub(/\.yaml$/, '')
-          data['Flags']       = 0
-          data['Value']       = Base64.encode64(File.read(filename))
-          data['CreateIndex'] = 0
-          data['ModifyIndex'] = 0
-        end
+      def new
+        Connection.new
       end
 
-      response = Response.new(FakeNetHttpResponse.new(Psych.dump(key_data)))
-    end
-
-    def self.read(keypath, opts={})
-      obj = read_obj(keypath, opts)
-      if obj.respond_to?(:value)
-        obj.value
-      else
-        Hash[obj.map{|k,v| [k, v.value] }]
+      def connection
+        @connection ||= Connection.new
       end
     end
 
-    def self.read_obj(keypath, opts={})
-      response = if is_online?
-                   online_read(keypath, opts)
-                 else
-                   offline_read(keypath, opts)
-                 end
-
-      keyname = File.basename(keypath)
-      if response.length == 1 && response.keys.first == keyname
-        response = response[keyname]
-      end
-      response
-    end
-
-    def self.online_write(keypath,data=nil,path_mimic=false)
-      data = encode(data)
-      http.put("/kv" + path(keypath), data)
-    end
-
-    def self.offline_write(keypath,data=nil)
-      data = encode(data)
-      filename = File.join(local_path, path(keypath) + ".yaml")
-      dirname = File.dirname(filename)
-
-      unless File.directory?(dirname)
-        FileUtils.mkdir_p(dirname)
-      end
-      File.open(filename, 'w') { |f| f.write(data) }
-      Response.new(FakeNetHttpResponse.new)
-    end
-
-    def self.write(keypath,data=nil)
-      if is_online?
-        online_write(keypath,data)
-      else
-        offline_write(keypath,data)
-      end
-    end
-
-
-    #def self.lock(keypath, data=nil)
-    #  write(keypath + "?acquire=#{session_id}", data)
-    #end
-
-    #def self.unlock(keypath, data=nil)
-    #  write(keypath + "?release=#{session_id}", data)
-    #end
-
-    #def self.session_id
-    #  @@session_id ||= http.put("/session/create")
-    #end
-
-    #def self.has_lock?(keypath)
-    #  read("/kv/" + keypath).session == session_id
-    #end
-
-    def self.http
-      @http ||= Http.new
-    end
-
-    def self.local_path
-      ENV['CONSUL_CLIENT_YAML_PATH'] || "/tmp/consul_client"
-    end
-
-    def self.path(keypath)
-      File.join("/" + config.namespace,  keypath).gsub(%r{//}, '/')
-    end
-
-    def self.is_online?
-      if defined?(Chef)
-        !::Chef::Config[:solo]
-      else
-        false
-      end
-    end
-
-    def self.decode_r(data)
-      if data.respond_to?(:keys)
-        Hash[ data.map{ |k,v| [k,decode_r(v)] } ]
-      else
-        decode(data.value)
-      end
-    end
-
-    def self.decode(value)
-      Psych.safe_load(value, [Symbol])
-    end
-
-    def self.encode(value)
-      encoded = Psych.dump(value)
-      if decode(encoded) != value
-        raise TypeError, "Unable to relaibly decode #{value.class}"
-      end
-      encoded
-    end
-
-    def self.encode_r(data)
-      if data.respond_to?(:keys)
-        Hash[ data.map{ |k,v| [k, encode_r(v)] } ]
-      else
-        encode(data)
-      end
-    end
   end
 end

data/lib/consul/data.rb

@@ -13,11 +13,7 @@ module Consul
 
     def value
       text = Base64.decode64(hash_map('Value'))
-      begin
-        decoded = Consul::Client.decode(text)
-      rescue Psych::DisallowedClass, Psych::SyntaxError
-      end
-      decoded || text
+      try_decode(text)
     end
 
     def flags
@@ -30,5 +26,13 @@ module Consul
       @response[key.to_s.split('_').map{ |w| w.capitalize }.join]
     end
 
+    def try_decode(text)
+      begin
+        decoded = Consul::Client.decode(text)
+      rescue Psych::DisallowedClass, Psych::SyntaxError
+      end
+      decoded || text
+    end
+
   end
 end

data/lib/consul/http.rb

@@ -21,6 +21,10 @@ module Consul
       request('GET', path)
     end
 
+    def delete(path)
+      request('DELETE', path)
+    end
+
     def load_config
       self.http_client = Net::HTTP.new(Consul::Client.config.host, Consul::Client.config.port, nil, nil)
     end

data/lib/consul/response.rb

@@ -9,8 +9,7 @@ module Consul
 
     attr_reader :response, :data
     def_delegators :response, :body, :code, :code_type
-    def_delegators :data, :keys, :values, :each, :to_a, :length, :map, :[]
-    def_delegators :to_ruby, :to_h, :to_a
+    def_delegators :data, :keys, :values, :each, :to_a, :to_h, :length, :map, :[]
 
     class KeyError < RuntimeError; end
 
@@ -23,10 +22,18 @@ module Consul
       @data ||= init_data
     end
 
+    def value
+      @value ||= to_ruby
+    end
+
     #def locked?
     #  to_h.has_key?("Session")
     #end
 
+    def success?
+      response.code_type == Net::HTTPOK
+    end
+
     private
 
     def init_data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: offline_consul-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jason Scholl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,6 +120,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -129,6 +130,7 @@ files:
 - consul-client.gemspec
 - lib/consul/client.rb
 - lib/consul/client/config.rb
+- lib/consul/client/connection.rb
 - lib/consul/client/fake_http_response.rb
 - lib/consul/client/version.rb
 - lib/consul/data.rb