small-ops 0.0.15 → 0.0.16

data/bin/docker2etcd

@@ -2,6 +2,22 @@
 
 require 'small-setup'
 
+OptionParser.new do |opts|
+  opts.banner = "Usage: command [options]"
+  opts.on("-h", "--host host", "Set host IP/domain") do |h|
+      @options[:host] = h
+  end
+  opts.on("-e", "--etcd host:port", "Set etcd host and port") do |e|
+      @options[:etcd] = e
+  end
+  opts.on("-u","--url","Make container url as host/name instead of host:port") do |u|
+      @options[:url]=u
+  end
+  opts.on("-v","--verbose","verboser") do |v|
+      @options[:verbose]=v
+  end
+end.parse!
+
 `docker ps | tail -n+2 | awk '{ print $1 }'`.split("\n")
     .map  { |id| `docker inspect #{id}` }
     .map  { |inspect| JSON.parse(inspect)[0]}
@@ -12,18 +28,18 @@ require 'small-setup'
         hport = container["/#{name}/networksettings/ports/#{port}/tcp/hostport"]
         container["/#{name}/name"] = name
         container["/#{name}/port"] = hport
-        container["/#{name}/host"] = @host
-        if @as_url then
-            container["/#{name}/url"] = "http://#{@host}/#{name}"
+        container["/#{name}/host"] = @options[:host]
+        if @options[:url] then
+            container["/#{name}/url"] = "http://#{@options[:host]}/#{name}"
         else
-            container["/#{name}/url"] = "http://#{@host}:#{hport}"
+            container["/#{name}/url"] = "http://#{@options[:host]}:#{hport}"
         end
         container.keys.each {|key|
             if container[key] != nil then
-                if @verbose then
+                if @options[:verbose] then
                     puts "#{key} = #{container[key]}"
                 end
-                http_put("#{@etcd}/v2/keys#{@prefix}#{key}","value=#{URI.encode(container[key])}")
+                http_put("#{@options[:etcd]}/v2/keys#{key}","value=#{URI.encode(container[key])}")
             end
         }
         puts "-> #{name} : #{container["/#{name}/url"]}"

data/bin/etcd2conf

@@ -4,7 +4,29 @@ require 'small-setup'
 require 'erb'
 require 'zlib'
 
-if !@input || !@output then
+OptionParser.new do |opts|
+  opts.banner = "Usage: command [options]"
+  opts.on("-h", "--host host", "Set host IP/domain") do |h|
+    @options[:host] = h
+  end
+  opts.on("-e", "--etcd host:port", "Set etcd host and port") do |e|
+    @options[:etcd] = e
+  end
+  opts.on("-f","--foreground","Keep running on foregroud. Default is run once and exit.") do |f|
+    @options[:foreground]=f
+  end
+  opts.on("-o","--output file","Output file") do |o|
+    @options[:output]=o
+  end
+  opts.on("-i","--input file","Input file") do |o|
+    @options[:input]=o
+  end
+  opts.on("-c","--command cmd","A command to execute after each run") do |c|
+    @options[:cmd]=c
+  end
+end.parse!
+
+if !@options[:input] || !@options[:output] then
   raise "Need input and output!"
 end
 
@@ -13,46 +35,44 @@ class Namespace
     @data=data
     @config=config
   end
-
   def get_binding
     binding
   end
 end
 
-
 run = true
-`bash -c '[[ ! -e #{@output} ]] && touch #{@output}'`
-last = File.read(@output)
+`bash -c '[[ ! -e #{@options[:output]} ]] && touch #{@options[:output]}'`
+last = File.read(@options[:output])
 
 while run do
-  r = http_get("#{@etcd}/v2/keys/#{@prefix}?recursive=true")
+  r = http_get("#{@options[:etcd]}/v2/keys/?recursive=true")
 
   data = nodes2obj(r["node"]["nodes"],"/")
 
-  template = File.read(@input)
+  template = File.read(@options[:input])
 
-  if @prefix.length >= 1 then prefix = "#{prefix}/" end
+  if @options[:prefix].length >= 1 then prefix = "#{prefix}/" end
 
-  ns = Namespace.new(data,{"host"=>@host,"prefix"=>prefix})
+  ns = Namespace.new(data,{"host"=>@options[:host],"prefix"=>prefix})
   result=ERB.new(template).result(ns.get_binding)
 
   actual = Zlib::crc32(result)
 
   if actual != last then
-    puts "Writing #{@output}"
+    puts "Writing #{@options[:output]}"
 
-    File.open(@output, 'w') { |file| file.write(result) }
+    File.open(@options[:output], 'w') { |file| file.write(result) }
 
     last = actual
 
-    if @cmd then
-      puts `#{@cmd}`
+    if @options[:cmd] then
+      puts `#{@options[:cmd]}`
     end
   end
 
   run = false
 
-  if @foreground then
+  if @options[:foreground] then
     sleep 10
     run = true
   end

data/bin/etcd2env

@@ -2,7 +2,17 @@
 
 require 'small-setup'
 
