etcd 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 608958d15011133cdba9f60d48ed79e880e0de67
-  data.tar.gz: 2c4ad5c83169f006a7fdd04ca4817d8ebedd8c52
+  metadata.gz: 22603e3722f2b94cc4b1b11b4b656328a43df33a
+  data.tar.gz: 13ecd4b92dc77af3540a61aa0237fbec51eb8b68
 SHA512:
-  metadata.gz: 119aca839b983863c895be6b7ab86f73b4301a8ad816b104652b0e3a1d10f9c5c0ebb49a315b858e8cfa5be7c07fc79523a3bfd02157d67052145d0409b6a39b
-  data.tar.gz: d1e5bd3393d11a19eb647db761571c55597b8884f3e1eb393dd9536727da340a28a6e87b4d7c1b49af3a2711518a7878ec7ffd900c65afd3e57d3f3d14e7b259
+  metadata.gz: ce218a334fd115475efb1e2aa4424de2a6c61c8b9d16ba3aceacecea6d2c4aa7fbeb980700cc6889e305f3297723a45837cdc022cd7e72fe4c880f25facb0033
+  data.tar.gz: ac82296d320989aa83c1852287a1b956709edb578e5215efbb9ad2318ad30e0641e37b3e7a70f7ea5efb127909cd404cbfe2fcee39c54ba4769d18795084706d

data/.rspec

@@ -1,3 +1,2 @@
 -c
 -fd
---fail-fast

data/.rubocop.yml

@@ -1,9 +1,9 @@
 AllCops:
-  Includes:
+  Include:
     - Gemfile
-    - lib/**
-  Excludes:
-    - spec/**
+    - lib/**/*
+  Exclude:
+    - spec/**/*
 
 Encoding:
   Enabled: false

data/.travis.yml

@@ -1,11 +1,13 @@
 before_install:
-  - bash build_etcd
-  - bundle install --path .bundle
+  - wget -c https://github.com/coreos/etcd/releases/download/v2.0.0-rc.1/etcd-v2.0.0-rc.1-linux-amd64.tar.gz
+  - tar -zxf etcd-v2.0.0-rc.1-linux-amd64.tar.gz
+  - bundle install
+
 rvm:
   - 1.9.3
-  - 2.0.0
   - 2.1.0
+  - 2.2.0
 branches:
   only:
     - master
-script: "ETCD_BIN=./etcd/bin/etcd bundle exec rake spec"
+script: "ETCD_BIN=./etcd-v2.0.0-rc.1-linux-amd64/etcd bundle exec rake spec"

data/Gemfile

@@ -7,5 +7,6 @@ gem 'coco'
 gem 'rubocop'
 gem 'guard'
 gem 'guard-rake'
+gem 'json'
 # uuid gem isn't pulling in systemu
 gem 'systemu'

data/README.md

@@ -25,6 +25,31 @@ client = Etcd.client(host: '127.0.0.1', port: 4003)
 client = Etcd.client(:user_name => 'test', :password => 'pwd') # populates the authentication header for basic HTTP auth with user name and password (useful for proxied connections)
 client = Etcd.client(host: '127.0.0.1', port: 4003, allow_redirect: false) # wont let you run sensitive commands on non-leader machines, default is true
 ```
+
+### Create a client object to connect to a SSL etcd instance
+
+See [Etcd config](https://github.com/coreos/etcd/blob/master/Documentation/configuration.md) to setup `etcd` in SSL mode.
+
+Assuming you have these:
+* `myca.crt` - Your internal CAs certificate
+* `my-cert.crt` - The "client" cert
+* `my-cert.key` - The key corresponding to `my-cert.crt`
+
+If you were using self signed Certs and have your own CA, You would have set `-ca-file` in your etcd config also to use `myca.crt`.
+
+```ruby
+client=Etcd.client(
+  :host => "your-etcd-host",
+  :port => 443,
+  :use_ssl => true,
+  :ca_file => "/pathto/myca.crt",
+  :ssl_cert => OpenSSL::X509::Certificate.new( File.read("/pathto/my-cert.crt") ),
+  :ssl_key => OpenSSL::PKey::RSA.new("/etc/ssl/my-cert.key",passphrase)
+)
+#Omit passphrase if not set on your key.
+```
+
+
 ### Set a key
 ```ruby
 client.set('/nodes/n1', value: 1)

data/etcd.gemspec

@@ -18,10 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mixlib-log"
+  spec.required_ruby_version = '>= 1.9'
 
+  spec.add_dependency "mixlib-log"
   spec.add_development_dependency "uuid"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rdoc"
   spec.add_development_dependency "rspec"
 end

data/lib/etcd/client.rb

@@ -16,7 +16,6 @@ module Etcd
   # etcd api, like Etcd::Client#lock and Etcd::Client#eternal_watch, they
   # are defined in separate modules and included in this class
   class Client
-
     extend Forwardable
 
     HTTP_REDIRECT = ->(r) { r.is_a? Net::HTTPRedirection }
@@ -26,12 +25,19 @@ module Etcd
     include Stats
     include Keys
 
-    Config = Struct.new(:use_ssl, :verify_mode, :read_timeout, :ssl_key, :ca_file,
-                        :user_name, :password, :allow_redirect, :ssl_cert)
+    Config = Struct.new(
+      :use_ssl,
+      :verify_mode,
+      :read_timeout,
+      :ssl_key,
+      :ca_file,
+      :user_name,
+      :password,
+      :ssl_cert
+    )
 
     def_delegators :@config, :use_ssl, :verify_mode, :read_timeout
-    def_delegators :@config, :user_name, :password, :allow_redirect
-
+    def_delegators :@config, :user_name, :password
 
     attr_reader :host, :port, :http, :config
 
@@ -48,12 +54,15 @@ module Etcd
       @port = opts[:port] || 4001
       @config = Config.new
       @config.read_timeout = opts[:read_timeout] || 60
-      @config.allow_redirect = opts.key?(:allow_redirect) ? opts[:allow_redirect] : true
       @config.use_ssl = opts[:use_ssl] || false
       @config.verify_mode = opts.key?(:verify_mode) ? opts[:verify_mode] : OpenSSL::SSL::VERIFY_PEER
       @config.user_name = opts[:user_name] || nil
       @config.password = opts[:password] || nil
-      @config.allow_redirect = opts.key?(:allow_redirect) ? opts[:allow_redirect] : true
+      @config.ca_file = opts.key?(:ca_file) ? opts[:ca_file] : nil
+      # Provide a OpenSSL X509 cert here and not the path. See README
+      @config.ssl_cert = opts.key?(:ssl_cert) ? opts[:ssl_cert] : nil
+      # Provide the key (content) and not just the filename here.
+      @config.ssl_key = opts.key?(:ssl_key) ? opts[:ssl_key] : nil
       yield @config if block_given?
     end
     # rubocop:enable CyclomaticComplexity
@@ -68,14 +77,9 @@ module Etcd
       api_execute('/version', :get).body
     end
 
-    # Returns array of all machines in the cluster
-    def machines
-      api_execute(version_prefix + '/machines', :get).body.split(',').map(&:strip)
-    end
-
     # Get the current leader
     def leader
-      api_execute(version_prefix + '/leader', :get).body.strip
+      api_execute(version_prefix + '/stats/leader', :get).body.strip
     end
 
     # This method sends api request to etcd server.
@@ -99,51 +103,40 @@ module Etcd
       else
         fail "Unknown http action: #{method}"
       end
-      timeout = options[:timeout] || @read_timeout
       http = Net::HTTP.new(host, port)
-      http.read_timeout = timeout
+      http.read_timeout = options[:timeout] || read_timeout
       setup_https(http)
       req.basic_auth(user_name, password) if [user_name, password].all?
       Log.debug("Invoking: '#{req.class}' against '#{path}")
       res = http.request(req)
       Log.debug("Response code: #{res.code}")
-      process_http_request(res, req, params)
+      Log.debug("Response body: #{res.body}")
+      process_http_request(res)
     end
 
     def setup_https(http)
       http.use_ssl = use_ssl
       http.verify_mode = verify_mode
-      unless config.ssl_cert.nil?
+      if config.ssl_cert
         Log.debug('Setting up ssl cert')
         http.cert = config.ssl_cert
       end
-      unless config.ssl_key.nil?
+      if config.ssl_key
         Log.debug('Setting up ssl key')
         http.key = config.ssl_key
       end
-      unless config.ca_file.nil?
+      if config.ca_file
         Log.debug('Setting up ssl ca file to :' + config.ca_file)
         http.ca_file = config.ca_file
       end
     end
 
-    # need to ahve original request to process the response when it redirects
-    def process_http_request(res, req = nil, params = nil)
+    # need to have original request to process the response when it redirects
+    def process_http_request(res)
       case res
       when HTTP_SUCCESS
         Log.debug('Http success')
         res
-      when HTTP_REDIRECT
-        if allow_redirect
-          uri = URI(res['location'])
-          @host = uri.host
-          @port = uri.port
-          Log.debug("Http redirect, setting new host to: #{@host}:#{@port}, and retrying")
-          api_execute(uri.path, req.method.downcase.to_sym, params: params)
-        else
-          Log.debug('Http redirect not allowed')
-          res.error!
-        end
       when HTTP_CLIENT_ERROR
         fail Error.from_http_response(res)
       else

data/lib/etcd/keys.rb

@@ -78,8 +78,12 @@ module Etcd
       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)
+      response = api_execute(
+        key_endpoint + key,
+        :get,
+        timeout: timeout,
+        params: params
+      )
       Response.from_http_response(response)
     end
 

data/lib/etcd/node.rb

@@ -19,7 +19,7 @@ module Etcd
       @expiration = opts['expiration']
       @dir = opts['dir']
 
-      if opts['dir'] && (!!opts['nodes'])
+      if opts['dir'] && opts['nodes']
         opts['nodes'].each do |data|
           children << Node.new(data)
         end
@@ -39,7 +39,7 @@ module Etcd
     end
 
     def directory?
-      !! @dir
+      ! @dir.nil?
     end
   end
 end

data/lib/etcd/version.rb

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

data/spec/etcd/basic_auth_client_spec.rb

@@ -3,14 +3,6 @@
 require 'spec_helper'
 
 describe 'Etcd basic auth client' do
-
-  before(:all) do
-    start_daemon(2)
-  end
-  after(:all) do
-    stop_daemon
-  end
-
   let(:client) do
     Etcd.client(host: 'localhost') do |config|
       config.user_name = 'test'
@@ -25,13 +17,4 @@ describe 'Etcd basic auth client' do
   it '#password' do
     expect(client.password).to eq('pwd')
   end
-
-  it 'should set basic auth' do
-    Net::HTTPRequest.any_instance.should_receive(:basic_auth).with('test', 'pwd')
-    key = random_key
-    value = uuid.generate
-    client.set(key, value: value)
-    sleep 1
-    expect(read_only_client.get(key).value).to eq(value)
-  end
 end

data/spec/etcd/client_spec.rb

@@ -1,29 +1,12 @@
 require 'spec_helper'
 
 describe Etcd::Client do
-
-  before(:all) do
-    start_daemon(3)
-  end
-
-  after(:all) do
-    stop_daemon
-  end
-
   let(:client) do
     etcd_client
   end
 
-  it 'should return the leader address' do
-    expect(client.leader).to_not be_nil
-  end
-
-  it '#machines' do
-    expect(client.machines).to include('http://127.0.0.1:4001')
-  end
-
-  it '#version' do
-    expect(client.version).to match(/^etcd v?0\.\d+\.\d+(\+git)?/)
+  it '#version' do #etcd 2.0.0-rc.1
+    expect(client.version).to match(/^etcd v?\d+\.\d+\.\d+.*$/)
   end
 
   it '#version_prefix' do
@@ -36,15 +19,6 @@ describe Etcd::Client do
         client.api_execute('/v2/keys/x', :do)
       end.to raise_error
     end
