etcd-discovery 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 960dc0430e6a20341f0fef6abf70a983809ac5d5
-  data.tar.gz: cec0aeba3b3d129be5f8e39cedd8c7e72803a914
+  metadata.gz: fe29a8729a9678c7983c4cabb8f7b6cb9e33d460
+  data.tar.gz: 9111832380a0338312a6cbef11bead94fcd414d9
 SHA512:
-  metadata.gz: 955d3be4ffaabf4e733a940a7e5defa90f1dd4e688477595bd4b2bf67840b416cafe369492af8dd74efa5940234ecdb0757e61db247c7a951f5d103e88e60ee4
-  data.tar.gz: acd4e8b4d6ba5e228064174c379ace5aec37ffdc6080a46b27f65d948e8ff83acc1f981825b391e570f83d732f4be424d5bcec6502887da3964fccf78de37e04
+  metadata.gz: 2140fc22e32b13b396c14f12bfb45f4a58babfe4c77529976d69ea6f99e0e7ae2ddcd6d2a9448adef66033e0a2bf919a4146a16e4060c4713eca8ffe3d0e8d45
+  data.tar.gz: 8625911eb2fdd877ab5d125673a91bb59adf7fb7587ce2d843417e2a135324f153b76188cd712b37b4bb1e05c1dbda942f6328deeb1bf7cc620cca574baf554f

data/lib/etcd-discovery.rb

@@ -27,12 +27,6 @@ module EtcdDiscovery
   end
 
   def self.register(service, host)
-    Thread.new {
-      begin
-        Service.register(service, host)
-      rescue => e
-        puts "Fail to register #{service}: #{e.class} #{e} #{e.backtrace}"
-      end
-    }
+    Service.register(service, host)
   end
 end

data/lib/etcd-discovery/registrar.rb

@@ -0,0 +1,47 @@
+module EtcdDiscovery
+  class Registrar
+    attr_reader :state
+    attr_reader :thread
+    attr_reader :host
+
+    def initialize(service, host)
+      @logger = Logger.new($stdout)
+
+      if host.is_a? Hash
+        @host = Host.new host
+      elsif host.is_a? EtcdDiscovery::Host
+        @host = host
+      else
+        raise TypeError, "host should be a Hash or a Etcd::Host, is a #{host.class}"
+      end
+
+      @service = service
+      @state = :new
+    end
+
+    def register
+      @state = :started
+      config = EtcdDiscovery.config
+      client = config.client
+      value = @host.to_json
+      key_name = "/services/#{@service}/#{@host.attributes['name']}"
+
+      @thread = Thread.new {
+        while @state == :started
+          begin
+            client.set(key_name, value: value, ttl: config.register_ttl)
+          rescue => e
+            logger.warn "Fail to set #{key_name}: #{e}, #{e.message}, #{e.class}"
+          end
+          sleep config.register_renew
+        end
+        logger.warn "Register '#{@service}' stopped"
+      }
+      self
+    end
+
+    def stop
+      @state = :stopped
+    end
+  end
+end

data/lib/etcd-discovery/service.rb

@@ -24,29 +24,7 @@ module EtcdDiscovery
     end
 
     def self.register(service, host)
-      logger = Logger.new($stdout)
-
-      if host.is_a? Hash
-        h = Host.new host
-      elsif host.is_a? Etcd::Host
-        h = host
-      else
-        raise TypeError, "host should be a Hash or a Etcd::Host, is a #{host.class}"
-      end
-
-      config = EtcdDiscovery.config
-      client = config.client
-      value = h.to_json
-      key_name = "/services/#{service}/#{h.attributes['name']}"
-
-      while true
-        begin
-          client.set(key_name, value: value, ttl: config.register_ttl)
-        rescue => e
-          logger.warn "Fail to set #{key_name}: #{e}, #{e.message}, #{e.class}"
-        end
-        sleep config.register_renew
-      end
+      EtcdDiscovery::Registrar.new(service, host).register
     end
   end
 end

data/spec/etcd-discovery/registrar_spec.rb

@@ -0,0 +1,43 @@
+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"
+      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
+      end
+    end
+  end
+
+  describe '#register' 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
+    end
+  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
+    end
+
+    it "should stop its registering thread" do
+      subject.register
+      subject.stop
+      sleep 1
+      expect(subject.thread.alive?).to eq false
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+require "etcd-discovery"
+
+require "rubygems"
+require "bundler/setup"
+Bundler.require(:default, :development, :test)
+
+EtcdDiscovery.config.register_renew = 0.5
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd-discovery
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Léo Unbekandt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby implementation of a service discovery tool based on etcd
-email: leo.unbekandt@appsdeck.eu
+email: leo.unbekandt@scalingo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -34,8 +34,11 @@ files:
 - lib/etcd-discovery/client.rb
 - lib/etcd-discovery/config.rb
 - lib/etcd-discovery/host.rb
+- lib/etcd-discovery/registrar.rb
 - lib/etcd-discovery/service.rb
-homepage: http://github.com/Appsdeck/etcd-discovery-ruby
+- spec/etcd-discovery/registrar_spec.rb
+- spec/spec_helper.rb
+homepage: http://github.com/Scalingo/etcd-discovery-ruby
 licenses:
 - BSD
 metadata: {}
@@ -55,8 +58,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Service discovery based on etcd
 test_files: []
+has_rdoc: