boutons 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b5abc6728dce0dcf5c43f5c38a6c61ad879f1b
-  data.tar.gz: 778cdd570c230f62e57e265feec3eda51e4f5233
+  metadata.gz: b6323d849f1adc7e1abb6cf0031cb892afc38396
+  data.tar.gz: e70c25a3738a20e41bd8adbdf23491d0fba436d3
 SHA512:
-  metadata.gz: d646f87a510789110a12da5215e34e4e9d13d8bea58f361a66aa05fa91191587e738b2e5f1c3c12d5eaa1841cb6897c2fa166cd2c8b0db54eb1ce3d2c1516c7f
-  data.tar.gz: 4ad6e13ef67b19ac5146c259db0425dc079204e1b05677e51562640059e92bb5b4bc32fa91239d964b9f2b96a99e3563773b29bdbc9df9cf7e26bf23c1005776
+  metadata.gz: fc3298b2be2ed421a3b1f65a0dcc8bfc0d49869b0d020df69d20be01b14d1405024006afa7b6f175cac6aabc69a3cdd945eb1ad1995c57f61a340d11de26c127
+  data.tar.gz: f1f0a6e00e850080110b157082fd57e99995059b2492937eaa83d0cc899083f5c837b670750fbf5655970429bbd0e58aeee43190668a2de268202cb70b341a4b

data/boutons.gemspec

@@ -22,8 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "synapse-easy", "~> 0.1"
   spec.add_dependency "synapse-config", "~> 0.1"
   spec.add_dependency "synapse-logging-interchangeable", "~> 0.1"
+  spec.add_dependency "toml-rb"
+  spec.add_dependency "recursive-open-struct"
+  spec.add_dependency "bundler", "~> 1.8"
 
-  spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "unirest"
 end

data/lib/boutons/config.rb

@@ -0,0 +1,27 @@
+require "toml"
+require "recursive-open-struct"
+
+module Boutons
+  class Config < RecursiveOpenStruct
+    class << self
+      def file
+        %w{. config/ ~/.boutons ~/ /etc/boutons /etc}.product(%w{tml toml}).collect{|x|File.expand_path x.join("/boutons.")}.each do |file|
+          return file if File.exists? file
+        end
+      end
+      private
+      def config
+        @config ||= self.new TOML.load_file(file,symbolize_keys:true)
+      end
+      def method_missing method, *args, &block
+        config.send method, *args, &block
+      end
+    end
+    def keys
+      @table.keys
+    end
+    def each *args, &block
+      @table.each(*args,&block)
+    end
+  end
+end

data/lib/boutons/early_start.rb

@@ -0,0 +1,5 @@
+require "synapse/easy/service"
+
+Boutons::Config.services.zookeeper.each do |service,path|
+  Boutons.add Synapse::Easy::Service.new application: service, path: path, hosts: (Boutons::Config.discovery.zookeeper.hosts rescue nil)
+end rescue nil

data/lib/boutons/synapse.rb

@@ -7,16 +7,6 @@ module Synapse
       @service_watchers ||= []
       @service_watchers << ServiceWatcher.create(service.name, service, self)
     end
-    # TODO: have to investigate haproxy-class of synapse a little bit more
-    # def remove_service service_name
-    #   @service_watchers ||= []
-    #   @service_watchers.each do |service_watcher|
-    #     next unless service_watcher.name == service_name
-    #     @service_watchers.delete(service_watcher)
-    #     service_watcher.stop
-    #     service_watcher = nil
-    #   end
-    # end
     def service_watchers
       @service_watchers
     end

data/lib/boutons/version.rb

@@ -1,3 +1,3 @@
 module Boutons
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/lib/boutons.rb

@@ -1,4 +1,5 @@
 require "boutons/version"
+require "boutons/config"
 require "synapse"
 require "synapse/easy"
 require "synapse/config"
@@ -116,3 +117,5 @@ module Boutons
     end
   end
 end
+
+require "boutons/early_start"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boutons
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Mathias Kaufmann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: synapse
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: toml-rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: recursive-open-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +101,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -125,6 +153,8 @@ files:
 - bin/setup
 - boutons.gemspec
 - lib/boutons.rb
+- lib/boutons/config.rb
+- lib/boutons/early_start.rb
 - lib/boutons/synapse.rb
 - lib/boutons/version.rb
 homepage: https://synapse.stei.gr/boutons