gv-valley 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a97752148a0e7d5ec68aaef6196d725f89cedd69
-  data.tar.gz: 693a4034c1f4da6f53e88f4a6354ba9cc472f5d0
+  metadata.gz: 7f0c6b2b1055b28c5a27bf64bb68e146b5dfd3b9
+  data.tar.gz: 6cfac4214935634628a53a1578de31acab5376a3
 SHA512:
-  metadata.gz: e55514e555542c05c559b6a861f439b9830488742f5cad85e8d3a1429a997fdd38dea24c9bbe6aae309365eb9211be56322734f075eab8882e303a556311df4b
-  data.tar.gz: 70bda547d563f5d0714c82d60f16e291f06f449d58a3af36b1d14bf80b2fcf209daeed1c9c2f8a8e251f8229c1008e8b5e74032572641c156481c25462e11043
+  metadata.gz: fcf8de1fe095ad062872a637a71f5a2f30b27c82c7d2143296a8b637746789f2caaf2a26427525250fcc3f45be015232ff373e959c12dbdae1e472f396402a0b
+  data.tar.gz: ef25b695f731ce1e841da5edf251ff0335101c557c4585b4815c6ebf31f2371cfe63a5f55dfc592e047bb3ed33a4cbb1a5c94a7f740905faaf8b2cff4c551d11

data/bin/valley

@@ -26,36 +26,39 @@ end
 # Apps API
 
 command :'apps:deploy' do |c|
-  c.syntax = 'valley apps:deploy APP_NAME'
+  c.syntax = 'valley apps:deploy'
   c.description = 'deploys app'
+  c.option '--app STRING', String, 'App name'
   c.action do |args, options|
     
     DRb.start_service    
     service = GV::Valley::Deployer.random_service
-    service.deploy args.first, &Sticks::Pipe::Blocks.stream
+    service.deploy options.app, &Sticks::Pipe::Blocks.stream
     DRb.stop_service    
   end
 end
 
 command :'apps:config' do |c|
-  c.syntax = 'valley apps:config APP_NAME'
+  c.syntax = 'valley apps:config'
   c.description = 'shows app config'
+  c.option '--app STRING', String, 'App name'  
   c.action do |args, options|
 
     DRb.start_service    
-    puts GV::Valley::App.find!(args.first)['config']
+    puts GV::Valley::App.find!(options.app)['config']
     DRb.stop_service    
   end
 end
 
 command :'apps:config add' do |c|
-  c.syntax = 'valley apps:config add APP_NAME KEY=VALUE [KEY=VALUE]'
+  c.syntax = 'valley apps:config add KEY=VALUE [KEY=VALUE]'
   c.description = 'adds item to app config'
+  c.option '--app STRING', String, 'App name'    
   c.action do |args, options|
 
     DRb.start_service    
     
-    name = args.shift
+    name = options.app
     config = Hash[args.map{|kv| kv.split("=")}]
     app = GV::Valley::App.find!(name)
     app["config"].update(config)
@@ -68,13 +71,14 @@ command :'apps:config add' do |c|
 end
 
 command :'apps:config remove' do |c|
-  c.syntax = 'valley apps:config remove APP_NAME KEY [KEY]'
+  c.syntax = 'valley apps:config remove KEY [KEY]'
   c.description = 'removes item from app config'
+  c.option '--app STRING', String, 'App name'    
   c.action do |args, options|
 
     DRb.start_service    
     
-    name = args.shift
+    name = options.app
     app = GV::Valley::App.find!(name)
     args.each do |key|
       app["config"].delete(key)
@@ -88,24 +92,26 @@ command :'apps:config remove' do |c|
 end
 
 command :'apps:ps' do |c|
-  c.syntax = 'valley apps:ps APP_NAME'
+  c.syntax = 'valley apps:ps'
   c.description = 'shows app processes'
+  c.option '--app STRING', String, 'App name'    
   c.action do |args, options|
   
     DRb.start_service    
-    puts GV::Valley::App.find!(args.first)['ps'].map{|type,ps| {type => ps['scale']} }
+    puts GV::Valley::App.find!(options.app)['ps'].map{|type,ps| {type => ps['scale']} }
     DRb.stop_service     
   end
 end
 
 command :'apps:ps scale' do |c|
-  c.syntax = 'valley apps:ps scale APP_NAME TYPE=SCALE [TYPE=SCALE]'
+  c.syntax = 'valley apps:ps scale TYPE=SCALE [TYPE=SCALE]'
   c.description = 'shows app processes'
+  c.option '--app STRING', String, 'App name'    
   c.action do |args, options|
     
     DRb.start_service    
 
-    name = args.shift
+    name = options.app
     ps = Hash[args.map{|kv| kv.split("=")}]
     app = GV::Valley::App.find!(name)
     ps.each do |key,scale|
@@ -123,24 +129,26 @@ command :'apps:ps scale' do |c|
 end
 
 command :'apps:domains' do |c|
-  c.syntax = 'valley apps:domains APP_NAME'
+  c.syntax = 'valley apps:domains'
   c.description = 'shows app domains'
+  c.option '--app STRING', String, 'App name'    
   c.action do |args, options|
 
     DRb.start_service    
-    puts GV::Valley::App.find!(args.first)['domains']
+    puts GV::Valley::App.find!(options.app)['domains']
     DRb.stop_service     
   end
 end
 
 command :'apps:domains add' do |c|
-  c.syntax = 'valley apps:domains add APP_NAME DOMAIN [DOMAIN]'
+  c.syntax = 'valley apps:domains add DOMAIN [DOMAIN]'
   c.description = 'adds item to app domains'
+  c.option '--app STRING', String, 'App name'    
   c.action do |args, options|
 
     DRb.start_service    
     
-    name = args.shift
+    name = options.app
     app = GV::Valley::App.find!(name)
     domains = args - GV::Valley::App.all.map{|a| a["domains"]}.flatten
     app["domains"] = (app["domains"] + domains).compact.uniq
@@ -153,13 +161,14 @@ command :'apps:domains add' do |c|
 end
 
 command :'apps:domains remove' do |c|
-  c.syntax = 'valley apps:domains remove APP_NAME DOMAIN [DOMAIN]'
+  c.syntax = 'valley apps:domains remove DOMAIN [DOMAIN]'
   c.description = 'removes item from app domains'
+  c.option '--app STRING', String, 'App name'    
   c.action do |args, options|
     
     DRb.start_service    
     
-    name = args.shift
+    name = options.app
     app = GV::Valley::App.find!(name)
     app["domains"] = app["domains"] - args
     app.save
@@ -171,13 +180,14 @@ command :'apps:domains remove' do |c|
 end
 
 command :'apps:run' do |c|
-  c.syntax = 'valley apps:run APP_NAME CMD'
+  c.syntax = 'valley apps:run CMD'
   c.description = 'runs cmd on app'
+  c.option '--app STRING', String, 'App name'    
   c.action do |args, options|
  
     DRb.start_service    
     service = GV::Valley::Runner.random_service
-    name = args.shift
+    name = options.app
     cmd = args.join(" ")
     block = cmd =~ Sticks::Pipe::INTERACTIVE_COMMANDS ? Sticks::Pipe::Blocks.interactive : Sticks::Pipe::Blocks.stream
     service.run name, cmd, &block
@@ -186,13 +196,14 @@ command :'apps:run' do |c|
 end
 
 command :'apps:logs' do |c|
-  c.syntax = 'valley apps:logs APP_NAME <PS>'
+  c.syntax = 'valley apps:logs <PS>'
   c.description = 'runs cmd on app'
+  c.option '--app STRING', String, 'App name'    
   c.option '-f','--follow', String, 'streams log'
   c.action do |args, options|
 
     DRb.start_service    
-    name = args.shift
+    name = options.app
     app = GV::Valley::App.find!(name)
     ps = args.shift
     psname = "#{name}.#{ps}"
@@ -209,38 +220,39 @@ command :'apps:logs' do |c|
   end
 end
 
