dendrite 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 585ad77536fd0f74a3f9f90576d6baa776667218
-  data.tar.gz: 7a71f290f2687575245d0e3088b6c84169b6acd6
+  metadata.gz: 0d0f802a104f1332fd54dfd363f96f68ed3c862f
+  data.tar.gz: 639c00dccaaff88406e9527da5bae00d91b179d9
 SHA512:
-  metadata.gz: 4a86e0599b5ff8fadb08942264d69b66d40de073e8d0b7fd73039350f88665d73fb22e0221c5b749503010d664ced4dc56f83a8de6eb7d51083a2d8408ebdc1f
-  data.tar.gz: 8cd32f8074ec0ac8a42a9e95111208da74cc1bba087a9df1329a24e70662e354bd9a368d1962ece82e3c93e18e22e0f8e7025fe61258168bf60c76047514a210
+  metadata.gz: 0f05cf860d8ef399600105c2aa6ebb6cac9f3af48312267273a221f3e1bd9c4b7e8c74f691cc479074734feb7563fe2a1f2fa2120d51abbc45b24fa300bf34af
+  data.tar.gz: 2e3063feb05283898875f31c38177b63e69061f608dd65b860175adbe92f5a34b0e50d7c7ea241c54479ff5cd6ce8c6d844c0530da921e84486a075f2e78e16b

data/bin/add_proxy

@@ -5,25 +5,34 @@ require 'optparse'
 options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: proxy [options]"
-  opts.on("-s", "--service SERVICE_NAME", "service name") do |v|
-    options[:service_name] = v
+  opts.on("-s", "--services SERVICE_NAME:PORT,..", "service name and port") do |v|
+    options[:services] = v
   end
 
   opts.on("-c", "--config CONFIG_FILE", "config file") do |v|
     options[:config] = v
   end
-
-  opts.on("-p", "--port PORT", "port") do |v|
-    options[:port] = v.to_i
-  end
 end.parse!
 
+services = options[:services].split(',').inject({}) do |hsh, name_port|
+  name, port = name_port.split(':')
+  name = name.strip
+  port = port.to_i
+  hsh[name] = port
+  hsh
+end
+
+puts "Loading config"
 Dendrite::Config.load(source: options[:config])
-services = [options[:service_name]]
+puts "Loading graph"
 graph = Dendrite::IO.load(source: Dendrite::Config.services_source)
 raise Dendrite::InvalidData unless graph.valid?
-raise Dendrite::UnknownService unless services.collect {|service_name| graph[service_name]}.all?
+raise Dendrite::UnknownService unless services.keys.collect {|service_name| graph[service_name]}.all?
 
-Dendrite::Config.custom_frontend!(name: "custom_#{options[:service_name]}", port: options[:port], backend_name: options[:service_name])
+services.each do |name, port|
+  puts "adding proxy for #{name}"
+  Dendrite::Config.custom_frontend!(name: "custom_#{name}", port: port, backend_name: name)
+end
 synapse = Dendrite::Generators::Synapse.new(graph: graph, service_names: services, proxy: true)
 Dendrite::IO.write(data: synapse.to_yaml, destination: Dendrite::Config.synapse_config_path)
+

data/bin/register

@@ -14,6 +14,7 @@ OptionParser.new do |opts|
   end
 end.parse!
 
+puts "Loading config"
 Dendrite::Config.load(source: options[:config])
 graph = Dendrite::IO.load(source: Dendrite::Config.services_source)
 
@@ -28,8 +29,10 @@ services.uniq!
 raise Dendrite::InvalidData unless graph.valid?
 raise Dendrite::UnknownService unless services.collect {|service_name| graph[service_name]}.all?
 
+puts "Generating synapse"
 synapse = Dendrite::Generators::Synapse.new(graph: graph, service_names: services)
 Dendrite::IO.write(data: synapse.to_yaml, destination: Dendrite::Config.synapse_config_path)
 
+puts "Generating nerve"
 nerve = Dendrite::Generators::Nerve.new(graph: graph, service_names: services)
 Dendrite::IO.write(data: nerve.to_yaml, destination: Dendrite::Config.nerve_config_path)

data/lib/dendrite/version.rb

@@ -1,3 +1,3 @@
 module Dendrite
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

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