cncflora_commons 0.0.32 → 0.0.33

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2170497a7b3986d289ca11640f750a2573254acc
+  data.tar.gz: 4ac865a95f66b787a4240fb7eb0ffd9571d2b9fb
+SHA512:
+  metadata.gz: 635c7edd9067fb5901614d2594ce94787d3dd4922621a22a2a9982d15d1890c23a24758c2b07cddbb3675224396b312a35279bd3656c10d0bddb8df2725d8f27
+  data.tar.gz: 5428554cdb062d5f4540f9f684056b336ab528b86bb5bad83e3d8b2c26aaa2aba13a6c6484ce61a44efd0180d3ddea350ebc976843ef68db2ff94ac2cb8c651b

data/lib/cncflora_commons.rb

@@ -77,25 +77,36 @@ end
 def setup(file)
     #config_file file
 
-    config = YAML.load_file(file)[ENV['RACK_ENV'] || 'development']
+    @config = YAML.load_file(file)[ENV['RACK_ENV'] || 'development']
+
+    if @config["etcd"] || ENV["ETCD"] then
+      etcd_cfg = etcd2config(@config["etcd"] || ENV["ETCD"])
+      onchange(@config["etcd"] || ENV["ETCD"]) do |newconfig|
+        newconfig.each {|k,v| @config[k] = v }
+        if defined? settings then
+          newconfig.each {|k,v| set k.to_sym,v }
+        end
+      end
+      etcd_cfg.each {|k,v| @config[k] = v }
+    end
 
-    config.each {|ck,cv|
+    @config.each {|ck,cv|
       ENV.each {|ek,ev|
         if cv =~ /\$#{ek}/ then
-          config[ck] = cv.gsub(/\$#{ek}/,ev)
+          @config[ck] = cv.gsub(/\$#{ek}/,ev)
         end
       }
     }
 
-    ENV.each {|k,v| config[k]=v }
+    ENV.each {|k,v| @config[k]=v }
 
-    if config["lang"] then
-        config["strings"] = JSON.parse(File.read("src/locales/#{config["lang"]}.json", :encoding => "BINARY"))
+    if @config["lang"] then
+        @config["strings"] = JSON.parse(File.read("src/locales/#{@config["lang"]}.json", :encoding => "BINARY"))
     end
 
     if defined? settings then
-      config.each {|k,v| set k.to_sym,v }
-      set :config, config
+      @config.each {|k,v| set k.to_sym,v }
+      set :@config, @config
 
       use Rack::Session::Pool
 
@@ -103,9 +114,51 @@ def setup(file)
       set :views, 'src/views'
     end
 
-    puts "Config loaded"
-    puts config
+    puts "@config loaded"
+    puts @config
+
+    @config
+end
+
+def flatten(obj)
+  flat = {}
+  if obj["dir"] && obj["nodes"] then
+    obj["nodes"].each { |n|
+      flat = flat.merge(flatten(n))
+    }
+  else
+    key = obj["key"].gsub("/","_").gsub("-","_")
+    flat[key[1..key.length]]=obj["value"]
+  end
+  flat
+end
 
-    config
+def etcd2config(server)
+  cfg = flatten( http_get("#{server}/v2/keys/?recursive=true")["node"] )
+  to_add={}
+  cfg.each {|k,v|
+    if k.match(/_port$/) then
+      name = /(\w+)_port/.match(k).captures[0]
+      ip   = cfg["#{name}_networksettings_ipaddress"]
+      port = 80
+      cfg.each {|kk,vv|
+        if /^#{name}_networksettings/.match(kk) && vv == v then 
+          port = /ports_(\d+)_tcp/.match(kk).captures[0] 
+        end
+      }
+      to_add[name] = "http://#{ip}:#{port}"
+    end
+  }
+  to_add.each{|k,v| cfg[k]=v}
+  cfg
 end
 
+def onchange(etcd)
+  Thread.new do
+    while true do
+      a = http_get("#{etcd}/v2/keys/?recursive=true&wait=true")
+      puts "etcd updated"
+      yield etcd2config(etcd)
+    end
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cncflora_commons
 version: !ruby/object:Gem::Version
-  version: 0.0.32
-  prerelease: 
+  version: 0.0.33
 platform: ruby
 authors:
 - Diogo Silva
@@ -15,17 +14,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: HTTP, etcd...
@@ -38,26 +35,25 @@ files:
 homepage: https://github.com/CNCFlora/cncflora-commons
 licenses:
 - Apache License 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CNCFlora common functions
 test_files: []