etcd 0.0.6 → 0.2.0.alpha

data/spec/etcd/stats_spec.rb

@@ -0,0 +1,40 @@
+# Encoding: utf-8
+
+require 'spec_helper'
+
+describe Etcd::Stats do
+
+  let(:client) do
+    Etcd.client
+  end
+
+  describe 'of leader' do
+
+    let(:stats) do
+      client.stats(:leader)
+    end
+
+    it 'should contain a key for leader' do
+      expect(stats['leader']).to_not be_nil
+    end
+
+    it 'should have 4 followers (since we spawn 5 node etcd cluster)' do
+      expect(stats['followers'].keys.size).to eq(4)
+    end
+  end
+
+  it 'should show self statsistics' do
+    expect(client.stats(:self)['name']).to_not be_nil
+    expect(client.stats(:self)['state']).to_not be_nil
+  end
+
+  it 'should show store statistics' do
+    expect(client.stats(:store).keys).to_not be_empty
+  end
+
+  it 'should raise error for invalid types' do
+    expect do
+      client.stats(:foo)
+    end.to raise_error
+  end
+end

data/spec/{functional → etcd}/test_and_set_spec.rb

@@ -1,4 +1,13 @@
-shared_examples "test_and_set" do
+# Encoding: utf-8
+
+require 'spec_helper'
+
+describe "Etcd test_and_set" do
+
+  let(:client) do
+    Etcd.client
+  end
+
   it "should pass when prev value is correct" do
     key = random_key(2)
     old_value = uuid.generate
@@ -12,7 +21,7 @@ shared_examples "test_and_set" 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)
+    expect{ client.test_and_set(key, 10, 2)}.to raise_error(Etcd::TestFailed)
   end
 
   it "#create should succeed when the key is absent and update should fail" do
@@ -41,4 +50,3 @@ shared_examples "test_and_set" do
     }.to_not raise_error
   end
 end
-

data/spec/{functional → etcd}/watch_spec.rb

@@ -1,4 +1,13 @@
-shared_examples "watch" do
+# Encoding: utf-8
+
+require 'spec_helper'
+
+describe "Etcd watch" do
+
+  let(:client) do
+    Etcd.client
+  end
+
   it "without index, returns the value at a particular index" do
     key = random_key(4)
     value1 = uuid.generate
@@ -7,8 +16,8 @@ shared_examples "watch" do
     index1 = client.create(key, value1).node.modifiedIndex
     index2 = client.test_and_set(key, value2, value1).node.modifiedIndex
 
-    expect(client.watch(key, index: index1).value).to eq(value1)
-    expect(client.watch(key, index: index2).value).to eq(value2)
+    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
@@ -20,6 +29,6 @@ shared_examples "watch" do
     end
     client.set(key, value)
     thr.join
-    expect(response.value).to eq(value)
+    expect(response.node.value).to eq(value)
   end
 end

data/spec/spec_helper.rb

@@ -1,14 +1,94 @@
 # 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 'coco'
+require 'uuid'
 require 'etcd'
-require 'functional_spec_helpers'
+
+module Etcd
+  module SpecHelper
+
+    @@pids =  []
+
+    def self.etcd_binary
+      if File.exists? './etcd/etcd'
+        './etcd/etcd'
+      elsif !! ENV['ETCD_BIN']
+        ENV['ETCD_BIN']
+      else
+        raise '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')
+      @@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)
+        @@pids << pid
+      end
+    end
+
+    def self.stop_etcd_servers
+      @@pids.each do |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)
+      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
+                else
+                  etcd_binary + args + " -peers #{leader}"
+                end
+      pid = spawn(command, out: '/dev/null')
+      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
+
+    def etcd_servers
+      (1..5).map{|n| "http://127.0.0.1:700#{n}"}
+    end
+
+    def other_client
+      Etcd.client
+    end
+
+    def read_only_client
+      Etcd.client(:allow_redirect=>false, :port=> 4004)
+    end
+  end
+end
+
+RSpec.configure do |c|
+
+  c.include Etcd::SpecHelper
+  c.before(:suite) do
+    Etcd::SpecHelper.start_etcd_servers
+  end
+  c.after(:suite) do
+    Etcd::SpecHelper.stop_etcd_servers
+  end
+end
+

metadata

@@ -1,111 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: etcd
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.2.0.alpha
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mixlib-cli
-  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: 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: :runtime
+  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'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  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
@@ -115,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coco.yml
 - .gitignore
 - .rspec
 - .travis.yml
@@ -122,25 +95,30 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- build_etcd
 - etcd.gemspec
 - lib/etcd.rb
 - lib/etcd/client.rb
-- lib/etcd/lock.rb
+- lib/etcd/exceptions.rb
+- lib/etcd/keys.rb
 - lib/etcd/log.rb
-- lib/etcd/mixins/helpers.rb
-- lib/etcd/mixins/lockable.rb
+- lib/etcd/mod/leader.rb
+- lib/etcd/mod/lock.rb
+- lib/etcd/node.rb
+- lib/etcd/response.rb
+- lib/etcd/stats.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/etcd/client_spec.rb
+- spec/etcd/keys_spec.rb
+- spec/etcd/leader_spec.rb
+- spec/etcd/lock_spec.rb
+- spec/etcd/node_spec.rb
+- spec/etcd/read_only_client_spec.rb
+- spec/etcd/readme_spec.rb
+- spec/etcd/stats_spec.rb
+- spec/etcd/test_and_set_spec.rb
+- spec/etcd/watch_spec.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
@@ -151,29 +129,29 @@ 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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Ruby client library for etcd
 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/etcd/client_spec.rb
+- spec/etcd/keys_spec.rb
+- spec/etcd/leader_spec.rb
+- spec/etcd/lock_spec.rb
+- spec/etcd/node_spec.rb
+- spec/etcd/read_only_client_spec.rb
+- spec/etcd/readme_spec.rb
+- spec/etcd/stats_spec.rb
+- spec/etcd/test_and_set_spec.rb
+- spec/etcd/watch_spec.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

data/spec/functional/client_spec.rb

@@ -1,59 +0,0 @@
-$:<< "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
-
-  let(:etcd_servers) do
-    (1..5).map{|n| "http://127.0.0.1:700#{n}"}
-  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(etcd_servers).to include(client.leader)
-  end
-
-  it "#machines" do
-    expect(client.machines).to include('http://127.0.0.1:4001')
-  end
-end