odania 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3ea4dc6ef659e59d62f4afa7b347f84ca289143
-  data.tar.gz: 1f2cb8775a0d6df2ea304b0296688d569f0813c0
+  metadata.gz: 98f1b35d343d29593bd92072acba51056e07f691
+  data.tar.gz: 1473ba35af554c2addb4b67b328b456667f8dabe
 SHA512:
-  metadata.gz: 39b57280e4fc8b73efb5751ff85063bd0196394546b5f803b0d08766f37201cb834571ce21b323607c601d56823fe88d7824467966f9d706bcb345909071f556
-  data.tar.gz: 4d71815ae0788bc39f911a82853f38c1ead7387e209811b60dc8a43b301fedef03296101c31b4b88c9fe77cea438347260fa01f41445ed0f4fc1d1c7d87568ce
+  metadata.gz: c1a2ea5dce9d5d95f5cf14256f085a1a6c4be5175abb8c9cbb7aac82f76dd8bf01e3d735413cd4357b957cc96020b3c3400c6501b9aad8ea6ed7d679ff170383
+  data.tar.gz: 26ad3362b23cd99dbc1df1a7099c1fd0c16ea488759336b828550947addc3e12a8c9a8cc98d630068b4befb6d0820b370e205df5796d5b14d92bbe428304d55c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    odania (0.0.1)
+    odania (0.0.2)
       diplomat
 
 GEM

data/lib/odania/consul.rb

@@ -1,34 +1,6 @@
 module Odania
 	class Consul
-		def initialize
-			consul_url = "http://#{ENV['CONSUL_PORT_8500_TCP_ADDR']}:#{ENV['CONSUL_PORT_8500_TCP_PORT']}"
-			puts "Consul: #{consul_url}"
-
-			Diplomat.configure do |config|
-				# Set up a custom Consul URL
-				config.url = consul_url
-			end
-		end
-
-		def get_config
-			configs = retrieve_value 'plugins'
-			puts
-			puts 'Configs'
-			puts configs.inspect
-			puts
-			puts
-
-			result = {}
-			configs.each do |json_data|
-				config = JSON.parse json_data[:value]
-				# TODO merge
-				puts config.inspect
-				result = config
-			end
-			result
-		end
-
-		private
+		protected
 
 		def retrieve_value(plugin_path)
 			begin

data/lib/odania/plugin.rb

@@ -0,0 +1,49 @@
+module Odania
+	class Plugin < Odania::Consul
+		def plugins_config
+			configs = retrieve_value 'plugins'
+			puts
+			puts 'Configs'
+			puts configs.inspect
+			puts
+			puts
+
+			result = {}
+			configs.each do |json_data|
+				config = JSON.parse json_data[:value]
+				# TODO merge
+				puts config.inspect
+				result = config
+			end
+			result
+		end
+
+		def add_plugin(plugin_config)
+			plugin_name = plugin_config['name']
+			plugin_instance_name = get_plugin_instance_name plugin_name
+
+			puts "Writing plugin instance config: #{plugin_instance_name}"
+			Diplomat::Kv.put("#{get_plugin_path(plugin_name)}#{plugin_instance_name}", JSON.dump(plugin_config))
+
+			Odania.service.add_service(plugin_name, plugin_instance_name, plugin_config['ip'])
+
+			Diplomat::Event.fire('updated_plugin_config', "#{plugin_name}|#{plugin_instance_name}")
+		end
+
+		private
+
+		def get_plugin_path(plugin_name)
+			"plugins/#{plugin_name}/"
+		end
+
+		# Generate a unique number for this instance of the plugin
+		def get_plugin_instance_name(plugin_name)
+			available_plugins = retrieve_value(get_plugin_path(plugin_name))
+
+			puts 'Current plugins'
+			puts available_plugins.inspect
+
+			"#{plugin_name}_#{available_plugins.length + 1}"
+		end
+	end
+end

data/lib/odania/service.rb

@@ -0,0 +1,33 @@
+module Odania
+	class Service < Odania::Consul
+		def register_service(plugin_name, plugin_instance_name, ip)
+			puts "Registering service #{plugin_name} as instance #{plugin_instance_name}"
+			if Diplomat::Service.register consul_service_config(plugin_name, plugin_instance_name, ip)
+				puts 'Service registered'
+			else
+				puts 'Error registering service'
+			end
+		end
+
+		private
+
+		def consul_service_config(plugin_name, plugin_instance_name, ip)
+			{
+				'id' => plugin_instance_name,
+				'name' => plugin_name,
+				'tags' => ['odania-static'],
+				'port' => 80,
+				'token' => plugin_instance_name,
+				'checks' => [
+					{
+						'id' => plugin_name,
+						'name' => 'HTTP on port 80',
+						'http' => "http://#{ip}:80/health",
+						'interval' => '10s',
+						'timeout' => '1s'
+					}
+				]
+			}
+		end
+	end
+end

data/lib/odania/version.rb

@@ -1,3 +1,3 @@
 module Odania
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/odania.rb

@@ -3,4 +3,32 @@ require 'diplomat'
 
 module Odania
 	autoload :Consul, 'odania/consul'
+	autoload :Service, 'odania/service'
+	autoload :Plugin, 'odania/plugin'
+
+	def self.service(consul_url=nil)
+		if @service.nil?
+			Odania.configure
+			@service = Service.new(consul_url)
+		end
+		@service
+	end
+
+	def self.plugin
+		Odania.configure
+		@plugin = Plugin.new if @plugin.nil?
+		@plugin
+	end
+
+	def self.configure(consul_url=nil)
+		if @configured.nil?
+			consul_url = "http://#{ENV['CONSUL_PORT_8500_TCP_ADDR']}:#{ENV['CONSUL_PORT_8500_TCP_PORT']}" if consul_url.nil?
+			puts "Consul URL: #{consul_url}"
+			Diplomat.configure do |config|
+				# Set up a custom Consul URL
+				config.url = consul_url
+			end
+			@configured = true
+		end
+	end
 end

data/spec/{odania_spec.rb → odania/plugin_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Odania::Consul do
-	subject { Odania::Consul.new }
+describe Odania::Plugin do
+	subject { Odania::Plugin.new }
 
-	describe '#process' do
-		let(:output) { subject.get_config }
+	describe 'plugins_config' do
+		let(:output) { subject.plugins_config }
 
 		it 'retrieves config' do
 			allow(subject).to receive(:retrieve_value) do |plugin_path|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mike Petersen
@@ -81,9 +81,11 @@ files:
 - Rakefile
 - lib/odania.rb
 - lib/odania/consul.rb
+- lib/odania/plugin.rb
+- lib/odania/service.rb
 - lib/odania/version.rb
 - odania.gemspec
-- spec/odania_spec.rb
+- spec/odania/plugin_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
 homepage: http://www.odania.com
@@ -111,5 +113,5 @@ signing_key:
 specification_version: 4
 summary: Helper for the odania portal
 test_files:
-- spec/odania_spec.rb
+- spec/odania/plugin_spec.rb
 - spec/spec_helper.rb