boutons 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eedf75f5b88e6bc0015378dd9cccd4e32123183
-  data.tar.gz: 576fb18f8c227b183c8c104c6aca06a97b7ca8b1
+  metadata.gz: 6335817799c818e80c5e9b9042192f6d259d5ee1
+  data.tar.gz: bd818a6d33cc0fc7bb23ad3bb2aabc3714884a0d
 SHA512:
-  metadata.gz: 4a2ff48868a766cd4ee4d7725b9f118f37badd575a3eb60294452e07fe792d5b0e63a4ef18fb6391ea6aba0de92304332bb44699ecd127c783c4f0ebbe6531da
-  data.tar.gz: 400f48bfd41954399837c022f5ed11c8e59c5c12a03f16f33e102662c89e4c15fcd617186e858f70da05c0a6f79df1984e1ceff474b168ad679bdaf52a6d9013
+  metadata.gz: 4a401dee9068d6fbc4f595a36e6e132a607200fda967961a9f10bab13b1edda3d6becaf1b88356e3720796067f33b155cee52bcd727e8670b45aa8a2dfaeea64
+  data.tar.gz: 352b06e6490ffe2e2ee83925dfb7988d6dd17cd3e41730311a6c91c6a8d8d30cd247d102fb021cc785abdec5f5d4e360da01bdb7d139d5f8d22485a937dcbf00

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.tml

data/.ruby-gemset

@@ -0,0 +1 @@
+boutons

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.2.2

data/bin/console

@@ -2,13 +2,5 @@
 
 require "bundler/setup"
 require "boutons"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+require "pry"
+Pry.start

data/boutons.gemspec

@@ -22,10 +22,11 @@ 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_dependency "toml-rb"
+  spec.add_dependency "activesupport"
 
+  spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "unirest"
+  spec.add_development_dependency "pry"
 end

data/lib/boutons/config.rb

@@ -1,5 +1,6 @@
 require "toml"
 require "recursive-open-struct"
+require "active_support/core_ext/hash/deep_merge"
 
 module Boutons
   class Config < RecursiveOpenStruct
@@ -8,15 +9,27 @@ module Boutons
         %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
+        nil
       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
+      # privaste
+      def defaults
+        { :registry => { :zookeeper => { :hosts => [ "localhost:2181" ] } } }
       end
-      private
+      def with_environment
+        environment = defaults
+        environment[:registry][:zookeeper][:hosts] = ENV["ZK_HOSTS"].split(",") if ENV["ZK_HOSTS"] 
+        environment
+      end
+      def with_configuration
+        file ? TOML.load_file(file,symbolize_keys:true) : {}
+      end 
       def config params={}
-        @config ||= self.new TOML.load_file(file,symbolize_keys:true).deep_merge(params)
+        unless @config
+          params.deep_merge! with_environment
+          params.deep_merge! with_configuration
+          @config      = self.new params
+        end
+        @config
       end
       def method_missing method, *args, &block
         config.send(method, *args, &block) rescue nil

data/lib/boutons/resource.rb

@@ -0,0 +1,16 @@
+module Boutons
+  class Resource
+    class << self
+      def add name, object
+        self.instance_variable_set("@#{name}",object)
+      end
+      private
+      def method_missing method, *args, &block
+        if self.instance_variable_defined?("@#{method.to_s}") 
+          return self.instance_variable_get("@#{method.to_s}")
+        end
+        super
+      end
+    end
+  end
+end

data/lib/boutons/uri.rb

