ruby_skynet 1.3.0.alpha2 → 1.3.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d91bd2a63e1f1430910be685ed142d868a513abc
-  data.tar.gz: ad501fa1158e5e6b8dd3fb951d6f3435b338c51e
+  metadata.gz: 6740cfd40beae05bf039e9bd5fa02281cf6a5e8a
+  data.tar.gz: 4fe0295d46526174f6756a505982a9e67d6cd127
 SHA512:
-  metadata.gz: 3e53d1a355c850095909974fe3af5ffc608e504aa9cbbd185919003e648b7646d58dd037a3d630fca51968b24a3726d4273d905b9c7b73c0e7b37511d45f10b2
-  data.tar.gz: 973628fb4d8dcbe406cefaebe9777a64199a19637a9184dda38a0109f79da1364ffd64fdb217593691d49223eeca1aaeaed9f20927605191dd95f53908c68910
+  metadata.gz: f49f801c0796148c2269a6a82db40980f8bbf6542bffd7bd9b448aebda4497c7a316a4d7a7a9ba512898234221bcb51e634ddd91d67d631ea7ed751b9f35fd22
+  data.tar.gz: 1420af0774b7404a1fdc227ff64d64300d214f4b505b17cacba14d56ddde5147a46259fd1067d15dc18940c785caba230552742a8ac0636eb893b0665d03829f

data/Gemfile

@@ -10,7 +10,7 @@ gem "resilient_socket"
 # Doozer Client
 #gem "ruby_doozer"
 # Zookeeper Client
-gem "zookeeper"
+#gem "zookeeper"
 # Thread Safe Hash and Array
 gem "thread_safe"
 # For looking up Service entries in Service Registry

data/Gemfile.lock

@@ -30,7 +30,6 @@ GEM
     thread_safe (0.1.3)
       atomic
     tzinfo (0.3.38)
-    zookeeper (1.4.7)
 
 PLATFORMS
   ruby
@@ -44,4 +43,3 @@ DEPENDENCIES
   semantic_logger (>= 2.1)
   shoulda
   thread_safe
-  zookeeper

data/lib/ruby_skynet/ruby_skynet.rb

@@ -51,7 +51,7 @@ module RubySkynet
   # By default it connects to a local ZooKeeper instance
   # Use .configure! to supply a configuration file with any other settings
   sync_cattr_reader :service_registry do
-    ServiceRegistry.new
+    ServiceRegistry.new(registry: {})
   end
 
   # Returns the current Registry Config information

data/lib/ruby_skynet/static_service_registry.rb

@@ -10,15 +10,15 @@ require 'thread_safe'
 # Format of the YAML file
 #   key: [String] "<name>/<version>/<region>"
 #   value: [Array<String>] 'host:port', 'host:port'
-
 #
 module RubySkynet
   class StaticServiceRegistry
     include SemanticLogger::Loggable
 
     # Create a service registry
-    def initialize(services = {})
-      @services = services
+    def initialize(params = {})
+      @services = params[:registry]
+      raise "Missing :registry in config that must list the availables services" unless @services
     end
 
     # Returns the Service Registry as a Hash

data/lib/ruby_skynet/version.rb

@@ -1,3 +1,3 @@
 module RubySkynet #:nodoc
-  VERSION = "1.3.0.alpha2"
+  VERSION = "1.3.0.alpha3"
 end

data/test/service_registry_test.rb

@@ -75,7 +75,8 @@ class ServiceRegistryTest < Test::Unit::TestCase
 
         should "using * version match" do
           assert (servers = RubySkynet.service_registry.servers_for(@service_name, '*', @region)), RubySkynet.service_registry.to_h.inspect
-          assert_equal 3, servers.size, servers
+          expected = RubySkynet::ServiceRegistry.respond_to?(:score_for_server) ? 3 : 4
+          assert_equal expected, servers.size, servers
           assert_equal true, servers.include?("#{@hostname}:#{@port}"), servers
           assert_equal true, servers.include?("#{@hostname}:#{@port+1}"), servers
           assert_equal true, servers.include?("#{@hostname}:#{@port+3}"), servers
@@ -110,6 +111,7 @@ class ServiceRegistryTest < Test::Unit::TestCase
         ['10.0.11.0',     0 ],
       ].each do |test|
         should "handle score #{test[1]}" do
+          skip "Not applicable to Static Service Registry" unless RubySkynet::ServiceRegistry.respond_to?(:score_for_server)
           local_ip_address = "192.168.11.0"
           assert_equal test[1], RubySkynet::ServiceRegistry.score_for_server(test[0], local_ip_address), "Local: #{local_ip_address} Server: #{test[0]} Score: #{test[1]}"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_skynet
 version: !ruby/object:Gem::Version
-  version: 1.3.0.alpha2
+  version: 1.3.0.alpha3
 platform: ruby
 authors:
 - Reid Morrison