etcd-discovery 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe29a8729a9678c7983c4cabb8f7b6cb9e33d460
-  data.tar.gz: 9111832380a0338312a6cbef11bead94fcd414d9
+  metadata.gz: 9c01bf46ee0a9c4812bf9ac80fa816b6b5bcd541
+  data.tar.gz: 66c258afe4d3387737216e9c26fc7f1522d92d4e
 SHA512:
-  metadata.gz: 2140fc22e32b13b396c14f12bfb45f4a58babfe4c77529976d69ea6f99e0e7ae2ddcd6d2a9448adef66033e0a2bf919a4146a16e4060c4713eca8ffe3d0e8d45
-  data.tar.gz: 8625911eb2fdd877ab5d125673a91bb59adf7fb7587ce2d843417e2a135324f153b76188cd712b37b4bb1e05c1dbda942f6328deeb1bf7cc620cca574baf554f
+  metadata.gz: 4253017c7feb7d976bb37d0e0e81512decb5a10f4c56ce19b888fb11d41106a9e77d2fb7fbd7f9316f4962685078bbd2533c631dfb372ba96766638cadfd169a
+  data.tar.gz: c9d54aa78d9a5beeaa846a8a0fd1dab8ea9d14ea8fac04490d2468f1303e405ad39c46646c8e6e425fcfc43fdb042bae3ea36b81ccacefb6d2781fa75d5d974a

data/lib/etcd-discovery/registrar.rb

@@ -1,4 +1,15 @@
 module EtcdDiscovery
+  class InvalidStateError < StandardError
+    def initialize(current, expected)
+      @current = current
+      @expected = expected
+    end
+
+    def message
+      "Registrar is #{@current}, expected #{@expected}"
+    end
+  end
+
   class Registrar
     attr_reader :state
     attr_reader :thread
@@ -21,27 +32,41 @@ module EtcdDiscovery
 
     def register
       @state = :started
-      config = EtcdDiscovery.config
-      client = config.client
       value = @host.to_json
-      key_name = "/services/#{@service}/#{@host.attributes['name']}"
 
       @thread = Thread.new {
+        @logger.warn "Register '#{@service}' started"
         while @state == :started
           begin
-            client.set(key_name, value: value, ttl: config.register_ttl)
+            client.set(key, value: value, ttl: config.register_ttl)
           rescue => e
-            logger.warn "Fail to set #{key_name}: #{e}, #{e.message}, #{e.class}"
+            @logger.warn "Fail to set #{key}: #{e}, #{e.message}, #{e.class}"
           end
           sleep config.register_renew
         end
-        logger.warn "Register '#{@service}' stopped"
+        @logger.warn "Register '#{@service}' stopped"
       }
       self
     end
 
     def stop
+      raise InvalidStateError.new(@state, :started) if @state != :started
+      @logger.debug "Set state to :stopped"
       @state = :stopped
+      @logger.debug "Delete #{key}"
+      client.delete(key)
+    end
+
+    def client
+      config.client
+    end
+
+    def config
+      EtcdDiscovery.config
+    end
+
+    def key
+      "/services/#{@service}/#{@host.attributes['name']}"
     end
   end
 end

data/spec/etcd-discovery/registrar_spec.rb

@@ -1,43 +1,62 @@
 require 'spec_helper.rb'
 
 RSpec.describe EtcdDiscovery::Registrar do
-  describe '.new' do
-    context 'with a Hash' do
-      subject { EtcdDiscovery::Registrar.new "service", {"name" => "example.com", "ports" => {"http" => 80}} }
-      it "should transform the has in Host" do
-        expect(subject.host.attributes["name"]).to eq "example.com"
+  context "without a running client" do
+    describe '.new' do
+      context 'with a Hash' do
+        subject { EtcdDiscovery::Registrar.new "service", {"name" => "example.com", "ports" => {"http" => 80}} }
+        it "should transform the has in Host" do
+          expect(subject.host.attributes["name"]).to eq "example.com"
+        end
       end
-    end
 
-    context 'with a EtcdDiscovery::Host' do
-      subject { EtcdDiscovery::Registrar.new "service", EtcdDiscovery::Host.new({"name" => "example.com", "ports" => {"http" => 80}}) }
-      it "should defines the state to new" do
-        expect(subject.state).to eq :new
+      context 'with a EtcdDiscovery::Host' do
+        subject { EtcdDiscovery::Registrar.new "service", EtcdDiscovery::Host.new({"name" => "example.com", "ports" => {"http" => 80}}) }
+        it "should defines the state to new" do
+          expect(subject.state).to eq :new
+        end
       end
     end
   end
 
-  describe '#register' do
+  context "with an unregistered client" do
     subject { EtcdDiscovery::Registrar.new "service", EtcdDiscovery::Host.new({"name" => "example.com", "ports" => {"http" => 80}}) }
-    it "should start a registering thread" do
-      subject.register
-      expect(subject.thread).not_to eq nil
-      expect(subject.thread.alive?).to eq true
+
+    describe '#stop' do
+      it "should raise an exception if service not registered" do
+        expect{ subject.stop }.to raise_exception EtcdDiscovery::InvalidStateError
+      end
     end
+
+    its(:client) { is_expected.to eq EtcdDiscovery.config.client }
+    its(:key) { is_expected.to eq "/services/service/example.com" }
   end
 
-  describe '#stop' do
-    subject { EtcdDiscovery::Registrar.new "service", EtcdDiscovery::Host.new({"name" => "example.com", "ports" => {"http" => 80}}) }
-    it "should change the state to stopped" do
-      subject.stop
-      expect(subject.state).to eq :stopped
+  context "with a registered client" do
+    subject { EtcdDiscovery::Registrar.new("service", EtcdDiscovery::Host.new({"name" => "example.com", "ports" => {"http" => 80}})) }
+
+    before(:each) do subject.register ; sleep 0.2 ; end
+    after(:each) do subject.stop if subject.state == :started ; end
+
+    describe '#register' do
+      its(:thread) { is_expected.not_to eq nil }
+      it "s thread should be alived" do
+        expect(subject.thread.alive?).to eq true
+      end
     end
 
-    it "should stop its registering thread" do
-      subject.register
-      subject.stop
-      sleep 1
-      expect(subject.thread.alive?).to eq false
+    describe "#stop" do
+      it "should stop its registering thread" do
+        subject.stop
+        sleep 0.2
+        expect(subject.thread.alive?).to eq false
+      end
+
+      it "should remote the etcd key of the service" do
+        expect(EtcdDiscovery.get("service").length).to eq 1
+        subject.stop
+        expect { EtcdDiscovery.get("service") }.to raise_exception EtcdDiscovery::ServiceNotFound
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,5 +4,5 @@ require "rubygems"
 require "bundler/setup"
 Bundler.require(:default, :development, :test)
 
-EtcdDiscovery.config.register_renew = 0.5
+EtcdDiscovery.config.register_renew = 0.1
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd-discovery
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - Léo Unbekandt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd