dendrite 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9337cede5c112c5d1a353748e6d4403d208fdf2
-  data.tar.gz: 0099c4e6c387464575c0f64cc9e562b7d4a09303
+  metadata.gz: ef8c060dff6dc807514af1ccd1d171737b6f2d77
+  data.tar.gz: b2c1dc4a4c1fe26460b92ce416e08327d5488903
 SHA512:
-  metadata.gz: 4c82e70c0765463644f1877ebb30b667c453ac1859b011567e75a36d94418e79af0b0e0ba77c5e67f4eb4a77daba98113964b77a6103fdce3ce82a73f13bb9ec
-  data.tar.gz: 47c53acf63d3e3325031fd533d8f3c09cb08b4115ae55a346b76c218414ac3cdacbe3d419942c6fe726961cd0c98f6cfd6fe10c68afc74ce19a79261ae095a3b
+  metadata.gz: af014bb87f87559989176b3ad01ae49fb7c919c47761fcfe6f3d5387858ed14a026583c4685e17ccc72185438aa908c42ed88f93d33072c67d46616b381b0a7f
+  data.tar.gz: 34e182d57a4b6dfc2670bbb4e42639c0d73e35b6ea31007ec0178f9ad338b952e284f103aaabb6d57c2156f94f193238f8f26050189cad6df0a0706a018b01bb

data/conf/config.yaml

@@ -6,7 +6,14 @@ dendrite:
     - localhost:2181
   nerve_config_path: /opt/smartstack/conf/nerve.yml
   synapse_config_path: /opt/smartstack/conf/synapse.yml
-  services_source: /vagrant/services/services/ 
+  services_source: conf/services
+  valid_app_types:
+    - tomcat
+    - mysql
+    - mongodb
+    - aerospike
+    - cassandra
+    - jar
 
 synapse:
   haproxy:

data/conf/services/service.yml

@@ -1,4 +1,3 @@
-dendrite_version: 1
 organization: sd
 namespace: cams
 lead_email: vp@foobar.com

data/lib/dendrite/generators/synapse.rb

@@ -55,7 +55,7 @@ module Dendrite
               port: service.advertised_port,
               server_options: 'check inter 2s rise 3 fall 2',
               listen: [
-                'mode http'
+                'mode tcp'
               ]
             }
           }

data/lib/dendrite/service_node.rb

@@ -73,14 +73,6 @@ module Dendrite
       validates_presence_of :package
     end
 
-    VALID_TYPE = %w(
-      tomcat
-      mysql
-      mongodb
-      aerospike
-      cassandra
-    )
-
     VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
 
     attr_reader :organization, :namespace, :lead_email, :team_email,
@@ -95,7 +87,7 @@ module Dendrite
     validates :lead_email, format: { with: VALID_EMAIL_REGEX, message: "invalid email format" }
     validates :team_email, format: { with: VALID_EMAIL_REGEX, message: "invalid email format" }
     validates :name, format: { with: /\A[a-z_]+\z/, message: "only allows lowercase letters" }
-    validates :type, inclusion: { in: VALID_TYPE, message: "%{value} is not a valid type" }
+    validates :type, inclusion: { in: -> (_) { Dendrite::Config.valid_types } , message: "%{value} is not a valid type" }
 
     def initialize(**args)
       @ports = {}

data/lib/dendrite/version.rb

@@ -1,3 +1,3 @@
 module Dendrite
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/dendrite.rb

@@ -4,12 +4,6 @@ require 'active_model'
 require 'socket'
 require 'forwardable'
 require 'dendrite/version'
-require 'dendrite/io'
-require 'dendrite/service_node'
-require 'dendrite/service_graph'
-require 'dendrite/generators/base'
-require 'dendrite/generators/nerve'
-require 'dendrite/generators/synapse'
 
 module Dendrite
   Error = Class.new(StandardError)
@@ -51,6 +45,10 @@ module Dendrite
         @@data[:synapse][:haproxy]
       end
 
+      def valid_types
+        @@data[:dendrite][:valid_app_types]
+      end
+
       def public_ip
         ip = Socket.ip_address_list.detect{|intf| intf.ipv4_private?} ||
              Socket.ip_address_list.detect{|intf| intf.ipv4? && !intf.ipv4_loopback? && !intf.ipv4_multicast? && !intf.ipv4_private?}
@@ -62,10 +60,15 @@ module Dendrite
       end
 
       def instance
-        fqdn.gsub('.', '_')
+        fqdn
       end
     end
   end
 end
 
-
+require 'dendrite/io'
+require 'dendrite/service_node'
+require 'dendrite/service_graph'
+require 'dendrite/generators/base'
+require 'dendrite/generators/nerve'
+require 'dendrite/generators/synapse'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dendrite
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Yagnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler