small-ops 0.0.32 → 0.0.33

data/bin/docker2etcd

@@ -19,43 +19,66 @@ OptionParser.new do |opts|
   opts.on("-c","--clear","clear etcd of previous data (only containers data)") do |c|
       @options[:clear]=c
   end
+  opts.on("-f","--foreground","Keep running on foregroud. Default is run once and exit.") do |f|
+    @options[:foreground]=f
+  end
 end.parse!
 
-if @options[:clear] then
-  data = nodes2obj( http_get("#{@options[:etcd]}/v2/keys/?recursive=true")["node"]["nodes"] ,"/")
-  data.keys.each {|k|
-    n = data[k]
-    if n.has_key?("host") && n.has_key?("name") && n.has_key?("port") then
-        puts "del #{n["name"]}"
-        http_delete("#{@options[:etcd]}/v2/keys/#{n["name"]}?dir=true&recursive=true")
-    end
-  }
-end
+run  = true
+last = []
+
+while run do
 
-`docker ps | tail -n+2 | awk '{ print $1 }'`.split("\n")
-    .map  { |id| `docker inspect #{id}` }
-    .map  { |inspect| JSON.parse(inspect)[0]}
-    .map  { |data| flatten(data,data["Name"]) }
-    .each { |container| 
-        name = container.keys.first.split("/")[1]
-        port = `docker inspect #{container["/#{name}/id"]} | grep -o '[0-9]\\+/tcp' | head -n1 | grep -o '[0-9]\\+'`.gsub("\n","")
-        hport = container["/#{name}/networksettings/ports/#{port}/tcp/hostport"]
-        container["/#{name}/name"] = name
-        container["/#{name}/port"] = hport
-        container["/#{name}/host"] = @options[:host]
-        if @options[:url] then
-            container["/#{name}/url"] = "http://#{@options[:host]}/#{name}"
-        else
-            container["/#{name}/url"] = "http://#{@options[:host]}:#{hport}"
+  containers = `docker ps | tail -n+2 | awk '{ print $1 }'`.split("\n")
+
+  if last != containers then
+
+    if @options[:clear] then
+      data = nodes2obj( http_get("#{@options[:etcd]}/v2/keys/?recursive=true")["node"]["nodes"] ,"/")
+      data.keys.each {|k|
+        n = data[k]
+        if n.has_key?("host") && n.has_key?("name") && n.has_key?("port") then
+            puts "delete #{n["name"]}"
+            http_delete("#{@options[:etcd]}/v2/keys/#{n["name"]}?dir=true&recursive=true")
         end
-        container.keys.each {|key|
-            if container[key] != nil then
-                if @options[:verbose] then
-                    puts "#{key} = #{container[key]}"
-                end
-                http_put("#{@options[:etcd]}/v2/keys#{key}","value=#{URI.encode(container[key])}")
+      }
+    end
+
+    containers
+        .map  { |id| `docker inspect #{id}` }
+        .map  { |inspect| JSON.parse(inspect)[0]}
+        .map  { |data| flatten(data,data["Name"]) }
+        .each { |container| 
+            name = container.keys.first.split("/")[1]
+            port = `docker inspect #{container["/#{name}/id"]} | grep -o '[0-9]\\+/tcp' | head -n1 | grep -o '[0-9]\\+'`.gsub("\n","")
+            hport = container["/#{name}/networksettings/ports/#{port}/tcp/hostport"]
+            container["/#{name}/name"] = name
+            container["/#{name}/port"] = hport
+            container["/#{name}/host"] = @options[:host]
+            if @options[:url] then
+                container["/#{name}/url"] = "http://#{@options[:host]}/#{name}"
+            else
+                container["/#{name}/url"] = "http://#{@options[:host]}:#{hport}"
             end
+            container.keys.each {|key|
+                if container[key] != nil then
+                    if @options[:verbose] then
+                        puts "#{key} = #{container[key]}"
+                    end
+                    #http_put("#{@options[:etcd]}/v2/keys#{key}","value=#{URI.encode(container[key])}")
+                end
+            }
+            puts "-> #{name} : #{container["/#{name}/url"]}"
         }
-        puts "-> #{name} : #{container["/#{name}/url"]}"
-    }
+      last = containers
+  end
+
+  run =false
+
+  if @options[:foreground] then
+    run = true
+    sleep 5
+  end
+
+end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: small-ops
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
   prerelease: 
 platform: ruby
 authors: