dendrite 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97c0e4e5c8c44bdb148bfb82e0e6ac7bf5d95c91
-  data.tar.gz: b0216b867e76656fc2eba3681726fcb17181341a
+  metadata.gz: 32f0e0b81539879488b8bb9c181911fa8c925e60
+  data.tar.gz: 068446bf6601e65ed4d4da4761c1cde480527a2c
 SHA512:
-  metadata.gz: 5260ce9237afcc363e5abd6e604e1fb9cfb71a8a8324e143191f146356dbbc378e91b322605fb5c71e3e3a69633ad252df981a8db41f89c74858158d846d6295
-  data.tar.gz: 8897fd44daec5e7cda853b2b8914c2022f0c8d8900f74880032bd4b7f1400f857e15c716c79d42fd3efd18159558665e92828976be547adde9750e3ebab7c659
+  metadata.gz: 09746c3effb3492c2e464d75cc238a47a1c319c1bf6d2e83fd48ae437190d2c9ed9c19a4b2cd40e0b79330818a6ea57f7a2ef0ee72a60456f21b2cca68e150b6
+  data.tar.gz: 5adc3ce5ed43baee7567926ff6f6f50333e91ea4413f7378060ea9b59a1f407a487a209dbe93193ff3bddd2d0b51da93be9520fd630ff8d3b871098cb91e8d08

data/conf/services/service.yml

@@ -14,7 +14,7 @@ services:
     ports:
       advertised_port: 8082
       listening_port: 8080
-    dependancies:
+    dependencies:
       - namespace: cams
         name: cat
         latency: foo
@@ -32,7 +32,7 @@ services:
     ports:
       advertised_port: 8081
       listening_port: 8080
-    dependancies:
+    dependencies:
       - namespace: cams
         name: foobar
         latency: foo
@@ -45,6 +45,6 @@ services:
       min_instance_count: 1
       max_instance_count: 5
     ports:
-      advertised_port: 8081
+      advertised_port: 8083
       listening_port: 8080
-    dependancies: []
+    dependencies: []

data/lib/dendrite/generators/nerve.rb

@@ -6,7 +6,7 @@ module Dendrite
         super
         @services.group_by { |service| service.listening_port }.each do |port, services|
           if services.length > 1
-            raise PortCollission, "Port collission between #{services.collect(&:name).join(',')}"
+            raise PortCollision, "Port collission between #{services.collect(&:name).join(',')}"
           end
         end
         @services = @services.collect { |service| ServiceConfig.new(service)}

data/lib/dendrite/generators/synapse.rb

@@ -5,14 +5,14 @@ module Dendrite
         super
         dep = []
         @services.each do |service|
-          service.dependancies.each do |_, dependancy|
-            dep << dependancy.service
+          service.dependencies.each do |_, dependency|
+            dep << dependency.service
           end
         end
         @services = dep.uniq
         @services.group_by { |service| service.advertised_port }.each do |port, services|
           if services.length > 1
-            raise PortCollission, "Port collission between #{services.collect(&:name).join(',')}"
+            raise PortCollision, "Port collission between #{services.collect(&:name).join(',')}"
           end
         end
         @services = @services.collect { |service| ServiceConfig.new(service)}

data/lib/dendrite/io.rb

@@ -13,10 +13,16 @@ module Dendrite
 
         services.each do |service|
           node = ServiceNode.new(service)
+          if service[:dependencies]
+            service[:dependencies].each do |deps|
+              dependency_name = "#{service[:organization]}_#{deps[:namespace]}_#{deps[:name]}"
+              graph[node.name].add_dependency(service: graph[dependency_name], latency: deps[:latency])
+            end
+          end
           if service[:dependancies]
             service[:dependancies].each do |deps|
-              dependancy_name = "#{service[:organization]}_#{deps[:namespace]}_#{deps[:name]}"
-              graph[node.name].add_dependancy(service: graph[dependancy_name], latency: deps[:latency])
+              dependency_name = "#{service[:organization]}_#{deps[:namespace]}_#{deps[:name]}"
+              graph[node.name].add_dependency(service: graph[dependency_name], latency: deps[:latency])
             end
           end
         end

data/lib/dendrite/service_graph.rb

@@ -20,14 +20,24 @@ module Dendrite
     end
 
     def valid?
-      services.values.collect(&:valid?).all?
+      services.values.collect(&:valid?).all? &&
+      services.values.group_by(&:advertised_port).all? do |port, svc|
+        svc.length == 1
+      end
     end
 
     def errors
-      services.inject({}) do |hash, (name, service)|
+      hash = services.inject({}) do |hash, (name, service)|
         hash[name] = service.errors.messages if service.errors.messages.length > 0
         hash
       end
+      services.values.group_by(&:advertised_port).each do |port, svc|
+        if svc.length > 1
+          hash[:port_collisions] ||= {}
+          hash[:port_collisions][port] = svc.collect(&:name)
+        end
+      end
+      return hash
     end
   end
 end

data/lib/dendrite/service_node.rb

@@ -3,10 +3,10 @@ module Dendrite
     def valid?
       super
 
-      dependancies.each do |depname, dep|
+      dependencies.each do |depname, dep|
         if dep.invalid?
           dep.errors.each do |key, value|
-            errors.add "dependancy_#{key}", value
+            errors.add "dependency_#{key}", value
           end
         end
       end
@@ -46,7 +46,7 @@ module Dendrite
       validates :port, numericality: { only_integer: true }
     end
 
-    Dependacy = Struct.new(:service, :latency) do
+    Dependency = Struct.new(:service, :latency) do
       include ActiveModel::Validations
       validates_presence_of :service
       validates_presence_of :latency
@@ -76,7 +76,7 @@ module Dendrite
     VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
 
     attr_reader :organization, :namespace, :lead_email, :team_email,
-                :type, :deploy, :scale, :ports, :dependancies
+                :type, :deploy, :scale, :ports, :dependencies
                 # :name is set but magically
 
     validates_presence_of :organization, :namespace, :lead_email, :team_email,
@@ -105,7 +105,7 @@ module Dendrite
           instance_variable_set("@#{k}", v)
         end
       end
-      @dependancies = {}
+      @dependencies = {}
     end
 
     def real_name
@@ -124,8 +124,8 @@ module Dendrite
       ports[:advertised_port].port if ports[:advertised_port]
     end
 
-    def add_dependancy(service:, latency:)
-      @dependancies[service.name] = Dependacy.new(service, latency)
+    def add_dependency(service:, latency:)
+      @dependencies[service.name] = Dependency.new(service, latency)
     end
   end
 end

data/lib/dendrite/version.rb

@@ -1,3 +1,3 @@
 module Dendrite
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

data/lib/dendrite.rb

@@ -10,7 +10,7 @@ module Dendrite
   InvalidData = Class.new(Error)
   UnknownService = Class.new(Error)
   DuplicateService = Class.new(Error)
-  PortCollission = Class.new(Error)
+  PortCollision = Class.new(Error)
 
   class Config
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dendrite
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Yagnik