offline_consul-client 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e581d353ceef2e170fae3f52957cc6a04a017ae4
-  data.tar.gz: e3091c3965da1981d52b672555814ca53b5cdcf0
+  metadata.gz: e15f6c39aa174b3f7db3b0d0f55b3ba60b4c6559
+  data.tar.gz: e768c0465b381487196b44a33245b21bdbe406e5
 SHA512:
-  metadata.gz: 55e1354375b9dd7c8bee244d97d2b4345180261c13cba7d769f2a51dca98b2341a2cb59f4834317a967a7a880e24a9ed947ed60e2a9f2c39cb44e1ee08c01d1e
-  data.tar.gz: b70b527b7248849c3212e8b3ce86d97ef47fe9e9c4ed6c559100dcd7f09cc0062311609f770073fad3ae7f43188ec5bee0d63683212e634a8f10786f587def51
+  metadata.gz: 40a2277ad6f515faf6cf6929986c99ca697ae384295534e1ba00a6ce078e766f6bef78b7656815b1b0f4f63b490e11c93cf7adc59316ecf43d5a5be7df16adb2
+  data.tar.gz: 27979ace78e9485b53379d1a02c845c78f5475b20e0238e773611e5adf63117449d5ec8dd455026f3479eef6fd74ccd0b7898472f262975fc5a9258eea38215b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    offline_consul-client (0.2.0)
+    offline_consul-client (0.3.1)
 
 GEM
   remote: https://rubygems.org/

data/bin/console

@@ -7,4 +7,15 @@ require "consul/client"
 # with your gem easier. You can also use a different console, if you like.
 
 require "pry"
+
+SOLO = (ARGV.first == "solo")
+
+module Chef
+  module Config
+    def self.[](f)
+      SOLO
+    end
+  end
+end
+
 Pry.start

data/lib/consul/client.rb

@@ -1,6 +1,7 @@
 require "consul/client/version"
 require "consul/client/config"
 require "consul/client/connection"
+require "consul/client/offline_connection"
 require "consul/client/fake_http_response"
 require "consul/http"
 require "consul/response"
@@ -17,12 +18,29 @@ module Consul
       def_delegators :connection, *(Connection.instance_methods - Object.instance_methods)
 
       def new
-        Connection.new
+        if is_online?
+          Connection.new
+        else
+          OfflineConnection.new
+        end
       end
 
       def connection
-        @connection ||= Connection.new
+        @connection ||= new
       end
+
+      def is_online?
+        if defined?(Chef)
+          !::Chef::Config[:solo]
+        else
+          false
+        end
+      end
+
+      def reconnect
+        @connection = new
+      end
+
     end
 
   end

data/lib/consul/client/connection.rb

@@ -8,98 +8,38 @@ module Consul::Client
       @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
-
+      response = http.get("/kv" + path(keypath) + (opts[:recursive] ? '?recurse' : ''))
       if response.length == 1 && response.keys.first == keyname
         response[keyname]
       else
-        Hash[response.map{ |k,v| [k, v.value] }]
+        response
       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
+      response = read_obj(keypath, opts)
+      read_value_r(response)
     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={})
+    def read_value_r(response)
+      if response.respond_to?(:keys)
+        Hash[ response.map{ |k,v| [k,read_value_r(v)] } ]
       else
-        offline_delete(keypath, opts={})
+        response.value
       end
     end
 
-    def online_write(keypath,data=nil,path_mimic=false)
-      data = encode(data)
-      http.put("/kv" + path(keypath), data)
+    def delete(keypath, opts={})
+      http.delete("/kv" + path(keypath) + (opts[:recursive] ? '?recurse' : '')).value
     end
 
-    def offline_write(keypath,data=nil)
+    def write(keypath,data=nil,path_mimic=false)
       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
+      http.put("/kv" + path(keypath), data)
     end
 
-
     #def lock(keypath, data=nil)
     #  write(keypath + "?acquire=#{session_id}", data)
     #end
@@ -120,22 +60,10 @@ module Consul::Client
       @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)] } ]

data/lib/consul/client/offline_connection.rb

@@ -0,0 +1,68 @@
+require "psych"
+require "fileutils"
+
+module Consul::Client
+  class OfflineConnection < Connection
+
+    def read_obj(keypath, opts={})
+      keyname = File.basename(keypath)
+
+      response = http_get(keypath, opts)
+      if response.length == 1 && response.keys.first == keyname
+        response[keyname]
+      else
+        response
+      end
+    end
+
+    def delete(keypath, opts={})
+      #do nothing, lets not delete our local files
+      true
+    end
+
+    def 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
+
+    private
+
+    def files(keypath, opts)
+      if opts[:recursive]
+        recursive_files = Dir.glob(File.join(local_path, path(keypath) + '*', '**', '*.yaml'))
+        path_files = Dir.glob(File.join(local_path, path(keypath) + '*.yaml'))
+
+        recursive_files | path_files
+      else
+        [File.join(local_path, path(keypath) + ".yaml")]
+      end
+    end
+
+    def http_get(keypath, opts)
+      key_data = files(keypath, opts).map do |filename|
+        {}.tap do |data|
+          data['LockIndex']   = 0
+          data['Key']         = filename.sub(/^#{File.dirname(File.join(local_path, path(keypath)))}/, '').chomp('.yaml')
+          data['Flags']       = 0
+          data['Value']       = Base64.encode64(File.read(filename))
+          data['CreateIndex'] = 0
+          data['ModifyIndex'] = 0
+        end
+      end
+
+      Consul::Response.new(Consul::Client::FakeNetHttpResponse.new(Psych.dump(key_data)))
+    end
+
+    def local_path
+      ENV['CONSUL_CLIENT_YAML_PATH'] || "/tmp/consul_client"
+    end
+
+  end
+end

data/lib/consul/client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: offline_consul-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jason Scholl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - lib/consul/client/config.rb
 - lib/consul/client/connection.rb
 - lib/consul/client/fake_http_response.rb
+- lib/consul/client/offline_connection.rb
 - lib/consul/client/version.rb
 - lib/consul/data.rb
 - lib/consul/http.rb