discover 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e952beaea5ffcb83ae577c9b95a19c05c595eba
-  data.tar.gz: dd8c6d2cc4c03a078e84024f14ff50695f3138e7
+  metadata.gz: 8e5f959700c606323c1b0b0748db67ac608ad9da
+  data.tar.gz: 1621c20260613bd508ae1623689cd29932923b5b
 SHA512:
-  metadata.gz: 3f74fd998d606f0ea0aebecb4220cb9f05d7f138e47d34bb3bc88af5b23c37410f1330ef8e5c63d8660b852e01c50baa030ebbec1c7ffe96ff75b4b367fcdbcd
-  data.tar.gz: 601a492a7bc6bf57ada768f1b0c614d26c3616cfa94113ef758a840b962e062931d82c4635bdbfc5bc978e6c530735e2113df9febd8a0e173279c01f4cc50846
+  metadata.gz: 6b8b8cd45b2e7bbee0c168891194b3bf631d5b43f26caa3159f6a0808fd622bc422982202ff7c4473631fa7cc955355b8b85e9777047c065d52d1e7e41723f36
+  data.tar.gz: fced2f474c7430f855e2666e12d7fb81173c18e2b3d9dc03ba7981a75ca9270b205181e3710fbacbab4ee6349acb7ce6ed2c5aa9f76e51679a1004c35d4d0bd1

data/Rakefile

@@ -1,14 +1,18 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
 
-desc "Run all tests by default"
-task :default => "test:integration"
+desc "Run all tests"
+task :default => ["test:unit", "test:integration"]
 
 namespace :test do
+  Rake::TestTask.new(:unit) do |t|
+    t.libs << "test"
+    t.pattern = "test/unit/test_*.rb"
+  end
+
   # If HAS_DEPENDENCIES is set then we just run the tests, otherwise we spin up a
   # Docker container with all the dependencies installed and run the tests inside that
   if ENV["HAS_DEPENDENCIES"]
-    require "rake/testtask"
-
     Rake::TestTask.new(:integration) do |t|
       t.libs << "test"
       t.pattern = "test/integration/test_*.rb"

data/lib/discover.rb

@@ -1,12 +1,14 @@
-require 'discover/version'
+require "uri"
 require "rpcplus"
 
 module Discover
   class Client
     include Celluloid
 
-    def initialize(host='127.0.0.1', port=1111)
-      @client        = RPCPlus::Client.new(host, port)
+    def initialize(address = nil)
+      uri = parse(address || ENV["DISCOVERD"] || "127.0.0.1:1111")
+
+      @client        = RPCPlus::Client.new(uri.host, uri.port)
       @registrations = []
     end
 
@@ -35,6 +37,12 @@ module Discover
     end
 
     private
+    def parse(address)
+      URI.parse(address)
+    rescue URI::InvalidURIError
+      URI.parse("tcp://#{address}")
+    end
+
     def _register(name, port=nil, ip=nil, attributes={}, standby=false)
       reg = Registration.new(self, name, "#{ip}:#{port}", attributes, standby)
       @registrations << reg

data/lib/discover/version.rb

@@ -1,3 +1,3 @@
 module Discover
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/integration/test_registration.rb

@@ -26,7 +26,7 @@ class TestRegistration < DiscoverIntegrationTest
   end
 
   def test_service_is_online_after_registration
-    name       = "foo"
+    name       = "service-online"
     port       = 1111
     ip         = "127.0.0.1"
     attributes = { "foo" => "bar" }
@@ -47,7 +47,7 @@ class TestRegistration < DiscoverIntegrationTest
   end
 
   def test_service_is_offline_after_unregister
-    name       = "foo"
+    name       = "service-offline"
     port       = 1111
     ip         = "127.0.0.1"
 
@@ -63,7 +63,7 @@ class TestRegistration < DiscoverIntegrationTest
   end
 
   def test_changing_service_attributes
-    name       = "foo"
+    name       = "change-attributes"
     port       = 1111
     ip         = "127.0.0.1"
     attributes = { "foo" => "bar" }
@@ -87,7 +87,7 @@ class TestRegistration < DiscoverIntegrationTest
   end
 
   def test_service_with_filters
-    name = "foo"
+    name = "service-filters"
     ip   = "127.0.0.1"
 
     matching_attributes     = { "foo" => "bar", "baz" => "qux" }
@@ -107,22 +107,22 @@ class TestRegistration < DiscoverIntegrationTest
   end
 
   def test_register_and_standby
-    name = "foo"
+    name = "register-and-standby"
     ip   = "127.0.0.1"
 
     registrations = []
     registrations << @client.register(name, 1111, ip)
 
     standby = TestRegisterStandby.new @client, name, 2222, ip
-    sleep(0.2)
+    sleep(0.5)
     assert !standby.elected?
 
     registrations << @client.register(name, 3333, ip)
-    sleep(0.2)
+    sleep(0.5)
     assert !standby.elected?
 
     registrations.each(&:unregister)
-    sleep(0.2)
+    sleep(0.5)
     assert standby.elected?
   end
 end

data/test/integration/test_service_leader.rb

