etcd 0.0.2 → 0.0.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzNhZWZiNTA1ZjAzOTQ0ZjQ4YjUzOTIyZTZiNjEwZGVkZWJkYzllZg==
+  data.tar.gz: !binary |-
+    Y2ZlOTY4YTcxYTNkNzRhZGRhZDBlNzRlYWUyNjk2Y2VmMzBjYWFmYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YTU1YjdhMmVhNTM1ZWFlOTc3ZmQwN2ZlNDM2N2EyNTI0ZTVjN2FkNTljMzc2
+    ODZhYjdiNTU4YmE3NGE0NjdiY2M2MDhhM2VmNWEzZTQ0OTBmMjViYmI3MWVj
+    MTkxZjI1YWM4NTU5OWUzMmRiYmY5MzcyNzg0YzljN2Y2OWQ5Njg=
+  data.tar.gz: !binary |-
+    NjJlNWY1NjQyNmQ0YmU1Y2M1ZTkxYTY3NzRhOTc3Mjc0ODUxODYxOGE2NGY0
+    NDE3ZWFkZjMzMGFlNzZhYWIyZTRhMTE5NDUyMjZkNWE3Y2Y4MTI4NzQ4YmRh
+    ZGM0MGRlNDM5ZGQ4MzNkN2JhNmEzMTVhN2QzNWNhNjY1NjkyZWM=

data/.rspec

@@ -0,0 +1,2 @@
+-c
+-fs

data/.travis.yml

@@ -0,0 +1,14 @@
+before_install: 
+  - sudo add-apt-repository ppa:duh/golang -y
+  - sudo apt-get update -y
+  - sudo apt-get install golang -y
+  - git clone https://github.com/coreos/etcd
+  - cd etcd && bash build
+  - bundle install --path .bundle
+rvm:
+  - 1.9.3
+  - 2.0.0
+branches:
+  only:
+    - master
+script: "bundle exec rake spec"

data/README.md

