etcd-rb 1.0.0 → 1.1.0

data/spec/resources/cluster_controller.rb

@@ -5,7 +5,7 @@ class ClusterController
   end
 
   def self.kill_node(node_name)
-    node_pid = `ps -ef|grep #{node_name}|grep -v grep`.split[1]
+    node_pid = `ps -ef|grep etcd|grep #{node_name}|grep -v grep`.split[1]
     `kill -9 #{node_pid}`
   end
 
@@ -16,4 +16,4 @@ class ClusterController
   def self.stop_cluster
     `#{sh_path}/cluster stop`
   end
-end
+end

data/spec/support/client_helper.rb

@@ -1,4 +1,8 @@
 module ClientHelper
+  # Sample V2 API request/response for keys
+  # $ curl -L http://127.0.0.1:4001/v2/keys
+  # {"action":"get","node":{"dir":true,"nodes":[{"key":"/foo","value":"bar","modifiedIndex":22,"createdIndex":22}]}}
+
   def default_client(uri = "http://127.0.0.1:4001")
     client         = Etcd::Client.new(:uris => uri)
     client.cluster = healthy_cluster(uri)
@@ -12,8 +16,8 @@ module ClientHelper
     nodes   = Etcd::Cluster.nodes_from_attributes(data)
     cluster = Etcd::Cluster.new(uri)
     cluster.nodes = nodes
-    nodes.map{|x| x.status = :running}
+    nodes.map{|node| node.status = :running}
     nodes.first.is_leader = true
     cluster
   end
-end
+end

data/spec/support/cluster_helper.rb

@@ -1,45 +1,42 @@
 module ClusterHelper
+
+  # Sample V2 API request/response for cluster members
+  # $ curl -L http://127.0.0.1:4001/v2/members
+  # {"members":[{"id":"d2356cd527a56a4","name":"node2","peerURLs":["http://127.0.0.1:7002"],"clientURLs":["http://127.0.0.1:4002"]},{"id":"108d26d18c38bf0e","name":"node0","peerURLs":["http://127.0.0.1:7000"],"clientURLs":["http://127.0.0.1:4000"]},{"id":"14306b09b8d69fc4","name":"node1","peerURLs":["http://127.0.0.1:7001"],"clientURLs":["http://127.0.0.1:4001"]}]}
+
   def status_data
-    [
-      {"action"=>"GET",
-      "key"=>"/_etcd/machines/node1",
-      "value"=>
-       "raft=http://127.0.0.1:7001&etcd=http://127.0.0.1:4001&raftVersion=v0.1.1",
-      "index"=>360},
-     {"action"=>"GET",
-      "key"=>"/_etcd/machines/node2",
-      "value"=>
-       "raft=http://127.0.0.1:7002&etcd=http://127.0.0.1:4002&raftVersion=v0.1.1",
-      "index"=>360},
-     {"action"=>"GET",
-      "key"=>"/_etcd/machines/node3",
-      "value"=>
-       "raft=http://127.0.0.1:7003&etcd=http://127.0.0.1:4003&raftVersion=v0.1.1",
-      "index"=>360}
-    ]
+   {"members" =>
+     [
+       {"id" => "14306b09b8d69fc4","name" => "node1","peerURLs"=> ["http://127.0.0.1:7001"],"clientURLs" => ["http://127.0.0.1:4001"]},
+       {"id" => "d2356cd527a56a4","name" => "node2","peerURLs" => ["http://127.0.0.1:7002"],"clientURLs" => ["http://127.0.0.1:4002"]},
+       {"id" => "108d26d18c38bf0e","name" => "node3","peerURLs" => ["http://127.0.0.1:7003"],"clientURLs" => ["http://127.0.0.1:4003"]}
+     ]
+   }
   end
 
+  # cluster config hashes below map member client URLs to the leader client URL
+
   def healthy_cluster_config
     {
-      'http://127.0.0.1:4001' => 'http://127.0.0.1:7001',
-      'http://127.0.0.1:4002' => 'http://127.0.0.1:7001',
-      'http://127.0.0.1:4003' => 'http://127.0.0.1:7001'
+      'http://127.0.0.1:4001' => 'http://127.0.0.1:4001',
+      'http://127.0.0.1:4002' => 'http://127.0.0.1:4001',
+      'http://127.0.0.1:4003' => 'http://127.0.0.1:4001'
     }
   end
 
   def one_down_cluster_config
     {
-      'http://127.0.0.1:4001' => 'http://127.0.0.1:7001',
-      'http://127.0.0.1:4002' => 'http://127.0.0.1:7001',
+      'http://127.0.0.1:4001' => 'http://127.0.0.1:4001',
+      'http://127.0.0.1:4002' => 'http://127.0.0.1:4001',
       'http://127.0.0.1:4003' => :down
     }
   end
 
   def healthy_cluster_changed_leader_config
     {
-      'http://127.0.0.1:4001' => 'http://127.0.0.1:7002',
-      'http://127.0.0.1:4002' => 'http://127.0.0.1:7002',
-      'http://127.0.0.1:4003' => 'http://127.0.0.1:7002'
+      'http://127.0.0.1:4001' => 'http://127.0.0.1:4002',
+      'http://127.0.0.1:4002' => 'http://127.0.0.1:4002',
+      'http://127.0.0.1:4003' => 'http://127.0.0.1:4002'
     }
   end
 
@@ -52,19 +49,20 @@ module ClusterHelper
 
 
   def leader_uri(uri)
-    "#{uri}/v1/leader"
+    "#{uri}/v2/members/leader"
   end
 
   def stub_leader_uri(uri, opts = {})
-    leader = (opts[:leader] ||"http://127.0.0.1:7001")
+    leader = (opts[:leader] || "http://127.0.0.1:4001")
     if leader == :down
       stub_request(:get, leader_uri(uri)).to_timeout
     else
-      stub_request(:get, leader_uri(uri)).to_return(body: leader)
+      leader_info = status_data["members"].select{|node| node["clientURLs"].first == leader }.first
+      stub_request(:get, leader_uri(uri)).to_return(body: MultiJson.dump(leader_info) )
     end
   end
 
-  # [{etcd_url => leader_string},{etcd_url => leader_string}]
+  # [{node_client_url => leader_client_url},{node_client_url => leader_client_url}]
   def with_stubbed_leaders(cluster_config)
     cluster_config.each do |url, leader_uri|
       stub_leader_uri(url, :leader => leader_uri)
@@ -72,4 +70,4 @@ module ClusterHelper
     yield if block_given?
     #urls.each { |url| WebMock.should have_requested(:get, leader_uri(url))}
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etcd-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2016-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: ''