etcd 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTQyMjkyOGM4NDVjZDUxZjkxZTBlYmMyMzdlMjYwMDAyOGJiZGEwYg==
+    NGE5YmE0ZDk3MDJmNjQzZDJkMWJhOTg2ZDNiODM4NGEyYzFlNDg0Yw==
   data.tar.gz: !binary |-
-    ZGY4MjJlZGJhODY1NTQ0YTA1YjkxYmNhYmJiNDI2ZGVhMDMxMTZhYQ==
+    NTM0MzMyY2RlZWFlYjAxYTc2OGU3Mjk5YmEwOTlmYmJkN2NiZTJlNg==
 SHA512:
   metadata.gz: !binary |-
-    NDc5NmZkOTAwZGNhZjNkMjBmMTM3NWRmYTViYzE3YTkyMWY3Yzc3NjcxYjRi
-    OWVmZDZkNWE3MzdjNWJhODgzN2RhZDg0NThhZWFiOTUxY2Y5ODU5MGE5NzJj
-    NWRhZWJjZmNlM2IyNDJlNjBkZDVkZjYwZjgzNzEwMTY1NzhiOGE=
+    MGM0YzhmZDdmYmJmY2IyZmViYTEwMDlkNmNkMDQ2ZDhlNjE0Nzg4MDA0MjUw
+    MDcwY2QyNzA1MDEwN2IwZmMwMThlN2MxNTNmOGRiNDIyNTU5ZjcyY2I2NWQ5
+    ODI5MWU2ZDVjZjQxMDFhNTkyY2QzMWExMDYwNjBmNDk1OTJhYmE=
   data.tar.gz: !binary |-
-    Njc1NGI2NWUyZGEzMWZhMmU0M2JkYjdiNDFmMWNkNzUxYTQ2YzI4NjFiNmVh
-    NjBjYjcyNDBlMzczODg3YzcyNmZkNTllZTY0Y2UxMWM1ODU2ZDBlNzI5Y2M1
-    NDJkNzAzYTZjYzlmNzRkY2E1OWI4NWI3ZmZkNjI3YWY3MTg4NDM=
+    YmM3ZWU4NDUzOWQwY2U2MzM0ZWI2YTM2MDMxOTJhOGE2OTJmNzUyNGM3Mzgw
+    OWViNGFmNDc3MjA5MWFkODQxYWI5YTQyMzlhMmFmM2RhYTIwOGI5NTI5NzI4
+    NDMzNjBmNmIwM2VlM2FlNWY4YjViOGY4MmRiZTI3NGYyODQ3MDI=

data/lib/etcd.rb

@@ -11,6 +11,8 @@ module Etcd
   # directly
   # If +opts+ is not passed default options are used, defined by Etcd::Client.new
   def self.client(opts = {})
-    Etcd::Client.new(opts)
+    Etcd::Client.new(opts) do |config|
+      yield config if block_given?
+    end
   end
 end

data/lib/etcd/client.rb

@@ -2,6 +2,7 @@
 
 require 'openssl'
 require 'net/http'
+require 'net/https'
 require 'json'
 require 'etcd/log'
 require 'etcd/stats'
@@ -17,6 +18,9 @@ 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 }
     HTTP_SUCCESS = ->(r) { r.is_a? Net::HTTPSuccess }
     HTTP_CLIENT_ERROR = ->(r) { r.is_a? Net::HTTPClientError }
@@ -26,9 +30,14 @@ module Etcd
     include Mod::Lock
     include Mod::Leader
 
-    attr_reader :host, :port, :http, :allow_redirect
-    attr_reader :use_ssl, :verify_mode, :read_timeout
-    attr_reader :user_name, :password
+    Config = Struct.new(:use_ssl, :verify_mode, :read_timeout, :ssl_key, :ca_file,
+                        :user_name, :password, :allow_redirect, :ssl_cert)
+
+    def_delegators :@config, :use_ssl, :verify_mode, :read_timeout
+    def_delegators :@config, :user_name, :password, :allow_redirect
+
+
+    attr_reader :host, :port, :http, :config
 
     ##
     # Creates an Etcd::Client object. It accepts a hash +opts+ as argument
@@ -41,12 +50,15 @@ module Etcd
     def initialize(opts = {})
       @host = opts[:host] || '127.0.0.1'
       @port = opts[:port] || 4001
-      @read_timeout = opts[:read_timeout] || 60
-      @allow_redirect = opts.key?(:allow_redirect) ? opts[:allow_redirect] : true
-      @use_ssl = opts[:use_ssl] || false
-      @verify_mode = opts.key?(:verify_mode) ? opts[:verify_mode] : OpenSSL::SSL::VERIFY_PEER
-      @user_name = opts[:user_name] || nil
-      @password = opts[:password] || nil
+      @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
+      yield @config if block_given?
     end
     # rubocop:enable CyclomaticComplexity
 
@@ -94,8 +106,7 @@ module Etcd
       timeout = options[:timeout] || @read_timeout
       http = Net::HTTP.new(host, port)
       http.read_timeout = timeout
-      http.use_ssl = use_ssl
-      http.verify_mode = verify_mode
+      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)
@@ -103,6 +114,23 @@ module Etcd
       process_http_request(res, req, params)
     end
 
+    def setup_https(http)
+      http.use_ssl = use_ssl
+      http.verify_mode = verify_mode
+      unless config.ssl_cert.nil?
+        Log.debug('Setting up ssl cert')
+        http.cert = config.ssl_cert
+      end
+      unless config.ssl_key.nil?
+        Log.debug('Setting up ssl key')
+        http.key = config.ssl_key
+      end
+      unless config.ca_file.nil?
+        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)
       case res