-
-    it 'should redirect api request when allow_redirect is set' do
-      key = random_key
-      value = uuid.generate
-      resp = client.set(key, value: value)
-      resp.node.key.should eql key
-      resp.node.value.should eql value
-      client.get(key).value.should eql resp.value
-    end
   end
 
   context '#http header based metadata' do

data/spec/etcd/keys_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Etcd::Keys do
-
   shared_examples 'basic key operation' do
-
     it '#set/#get' do
       key = random_key
       value = uuid.generate
@@ -65,43 +63,10 @@ describe Etcd::Keys do
       end
     end
   end
-
   context 'without ssl' do
-    before(:all) do
-      start_daemon
-    end
-    after(:all) do
-      stop_daemon
-    end
     let(:client) do
       etcd_client
     end
     it_should_behave_like 'basic key operation'
   end
-
-  context 'with ssl' do
-    before(:all) do
-      start_daemon(1, use_ssl: true)
-    end
-    after(:all) do
-      stop_daemon
-    end
-    let(:client) do
-      etcd_ssl_client
-    end
-    it_should_behave_like 'basic key operation'
-  end
-
-  context 'with ssl and client certificate' do
-    before(:all) do
-      start_daemon(1, use_ssl: true, check_client_cert: true )
-    end
-    after(:all) do
-      stop_daemon
-    end
-    let(:client) do
-      etcd_ssl_client_with_cert
-    end
-    it_should_behave_like 'basic key operation'
-  end
 end

data/spec/etcd/node_spec.rb

@@ -1,15 +1,6 @@
 require 'spec_helper'
 
 describe Etcd::Node do
-
-  before(:all) do
-    start_daemon
-  end
-
-  after(:all) do
-    stop_daemon
-  end
-
   let(:client) do
     etcd_client
   end

data/spec/etcd/readme_spec.rb

@@ -3,17 +3,8 @@
 require 'spec_helper'
 
 describe 'Etcd specs for the main etcd README examples' do
-
-  before(:all) do
-    start_daemon
-  end
-
-  after(:all) do
-    stop_daemon
-  end
-
   let(:client) do
-    Etcd.client
+    etcd_client
   end
 
   shared_examples 'response with valid node data' do |action|
@@ -307,7 +298,6 @@ describe 'Etcd specs for the main etcd README examples' do
   end
 
   context 'hidden nodes' do
-
     before(:all) do
       etcd_client.set('/_message', value: 'Hello Hidden World')
       etcd_client.set('/message', value: 'Hello World')

data/spec/etcd/stats_spec.rb

@@ -3,19 +3,14 @@
 require 'spec_helper'
 
 describe Etcd::Stats do
-
-  before(:all) do
-    start_daemon(5)
-  end
-
-  after(:all) do
-    stop_daemon
-  end
-
   let(:client) do
     etcd_client
   end
 
+  let(:leader) do
+    etcd_leader
+  end
+
   describe 'of leader' do
 
     let(:stats) do
@@ -23,11 +18,7 @@ describe Etcd::Stats do
     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)
+      expect(leader.stats(:leader)).to_not be_nil
     end
   end
 

data/spec/etcd/test_and_set_spec.rb

@@ -3,15 +3,6 @@
 require 'spec_helper'
 
 describe 'Etcd test_and_set' do
-
-  before(:all) do
-    start_daemon
-  end
-
-  after(:all) do
-    stop_daemon
-  end
-
   let(:client) do
     etcd_client
   end
@@ -21,7 +12,7 @@ describe 'Etcd test_and_set' do
     old_value = uuid.generate
     new_value = uuid.generate
     resp = client.set(key, value: old_value)
-    resp.node.value.should eql old_value
+    expect(resp.node.value).to eq(old_value)
     client.test_and_set(key, value: new_value, prevValue: old_value)
     expect(client.get(key).value).to eq(new_value)
   end

data/spec/etcd/watch_spec.rb

@@ -3,19 +3,9 @@
 require 'spec_helper'
 
 describe 'Etcd watch' do
-
-  before(:all) do
-    start_daemon
-  end
-
-  after(:all) do
-    stop_daemon
-  end
-
   let(:client) do
     etcd_client
   end