-data = http_get("#{@etcd}/v2/keys/#{@prefix}?recursive=true")
+OptionParser.new do |opts|
+  opts.banner = "Usage: command [options]"
+  opts.on("-h", "--host host", "Set host IP/domain") do |h|
+    @options[:host] = h
+  end
+  opts.on("-e", "--etcd host:port", "Set etcd host and port") do |e|
+    @options[:etcd] = e
+  end
+end.parse!
+
+data = http_get("#{@options[:etcd]}/v2/keys/?recursive=true")
 
 final = eflatten( data["node"] )
 final.keys.each {|k|

data/bin/fige

@@ -3,22 +3,44 @@
 require 'small-setup'
 require 'yaml'
 
-yml = YAML.load_file('fig.yml')
+OptionParser.new do |opts|
+  opts.banner = "Usage: command [options]"
+  opts.on("-h", "--host host", "Set host IP/domain") do |h|
+      @options[:host] = h
+  end
+  opts.on("-e", "--etcd host:port", "Set etcd host and port") do |e|
+      @options[:etcd] = e
+  end
+  opts.on("-c","--command cmd","A command to execute after each run") do |c|
+    @options[:cmd]=c
+  end
+  opts.on("-f","--foreground","Keep running on foregroud. Default is run once and exit.") do |f|
+    @options[:foreground]=f
+  end
+  opts.on("-t","--target name","Target a single container") do |t|
+    @options[:target]=t
+  end
+  opts.on("-i","--input file","Input file") do |i|
+    @options[:input]=i
+  end
+  opts.on("-u","--update","pull container") do |p|
+    @options[:update]=p
+  end
+end.parse!
+
+file = @options[:input] || 'fig.yml'
+yml = YAML.load_file(file)
 
 env = {
-  'HOST'=>@host,
-  'ETCD'=>@etcd
+  'HOST'=>@options[:host],
+  'ETCD'=>@options[:etcd]
 }
 
-if @prefix.length >= 1 then
-    env['PREFIX']=@prefix
-end
-
-@containers=[]
+@options[:containers]=[]
 
 apps=[]
-if @target then
-  apps=yml.keys.select {|k| k == @target}
+if @options[:target] then
+  apps=yml.keys.select {|k| k == @options[:target]}
 else
     apps=yml.keys
 end
@@ -40,10 +62,6 @@ apps.each {|k|
     yml[k]['environment'][ke] = env[ke]
   }
 
-  if @prefix.length >= 1 then
-    yml[k]['name'] = "#{@prefix}_#{yml[k]['name']}"
-  end
-
   cmd = "docker run -d "
   cmd << " --name #{yml[k]['name']} "
 
@@ -77,24 +95,26 @@ apps.each {|k|
     cmd << " #{yml[k]["command"]}  "
   end
 
-  #`docker pull #{yml[k]['image']}`
+  if @options[:update] then
+    `docker pull #{yml[k]['image']} > /dev/null 2>&1`
+  end
 
   cid = `#{cmd}`
-  @containers.push(cid)
+  @options[:containers].push(cid)
   puts "#{yml[k]['name']} = #{cid}"
 
-  if @cmd then
-      puts `#{@cmd}`
+  if @options[:cmd] then
+      puts `#{@options[:cmd]}`
   end
 
 }
 
 puts `docker ps`
 
-if @foreground then
+if @options[:foreground] then
   def stop()
     puts "Stopping..."
-    @containers.each {|cid|
+    @options[:containers].each {|cid|
       puts `docker stop #{cid}`
       puts `docker rm #{cid}`
     }

data/lib/small-setup.rb

@@ -4,58 +4,18 @@ require 'json'
 require 'net/http'
 require 'optparse'
 
-options = {}
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: command [options]"
-  opts.on("-h", "--host host", "Set host IP/domain") do |h|
-    options[:host] = h
-  end
-  opts.on("-e", "--etcd host:port", "Set etcd host and port") do |e|
-    options[:etcd] = e
-  end
-  opts.on("-p", "--prefix prefix", "Set etcd prefix path") do |p|
-    options[:prefix] = p
-  end
-  opts.on("-d","--daemon","Run in background") do |d|
-    options[:daemon]=d
-  end
-  opts.on("-o","--output file","Output file") do |o|
-    options[:output]=o
-  end
-  opts.on("-i","--input file","Input file") do |o|
-    options[:input]=o
-  end
-  opts.on("-c","--command cmd","A command to execute at certain point") do |c|
-    options[:cmd]=c
-  end
-  opts.on("-t","--target name","Target a single container") do |t|
-      options[:target]=t
-  end
-  opts.on("-u","--as_url","Make url as host/name instead of host:port") do |u|
-      options[:as_url]=u
-  end
-  opts.on("-v","--verbose","verboser") do |v|
-      options[:verbose]=v
-  end
-end.parse!
+@options = {}
+if ENV["HOST"] then
+  @options[:host] = ENV["HOST"]
+else
+  @options[:host] = `hostname -I | awk '{ print $1 }'`.gsub("\n","")
+end
 
-@host = options[:host] || ENV['HOST'] || `hostname -I | awk '{ print $1 }'`.gsub("\n","")
-if options[:etcd] then
-    @etcd = options[:etcd] 
-elsif ENV["ETCD_PORT_4001_TCP_ADDR"] then
-    @etcd = "http://#{ENV["ETCD_PORT_4001_TCP_ADDR"]}:#{ENV["ETCD_PORT_4001_TCP_PORT"]}"
+if ENV["ETCD_PORT_4001_TCP_ADDR"] then
+    @options[:etcd] = "http://#{ENV["ETCD_PORT_4001_TCP_ADDR"]}:#{ENV["ETCD_PORT_4001_TCP_PORT"]}"
 else
-    @etcd = ENV['ETCD'] || "http://#{@host}:4001"
+    @options[:etcd] = ENV['ETCD'] || "http://#{@options[:host]}:4001"
 end
-@prefix = options[:prefix] || ENV['PREFIX'] || ""
-@foreground = !options[:daemon]
-@output = options[:output] || false
-@input = options[:input] || false 
-@cmd = options[:cmd] || false
-@target = options[:target] || false
-@as_url = options[:as_url] || false
-@verbose = options[:verbose] || false
 
 def http_get(uri)
     JSON.parse(Net::HTTP.get(URI(uri)))

metadata

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