data/lib/etcd/node.rb

@@ -5,7 +5,7 @@ module Etcd
   class Node
     include Comparable
 
-    attr_reader :created_index, :modified_index, :expiration, :ttl, :key, :value
+    attr_reader :created_index, :modified_index, :expiration, :ttl, :key, :value, :dir
     alias_method :createdIndex, :created_index
     alias_method :modifiedIndex, :modified_index
 

data/lib/etcd/version.rb

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

data/spec/data/ca.crt

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDxzCCAq+gAwIBAgIJAOHnywsV/TrCMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRQwEgYDVQQHDAtGb3N0ZXIgQ2l0
+eTESMBAGA1UECgwJZXRjZC1ydWJ5MQswCQYDVQQDDAJDQTEfMB0GCSqGSIb3DQEJ
+ARYQcmFuamliQGxpbnV4LmNvbTAeFw0xNDAzMTYwMjM2MjVaFw0xOTAzMTUwMjM2
+MjVaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRQwEgYDVQQH
+DAtGb3N0ZXIgQ2l0eTESMBAGA1UECgwJZXRjZC1ydWJ5MQswCQYDVQQDDAJDQTEf
+MB0GCSqGSIb3DQEJARYQcmFuamliQGxpbnV4LmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANf6jqt488XVaHDnXFT3KwXRuzs4fglJacRSXCjgfowN
+QXgMawcycaX2/IZVk0FbQqiWZmS76ho5yaFny/GEHxKmeBchbLfciBbTWT6aJ5Kx
+jDlLbMS9qZB+flV7dcUS+XYtNyDMAz52CnD5IvZSAXT0HADeATtZd49y9K6KE5Gc
+2Mff2Rco6Fs1+r5Pg3LPitqq4xU56ezb8TM+bDlG0czrhrGCm4IuwspYDJYFhWk5
+v85d9s5WxenJsJaGfAwV3+XbSRymr/JHWHUd/UR+iMvQ4qGd7JBI5UJU9IpM0zuT
+EgZRptBoZfLolqArqZbbWhif5+qRRtjkpiVfNMqSsksCAwEAAaNQME4wHQYDVR0O
+BBYEFPIzKQ+nceGu6RbzP9jCNaIPZvNKMB8GA1UdIwQYMBaAFPIzKQ+nceGu6Rbz
+P9jCNaIPZvNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJfbp690
+nlbxr68RhAMtufqU9a+wBgh/U/Vlp5XlToCaDitdQToDkONuLnSx+sa2bnSg+gKs
+dVNDYAat8jlJ6U3mIoC8zS7MPF0BCr9gXk7BQW/p0zZf0I62CbTkucBh5yE8WFB9
+r7Z2UgpaJ6j95IVSRoVZ1gCbhKvN0o9dts4P8WD8ow3+kJ8n1wcPlZ5qvCzoDQNX
+hJFE+vPN9UMP/oo4p/xzHJUysJcDwQ5k+Jqnl6wY289RibGaTfIFFWxqAKUVmxno
+Ybkq5mZiXj0cs2lqw3zWYQ4xP6b50uECik+KZnBqYSmLP9s7d0qFgoA4ChFh5S1L
+KY5mizc88rgPhlc=
+-----END CERTIFICATE-----

data/spec/data/client.crt

@@ -0,0 +1,85 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=California, L=Foster City, O=etcd-ruby, CN=CA/emailAddress=ranjib@linux.com
+        Validity
+            Not Before: Mar 17 04:27:53 2014 GMT
+            Not After : Mar 17 04:27:53 2015 GMT
+        Subject: C=US, ST=California, L=Foster City, O=etcd-ruby-client, CN=localhost/emailAddress=ranjib@linux.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:dc:79:2c:aa:a0:6d:dd:09:72:29:6e:a2:67:a5:
+                    15:dd:b6:27:e2:e1:4a:ae:4c:2e:19:52:b3:31:2c:
+                    2b:8e:0b:62:bf:83:62:0e:a3:41:22:4c:6a:f1:84:
+                    4d:8f:18:22:13:53:56:79:44:df:9f:b8:e1:05:a4:
+                    7b:50:35:14:0c:9c:7c:40:ef:c3:27:1c:84:77:7c:
+                    0a:5e:ef:e7:ac:97:85:3c:ec:aa:32:5b:30:37:10:
+                    7b:2b:ab:ac:96:53:79:42:47:ff:5e:22:19:bb:c3:
+                    50:da:3d:75:ae:14:fa:68:f7:e6:e0:d5:a0:2d:60:
+                    0e:71:0b:a9:9f:ff:13:b7:d1:0f:e6:b9:e9:12:fa:
+                    fb:ff:d7:a7:33:73:15:f7:1b:37:f1:2f:d7:4a:96:
+                    46:c8:30:b9:4a:a6:29:9b:c5:7c:c4:a6:e2:b7:08:
+                    74:2c:8f:25:0b:a9:a5:13:4f:03:e3:ae:d6:12:56:
+                    1d:b5:9b:b0:32:f4:84:f9:59:1e:10:30:a9:7a:c0:
+                    f2:75:6d:44:c1:2d:9a:f2:4e:1e:59:af:f2:30:8e:
+                    12:8e:da:85:00:c3:c8:28:96:1e:59:98:49:a4:93:
+                    87:0f:b5:e8:0c:95:90:a8:20:3d:43:26:67:4e:9a:
+                    ee:ac:5e:0a:40:53:2b:99:4c:db:9d:72:20:25:04:
+                    d4:ab
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                3D:DA:77:1F:F0:A1:13:50:B4:CD:74:B3:45:90:F9:20:CB:EC:A1:79
+            X509v3 Authority Key Identifier: 
+                keyid:F2:33:29:0F:A7:71:E1:AE:E9:16:F3:3F:D8:C2:35:A2:0F:66:F3:4A
+
+            X509v3 Extended Key Usage: 
+                TLS Web Client Authentication
+    Signature Algorithm: sha1WithRSAEncryption
+         3e:a5:65:e2:2d:95:d0:1f:56:d4:07:67:37:fb:f4:e0:30:95:
+         fd:a0:d0:a0:29:2d:2b:c1:33:d8:76:02:c7:17:e0:4e:88:30:
+         26:4f:ec:99:b8:a6:0e:c4:e3:9f:3d:ce:fa:29:0b:58:51:a4:
+         14:9f:1b:5b:ce:91:72:04:ed:f9:ac:55:6e:72:fe:81:2f:30:
+         c1:3b:6f:75:9d:56:af:d6:12:66:4d:95:24:c1:b9:c7:da:98:
+         3f:9f:b1:ce:22:ba:f7:16:6a:37:e2:57:d1:b7:01:3b:30:7b:
+         30:60:f6:f6:10:37:ef:8e:d8:fa:13:33:dd:d1:99:b7:65:07:
+         b0:e4:b9:04:2f:28:3d:b1:cf:6b:01:1b:8c:fe:ac:f3:db:6e:
+         e9:86:19:de:2a:c9:eb:f4:ae:d0:93:72:14:03:4a:63:dc:8e:
+         c6:76:fa:0e:4f:be:91:3b:3c:7e:44:f0:07:b1:06:4d:a6:d5:
+         3b:c8:e3:4b:92:8f:43:1c:8b:e0:44:51:a0:55:1e:d9:33:23:
+         77:83:6e:90:4b:aa:3b:d5:57:ed:73:bd:7b:f6:be:0c:d5:76:
+         8e:ee:00:2d:ee:71:b5:f4:e0:ef:f5:2f:34:6e:25:ac:d2:2d:
+         9d:50:ec:df:b9:fd:39:4b:b7:60:85:24:45:ca:0e:54:73:92:
+         a7:d0:62:d8
+-----BEGIN CERTIFICATE-----
+MIIEEDCCAvigAwIBAgIBATANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTEUMBIGA1UEBwwLRm9zdGVyIENpdHkxEjAQBgNV
+BAoMCWV0Y2QtcnVieTELMAkGA1UEAwwCQ0ExHzAdBgkqhkiG9w0BCQEWEHJhbmpp
+YkBsaW51eC5jb20wHhcNMTQwMzE3MDQyNzUzWhcNMTUwMzE3MDQyNzUzWjCBiDEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFDASBgNVBAcMC0Zvc3Rl
+ciBDaXR5MRkwFwYDVQQKDBBldGNkLXJ1YnktY2xpZW50MRIwEAYDVQQDDAlsb2Nh
+bGhvc3QxHzAdBgkqhkiG9w0BCQEWEHJhbmppYkBsaW51eC5jb20wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDceSyqoG3dCXIpbqJnpRXdtifi4UquTC4Z
+UrMxLCuOC2K/g2IOo0EiTGrxhE2PGCITU1Z5RN+fuOEFpHtQNRQMnHxA78MnHIR3
+fApe7+esl4U87KoyWzA3EHsrq6yWU3lCR/9eIhm7w1DaPXWuFPpo9+bg1aAtYA5x
+C6mf/xO30Q/muekS+vv/16czcxX3GzfxL9dKlkbIMLlKpimbxXzEpuK3CHQsjyUL
+qaUTTwPjrtYSVh21m7Ay9IT5WR4QMKl6wPJ1bUTBLZryTh5Zr/IwjhKO2oUAw8go
+lh5ZmEmkk4cPtegMlZCoID1DJmdOmu6sXgpAUyuZTNudciAlBNSrAgMBAAGjgZEw
+gY4wCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQg
+Q2VydGlmaWNhdGUwHQYDVR0OBBYEFD3adx/woRNQtM10s0WQ+SDL7KF5MB8GA1Ud
+IwQYMBaAFPIzKQ+nceGu6RbzP9jCNaIPZvNKMBMGA1UdJQQMMAoGCCsGAQUFBwMC
+MA0GCSqGSIb3DQEBBQUAA4IBAQA+pWXiLZXQH1bUB2c3+/TgMJX9oNCgKS0rwTPY
+dgLHF+BOiDAmT+yZuKYOxOOfPc76KQtYUaQUnxtbzpFyBO35rFVucv6BLzDBO291
+nVav1hJmTZUkwbnH2pg/n7HOIrr3Fmo34lfRtwE7MHswYPb2EDfvjtj6EzPd0Zm3
+ZQew5LkELyg9sc9rARuM/qzz227phhneKsnr9K7Qk3IUA0pj3I7GdvoOT76ROzx+
+RPAHsQZNptU7yONLko9DHIvgRFGgVR7ZMyN3g26QS6o71Vftc7179r4M1XaO7gAt
+7nG19ODv9S80biWs0i2dUOzfuf05S7dghSRFyg5Uc5Kn0GLY
+-----END CERTIFICATE-----

data/spec/data/client.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDceSyqoG3dCXIp
+bqJnpRXdtifi4UquTC4ZUrMxLCuOC2K/g2IOo0EiTGrxhE2PGCITU1Z5RN+fuOEF
+pHtQNRQMnHxA78MnHIR3fApe7+esl4U87KoyWzA3EHsrq6yWU3lCR/9eIhm7w1Da
+PXWuFPpo9+bg1aAtYA5xC6mf/xO30Q/muekS+vv/16czcxX3GzfxL9dKlkbIMLlK
+pimbxXzEpuK3CHQsjyULqaUTTwPjrtYSVh21m7Ay9IT5WR4QMKl6wPJ1bUTBLZry
+Th5Zr/IwjhKO2oUAw8golh5ZmEmkk4cPtegMlZCoID1DJmdOmu6sXgpAUyuZTNud
+ciAlBNSrAgMBAAECggEAAeTcmF6mcvaoz2hO5tsJNA1jjFRpItQutTL7rRl3ClJY
+t9J2HjAS2CuV45tCW09Ww5m8rXAFB8c7z6OZF5hNIsqZWql0oLpi/O/I2wXulJH8
+qAhUcfhMkryGglqIMgZnjUU3EWTzmaRU5nsOrr8pY4t1pUrQhHNFzHzQKTq0vah/
+CGWU4vd/F4P6NAuIhaWFbjkPJcKc/bNjGaoo/mh0JVlHzlA7soPmRr3Ki2ucHVsy
+n24QApG+XULuJCUOV6EhaUFvKkCziId4xFoMqwAzzZ2sUiYt9+ftpZ9fB7Q6KcW0
+MftW0P6ox3cTL/6HJ8gdHoQVDo/692kJAfWwaoKEyQKBgQDxRzx8OfCcXtMrB1D0
++dT9Do0sbaXY5MY59S1maCvbpDL/jApttSMM+R0BugKtTQjYykLYSKrRhp8JDOPO
+L/XJ+7azfw01IduVvRE5auKwJohS1DJx1NexDF2OMKBOLVffbBdweHIwKDNde9ki
++ws1PJTrNcXTr+uoZ0BBDtg33wKBgQDp7PcoZHYcyBdBgUiFZdZWSLjHl3pRjcJY
+qQT3sHDomweYx9kwafbf2iKPs0KLzfsHdFMvT/Og1Ks9mD9vZMoWVxia9J3/mlD5
+66imnXfcuN432kIqxwY2PArLsUOGJs9zCTr6Yed1XBHdBNEQWVmox+g8TdTyVZlk
+xu3zANUstQKBgG+/D3t1lkPGA0VteQhM4WFmqOnHysUeh9R2AlXor09lyBzlLjtL
+ZnVutwmCrhS3lf5aBwWG+l5aXDPj3Wo0ekDXLPILSQGvsbSzQVP3dhAheIfsMYTZ
+ECC22mmticFLbORUerKjhjdZlxiX8KQr4y//4/TgDcSSOLHhSDgZePi/AoGAE6j6
+zMZEtv6KFdNLyQpaDT5naT7t5NTJNLJf3IFTu/jrloeVVWBSg1XN+c3TFfTl2CaK
+pztM+oNlMPQOwMnzwhTn2H4emVDa5WZM8lPhswdGheMuFHJNr1k0fxIS3r98R+rK
+rih0T4TBa5XwDDO2OV0zw323G/bdwX6GmRnE0NECgYAZL+Nyz6kTvRhv4o68hubR
+3XmxgtGA8mQWq88aYN9xBvO4S5ixxV5qqWDVrKf7qdTerDkvTcEeDQ4ERdojQau5
+HSppZrGs7ARsGvWOvSInXE2SNl8YjKKNqOD4SEAQy2xjblP9EAFmTaAG9RtUQFn9
+MO7HMeev/i1iRK6q7OXZeg==
+-----END PRIVATE KEY-----

data/spec/data/server.crt