@@ -21,7 +21,7 @@ class TestServiceLeader < DiscoverIntegrationTest
   end
 
   def test_leader_is_oldest_online_service
-    name = "foo"
+    name = "leader-is-oldest"
     ip   = "127.0.0.1"
 
     service = @client.service(name)
@@ -29,24 +29,25 @@ class TestServiceLeader < DiscoverIntegrationTest
 
     registrations = []
     registrations << @client.register(name, 1111, ip)
+    sleep(0.5)
     assert_equal "#{ip}:1111", service.leader.address
 
     registrations << @client.register(name, 2222, ip)
     registrations << @client.register(name, 3333, ip)
-    sleep(0.2)
+    sleep(0.5)
     assert_equal "#{ip}:1111", service.leader.address
 
     registrations.shift.unregister
-    sleep(0.2)
+    sleep(0.5)
     assert_equal "#{ip}:2222", service.leader.address
 
     registrations.each(&:unregister)
-    sleep(0.2)
+    sleep(0.5)
     assert_nil service.leader
   end
 
   def test_leader_changes
-    name = "foo"
+    name = "leader-changes"
     ip   = "127.0.0.1"
 
     service = @client.service(name)
@@ -55,23 +56,23 @@ class TestServiceLeader < DiscoverIntegrationTest
 
     registrations = []
     registrations << @client.register(name, 1111, ip)
-    sleep(0.2)
+    sleep(0.5)
     assert_equal 1, watcher.leader_updates.size
     assert_equal "#{ip}:1111", watcher.leader_updates.last.address
 
     registrations << @client.register(name, 2222, ip)
     registrations << @client.register(name, 3333, ip)
-    sleep(0.2)
+    sleep(0.5)
     assert_equal 1, watcher.leader_updates.size
     assert_equal "#{ip}:1111", watcher.leader_updates.last.address
 
     registrations.shift.unregister
-    sleep(0.2)
+    sleep(0.5)
     assert_equal 2, watcher.leader_updates.size
     assert_equal "#{ip}:2222", watcher.leader_updates.last.address
 
     registrations.each(&:unregister)
-    sleep(0.2)
+    sleep(0.5)
     assert_equal 3, watcher.leader_updates.size
     assert_equal "#{ip}:3333", watcher.leader_updates.last.address
   end

data/test/integration/test_service_updates.rb

@@ -20,24 +20,24 @@ class TestServiceUpdates < DiscoverIntegrationTest
   end
 
   def test_registration_triggers_updates
-    name = "foo"
+    name = "registration-updates"
     ip   = "127.0.0.1"
 
     service = @client.service(name)
     watcher = TestServiceWatcher.new(service)
 
     @client.register name, 1111, ip
-    sleep(0.2)
+    sleep(0.5)
     assert_equal 1, watcher.updates.size
     assert_equal "#{ip}:1111", watcher.updates.last.address
 
     @client.register name, 2222, ip
-    sleep(0.2)
+    sleep(0.5)
     assert_equal 2, watcher.updates.size
     assert_equal "#{ip}:2222", watcher.updates.last.address
 
     @client.register name, 1111, ip, { "foo" => "bar" }
-    sleep(0.2)
+    sleep(0.5)
     assert_equal 3, watcher.updates.size
     assert_equal "#{ip}:1111", watcher.updates.last.address
   end

data/test/unit/test_client.rb

@@ -0,0 +1,37 @@
+require "test_helper"
+
+class TestClient < Minitest::Test
+  def setup
+    @rpc_client_class = RPCPlus.send(:remove_const, :Client)
+    RPCPlus.send(:const_set, :Client, Minitest::Mock.new)
+  end
+
+  def teardown
+    RPCPlus.send(:remove_const, :Client)
+    RPCPlus.send(:const_set, :Client, @rpc_client_class)
+  end
+
+  def test_explicit_address
+    address = "1.2.3.4:5678"
+    RPCPlus::Client.expect :new, nil, ["1.2.3.4", 5678]
+    Discover::Client.new(address)
+  end
+
+  def test_explicit_address_as_uri
+    address = "tcp://1.2.3.4:5678"
+    RPCPlus::Client.expect :new, nil, ["1.2.3.4", 5678]
+    Discover::Client.new(address)
+  end
+
+  def test_address_as_environment_variable
+    ENV["DISCOVERD"] = "tcp://5.6.7.8:4321"
+    RPCPlus::Client.expect :new, nil, ["5.6.7.8", 4321]
+    Discover::Client.new
+    ENV.delete "DISCOVERD"
+  end
+
+  def test_default_address
+    RPCPlus::Client.expect :new, nil, ["127.0.0.1", 1111]
+    Discover::Client.new
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discover
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jonathan Rudenberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -108,6 +108,7 @@ files:
 - test/integration/test_service_updates.rb
 - test/support/discover_integration_test.rb
 - test/test_helper.rb
+- test/unit/test_client.rb
 homepage: ''
 licenses:
 - BSD
@@ -138,3 +139,4 @@ test_files:
 - test/integration/test_service_updates.rb
 - test/support/discover_integration_test.rb
 - test/test_helper.rb
+- test/unit/test_client.rb