boutons 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6323d849f1adc7e1abb6cf0031cb892afc38396
-  data.tar.gz: e70c25a3738a20e41bd8adbdf23491d0fba436d3
+  metadata.gz: 4eedf75f5b88e6bc0015378dd9cccd4e32123183
+  data.tar.gz: 576fb18f8c227b183c8c104c6aca06a97b7ca8b1
 SHA512:
-  metadata.gz: fc3298b2be2ed421a3b1f65a0dcc8bfc0d49869b0d020df69d20be01b14d1405024006afa7b6f175cac6aabc69a3cdd945eb1ad1995c57f61a340d11de26c127
-  data.tar.gz: f1f0a6e00e850080110b157082fd57e99995059b2492937eaa83d0cc899083f5c837b670750fbf5655970429bbd0e58aeee43190668a2de268202cb70b341a4b
+  metadata.gz: 4a2ff48868a766cd4ee4d7725b9f118f37badd575a3eb60294452e07fe792d5b0e63a4ef18fb6391ea6aba0de92304332bb44699ecd127c783c4f0ebbe6531da
+  data.tar.gz: 400f48bfd41954399837c022f5ed11c8e59c5c12a03f16f33e102662c89e4c15fcd617186e858f70da05c0a6f79df1984e1ceff474b168ad679bdaf52a6d9013

data/lib/boutons.rb

@@ -104,18 +104,30 @@ module Boutons
     def normalize name
       name.to_s.gsub(/\./,"_").to_sym
     end
-    def method_missing method, *args, &block
+    def service_from_config name
+      return if @@mapping[name]
+      return unless Boutons::Config.services.zookeeper.keys.include? name
+      params   = Boutons::Config.discovery.zookeeper rescue {}
+      params[:application] = name
+      params[:path]        = Boutons::Config.services.zookeeper.send(name)
+      Boutons.add Synapse::Easy::Service.new params
+    end
+    def resolv_service method, *args, &block
+      service_from_config method
       name   = @@mapping[method]
       unless name
         return @@services.send(method, *args, &block) if @@services.respond_to? method
-        raise SynapseNotFound.new("The Synapse #{method} cannot be resolved") unless name
+        raise SynapseNotFound.new("The Synapse #{method} is unavailable. Add service #{method} first.") unless name
       end
       synapse = @@services[name]
-      raise SynapseNotFound.new("The Synapse #{method} cannot be resolved") unless synapse
+      unless synapse
+        raise SynapseNotFound.new("The Synapse #{method} is unavailable. Add service #{method} first.") 
+      end
       return synapse if args.empty?
       synapse.send(args[0],*args,&block)
     end
+    def method_missing method, *args, &block
+      resolv_service  method, *args, &block
+    end
   end
-end
-
-require "boutons/early_start"
+end

data/lib/boutons/config.rb

@@ -9,12 +9,17 @@ module Boutons
           return file if File.exists? file
         end
       end
+      def use
+        services.zookeeper.each do |service,path|
+          Boutons.add Synapse::Easy::Service.new application: service, path: path, hosts: (discovery.zookeeper.hosts rescue nil)
+        end rescue nil
+      end
       private
-      def config
-        @config ||= self.new TOML.load_file(file,symbolize_keys:true)
+      def config params={}
+        @config ||= self.new TOML.load_file(file,symbolize_keys:true).deep_merge(params)
       end
       def method_missing method, *args, &block
-        config.send method, *args, &block
+        config.send(method, *args, &block) rescue nil
       end
     end
     def keys

data/lib/boutons/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boutons
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mathias Kaufmann
@@ -154,7 +154,6 @@ files:
 - 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

data/lib/boutons/early_start.rb

@@ -1,5 +0,0 @@
-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