@@ -0,0 +1,83 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=California, L=Foster City, O=etcd-ruby, CN=CA/emailAddress=ranjib@linux.com
+        Validity
+            Not Before: Mar 16 02:48:04 2014 GMT
+            Not After : Mar 16 02:48:04 2015 GMT
+        Subject: C=US, ST=California, L=Foster City, O=Default Company Ltd, CN=localhost/emailAddress=ranjib@linux.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:d3:d7:3f:b2:88:6b:48:c3:1f:ae:70:cf:a5:ec:
+                    71:1a:f0:3c:82:4f:29:84:d4:f9:01:d1:4e:b4:ba:
+                    cf:72:88:06:55:01:c5:f6:83:d1:34:cf:3c:8b:40:
+                    1c:eb:0e:36:93:d4:08:2a:b3:1b:55:42:a2:12:40:
+                    b5:c0:a1:51:22:9c:95:19:22:3e:a6:52:b9:5f:d9:
+                    04:45:bb:e6:95:13:61:7c:54:8e:17:07:f8:23:4c:
+                    e7:dd:61:bc:71:78:5a:7e:c6:ae:1a:ec:05:b4:02:
+                    96:b4:ca:16:5a:50:25:e1:9d:df:ae:41:39:ff:64:
+                    d3:33:87:53:36:51:68:8f:fe:92:9d:a7:02:53:be:
+                    c8:be:bd:13:c0:34:d6:d4:a9:0a:84:9d:53:4e:37:
+                    42:57:70:5b:eb:5f:97:36:3c:1b:30:77:83:61:d9:
+                    43:ee:9a:8f:c4:40:13:ef:b2:d2:42:d2:85:f5:ca:
+                    bb:92:8e:a6:85:9d:b5:fd:7b:6e:a9:46:33:35:5c:
+                    13:8d:71:9d:dd:7e:96:a2:da:98:c4:cc:33:00:aa:
+                    a4:fc:41:b0:cb:80:13:57:19:d7:36:06:bc:d3:58:
+                    3c:ab:31:e6:db:3d:8b:52:bb:c2:97:22:72:8e:c2:
+                    b8:9e:4a:a8:22:96:6f:9f:9d:a4:f5:8f:15:7d:9f:
+                    91:2b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                B1:24:B6:2E:99:A8:14:D8:86:84:FB:0B:26:A7:64:3B:29:59:B6:D9
+            X509v3 Authority Key Identifier: 
+                keyid:F2:33:29:0F:A7:71:E1:AE:E9:16:F3:3F:D8:C2:35:A2:0F:66:F3:4A
+
+    Signature Algorithm: sha1WithRSAEncryption
+         0e:a1:12:ce:cb:db:64:d3:61:a2:0e:0b:93:ea:16:7b:91:6f:
+         af:a6:0a:e8:bf:b5:a7:4a:60:41:fc:cc:d6:bb:8b:4c:00:f3:
+         08:c6:31:41:57:7e:66:53:1e:41:93:e7:e2:62:e5:d6:9a:93:
+         ca:ef:b6:d1:1e:3d:ec:e4:fe:8e:1b:ac:4d:ef:16:56:09:8c:
+         d5:1a:30:c9:2f:13:1d:47:17:6e:67:26:9d:75:a1:9d:94:41:
+         f9:3e:b6:de:f5:e9:76:87:dc:c7:a9:d6:37:47:52:bf:2a:59:
+         48:72:56:f0:89:d5:83:9c:35:f3:37:48:02:52:4a:a0:52:92:
+         fe:65:6b:7b:ce:57:0c:9b:93:56:48:86:c5:db:4f:df:dd:d4:
+         ac:9f:31:39:77:7b:3a:aa:f5:d8:95:db:28:e6:1b:47:9d:18:
+         c5:b2:38:88:2a:8a:5d:11:9d:aa:26:aa:8c:06:8a:20:b1:70:
+         7e:2b:dd:fa:12:7b:32:64:c6:5b:54:d6:4a:aa:fb:a4:22:35:
+         6b:69:9f:c6:c2:58:e7:79:6f:a6:4b:f5:25:64:55:ce:2f:69:
+         52:76:1c:33:9e:97:3d:f5:f7:2c:67:29:30:55:86:65:5a:9a:
+         7c:9c:79:80:f6:14:e3:8b:35:fb:7d:c9:a8:c0:86:24:07:9d:
+         0d:c2:69:70
+-----BEGIN CERTIFICATE-----
+MIID/DCCAuSgAwIBAgIBAjANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTEUMBIGA1UEBwwLRm9zdGVyIENpdHkxEjAQBgNV
+BAoMCWV0Y2QtcnVieTELMAkGA1UEAwwCQ0ExHzAdBgkqhkiG9w0BCQEWEHJhbmpp
+YkBsaW51eC5jb20wHhcNMTQwMzE2MDI0ODA0WhcNMTUwMzE2MDI0ODA0WjCBizEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFDASBgNVBAcMC0Zvc3Rl
+ciBDaXR5MRwwGgYDVQQKDBNEZWZhdWx0IENvbXBhbnkgTHRkMRIwEAYDVQQDDAls
+b2NhbGhvc3QxHzAdBgkqhkiG9w0BCQEWEHJhbmppYkBsaW51eC5jb20wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDT1z+yiGtIwx+ucM+l7HEa8DyCTymE
+1PkB0U60us9yiAZVAcX2g9E0zzyLQBzrDjaT1AgqsxtVQqISQLXAoVEinJUZIj6m
+Urlf2QRFu+aVE2F8VI4XB/gjTOfdYbxxeFp+xq4a7AW0Apa0yhZaUCXhnd+uQTn/
+ZNMzh1M2UWiP/pKdpwJTvsi+vRPANNbUqQqEnVNON0JXcFvrX5c2PBswd4Nh2UPu
+mo/EQBPvstJC0oX1yruSjqaFnbX9e26pRjM1XBONcZ3dfpai2pjEzDMAqqT8QbDL
+gBNXGdc2BrzTWDyrMebbPYtSu8KXInKOwrieSqgilm+fnaT1jxV9n5ErAgMBAAGj
+ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+IENlcnRpZmljYXRlMB0GA1UdDgQWBBSxJLYumagU2IaE+wsmp2Q7KVm22TAfBgNV
+HSMEGDAWgBTyMykPp3HhrukW8z/YwjWiD2bzSjANBgkqhkiG9w0BAQUFAAOCAQEA
+DqESzsvbZNNhog4Lk+oWe5Fvr6YK6L+1p0pgQfzM1ruLTADzCMYxQVd+ZlMeQZPn
+4mLl1pqTyu+20R497OT+jhusTe8WVgmM1RowyS8THUcXbmcmnXWhnZRB+T623vXp
+dofcx6nWN0dSvypZSHJW8InVg5w18zdIAlJKoFKS/mVre85XDJuTVkiGxdtP393U
+rJ8xOXd7Oqr12JXbKOYbR50YxbI4iCqKXRGdqiaqjAaKILFwfivd+hJ7MmTGW1TW
+Sqr7pCI1a2mfxsJY53lvpkv1JWRVzi9pUnYcM56XPfX3LGcpMFWGZVqafJx5gPYU
+44s1+33JqMCGJAedDcJpcA==
+-----END CERTIFICATE-----