@@ -1,3 +1,4 @@
+[![Built on Travis](https://secure.travis-ci.org/ranjib/etcd-ruby.png?branch=master)](http://travis-ci.org/ranjib/etcd-ruby)
 # Etcd
 
 A ruby client for [etcd](https://github.com/coreos/etcd)
@@ -65,6 +66,11 @@ client.machines
 client.leader
 ```
 
+## Contributors 
+* Ranjib Dey
+* Jesse Nelson
+
+
 
 ## Contributing
 
@@ -73,3 +79,4 @@ client.leader
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+6. If applicable, update the README.md

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "rdoc/task"
+
+RSpec::Core::RakeTask.new("spec")
+
+RDoc::Task.new do |rdoc|
+  rdoc.main = "README.rdoc"
+  rdoc.rdoc_files.include("README.rdoc", "lib   /*.rb")
+end

data/etcd.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mixlib-cli"
   spec.add_dependency "mixlib-log"
-  spec.add_dependency "hashie"
+  spec.add_dependency "uuid"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "simplecov"
 end

data/lib/etcd.rb

@@ -1,5 +1,15 @@
+
+##
+# This module provides the Etcd:: name space for the gem and few 
+# factory methods for Etcd domain objects
 require 'etcd/client'
 module Etcd
+
+  ##
+  # Create and return a Etcd::Client object. It takes a hash +opts+
+  # as an argument which gets passed to the Etcd::Client.new method
+  # directly
+  # If +opts+ is not passed default options are used, defined by Etcd::Client.new
   def self.client(opts={})
     Etcd::Client.new(opts)
   end

data/lib/etcd/client.rb

@@ -1,16 +1,35 @@
 require 'net/http'
 require 'json'
-require 'hashie'
 require 'etcd/log'
+require 'etcd/mixins/helpers'
+require 'etcd/mixins/lockable'
+require 'ostruct'
+
 
 module Etcd
+  ##
+  # This is the central ruby class for Etcd. It provides methods for all Etcd api calls.
+  # It also provides few additional methods beyond the core Etcd api, like Etcd::Client#lock
+  # and Etcd::Client#eternal_watch, they are defined in separate modules and included in this
+  # class
   class Client
 
+    include Etcd::Helpers
+    include Etcd::Lockable
+
     attr_reader :host, :port, :http, :allow_redirect
 
+    ##
+    # Creates a new instance of Etcd::Client. It accepts a hash +opts+ as argument
+    # 
+    # @param [Hash] opts The options for new Etcd::Client object
+    # @opts [String] :host IP address of the etcd server (default is '127.0.0.1')
+    # @opts [Fixnum] :port Port number of the etcd server (default is 4001)
+
     def initialize(opts={})
       @host = opts[:host] || '127.0.0.1'
       @port = opts[:port] || 4001
+      @read_timeout = opts[:read_timeout] || 60
       if opts.has_key?(:allow_redirect)
         @allow_redirect = opts[:allow_redirect]
       else
@@ -23,11 +42,11 @@ module Etcd
     end
 
     def machines
-      api_execute('/machines', :get).split(",")
+      api_execute( version_prefix + '/machines', :get).split(",")
     end
 
     def leader
-      api_execute('/leader', :get)
+      api_execute( version_prefix + '/leader', :get)
     end
 
     def key_endpoint
@@ -43,30 +62,26 @@ module Etcd
       payload = {'value' => value, 'prevValue' => prevValue }
       payload['ttl'] = ttl unless ttl.nil?
       response = api_execute(path, :post, payload)
-      Hashie::Mash.new(JSON.parse(response))
+      json2obj(response)
     end
 
     def set(key, value, ttl=nil)
       path  = key_endpoint + key
-      payload = {'value' => value} 
+      payload = {'value' => value}
       payload['ttl'] = ttl unless ttl.nil?
       response = api_execute(path, :post, payload)
-      Hashie::Mash.new(JSON.parse(response))
+      json2obj(response)
     end
 
+
     def delete(key)
       response = api_execute(key_endpoint + key, :delete)
-      Hashie::Mash.new(JSON.parse(response))
+      json2obj(response)
     end
 
     def get(key)
       response = api_execute(key_endpoint + key, :get)
-      obj = JSON.parse(response)
-      if obj.is_a?(Array)
-        obj.map{|e| Hashie::Mash.new(e)}
-      else
-        Hashie::Mash.new(obj)
-      end
+      json2obj(response)
     end
 
     def watch(key, index=nil)
@@ -75,7 +90,7 @@ module Etcd
                   else
                     api_execute(watch_endpoint + key, :post, {'index' => index})
                   end
-      Hashie::Mash.new(JSON.parse(response))
+      json2obj(response)
     end
 
     def api_execute(path, method, params=nil)
@@ -87,9 +102,10 @@ module Etcd
               else
                 Net::HTTP.new(host, port)
               end
+      http.read_timeout = @read_timeout
 
       case  method
-      when :get 
+      when :get
         unless params.nil?
           encoded_params = URI.encode_www_form(params)
           path+= "?" + encoded_params
@@ -111,7 +127,7 @@ module Etcd
       Log.debug("Invoking: '#{req.class}' against '#{path}")
       res = http.request(req)
       Log.debug("Response code: #{res.code}")
-      if res.is_a?(Net::HTTPSuccess) 
+      if res.is_a?(Net::HTTPSuccess)
         Log.debug("Http success")
         res.body
       elsif redirect?(res.code.to_i) and allow_redirect
@@ -128,5 +144,14 @@ module Etcd
     def redirect?(code)
       (code >= 300) and (code < 400)
     end
+
+    def json2obj(json)
+      obj = JSON.parse(json)
+      if obj.is_a?(Array)
+        obj.map{|e| OpenStruct.new(e)}
+      else
+        OpenStruct.new(obj)
+      end
+    end
   end
 end

data/lib/etcd/lock.rb

@@ -0,0 +1,48 @@
+require 'uuid'
+
+module Etcd
+  class Lock
+    class AcqusitionFailure < StandardError; end
+    class ReleaseFailure < StandardError; end
+
+
+    attr_reader :lock_id, :key, :value, :client
+    attr_reader :retries, :retry_interval, :attempts
+
+
+    def initialize(opts={})
+      @client = opts[:client]
+      @key = opts[:key] || '/global/lock' 
+      @value = opts[:value] || 0
+      @retries = opts[:retries] || 1
+      @retry_interval = opts[:retry_interval] || 1
+      @attempts = 0
+    end
+
+    def acquire
+      @lock_id =  uuid.generate
+      begin
+        response = client.test_and_set(key, lock_id, value)
+        @attempts = 0
+        response
+      rescue Exception => e  
+        @attempts += 1
+        raise AcqusitionFailure, e.message if attempts >= retries
+        sleep retry_interval
+        acquire
+      end
+    end
+
+    def release
+      begin
+        response = client.test_and_set(key, value, lock_id)
+      rescue Exception => e
+        raise ReleaseFailure, e.message
+      end
+    end
+
+    def uuid
+      @uuid ||= UUID.new
+    end
+  end
+end

data/lib/etcd/log.rb

@@ -1,5 +1,7 @@
 require 'mixlib/log'
 module Etcd
+  ##
+  # A wrapper class that extends Mixlib::Log
   class Log
     extend Mixlib::Log
   end

data/lib/etcd/mixins/helpers.rb

@@ -0,0 +1,22 @@
+require 'etcd/lock'
+
+module Etcd
+  module Helpers
+
+    def has_key?(key)
+      begin
+        get(key)
+        true
+      rescue Net::HTTPServerException => e
+        false
+      end
+    end
+
+    def eternal_watch(key, index=nil)
+      loop do
+        response = watch(key, index)
+        yield response
+      end
+    end
+  end
+end

data/lib/etcd/mixins/lockable.rb

@@ -0,0 +1,16 @@
+module Etcd
+  module Lockable
+    def lock(opts={})
+      opts[:client] = opts[:client] || self
+      lock = Lock.new(opts)
+      lock.acquire
+      begin
+        yield lock.lock_id
+      rescue Exception => e
+        raise e
+      ensure
+        lock.release
+      end
+    end
+  end
+end

data/lib/etcd/version.rb

@@ -1,3 +1,3 @@
 module Etcd
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/spec/functional/client_spec.rb

@@ -0,0 +1,55 @@
+$:<< "lib/"
+
+require 'etcd'
+require 'uuid'
+
+ETCD_BIN = ENV['ETCD_BIN'] || './etcd/etcd'
+
+require 'functional_spec_helpers'
+require 'functional/lock_spec'
+require 'functional/read_only_client_spec'
+require 'functional/test_and_set_spec'
+require 'functional/watch_spec'
+
+include Etcd::FunctionalSpec::Helpers
+
+describe "Functional Test Suite" do
+
+  before(:all) do
+    start_etcd_servers
+  end
+
+  after(:all) do
+    stop_etcd_servers
+  end
+
+  let(:client) do
+    Etcd.client
+  end
+
+  let(:read_only_client) do
+    Etcd.client(:allow_redirect=>false, :port=> 4004)
+  end
+
+ 
+  include_examples "read only client"
+  include_examples "lock"
+  include_examples "test_and_set"
+  include_examples "watch"
+
+  it "#set/#get" do
+    key = random_key
+    value = uuid.generate
+    client.set(key, value)
+    expect(client.get(key).value).to eq(value)
+  end
+
+
+  it "#leader" do
+    expect(client.leader).to eq('http://127.0.0.1:7001')
+  end
+
+  it "#machines" do
+    expect(client.machines).to include('http://127.0.0.1:4001')
+  end
+end

data/spec/functional/lock_spec.rb

@@ -0,0 +1,70 @@
+shared_examples "lock" do
+
+  let(:other_client) do
+    Etcd.client
+  end
+
+  it "if the lock is already aquired then another lock acquisition should fail" do
+    key = random_key(4)
+    value = uuid.generate
+    # initialize the lock key
+    client.set(key, value)
+    thr = Thread.new do
+      client.lock(:key=>key, :value=>value) do
+        sleep 2
+      end
+    end
+    sleep 1
+    expect {
+      other_client.lock(:key=>key, :value=> value) do
+        puts "Do something"
+      end
+    }.to raise_error(Etcd::Lock::AcqusitionFailure)
+    thr.join
+  end
+
+  it "if the lock is not already aquired then new lock aquisition should pass" do
+    key = random_key(4)
+    value = uuid.generate
+    # initialize the lock key
+    client.set(key, value)
+    expect {
+      client.lock(:key=>key, :value=>value) do
+        :foo
+      end
+    }.to_not raise_error
+  end
+
+  it "should release the lock even if the given block raises exception" do
+    key = random_key(4)
+    value = uuid.generate
+    client.set(key, value)
+    expect {
+      client.lock(:key=>key, :value=>value) do
+        raise StandardError
+      end
+    }.to raise_error(StandardError)
+
+    expect{
+      other_client.lock(:key=>key, :value=>value) {}
+    }.to_not raise_error
+  end
+
+  it "should raise lock release exception if the lock key value is changed " do
+    key = random_key(4)
+    value = uuid.generate
+    # initialize the lock key
+    client.set(key, value)
+    thr = Thread.new do
+      expect{
+        client.lock(:key=>key, :value=>value) do
+          sleep 3
+        end
+      }.to raise_error(Etcd::Lock::ReleaseFailure)
+
+    end
+    sleep 1
+    other_client.set(key, uuid.generate)
+    thr.join
+  end
+end

data/spec/functional/read_only_client_spec.rb

@@ -0,0 +1,24 @@
+shared_examples "read only client" do
+  it "should not allow write" do
+    key= random_key
+    expect{
+      read_only_client.set(key, uuid.generate)
+    }.to raise_error(Net::HTTPRetriableError)
+  end
+
+  it "should allow reads" do
+    key = random_key
+    value = uuid.generate
+    client.set(key, value)
+    sleep 1
+    expect(read_only_client.get(key).value).to eq(value)
+  end
+
+  it "should allow watch" do
+    key = random_key
+    value = uuid.generate
+    index = client.set(key, value).index
+    expect(read_only_client.watch(key, index).value).to eq(value)
+  end
+end
+

data/spec/functional/test_and_set_spec.rb

@@ -0,0 +1,18 @@
+shared_examples "test_and_set" do
+  it "should pass when prev value is correct" do
+    key = random_key(2)
+    old_value = uuid.generate
+    new_value = uuid.generate
+    client.set(key, old_value)
+    client.test_and_set(key, new_value, old_value)
+    expect(client.get(key).value).to eq(new_value)
+  end
+
+  it "should fail when prev value is incorrect" do
+    key = random_key(2)
+    value = uuid.generate
+    client.set(key, value)
+    expect{ client.test_and_set(key, 10, 2)}.to raise_error(Net::HTTPServerException)
+  end
+end
+

data/spec/functional/watch_spec.rb

@@ -0,0 +1,25 @@
+shared_examples "watch" do
+  it "without index, returns the value at a particular index" do
+    key = random_key(4)
+    value1 = uuid.generate
+    value2 = uuid.generate
+
+    index1 = client.set(key, value1).index
+    index2 = client.set(key, value2).index
+
+    expect(client.watch(key, index1).value).to eq(value1)
+    expect(client.watch(key, index2).value).to eq(value2)
+  end
+
+  it "with index, waits and return when the key is updated" do
+    response = nil
+    key = random_key
+    value = uuid.generate
+    thr = Thread.new do
+      response = client.watch(key)
+    end
+    client.set(key, value)
+    thr.join
+    expect(response.value).to eq(value)
+  end
+end

data/spec/functional_spec_helpers.rb

@@ -0,0 +1,56 @@
+require 'uuid'
+
+module Etcd
+  module FunctionalSpec
+    module Helpers
+      def start_etcd_servers
+        @tmpdir = Dir.mktmpdir
+        pid = spawn_etcd_server(@tmpdir+'/leader')
+        @pids =  Array(pid)
+        puts "Etcd leader process id :#{pid}"
+        leader = '127.0.0.1:7001'    
+
+        4.times do |n|
+          client_port = 4002 + n
+          server_port = 7002 + n
+          pid = spawn_etcd_server(@tmpdir+client_port.to_s, client_port, server_port, leader)
+          @pids << pid
+        end
+      end
+
+      def stop_etcd_servers
+        @pids.each do |pid|
+          Process.kill("HUP", pid)
+          puts "Killed #{pid}"
+        end
+        FileUtils.remove_entry_secure @tmpdir
+      end
+
+      def spawn_etcd_server(dir, client_port=4001, server_port=7001, leader = nil)
+        args = " -c 127.0.0.1:#{client_port} -s 127.0.0.1:#{server_port} -d #{dir} -n node_#{client_port}"
+        command = if leader.nil?
+                    ETCD_BIN + args
+                  else
+                    ETCD_BIN + args + " -C #{leader}"
+                  end
+        puts command
+        pid = spawn(command)
+        Process.detach(pid)
+        sleep 1
+        pid
+      end
+
+      def uuid
+        @uuid ||= UUID.new
+      end
+
+      def random_key(n=1)
+        key=''
+        n.times do
+          key << '/'+ uuid.generate
+        end
+        key
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter "/.bundle/"
+  add_filter "/spec/"
+end
+
+$:.unshift(File.expand_path("../lib", __FILE__))
+$:.unshift(File.expand_path("../spec", __FILE__))
+
+require 'etcd'
+require 'functional_spec_helpers'

data/spec/unit/etcd/client_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+require 'unit/etcd/mixins/helpers_spec'
+
+describe Etcd::Client do
+
+  let(:client) do
+    Etcd::Client.new
+  end
+
+  it "should use localhost and 4001 port by default" do
+    expect(client.host).to eq('127.0.0.1')
+    expect(client.port).to eq(4001)
+  end
+
+  it "shlould follow redirection by default" do
+    expect(client.allow_redirect).to be_true
+  end
+
+  it "#machines should make /machines GET http request" do
+    client.should_receive(:api_execute).with('/v1/machines', :get).and_return('foobar')
+    expect(client.machines).to eq(['foobar'])
+  end
+
+  it "#leader should make /leader GET http request" do
+    client.should_receive(:api_execute).with('/v1/leader', :get).and_return('foobar')
+    expect(client.leader).to eq('foobar')
+  end
+
+  it "#get('/foo') should make /v1/keys/foo GET http request" do
+    client.should_receive(:api_execute).with('/v1/keys/foo', :get).and_return('{"value":1}')
+    expect(client.get('/foo').value).to eq(1)
+  end
+
+  describe "#set" do
+    it "set('/foo', 1) should invoke /v1/keys/foo POST http request" do
+      client.should_receive(:api_execute).with('/v1/keys/foo', :post, {'value'=>1}).and_return('{"value":1}')
+      expect(client.set('/foo', 1).value).to eq(1)
+    end
+    it "set('/foo', 1, 4) should invoke /v1/keys/foo POST http request and set the ttl to 4" do
+      client.should_receive(:api_execute).with('/v1/keys/foo', :post, {'value'=>1, 'ttl'=>4}).and_return('{"value":1}')
+      expect(client.set('/foo', 1, 4).value).to eq(1)
+    end
+  end
+
+  describe "#test_and_set" do
+    it "test_and_set('/foo', 1, 4) should invoke /v1/keys/foo POST http request" do
+      client.should_receive(:api_execute).with('/v1/keys/foo', :post, {'value'=>1, 'prevValue'=>4}).and_return('{"value":1}')
+      expect(client.test_and_set('/foo', 1, 4).value).to eq(1)
+    end
+    it "test_and_set('/foo', 1, 4, 10) should invoke /v1/keys/foo POST http request and set the ttl to 10" do
+      client.should_receive(:api_execute).with('/v1/keys/foo', :post, {'value'=>1, 'prevValue'=>4, 'ttl'=>10}).and_return('{"value":1}')
+      expect(client.test_and_set('/foo', 1, 4, 10).value).to eq(1)
+    end
+  end
+
+  it "#watch('/foo') should make /v1/watch/foo GET http request" do
+    client.should_receive(:api_execute).with('/v1/watch/foo', :get).and_return('{"value":1}')
+    expect(client.watch('/foo').value).to eq(1)
+  end
+
+  it "#delete('/foo') should make /v1/keys/foo DELETE http request" do
+    client.should_receive(:api_execute).with('/v1/keys/foo', :delete).and_return('{"index":"1"}')
+    client.delete('/foo')
+  end
+
+  it_should_behave_like Etcd::Helpers
+end

data/spec/unit/etcd/log_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Etcd::Log do
+  it "should support debug, warn, info logging" do
+    expect(Etcd::Log).to respond_to(:debug)
+    expect(Etcd::Log).to respond_to(:warn)
+    expect(Etcd::Log).to respond_to(:info)
+  end
+  it "should allow users to set a log levels" do
+    Etcd::Log.level = :warn
+    expect(Etcd::Log.level).to eq(:warn)
+  end
+end

data/spec/unit/etcd/mixins/helpers_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+shared_examples Etcd::Helpers do
+  describe "#has_key" do
+    it "should return true when the key is present" do
+      client.should_receive(:get).with('/foo/bar').and_return({})
+      expect(client.has_key?('/foo/bar')).to be_true
+    end
+    it "should return false when the key is absent" do
+      client.should_receive(:get).with('/foo/bar').and_raise(Net::HTTPServerException.new('',''))
+      expect(client.has_key?('/foo/bar')).to be_false
+    end
+  end
+end

data/spec/unit/etcd_spec.rb

@@ -0,0 +1,15 @@
+
+require 'spec_helper'
+
+describe Etcd do
+  describe "#client" do
+    it "should return a valid Etcd::Client object" do
+      expect(Etcd.client).to be_a_kind_of(Etcd::Client)
+    end
+    it "should pass the same options to Etcd::Client initilizer" do
+      opts = { :host => '10.10.10.10', :port=> 4001 }
+      Etcd::Client.should_receive(:new).with(opts)
+      Etcd.client(opts)
+    end
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: etcd
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,15 +34,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: uuid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,15 +90,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -131,6 +116,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -138,37 +125,55 @@ files:
 - etcd.gemspec
 - lib/etcd.rb
 - lib/etcd/client.rb
+- lib/etcd/lock.rb
 - lib/etcd/log.rb
+- lib/etcd/mixins/helpers.rb
+- lib/etcd/mixins/lockable.rb
 - lib/etcd/version.rb
+- spec/functional/client_spec.rb
+- spec/functional/lock_spec.rb
+- spec/functional/read_only_client_spec.rb
+- spec/functional/test_and_set_spec.rb
+- spec/functional/watch_spec.rb
+- spec/functional_spec_helpers.rb
+- spec/spec_helper.rb
+- spec/unit/etcd/client_spec.rb
+- spec/unit/etcd/log_spec.rb
+- spec/unit/etcd/mixins/helpers_spec.rb
+- spec/unit/etcd_spec.rb
 homepage: https://github.com/ranjib/etcd-ruby
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1991828162115001123
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1991828162115001123
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby client library for etcd
-test_files: []
+test_files:
+- spec/functional/client_spec.rb
+- spec/functional/lock_spec.rb
+- spec/functional/read_only_client_spec.rb
+- spec/functional/test_and_set_spec.rb
+- spec/functional/watch_spec.rb
+- spec/functional_spec_helpers.rb
+- spec/spec_helper.rb
+- spec/unit/etcd/client_spec.rb
+- spec/unit/etcd/log_spec.rb
+- spec/unit/etcd/mixins/helpers_spec.rb
+- spec/unit/etcd_spec.rb