-
   it 'without index, returns the value at a particular index' do
     key = random_key(4)
     value1 = uuid.generate

data/spec/spec_helper.rb

@@ -20,32 +20,31 @@ module Etcd
       @ca_cert = File.expand_path('../data/ca.crt', __FILE__)
     end
 
-    def etcd_servers
-      @pids.size.times.inject([]){|servers, n| servers << "http://127.0.0.1:700#{n}" }
+    def etcd_ports
+      @pids.size.times.inject([]){|servers, n| servers << 4000 + n + 1 }
     end
 
-    def start(numbers = 1, opts={})
+    def start(numbers = 1)
       raise "Already running etcd servers(#{@pids.inspect})" unless @pids.empty?
       @tmpdir = Dir.mktmpdir
-      ssl_args = ""
-      ssl_args << " -cert-file=#{@cert_file} -key-file=#{@key_file}" if opts[:use_ssl]
-      ssl_args << " -ca-file=#{@ca_cert}" if opts[:check_client_cert]
-      @pids << daemonize(@tmpdir, ssl_args)
-      (numbers - 1).times do |n|
-        @pids << daemonize(@tmpdir, ssl_args)
+      (1..numbers).each do |n|
+        @pids << daemonize(n, @tmpdir + n.to_s , numbers)
       end
+      sleep 5
     end
 
-    def daemonize(dir, ssl_args)
-      client_port = 4001 + @pids.size
-      server_port = 7001 + @pids.size
-      leader = '127.0.0.1:7001'
-      args = " -addr 127.0.0.1:#{client_port} -peer-addr 127.0.0.1:#{server_port}"
-      args << " -data-dir #{dir + client_port.to_s} -name node_#{client_port}"
-      command = etcd_binary + args + ssl_args
-      command << " -peers #{leader}"  unless @pids.empty? # if pids are not empty, theres a daemon already
-      pid = spawn(command, out: '/dev/null')
-      sleep 1
+    def daemonize(index, dir, total)
+      ad_url = "http://localhost:#{7000 + index}"
+      client_url = "http://localhost:#{4000 + index}"
+      cluster_urls = (1..total).map{|n| "node_#{n}=http://localhost:#{7000 + n}"}.join(",")
+      flags = " -name node_#{index} -initial-advertise-peer-urls #{ad_url}"
+      flags << " -listen-peer-urls #{ad_url}"
+      flags << " -listen-client-urls #{client_url}"
+      flags << " -initial-cluster #{cluster_urls}"
+      flags << " -data-dir #{dir} "
+
+      command = etcd_binary + flags
+      pid = spawn(command, out: '/dev/null', err: '/dev/null')
       Process.detach(pid)
       pid
     end
@@ -70,13 +69,15 @@ module Etcd
   end
 
   module SpecHelper
-
+    def spawner
+      Spawner.instance
+    end
     def start_daemon(numbers = 1, opts={})
-      Spawner.instance.start(numbers, opts)
+      spawner.start(numbers, opts)
     end
 
     def stop_daemon
-      Spawner.instance.stop
+     spawner.stop
     end
 
     def uuid
@@ -91,41 +92,24 @@ module Etcd
       key
     end
 
-    def etcd_ssl_client
-      Etcd.client(host: 'localhost') do |config|
-        config.use_ssl = true
-        config.ca_file = File.expand_path('../data/ca.crt', __FILE__)
-      end
+    def etcd_client(port = 4001)
+      Etcd.client(host: 'localhost', port: port)
     end
 