@@ -0,0 +1,70 @@
+require "uri"
+require "boutons/resource"
+
+module Boutons
+  class URI
+    class Registry
+      def initialize uri
+        @uri  = uri
+      end
+      def service
+        @uri.scheme
+      end
+      def zk_hosts
+        Boutons::Config.registry.send(service).hosts
+      end
+      def zk
+        begin
+          # return existing, working zookeeper connection
+          Boutons::Resource.zk
+        rescue
+          queue   = Queue.new
+          threads = []
+          zk_hosts.each do |zk_host|
+            threads << Thread.new do
+              # connect, push connection to queue
+              queue << [zk_host,ZK.new(zk_host)]
+            end
+          end
+          host,zk = queue.pop
+          # set first working host as host arrays
+          Boutons::Config.registry.zookeeper.hosts = [host]
+          # register connection
+          Boutons::Resource.add :zk, zk
+          # Add later connections if there are any
+          Thread.new do
+            threads.each{|t|t.join}
+            host,zk = queue.pop
+            Boutons::Config.registry.zookeeper.hosts << host if zk.ping?
+          end
+          retry
+        end
+      end
+      def zk_path
+        return @zk_path if @zk_path
+        paths = []
+        paths << "nerve"
+        paths += @uri.path.split("/")[1..-1].join("/#{@uri.host}/").split("/")
+        paths << "services"
+        paths.inject([Pathname.new("/")]) do |paths,dir|
+          paths << paths.last.join(dir)
+        end.map{|p|p.to_s}.reverse.each do |path|
+          return @zk_path = path unless zk.children(path).empty?
+        end
+      end
+    end
+    def initialize uri
+      @uri ||= URI uri
+    end
+    def registry
+      @registry ||= Registry.new @uri
+    end
+    def type
+      @uri.scheme
+    end
+    private
+    def method_missing method, *args, &block
+      @uri.send method, *args, &block
+    end
+  end
+end

data/lib/boutons/version.rb

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

data/lib/boutons.rb

@@ -4,130 +4,148 @@ require "synapse"
 require "synapse/easy"
 require "synapse/config"
 require "active_support/core_ext/hash/indifferent_access"
+require "active_support/core_ext/string/inflections"
 require "zookeeper"
 require "boutons/synapse"
 require "synapse/logging/interchangeable"
+require "boutons/uri"
+require "boutons/resource"
 
 module Boutons
-  class SynapseNotFound < Exception; end
+  class UnknownSynapse < Exception; end
+  class MissingSynapse < Exception; end
   class << self
-    @@haproxy  = Synapse::Config::Haproxy.new Synapse::Easy::Haproxy.new
-    @@services = Synapse::Config::Services.new
-    @@config   = { services: @@services, haproxy: @@haproxy }.with_indifferent_access
-    @@logger   = Logger.new(STDERR,progname:"Boutons")
-    @@mapping  = {} 
     def add synapse
-      return if @@services[synapse.name]
-      @@services[synapse.name] = synapse
-      refresh
+      return if services[synapse.name]
+      services[synapse.name] = synapse
+      start
       update
     end
     def remove name
-      @@services[@@mapping[name]] = nil
-      refresh
+      services[mapping[name]] = nil
+      start
       update
     end
     def with_loggers
-      @@synapse.service_watchers.collect{|s|s.logger}+[@@logger,@@synapse.logger].each do |logger|
+      synapse.service_watchers.collect{|s|s.logger}+[logger,synapse.logger].each do |logger|
         yield(logger) if block_given?
       end
     end
     def log_with logger, synapses:nil
-      @@logger.info "Replace logger #{@@logger} with #{logger}"
-      @@logger=logger
-      @@synapse.logger=@@logger
+      logger.info "Replace logger #{logger} with #{logger}"
+      logger=logger
+      synapse.logger=logger
       return unless synapses
       if synapses.to_sym == :all
-        return @@synapse.service_watchers.map{|s|s.logger=@@logger}
+        return synapse.service_watchers.map{|s|s.logger=logger}
       end
-      @@synapse.service_watchers.each do |services_watcher|
+      synapse.service_watchers.each do |services_watcher|
         if synapses==services_watcher.name
-          services_watcher.logger = @@logger
+          services_watcher.logger = logger
         end
       end
     end
     def haproxy
-      @@haproxy
+      @@haproxy ||= Synapse::Config::Haproxy.new Synapse::Easy::Haproxy.new
     end
     def all
-      @@services
+      services
     end
     private