-command :'apps:logs' do |c|
-  c.syntax = 'valley apps:logs APP_NAME <PS>'
-  c.description = 'runs cmd on app'
-  c.option '-f','--follow', String, 'streams log'
-  c.action do |args, options|
-
-    DRb.start_service    
-    name = args.shift
-    app = GV::Valley::App.find!(name)
-    ps = args.shift
-    psname = "#{name}.#{ps}"
-    
-    #  debug GV::Valley::Deployer.space.read_all([:ps,/#{psname}/,nil,nil])
-    
-    tuple = [:ps, /#{psname}/, nil, nil ]
-    block = options.follow ? Sticks::Pipe::Blocks.stream : Sticks::Pipe::Blocks.capture    
-    (GV::Valley::Deployer.space.read_all(tuple) rescue []).each do |h|
-      h[2].logs psname,options.follow, &block
-    end
-    
-    DRb.stop_service    
-  end
-end
+# command :'apps:logs' do |c|
+#   c.syntax = 'valley apps:logs APP_NAME <PS>'
+#   c.description = 'runs cmd on app'
+#   c.option '-f','--follow', String, 'streams log'
+#   c.action do |args, options|
+# 
+#     DRb.start_service    
+#     name = args.shift
+#     app = GV::Valley::App.find!(name)
+#     ps = args.shift
+#     psname = "#{name}.#{ps}"
+#     
+#     #  debug GV::Valley::Deployer.space.read_all([:ps,/#{psname}/,nil,nil])
+#     
+#     tuple = [:ps, /#{psname}/, nil, nil ]
+#     block = options.follow ? Sticks::Pipe::Blocks.stream : Sticks::Pipe::Blocks.capture    
+#     (GV::Valley::Deployer.space.read_all(tuple) rescue []).each do |h|
+#       h[2].logs psname,options.follow, &block
+#     end
+#     
+#     DRb.stop_service    
+#   end
+# end
 
 command :'apps:destroy' do |c|
-  c.syntax = 'valley apps:destroy APP_NAME'
+  c.syntax = 'valley apps:destroy'
   c.description = 'destroys app'
+  c.option '--app STRING', String, 'App name'    
   c.action do |args, options|
 
     DRb.start_service    
 
-    name = args.shift
+    name = options.app
     app = GV::Valley::App.find!(name)
     
     deployer = GV::Valley::Deployer.service
@@ -267,13 +279,14 @@ command :'balancer:reload' do |c|
 end
 
 command :'addons:create' do |c|
-  c.syntax = 'valley addons:create NAME APP_NAME'
+  c.syntax = 'valley addons:create NAME'
   c.description = 'creates addon service'
+  c.option '--app STRING', String, 'App name'    
   c.action do |args, options|
     
     DRb.start_service   
     addon = args.shift
-    app_name = args.shift    
+    app_name = options.app
     
     require "gv/addons/#{addon}"
     addon_service = "GV::Addons::#{addon.classify}".constantize.service
@@ -284,13 +297,14 @@ command :'addons:create' do |c|
 end
 
 command :'addons:run' do |c|
-  c.syntax = 'valley addons:run NAME APP_NAME CMD'
+  c.syntax = 'valley addons:run NAME CMD'
   c.description = 'runs method on addon service'
+  c.option '--app STRING', String, 'App name'    
   c.action do |args, options|
     
     DRb.start_service   
     addon = args.shift
-    app_name = args.shift    
+    app_name = options.app    
     cmd = args.shift        
     
     require "gv/addons/#{addon}"
@@ -302,13 +316,14 @@ command :'addons:run' do |c|
 end
 
 command :'addons:destroy' do |c|
-  c.syntax = 'valley addons:destroy NAME APP_NAME'
+  c.syntax = 'valley addons:destroy NAME'
   c.description = 'destroys addon service'
+  c.option '--app STRING', String, 'App name'    
   c.action do |args, options|
     
     DRb.start_service   
     addon = args.shift
-    app_name = args.shift    
+    app_name = options.app
     
     require "gv/addons/#{addon}"
     addon_service = "GV::Addons::#{addon.classify}".constantize.service

data/gv-valley.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'goliath'
   spec.add_dependency 'etcd'      
   spec.add_dependency 'gv-common'    
-  spec.add_dependency 'gv-bedrock'    
+  spec.add_dependency 'gv-bedrock', '~> 0.0.2'  
 end

data/lib/gv/valley/app.rb

@@ -61,7 +61,8 @@ module GV
         def default_config name
           config = {
             "SLUG_URL" => "#{GV::Valley::FileServer.service.url}/#{name}/slug.tgz",
-            "PORT" => PORT
+            "PORT" => PORT,
+            "RACK_ENV" => "production"
           }
         end
         

data/lib/gv/valley/balancer.rb

@@ -31,9 +31,12 @@ module GV
           end
           
           backend << "backend b_#{app["name"]}\n"
-          app["ps"]["web"]["containers"].each do |container|
-            host = container['HostConfig']['PortBindings']["#{App::PORT}/tcp"].first
-            backend << "#{INDENT}server srv_#{container['ID'][0..6]} #{host['HostIp']}:#{host['HostPort']}\n"
+          app["ps"].select{|k,v| k =~ /web/}.each do |ps,pdata|
+            pdata['containers'].each do |container|
+            # app["ps"]["web"]["containers"].each do |container|
+              host = container['HostConfig']['PortBindings']["#{App::PORT}/tcp"].first
+              backend << "#{INDENT}server srv_#{container['ID'][0..6]} #{host['HostIp']}:#{host['HostPort']}\n"
+            end
           end
           
         end

data/lib/gv/valley/file_server.rb

@@ -103,7 +103,7 @@ module GV
         runner.run
         at_exit { 
           pid = File.read("/var/run/gv-file_server.pid").chomp.to_i
-          Process.kill("TERM",pid)
+          Process.kill("TERM",pid) rescue nil
           File.delete("/var/run/gv-file_server.pid")          
           File.delete("/var/log/gv-file_server.log")
           File.delete("/var/log/gv-file_server.log_stdout.log")          

data/lib/gv/valley/version.rb

@@ -1,5 +1,5 @@
 module GV
   module Valley
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/test/gv/test_app.rb

@@ -46,7 +46,7 @@ module GV
         
         # clear all services
         GV::Bedrock::Service.space.read_all([nil,nil,nil,nil]).each do |t|
-          GV::Bedrock::Service.space.take(t)
+          GV::Bedrock::Service.space.take(t,0) rescue nil
         end
         
         DRb.stop_service

data/test/gv/test_etcd.rb

@@ -24,7 +24,7 @@ module GV
         
         # clear all services
         GV::Bedrock::Service.space.read_all([nil,nil,nil,nil]).each do |t|
-          GV::Bedrock::Service.space.take(t)
+          GV::Bedrock::Service.space.take(t,0) rescue nil
         end
         
         DRb.stop_service

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gv-valley
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Onur Uyar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,16 +98,16 @@ dependencies:
   name: gv-bedrock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 description: 
 email:
 - me@onuruyar.com