-    def etcd_ssl_client
-      Etcd.client(host: 'localhost') do |config|
-        config.use_ssl = true
-        config.ca_file = File.expand_path('../data/ca.crt', __FILE__)
-      end
-    end
-
-    def etcd_ssl_client_with_cert
-      client_cert = File.expand_path('../data/client.crt', __FILE__)
-      client_key = File.expand_path('../data/client.key', __FILE__)
-      Etcd.client(host: 'localhost') do |config|
-        config.use_ssl = true
-        config.ca_file = File.expand_path('../data/ca.crt', __FILE__)
-        config.ssl_cert = OpenSSL::X509::Certificate.new(File.read(client_cert))
-        config.ssl_key = OpenSSL::PKey::RSA.new(File.read(client_key))
-      end
-    end
-
-    def etcd_client
-      Etcd.client
-    end
-
-    def read_only_client
-      Etcd.client(allow_redirect: false, port: 4002, host: 'localhost')
+    def etcd_leader
+      clients = spawner.etcd_ports.map{|port| etcd_client(port)}
+      clients.detect{|c|c.stats(:self)['state'] == 'StateLeader'}
     end
   end
 end
 
 RSpec.configure do |c|
   c.include Etcd::SpecHelper
+  c.before(:suite) do
+    Etcd::Spawner.instance.start(3)
+  end
+  c.after(:suite) do
+    Etcd::Spawner.instance.stop
+  end
+  c.fail_fast = false
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  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
@@ -97,15 +111,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- build_etcd
 - etcd.gemspec
 - lib/etcd.rb
 - lib/etcd/client.rb
 - lib/etcd/exceptions.rb
 - lib/etcd/keys.rb
 - lib/etcd/log.rb
-- lib/etcd/mod/leader.rb
-- lib/etcd/mod/lock.rb
 - lib/etcd/node.rb
 - lib/etcd/response.rb
 - lib/etcd/stats.rb
@@ -118,10 +129,7 @@ files:
 - spec/etcd/basic_auth_client_spec.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
@@ -139,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -160,10 +168,7 @@ test_files:
 - spec/etcd/basic_auth_client_spec.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

data/build_etcd

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-wget -c https://go.googlecode.com/files/go1.2.linux-amd64.tar.gz
-tar -zxf go1.2.linux-amd64.tar.gz
-git clone https://github.com/coreos/etcd
-export GOROOT=$PWD/go
-export PATH=$GOROOT/bin:$PATH
-cd etcd && ./build

data/lib/etcd/mod/leader.rb

@@ -1,28 +0,0 @@
-# Encoding: utf-8
-
-require 'timeout'
-
-module Etcd
-  module Mod
-    # Implement Etcd's Leader module
-    module Leader
-      def mod_leader_endpoint
-        '/mod/v2/leader'
-      end
-
-      def set_leader(key, value, ttl)
-        path = mod_leader_endpoint + "#{key}?ttl=#{ttl}"
-        api_execute(path, :put, params: { name: value }).body
-      end
-
-      def get_leader(key)
-        api_execute(mod_leader_endpoint + key, :get).body
-      end
-
-      def delete_leader(key, value)
-        path = mod_leader_endpoint + key + '?' + URI.encode_www_form(name: value)
-        api_execute(path, :delete).body
-      end
-    end
-  end
-end

data/lib/etcd/mod/lock.rb

@@ -1,61 +0,0 @@
-# Encoding: utf-8
-
-require 'timeout'
-
-module Etcd
-  module Mod
-    # implement etcd lock module
-    module Lock
-      def mod_lock_endpoint
-        '/mod/v2/lock'
-      end
-
-      def acquire_lock(key, ttl, opts = {})
-        path = mod_lock_endpoint + key + "?ttl=#{ttl}"
-        timeout = opts[:timeout] || 60
-        Timeout.timeout(timeout) do
-          return api_execute(path, :post, params: opts).body
-        end
-      end
-
-      def renew_lock(key, ttl, opts = {})
-        unless opts.key?(:index) || opts.key?(:value)
-          fail ArgumentError, 'You mast pass index or value'
-        end
-        path = mod_lock_endpoint + key + "?ttl=#{ttl}"
-        timeout = opts[:timeout] || 60
-        Timeout.timeout(timeout) do
-          api_execute(path, :put, params: opts).body
-        end
-      end
-
-      def get_lock(key, opts = {})
-        api_execute(mod_lock_endpoint + key, :get, params: opts).body
-      end
-
-      def delete_lock(key, opts = {})
-        unless opts.key?(:index) || opts.key?(:value)
-          fail ArgumentError, 'You must pass index or value'
-        end
-        api_execute(mod_lock_endpoint + key, :delete, params: opts)
-      end
-
-      # rubocop:disable RescueException
-      def lock(key, ttl, opts = {})
-        key = "/" + key unless key.start_with? '/'
-        lock_index = acquire_lock(key, ttl, opts)
-        begin
-          yield key
-        rescue Exception => e
-          raise e
-        ensure
-          delete_lock(key, index: lock_index)
-        end
-      end
-      # rubocop:enable RescueException
-
-      alias_method :retrive_lock, :get_lock
-      alias_method :release_lock, :delete_lock
-    end
-  end
-end