data/spec/data/server.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDT1z+yiGtIwx+u
+cM+l7HEa8DyCTymE1PkB0U60us9yiAZVAcX2g9E0zzyLQBzrDjaT1AgqsxtVQqIS
+QLXAoVEinJUZIj6mUrlf2QRFu+aVE2F8VI4XB/gjTOfdYbxxeFp+xq4a7AW0Apa0
+yhZaUCXhnd+uQTn/ZNMzh1M2UWiP/pKdpwJTvsi+vRPANNbUqQqEnVNON0JXcFvr
+X5c2PBswd4Nh2UPumo/EQBPvstJC0oX1yruSjqaFnbX9e26pRjM1XBONcZ3dfpai
+2pjEzDMAqqT8QbDLgBNXGdc2BrzTWDyrMebbPYtSu8KXInKOwrieSqgilm+fnaT1
+jxV9n5ErAgMBAAECggEAMExdK3lK7JYAPSdfUHct+nRXd2ZREwXzl+R+y1nkPjqh
+JvR2jBPVuPKe3SjK7xSYgO/QxNt9Gd1NUlgKmFavRvLoU4ipPAaUWTQDc1q54bc/
+fLdShhG9E19PZfwImN5V0528yEqTqk0Ey0df/UtUt7Hk87fPX1k/hfoOkM3SxzFb
+SUF+KjwGfUj1uY0s4mFjrikAtITU+fZWiC3yw4V3BaeISxuArXtwvd6j1Pr7UUQI
+p6TAI8Xo49ZbvD7z/QxlOZM/FdvcZiW/74sxyOAP/e0bsQ0mzfTW3pFE1y2UHGyD
+RQPJoUzbcl2OyjjCPLT9bgBj+HMXo8nrkW774apggQKBgQDt8eUo0Pc7OV4C/Yyp
+dJ8QI2+7sROPweIa8thnzcX/bdBASelsUfs/neTgCUCXlXkrXyoVPZKSvyZg7fWU
+w3uYspoC2m3Lr3XEqfRqeVaYO9AtAgYdbkfSmg63WOgalcckJDnGlvRKm/Sh+QRj
+1MwGZDTnTflecTtPpLxmdxIdCwKBgQDj6kdtgnfFAlknidQqx0++AsxdgdZnDHhH
+6vweSML1Ft6IpGVgsUhXszvSAlvh/jF4RKO8xGHNFtUXRNzqp1F4G781uMFgCkrq
+5UecLx/Jv2LjMUiQmpiPWruANitbyjeiC0knV1RgWsqIwVm02zb5/y9icrKnLpAf
+mRSFJEGwYQKBgQC/AO5zVUsgv2w3+lBvtq34xnlqsTqCq6BVAZu1t/i4ke4ZrTsz
+OJv29UhEjyjKhbI+nqWpZ0PBiK/GHz6DrGgKq1P19mEsoCxpMgSBc+WPTnRNrNI7
+zcrZw9EMXNH0hUbWPD4krAht28MEQmDDwo4Ek2vkQTNsHHj/9b1Gg06HAQKBgQDB
+YrBowyNNDskHO3PDOIr49vbhAKIjnfkRTNnP+H0z6Mu5tYQvnz167KH9d/LutvjS
+y6sDKL6zfoQg0lWA5afC+ggsVS//hbw7w4AXjgSy8qm9jLu9tu9r89jU2SHBKLw7
+ysevkfIOL/taPnUXeEoVpelW52ufX2r65LD8p971AQKBgQCJan1QX94RnThqPocH
+NHQ2o20AV6vX/NZs4ydHADTrl+Kl2tK5ipfANe+iKZ54uSiPQRGQUFNA7+M3xcCU
+2Us+bS8/E06NADQlIAuVSCOVmRDLDDXwhr3brjxZ/Xq/WjLyWim0HNZq+W6HhL25
+149bGRGW4+GuqMEBR0jihvMh4A==
+-----END PRIVATE KEY-----

data/spec/etcd/basic_auth_client_spec.rb

@@ -4,8 +4,18 @@ 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(user_name: 'test', password: 'pwd')
+    Etcd.client(host: 'localhost') do |config|
+      config.user_name = 'test'
+      config.password = 'pwd'
+    end
   end
 
   it '#user_name' do

data/spec/etcd/client_spec.rb

@@ -2,8 +2,16 @@ 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
+    etcd_client
   end
 
   it 'should return the leader address' do
@@ -32,8 +40,7 @@ describe Etcd::Client do
     it 'should redirect api request when allow_redirect is set' do
       key = random_key
       value = uuid.generate
-      rd_client = Etcd.client host: 'localhost', port: 4003
-      resp = rd_client.set(key, value: value)
+      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
@@ -44,7 +51,7 @@ describe Etcd::Client do
     before(:all) do
       key = random_key
       value = uuid.generate
-      @response = Etcd.client.set(key, value: value)
+      @response = etcd_client.set(key, value: value)
     end
 
     it '#etcd_index' do

data/spec/etcd/keys_spec.rb

@@ -2,67 +2,105 @@ require 'spec_helper'
 
 describe Etcd::Keys do
 
-  let(:client) do
-    Etcd.client
-  end
-
-  it '#set/#get' do
-    key = random_key
-    value = uuid.generate
-    client.set(key, value: value)
-    expect(client.get(key).value).to eq(value)
-  end
+  shared_examples 'basic key operation' do
 
-  context '#exists?' do
-    it 'should be true for existing keys' do
+    it '#set/#get' do
       key = random_key
-      client.create(key, value: 10)
-      expect(client.exists?(key)).to be_true
-    end
-    it 'should be true for existing keys' do
-      expect(client.exists?(random_key)).to be_false
+      value = uuid.generate
+      client.set(key, value: value)
+      expect(client.get(key).value).to eq(value)
     end
-  end
 
-  context 'directory' 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
-    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
+    context '#exists?' do
+      it 'should be true for existing keys' do
+        key = random_key
+        client.create(key, value: 10)
+        expect(client.exists?(key)).to be_true
       end