-    def refresh
-      return if defined? @@synapse
-      @@synapse ||= Synapse::Synapse.new @@config # rescue nil
-      return unless @@synapse
-      @@services.map{|n,s|s.active=true}
-      @@haproxy.inform     @@synapse
+    def mapping
+      @@mapping  ||= {}
+    end
+    def config
+      @@config   ||= { services: services, haproxy: haproxy }.with_indifferent_access
+    end
+    def services
+      @@services ||= Synapse::Config::Services.new
+    end
+    def logger
+      @@logger   ||= Logger.new(STDERR,progname:"Boutons")
+    end
+    def synapse
+      @@synapse ||= Synapse::Synapse.new config rescue nil
+    end
+    def start
+      return if @started
+      services.map{|n,s|s.active=true}
+      haproxy.inform synapse
       at_exit do
-        @@logger.info "HAproxy cleanup begin"
-        pf = @@haproxy.pid_file_path
-        cf = @@haproxy.config_file_path
-        sf = @@haproxy.socket_file_path
+        logger.info "HAproxy cleanup begin"
+        pf = haproxy.pid_file_path
+        cf = haproxy.config_file_path
+        sf = haproxy.socket_file_path
         pids = File.read(pf).strip
-        @@logger.info "HAproxy stop: `kill -9 #{pids}`"
+        logger.info "HAproxy stop: `kill -9 #{pids}`"
         `kill -9 #{pids}`
         File.unlink(pf)
         File.unlink(sf)
         File.unlink(cf)
-        @@logger.info "HAproxy cleanup finish"
+        logger.info "HAproxy cleanup finish"
       end
-      @@services.inform    @@synapse
-      @@synapse.services = @@services
+      services.inform synapse
+      synapse.services = services
       @@synapse_thread   = Thread.new do
-        @@synapse.run
+        synapse.run
       end
       wait
+      @started = true
     end
     def wait
       loop do
         break unless restart_required
-        sleep 0.01
+        sleep 0.25
       end
     end
     def restart_required
-      @@synapse.instance_variable_get("@haproxy").instance_variable_get("@restart_required")
+      synapse.instance_variable_get("@haproxy").instance_variable_get("@restart_required")
     end
     def update
-      @@mapping = {}
-      @@services.each do |name,synapse|
-        next if @@mapping[normalize synapse.name]
-        @@mapping[normalize synapse.name] = name
+      services.each do |name,synapse|
+        next if mapping[normalize synapse.name]
+        mapping[normalize synapse.name] = name
       end
-      @@services.each do |name,synapse|
+      services.each do |name,synapse|
         synapse.aliases.each do |synapse_alias|
-          next if @@mapping[normalize synapse_alias]
-          @@mapping[normalize synapse_alias] = name
+          next if mapping[normalize synapse_alias]
+          mapping[normalize synapse_alias] = name
         end
       end
     end
     def normalize name
       name.to_s.gsub(/\./,"_").to_sym
     end
-    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} is unavailable. Add service #{method} first.") unless name
+    def connect service
+      return if mapping[service]
+      Boutons::Config.services.send(service).each do |service_uri|
+        uri = Boutons::URI.new service_uri
+        params = {}
+        params[:application] = uri.host
+        params[:method]      = uri.registry.service
+        params[:path]        = uri.registry.zk_path
+        params[:hosts]       = uri.registry.zk_hosts
+        params[:name]        = uri.registry.zk_path[1..-1].gsub(/\//,"_")
+        add Synapse::Easy::Service.new params
       end
-      synapse = @@services[name]
-      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 connectable? service
+      Boutons::Config.services.keys.include? service
+    end
+    def connection service
+      services[mapping[service]]
+    end
+    def setup service, *args, &block
+      raise UnknownSynapse.new("Synapse #{service} is unknown") unless connectable? service
+      connect service
+    end
+    def resolv service
+      raise MissingSynapse.new("Synapse #{service} is missing") unless connection service
+      connection service
     end
     def method_missing method, *args, &block
-      resolv_service  method, *args, &block
+      setup method, *args, &block
+      resolv method
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boutons
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Mathias Kaufmann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: synapse
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !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: toml-rb
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: recursive-open-struct
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +115,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: unirest
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,6 +159,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -154,7 +170,9 @@ files:
 - boutons.gemspec
 - lib/boutons.rb
 - lib/boutons/config.rb
+- lib/boutons/resource.rb
 - lib/boutons/synapse.rb
+- lib/boutons/uri.rb
 - lib/boutons/version.rb
 homepage: https://synapse.stei.gr/boutons
 licenses: []