etcd 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGE5YmE0ZDk3MDJmNjQzZDJkMWJhOTg2ZDNiODM4NGEyYzFlNDg0Yw==
-  data.tar.gz: !binary |-
-    NTM0MzMyY2RlZWFlYjAxYTc2OGU3Mjk5YmEwOTlmYmJkN2NiZTJlNg==
+SHA1:
+  metadata.gz: 608958d15011133cdba9f60d48ed79e880e0de67
+  data.tar.gz: 2c4ad5c83169f006a7fdd04ca4817d8ebedd8c52
 SHA512:
-  metadata.gz: !binary |-
-    MGM0YzhmZDdmYmJmY2IyZmViYTEwMDlkNmNkMDQ2ZDhlNjE0Nzg4MDA0MjUw
-    MDcwY2QyNzA1MDEwN2IwZmMwMThlN2MxNTNmOGRiNDIyNTU5ZjcyY2I2NWQ5
-    ODI5MWU2ZDVjZjQxMDFhNTkyY2QzMWExMDYwNjBmNDk1OTJhYmE=
-  data.tar.gz: !binary |-
-    YmM3ZWU4NDUzOWQwY2U2MzM0ZWI2YTM2MDMxOTJhOGE2OTJmNzUyNGM3Mzgw
-    OWViNGFmNDc3MjA5MWFkODQxYWI5YTQyMzlhMmFmM2RhYTIwOGI5NTI5NzI4
-    NDMzNjBmNmIwM2VlM2FlNWY4YjViOGY4MmRiZTI3NGYyODQ3MDI=
+  metadata.gz: 119aca839b983863c895be6b7ab86f73b4301a8ad816b104652b0e3a1d10f9c5c0ebb49a315b858e8cfa5be7c07fc79523a3bfd02157d67052145d0409b6a39b
+  data.tar.gz: d1e5bd3393d11a19eb647db761571c55597b8884f3e1eb393dd9536727da340a28a6e87b4d7c1b49af3a2711518a7878ec7ffd900c65afd3e57d3f3d14e7b259

data/README.md

@@ -27,9 +27,9 @@ client = Etcd.client(host: '127.0.0.1', port: 4003, allow_redirect: false) # won
 ```
 ### Set a key
 ```ruby
-client.set('/nodes/n1', 1)
+client.set('/nodes/n1', value: 1)
 # with ttl
-client.set('/nodes/n2', 2, 4)  # sets the ttl to 4 seconds
+client.set('/nodes/n2', value: 2, ttl: 4)  # sets the ttl to 4 seconds
 ```
 ### Get a key
 ```ruby

data/Rakefile

@@ -5,7 +5,7 @@ require "rubocop/rake_task"
 
 RSpec::Core::RakeTask.new("spec")
 
-Rubocop::RakeTask.new do |task|
+RuboCop::RakeTask.new do |task|
   task.fail_on_error = true
 end
 

data/lib/etcd/client.rb

@@ -8,8 +8,6 @@ require 'etcd/log'
 require 'etcd/stats'
 require 'etcd/keys'
 require 'etcd/exceptions'
-require 'etcd/mod/lock'
-require 'etcd/mod/leader'
 
 module Etcd
   ##
@@ -27,8 +25,6 @@ module Etcd
 
     include Stats
     include Keys
-    include Mod::Lock
-    include Mod::Leader
 
     Config = Struct.new(:use_ssl, :verify_mode, :read_timeout, :ssl_key, :ca_file,
                         :user_name, :password, :allow_redirect, :ssl_cert)

data/lib/etcd/keys.rb

@@ -76,6 +76,7 @@ module Etcd
       index = opts[:waitIndex] || opts[:index]
       params[:waitIndex] = index unless index.nil?
       params[:consistent] = opts[:consistent] if opts.key?(:consistent)
+      params[:recursive] = opts[:recursive] if opts.key?(:recursive)
 
       response = api_execute(key_endpoint + key, :get,
                              timeout: timeout, params: params)

data/lib/etcd/mod/leader.rb

@@ -4,7 +4,7 @@ require 'timeout'
 
 module Etcd
   module Mod
-    # Implemetn Etcd's Leader module
+    # Implement Etcd's Leader module
     module Leader
       def mod_leader_endpoint
         '/mod/v2/leader'

data/lib/etcd/version.rb

@@ -1,5 +1,5 @@
 # Encoding: utf-8
 # Version const
 module Etcd
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/etcd/keys_spec.rb

@@ -15,10 +15,10 @@ describe Etcd::Keys do
       it 'should be true for existing keys' do
         key = random_key
         client.create(key, value: 10)
-        expect(client.exists?(key)).to be_true
+        expect(client.exists?(key)).to be(true)
       end
       it 'should be true for existing keys' do
-        expect(client.exists?(random_key)).to be_false
+        expect(client.exists?(random_key)).to be(false)
       end
     end
 
@@ -26,13 +26,14 @@ describe Etcd::Keys do
       it 'should be able to create a directory' do
         d = random_key
         client.create(d, dir: true)
-        expect(client.get(d)).to be_true
+        expect(client.get(d)).to be_directory
       end
       context 'empty' do
         it 'should be able to delete with dir flag' do
           d = random_key
           client.create(d, dir: true)
-          expect(client.delete(d, dir: true)).to be_true
+          client.delete(d, dir: true)
+          expect(client.exist?(d)).to be(false)
         end
 
         it 'should not be able to delete without dir flag' do

data/spec/etcd/leader_spec.rb

@@ -1,6 +1,7 @@
 # Encoding: utf-8
 
 require 'spec_helper'
+=begin
 
 describe 'mod leader' do
 
@@ -35,3 +36,4 @@ describe 'mod leader' do
     end.to raise_error
   end
 end
+=end

data/spec/etcd/lock_spec.rb

@@ -1,7 +1,7 @@
 # Encoding: utf-8
 
 require 'spec_helper'
-
+=begin
 describe 'lock' do
 
   before(:all) do
@@ -52,3 +52,4 @@ describe 'lock' do
     end.to_not raise_error
   end
 end
+=end

data/spec/etcd/watch_spec.rb

@@ -40,4 +40,19 @@ describe 'Etcd watch' do
     thr.join
     expect(response.node.value).to eq(value)
   end
+
+
+  it 'with recrusive, waits and return when the key is updated' do
+    response = nil
+    key = random_key
+    value = uuid.generate
+    client.set("#{key}/subkey", value:"initial_value")
+    thr = Thread.new do
+      response = client.watch(key, recursive:true, timeout:3)
+    end
+    sleep 2
+    client.set("#{key}/subkey", value: value)
+    thr.join
+    expect(response.node.value).to eq(value)
+  end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: etcd
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby client library for etcd
@@ -87,11 +87,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coco.yml
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".coco.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -137,17 +137,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby client library for etcd