-
-      it 'should not be able to delete without dir flag' do
-        d = random_key
-        client.create(d, dir: true)
-        client.create("#{d}/foobar", value: 10)
-        expect do
-          client.delete(d)
-        end.to raise_error(Etcd::NotFile)
+      it 'should be true for existing keys' do
+        expect(client.exists?(random_key)).to be_false
       end
     end
-    context 'not empty' do
-      it 'should be able to delete with recursive flag' do
+
+    context 'directory' do
+      it 'should be able to create a directory' do
         d = random_key
         client.create(d, dir: true)
-        client.create("#{d}/foobar")
-        expect do
-          client.delete(d, dir: true, recursive: true)
-        end.to_not raise_error
+        expect(client.get(d)).to be_true
       end
-      it 'should be not able to delete without recursive flag' do
-        d = random_key
-        client.create(d, dir: true)
-        client.create("#{d}/foobar")
-        expect do
-          client.delete(d, dir: true)
-        end.to raise_error(Etcd::DirNotEmpty)
+      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
+        end
+
+        it 'should not be able to delete without dir flag' do
+          d = random_key
+          client.create(d, dir: true)
+          client.create("#{d}/foobar", value: 10)
+          expect do
+            client.delete(d)
+          end.to raise_error(Etcd::NotFile)
+        end
+      end
+      context 'not empty' do
+        it 'should be able to delete with recursive flag' do
+          d = random_key
+          client.create(d, dir: true)
+          client.create("#{d}/foobar")
+          expect do
+            client.delete(d, dir: true, recursive: true)
+          end.to_not raise_error
+        end
+        it 'should be not able to delete without recursive flag' do
+          d = random_key
+          client.create(d, dir: true)
+          client.create("#{d}/foobar")
+          expect do
+            client.delete(d, dir: true)
+          end.to raise_error(Etcd::DirNotEmpty)
+        end
       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/leader_spec.rb

@@ -4,8 +4,16 @@ require 'spec_helper'
 
 describe 'mod leader' do
 
+  before(:all) do
+    start_daemon
+  end
+
+  after(:all) do
+    stop_daemon
+  end
+
   let(:client) do
-    Etcd.client
+    etcd_client
   end
 
   it 'should allow setting a key value with ttl' do

data/spec/etcd/lock_spec.rb

@@ -4,8 +4,16 @@ require 'spec_helper'
 
 describe 'lock' do
 
+  before(:all) do
+    start_daemon
+  end
+
+  after(:all) do
+    stop_daemon
+  end
+
   let(:client) do
-    Etcd.client
+    etcd_client
   end
 
   it 'should be able to acquire a lock' do

data/spec/etcd/node_spec.rb

@@ -2,8 +2,16 @@ require 'spec_helper'
 
 describe Etcd::Node do
 
+  before(:all) do
+    start_daemon
+  end
+
+  after(:all) do
+    stop_daemon
+  end
+
   let(:client) do
-    Etcd.client
+    etcd_client
   end
 
   it 'should create a directory with parent key when nested keys are set' do

data/spec/etcd/read_only_client_spec.rb

@@ -4,8 +4,15 @@ 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
+    etcd_client
   end
 
   it 'should not allow write' do

data/spec/etcd/readme_spec.rb

@@ -4,6 +4,14 @@ 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
   end
@@ -55,7 +63,7 @@ describe 'Etcd specs for the main etcd README examples' do
   context 'set a key named "/message"' do
 
     before(:all) do
-     @response = Etcd.client.set('/message', value: 'PinkFloyd')
+      @response = etcd_client.set('/message', value: 'PinkFloyd')
     end
 
     it_should_behave_like 'response with valid http headers'
@@ -69,8 +77,8 @@ describe 'Etcd specs for the main etcd README examples' do
   context 'get a key named "/message"' do
 
     before(:all) do
-      Etcd.client.set('/message', value: 'PinkFloyd')
-      @response = Etcd.client.get('/message')
+      etcd_client.set('/message', value: 'PinkFloyd')
+      @response = etcd_client.get('/message')
     end
 
     it_should_behave_like 'response with valid http headers'
@@ -84,8 +92,8 @@ describe 'Etcd specs for the main etcd README examples' do
   context 'change the value of a key named "/message"' do
 
     before(:all) do
-      Etcd.client.set('/message', value: 'World')
-      @response = Etcd.client.set('/message', value: 'PinkFloyd')
+      etcd_client.set('/message', value: 'World')
+      @response = etcd_client.set('/message', value: 'PinkFloyd')
     end
 
     it_should_behave_like 'response with valid http headers'
@@ -99,9 +107,9 @@ describe 'Etcd specs for the main etcd README examples' do
   context 'delete a key named "/message"' do
 
     before(:all) do
-      Etcd.client.set('/message', value: 'World')
-      Etcd.client.set('/message', value: 'PinkFloyd')
-      @response = Etcd.client.delete('/message')
+      etcd_client.set('/message', value: 'World')
+      etcd_client.set('/message', value: 'PinkFloyd')
+      @response = etcd_client.delete('/message')
     end
 
     it 'should set the return action to SET' do
@@ -115,9 +123,9 @@ describe 'Etcd specs for the main etcd README examples' do
   context 'using ttl a key named "/message"' do
 
     before(:all) do
-      Etcd.client.set('/message', value: 'World')
+      etcd_client.set('/message', value: 'World')
       @set_time = Time.now
-      @response = Etcd.client.set('/message', value: 'PinkFloyd', ttl: 5)
+      @response = etcd_client.set('/message', value: 'PinkFloyd', ttl: 5)
     end
 
     it_should_behave_like 'response with valid http headers'
@@ -138,7 +146,7 @@ describe 'Etcd specs for the main etcd README examples' do
     it 'should throw exception after the expiration time' do
       sleep 8
       expect do
