etcd 0.2.0.alpha → 0.2.0.beta.1

data/spec/etcd/test_and_set_spec.rb

@@ -2,51 +2,52 @@
 
 require 'spec_helper'
 
-describe "Etcd test_and_set" do
+describe 'Etcd test_and_set' do
 
   let(:client) do
     Etcd.client
   end
 
-  it "should pass when prev value is correct" 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)
+    resp = client.set(key, value: old_value)
+    resp.node.value.should eql old_value
+    client.test_and_set(key, value: new_value, prevValue: old_value)
     expect(client.get(key).value).to eq(new_value)
   end
 
-  it "should fail when prev value is incorrect" do
+  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(Etcd::TestFailed)
+    client.set(key, value: value)
+    expect { client.test_and_set(key, value: 10, prevValue: 2) }.to raise_error(Etcd::TestFailed)
   end
 
-  it "#create should succeed when the key is absent and update should fail" do
+  it '#create should succeed when the key is absent and update should fail' do
     key = random_key(2)
     value = uuid.generate
-    expect {
-      client.update(key, value)
-    }.to raise_error
-    expect {
-      client.create(key, value)
-    }.to_not raise_error
+    expect do
+      client.update(key, value: value)
+    end.to raise_error
+    expect do
+      client.create(key, value: value)
+    end.to_not raise_error
     expect(client.get(key).value).to eq(value)
   end
 
-  it "#create should fail when the key is present and update should succeed" do
+  it '#create should fail when the key is present and update should succeed' do
     key = random_key(2)
     value = uuid.generate
-    client.set(key, 1)
+    client.set(key, value: 1)
 
-    expect {
-      client.create(key, value)
-    }.to raise_error
+    expect do
+      client.create(key, value: value)
+    end.to raise_error
 
-    expect {
-      client.update(key, value)
-    }.to_not raise_error
+    expect do
+      client.update(key, value: value)
+    end.to_not raise_error
   end
 end

data/spec/etcd/watch_spec.rb

@@ -2,32 +2,32 @@
 
 require 'spec_helper'
 
-describe "Etcd watch" do
+describe 'Etcd watch' do
 
   let(:client) do
     Etcd.client
   end
 
-  it "without index, returns the value at a particular index" do
+  it 'without index, returns the value at a particular index' do
     key = random_key(4)
     value1 = uuid.generate
     value2 = uuid.generate
 
-    index1 = client.create(key, value1).node.modifiedIndex
-    index2 = client.test_and_set(key, value2, value1).node.modifiedIndex
+    index1 = client.create(key, value: value1).node.modifiedIndex
+    index2 = client.test_and_set(key, value: value2, prevValue: value1).node.modifiedIndex
 
     expect(client.watch(key, index: index1).node.value).to eq(value1)
     expect(client.watch(key, index: index2).node.value).to eq(value2)
   end
 
-  it "with index, waits and return when the key is updated" do
+  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)
+    client.set(key, value: value)
     thr.join
     expect(response.node.value).to eq(value)
   end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-$:.unshift(File.expand_path("../lib", __FILE__))
-$:.unshift(File.expand_path("../spec", __FILE__))
+$LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
+$LOAD_PATH.unshift(File.expand_path('../spec', __FILE__))
 
 require 'coco'
 require 'uuid'
@@ -9,40 +9,39 @@ require 'etcd'
 
 module Etcd
   module SpecHelper
-
     @@pids =  []
 
     def self.etcd_binary
-      if File.exists? './etcd/etcd'
-        './etcd/etcd'
-      elsif !! ENV['ETCD_BIN']
+      if File.exists? './etcd/bin/etcd'
+        './etcd/bin/etcd'
+      elsif !!ENV['ETCD_BIN']
         ENV['ETCD_BIN']
       else
-        raise 'etcd binary not found., you need to set ETCD_BIN'
+        fail 'etcd binary not found., you need to set ETCD_BIN'
       end
     end
 
     def self.start_etcd_servers
       @@tmpdir = Dir.mktmpdir
-      pid = spawn_etcd_server(@@tmpdir+'/leader')
+      pid = spawn_etcd_server(@@tmpdir + '/leader')
       @@pids =  Array(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)
+        pid = spawn_etcd_server(@@tmpdir + client_port.to_s, client_port, server_port, leader)
         @@pids << pid
       end
     end
 
     def self.stop_etcd_servers
       @@pids.each do |pid|
-        Process.kill("TERM", pid)
+        Process.kill('TERM', pid)
       end
       FileUtils.remove_entry_secure(@@tmpdir, true)
     end
 
-    def self.spawn_etcd_server(dir, client_port=4001, server_port=7001, leader = nil)
+    def self.spawn_etcd_server(dir, client_port = 4001, server_port = 7001, leader = nil)
       args = " -addr 127.0.0.1:#{client_port} -peer-addr 127.0.0.1:#{server_port} -data-dir #{dir} -name node_#{client_port}"
       command = if leader.nil?
                   etcd_binary + args
@@ -59,16 +58,16 @@ module Etcd
       @uuid ||= UUID.new
     end
 
-    def random_key(n=1)
-      key=''
+    def random_key(n = 1)
+      key = ''
       n.times do
-        key << '/'+ uuid.generate
+        key << '/' + uuid.generate
       end
       key
     end
 
     def etcd_servers
-      (1..5).map{|n| "http://127.0.0.1:700#{n}"}
+      (1..5).map { |n| "http://127.0.0.1:700#{n}" }
     end
 
     def other_client
@@ -76,7 +75,7 @@ module Etcd
     end
 
     def read_only_client
-      Etcd.client(:allow_redirect=>false, :port=> 4004)
+      Etcd.client(allow_redirect: false, port: 4004)
     end
   end
 end
@@ -91,4 +90,3 @@ RSpec.configure do |c|
     Etcd::SpecHelper.stop_etcd_servers
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd
 version: !ruby/object:Gem::Version
-  version: 0.2.0.alpha
+  version: 0.2.0.beta.1
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -90,8 +90,10 @@ files:
 - .coco.yml
 - .gitignore
 - .rspec
+- .rubocop.yml
 - .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -108,6 +110,7 @@ files:
 - lib/etcd/response.rb
 - lib/etcd/stats.rb
 - lib/etcd/version.rb
+- spec/etcd/basic_auth_client_spec.rb
 - spec/etcd/client_spec.rb
 - spec/etcd/keys_spec.rb
 - spec/etcd/leader_spec.rb
@@ -144,6 +147,7 @@ signing_key:
 specification_version: 4
 summary: Ruby client library for etcd
 test_files:
+- spec/etcd/basic_auth_client_spec.rb
 - spec/etcd/client_spec.rb
 - spec/etcd/keys_spec.rb
 - spec/etcd/leader_spec.rb