data/spec/etcd/leader_spec.rb

@@ -1,39 +0,0 @@
-# Encoding: utf-8
-
-require 'spec_helper'
-=begin
-
-describe 'mod leader' do
-
-  before(:all) do
-    start_daemon
-  end
-
-  after(:all) do
-    stop_daemon
-  end
-
-  let(:client) do
-    etcd_client
-  end
-
-  it 'should allow setting a key value with ttl' do
-    client.set_leader('/db_master1', 'db01', 10)
-    expect(client.get_leader('/db_master1')).to eq('db01')
-  end
-
-  it 'should allow deleting key with value' do
-    client.set_leader('/db_master4', 'db04', 10)
-    expect do
-      client.delete_leader('/db_master4', 'db04')
-    end.to_not raise_error
-  end
-
-  it 'should not allow deleting key without value' do
-    client.set_leader('/db_master5', 'db05', 10)
-    expect do
-      client.delete_leader('/db_master5', 'db04')
-    end.to raise_error
-  end
-end
-=end

data/spec/etcd/lock_spec.rb

@@ -1,55 +0,0 @@
-# Encoding: utf-8
-
-require 'spec_helper'
-=begin
-describe 'lock' do
-
-  before(:all) do
-    start_daemon
-  end
-
-  after(:all) do
-    stop_daemon
-  end
-
-  let(:client) do
-    etcd_client
-  end
-
-  it 'should be able to acquire a lock' do
-    expect do
-      client.acquire_lock('/my_lock', 10)
-    end.to_not raise_error
-  end
-
-  it 'should be able to renew a lock based on value' do
-    client.acquire_lock('/my_lock1', 10, value: 123)
-    expect do
-      client.renew_lock('/my_lock1', 10, value: 123)
-    end.to_not raise_error
-  end
-
-  it 'should be able to renew a lock based on index' do
-    client.acquire_lock('/my_lock2', 10)
-    index = client.get_lock('/my_lock2', field: 'index')
-    expect do
-      client.renew_lock('/my_lock2', 10, index: index)
-    end.to_not raise_error
-  end
-
-  it 'should be able to delete a lock based on value' do
-    client.acquire_lock('/my_lock3', 10, value: 123)
-    expect do
-      client.delete_lock('/my_lock3', value: 123)
-    end.to_not raise_error
-  end
-
-  it 'should be able to delete a lock based on index' do
-    client.acquire_lock('/my_lock4', 10)
-    index = client.get_lock('/my_lock4', field: 'index')
-    expect do
-      client.delete_lock('/my_lock4', index: index)
-    end.to_not raise_error
-  end
-end
-=end

data/spec/etcd/read_only_client_spec.rb

@@ -1,39 +0,0 @@
-# Encoding: utf-8
-
-require 'spec_helper'
-
-describe 'Etcd read only client' do
-
-  before(:all) do
-    start_daemon(3)
-  end
-  after(:all) do
-    stop_daemon
-  end
-
-  let(:client) do
-    etcd_client
-  end
-
-  it 'should not allow write' do
-    key = random_key
-    expect do
-      read_only_client.set(key, value: uuid.generate)
-    end.to raise_error(Net::HTTPRetriableError)
-  end
-
-  it 'should allow reads' do
-    key = random_key
-    value = uuid.generate
-    client.set(key, value: 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: value).node.modified_index
-    expect(read_only_client.watch(key, index: index).value).to eq(value)
-  end
-end