-        Etcd.client.get('/message')
+        client.get('/message')
       end.to raise_error
     end
 
@@ -147,11 +155,12 @@ describe 'Etcd specs for the main etcd README examples' do
   context 'waiting for a change against a key named "/message"' do
 
     before(:all) do
-      Etcd.client.set('/message', value: 'foo')
+      etcd_client.set('/message', value: 'foo')
       thr = Thread.new do
-        @response = Etcd.client.watch('/message')
+        @response = etcd_client.watch('/message')
       end
-      Etcd.client.set('/message', value: 'PinkFloyd')
+      sleep 1
+      etcd_client.set('/message', value: 'PinkFloyd')
       thr.join
     end
 
@@ -172,7 +181,7 @@ describe 'Etcd specs for the main etcd README examples' do
   context 'atomic in-order keys' do
 
     before(:all) do
-      @response = Etcd.client.create_in_order('/queue', value: 'PinkFloyd')
+      @response = etcd_client.create_in_order('/queue', value: 'PinkFloyd')
     end
 
     it_should_behave_like 'response with valid http headers'
@@ -212,7 +221,7 @@ describe 'Etcd specs for the main etcd README examples' do
   context 'directory with ttl' do
 
     before(:all) do
-      @response = Etcd.client.set('/directory', dir: true, ttl: 4)
+      @response = etcd_client.set('/directory', dir: true, ttl: 4)
     end
 
     it 'should create a directory' do
@@ -300,8 +309,8 @@ describe 'Etcd specs for the main etcd README examples' do
   context 'hidden nodes' do
 
     before(:all) do
-      Etcd.client.set('/_message', value: 'Hello Hidden World')
-      Etcd.client.set('/message', value: 'Hello World')
+      etcd_client.set('/_message', value: 'Hello Hidden World')
+      etcd_client.set('/message', value: 'Hello World')
     end
 
     it 'should not be visible in directory listing' do

data/spec/etcd/stats_spec.rb

@@ -4,8 +4,16 @@ 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
+    etcd_client
   end
 
   describe 'of leader' do

data/spec/etcd/test_and_set_spec.rb

@@ -4,8 +4,16 @@ 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
+    etcd_client
   end
 
   it 'should pass when prev value is correct' do

data/spec/etcd/watch_spec.rb

@@ -4,8 +4,16 @@ require 'spec_helper'
 
 describe 'Etcd watch' do
 
+  before(:all) do
+    start_daemon
+  end
+
+  after(:all) do
+    stop_daemon
+  end
+
   let(:client) do
-    Etcd.client
+    etcd_client
   end
 
   it 'without index, returns the value at a particular index' do
@@ -27,6 +35,7 @@ describe 'Etcd watch' do
     thr = Thread.new do
       response = client.watch(key)
     end
+    sleep 2
     client.set(key, value: value)
     thr.join
     expect(response.node.value).to eq(value)

data/spec/spec_helper.rb

@@ -6,12 +6,51 @@ $LOAD_PATH.unshift(File.expand_path('../spec', __FILE__))
 require 'coco'
 require 'uuid'
 require 'etcd'
+require 'singleton'
 
 module Etcd
-  module SpecHelper
-    @@pids =  []
+  class Spawner
+
+    include Singleton
+
+    def initialize
+      @pids = []
+      @cert_file = File.expand_path('../data/server.crt', __FILE__)
+      @key_file = File.expand_path('../data/server.key', __FILE__)
+      @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}" }
+    end
+
+    def start(numbers = 1, opts={})
+      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)
+      end
+    end
 
-    def self.etcd_binary
+    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
+      Process.detach(pid)
+      pid
+    end
+
+    def etcd_binary
       if File.exists? './etcd/bin/etcd'
         './etcd/bin/etcd'
       elsif !!ENV['ETCD_BIN']
@@ -21,37 +60,23 @@ module Etcd
       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
+    def stop
+      @pids.each do |pid|
+        Process.kill('TERM', pid)
       end
+      FileUtils.remove_entry_secure(@tmpdir, true)
+      @pids.clear
     end
+  end
 
-    def self.stop_etcd_servers
-      @@pids.each do |pid|
-        Process.kill('TERM', pid)
-      end
-      FileUtils.remove_entry_secure(@@tmpdir, true)
+  module SpecHelper
+
+    def start_daemon(numbers = 1, opts={})
+      Spawner.instance.start(numbers, opts)
     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
+    def stop_daemon
+      Spawner.instance.stop
     end
 
     def uuid
@@ -66,27 +91,41 @@ module Etcd
       key
     end
 
-    def etcd_servers
-      (1..5).map { |n| "http://127.0.0.1:700#{n}" }
+    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 other_client
+    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: 4004)
+      Etcd.client(allow_redirect: false, port: 4002, host: 'localhost')
     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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -110,6 +110,11 @@ files:
 - lib/etcd/response.rb
 - lib/etcd/stats.rb
 - lib/etcd/version.rb
+- spec/data/ca.crt
+- spec/data/client.crt
+- spec/data/client.key
+- spec/data/server.crt
+- spec/data/server.key
 - spec/etcd/basic_auth_client_spec.rb
 - spec/etcd/client_spec.rb
 - spec/etcd/keys_spec.rb
@@ -147,6 +152,11 @@ signing_key:
 specification_version: 4
 summary: Ruby client library for etcd
 test_files:
+- spec/data/ca.crt
+- spec/data/client.crt
+- spec/data/client.key
+- spec/data/server.crt
+- spec/data/server.key
 - spec/etcd/basic_auth_client_spec.rb
 - spec/etcd/client_spec.rb
 - spec/etcd/keys_spec.rb