pi 0.1.24 → 0.1.25

data/lib/cli/choose_helper.rb

@@ -76,14 +76,16 @@ module PI::Cli
     def choose_app_help(appid_or_appname)
       target = @options[:target] 
       target_not_all = true
+      appid = nil
       if appid_or_appname =~ /^[1-9]\d*$/
         appid = appid_or_appname
         app = client.app_get_byid(appid)
-        return target_not_all, app
+        err"The application is not found!" if app[:id] == 0
+        return target_not_all, app, appid
       elsif appid_or_appname == nil 
         if target.nil?
           app = choose_app
-          return target_not_all, app
+          return target_not_all, app, appid
         else 
           err "Not enough arguments" 
         end
@@ -93,26 +95,28 @@ module PI::Cli
         if target != "all"
           app = client.app_search(target, appname)
           err "The application '#{appname}' is not found!" if app[:id] == 0
-          return target_not_all, app
+          return target_not_all, app, appid
         else
           apps = client.app_search_target_is_all(appname)
           err "The application '#{appname}' is not found!" if apps.size == 0
           target_not_all = false 
-          return target_not_all, apps        
+          return target_not_all, apps, appid        
         end
       end   
     end  
     
     def choose_app_help_target_not_all(appid_or_appname)
-      target = @options[:target]       
+      target = @options[:target]  
+      appid = nil     
       if appid_or_appname =~ /^[1-9]\d*$/
         appid = appid_or_appname
         app = client.app_get_byid(appid)
-        return app
+        err"The application is not found!" if app[:id] == 0
+        return app, appid
       elsif appid_or_appname == nil 
         if target.nil?
           app = choose_app
-          return app
+          return app, appid
         else 
           err "Not enough arguments" 
         end
@@ -121,10 +125,40 @@ module PI::Cli
         err "Not enough arguments" if target == nil
         app = client.app_search(target, appname)
         err "The application '#{appname}' is not found!" if app[:id] == 0
-        return app       
+        return app, appid       
       end   
     end 
     
+    def choose_serviceid
+      services = client.services
+      err "No services" if services.nil? || services.empty?
+      choices = Array.new
+      services.each do |s|
+        choices.push(s[:name])
+      end
+      servicename = ask"Select service", :choices => choices, :indexed => true
+      serviceid = nil
+      services.each do |s|
+        serviceid = s[:id] if s[:name] == servicename
+      end
+      return serviceid
+    end
+    
+    def choose_dnsid
+      dns = client.dns
+      err "No DNS" if dns.nil? || dns.empty?
+      choices = Array.new
+      dns.each do |d|
+        choices.push(d[:name])
+      end
+      dnsname = ask"Select DNS", :choices => choices, :indexed => true
+      dnsid = nil
+      dns.each do |d|
+        dnsid = d[:id] if dnsname == d[:name]
+      end
+      return dnsid
+    end
+    
     def check_status(target, appname, eventname)
       for i in 1..12 do  
         result = client.app_message(target,appname,eventname)
@@ -134,14 +168,19 @@ module PI::Cli
       return result 
     end
  
-# only [a-zA-Z0-9] for project name and app name (size <=18)
+    # only [a-zA-Z0-9] for project name and app name (size <=18)
     def check_name_valid?(name)
       (name =~ /^\w+$/ && name.size <= 18) ? true : false
     end
 
-#not include number, ', ", \, and begin with vcap_, vmc_ for env name (size <= 18)     
+    #not include number, and cannot be started with vcap_, vmc_ for env name (size <= 18)     
     def check_envname_valid?(name)
-      (name =~ /\b(?!vcap_|vmc_)\D+\b/ && name =~ /^[^\'\"\\]+$/ && name.size <= 18) ? true : false
+      (name =~ /\b(?!vcap_|vmc_|VCAP_|VMC_)\D+\b/ &&  name.size <= 18) ? true : false
+    end
+    
+    #not include number, ', ", \, and begin with vcap_, vmc_ for env name (size <= 18)     
+    def check_envvalue_valid?(value)
+      (value =~ /^[^\'\"\\]+$/ && value.size <= 18) ? true : false
     end
     
   end

data/lib/cli/commands/apps.rb

@@ -5,11 +5,11 @@ module PI::Cli::Command
     include PI::Cli::ChooseHelper
     include PI::Cli::InteractHelper
     DEFAULTS = {
-      "mem"         => "64M",
-      "instances"   => 1,
-      "needRestart" => false,
-      "isDebug"     => false,
-      "needMonitor" => false
+      "mem"             => "64M",
+      "instances"       => 1,
+      "action_for_change" => "notify",
+      "isDebug"         => false,
+      "needMonitor"     => false
     }
     
     def apps
@@ -69,11 +69,7 @@ module PI::Cli::Command
       # choose the target
       targets = client.targets  
       err "No Targets!" if targets.nil? || targets.empty?
-      target_choices = Array.new
-      targets.each do |t|
-        target_choices << t[:name]
-      end
-      target = ask "Select Target", :choices => target_choices, :indexed => true
+      target = ask "Select Target", :choices => targets.collect { |t| t[:name] }, :indexed => true
       display "Selected Target: ",false
       display "#{target}"
       target_memory = client.target_memory(target)
@@ -112,11 +108,7 @@ module PI::Cli::Command
       else
         binarylist = client.project_binary(projectname)
         err "No version!" if binarylist.nil? || binarylist.empty?
-        binary_choices = Array.new
-        binarylist.each do |b|
-          binary_choices << b[:versionName]
-        end
-        tag = ask "Select Version", :choices => binary_choices, :indexed => true
+        tag = ask "Select Version", :choices => binarylist.collect { |b| b[:versionName] }, :indexed => true
         display "Selected Version: ",false
         display "#{tag}"
         deployType = "binary"
@@ -143,10 +135,10 @@ module PI::Cli::Command
         }  
       isDebug = false
       isDebug = ask "Need debug?", :default => DEFAULTS["isDebug"] if deployType == "binary"
-      needRestart = ask "Need restart?", :default => DEFAULTS["needRestart"]
+      choices = ["restart", "notify"]
+      action_for_change = ask"Reaction when service changed", :default => DEFAULTS["action_for_change"], :choices => choices, :indexed => true
       needMonitor = ask "Need monitor?", :default => DEFAULTS["needMonitor"]
       isDebug = (isDebug == false ? "no" : "yes")
-      needRestart = (needRestart == false ? "no" : "yes")
       needMonitor = (needMonitor == false ? "no" : "yes")
       # choose the branch
       branchs = client.project_branchs(useproject[:name])
@@ -156,19 +148,19 @@ module PI::Cli::Command
       display "#{branch}"
               
       manifest = {
-        :targetName  => target,
-        :name        => "#{appname}",
-        :projectName => "#{projectname}",
-        :projectId   => "#{projectid}",
-        :branch      => branch,
-        :url         => url,
-        :memory      => mem_quota,
-        :instances   => instances,
-        :deployType  => deployType,
-        :tag         => tag,
-        :isDebug     => isDebug,
-        :needRestart => needRestart,
-        :needMonitor => needMonitor
+        :targetName        => target,
+        :name              => "#{appname}",
+        :projectName       => "#{projectname}",
+        :projectId         => "#{projectid}",
+        :branch            => branch,
+        :url               => url,
+        :memory            => mem_quota,
+        :instances         => instances,
+        :deployType        => deployType,
+        :tag               => tag,
+        :isDebug           => isDebug,
+        :action_for_change => action_for_change,
+        :needMonitor       => needMonitor
         }
      
       display "Creating application \"#{appname}\": ",false
@@ -197,7 +189,8 @@ module PI::Cli::Command
     
     def delete_app(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)
+      app, appid = choose_app_help_target_not_all(appid_or_appname) 
+      appid = (appid == nil ? app[:id] : appid)
       
       display "Deleting application: ",false
       
@@ -209,49 +202,52 @@ module PI::Cli::Command
       end
       end
       
-      client.delete_app(app[:id])
+      client.delete_app(appid)
       Thread.kill(t)
       display "OK".green
     end
     
     def start_app(appid_or_appname=nil)
       client.check_login_status   
-      target_not_all, app = choose_app_help(appid_or_appname)       
+      target_not_all, app, appid = choose_app_help(appid_or_appname) 
+      appid = (appid == nil ? app[:id] : appid)      
       if target_not_all
         return display "The application '#{app[:name]}'(target:#{app[:targetName]}) has already started.".yellow if app[:status] == "STARTED"     
-        do_start_app(app)     
+        do_start_app(app, appid)     
       else
         app.each do |a|
           next display "The application '#{a[:name]}'(target:#{a[:targetName]}) has already started.".yellow if a[:status] == "STARTED"     
-          do_start_app(a)
+          do_start_app(a, a[:id])
         end
       end
     end
     
     def stop_app(appid_or_appname=nil)
       client.check_login_status     
-      target_not_all, app = choose_app_help(appid_or_appname)
+      target_not_all, app, appid = choose_app_help(appid_or_appname) 
+      appid = (appid == nil ? app[:id] : appid) 
       if target_not_all
         return display "The application '#{app[:name]}'(target:#{app[:targetName]}) has already stopped.".yellow if app[:status] == "STOPPED"     
-        do_stop_app(app)     
+        do_stop_app(app, appid)     
       else
         app.each do |a|
           next display "The application '#{a[:name]}'(target:#{a[:targetName]}) has already stopped.".yellow if a[:status] == "STOPPED"     
-          do_stop_app(a)
+          do_stop_app(a, a[:id])
         end
       end
     end
     
     def restart_app(appid_or_appname=nil)
       client.check_login_status
-      target_not_all, app = choose_app_help(appid_or_appname)
+      target_not_all, app, appid = choose_app_help(appid_or_appname) 
+      appid = (appid == nil ? app[:id] : appid) 
       if target_not_all  
-        do_stop_app(app) if app[:status] == "STARTED"
-        do_start_app(app)   
+        do_stop_app(app, appid) if app[:status] == "STARTED"
+        do_start_app(app, appid)   
       else
         app.each do |a|
-          do_stop_app(a) if a[:status] == "STARTED"
-          do_start_app(a)
+          do_stop_app(a, a[:id]) if a[:status] == "STARTED"
+          do_start_app(a, a[:id])
         end
       end
     end
@@ -259,7 +255,8 @@ module PI::Cli::Command
     def scale_app(appid_or_appname=nil)
       client.check_login_status
       instance = @options[:instance]
-      app = choose_app_help_target_not_all(appid_or_appname)      
+      app, appid = choose_app_help_target_not_all(appid_or_appname) 
+      appid = (appid == nil ? app[:id] : appid)      
       loop{
         unless instance
           instance = ask "How many instances?", :default => app[:instances]
@@ -284,7 +281,7 @@ module PI::Cli::Command
       end
       end
       
-      client.scale_app(app[:id],instance)
+      client.scale_app(appid,instance)
       result = check_status(app[:targetName],app[:name], "scale")
       Thread.kill(t)
       if result[:code] == 200 
@@ -300,22 +297,20 @@ module PI::Cli::Command
     
     def update_app(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)      
+      tag = @options[:ver]
+      app, appid = choose_app_help_target_not_all(appid_or_appname) 
+      appid = (appid == nil ? app[:id] : appid)      
       if app[:deployType] == "git"        
         tags = client.project_tags(app[:projectName])
         err "No tags!" if tags.nil? || tags.empty?
-        tag = ask "Select Tag", :choices => tags, :indexed => true
+        tag = ask "Select Tag", :choices => tags, :indexed => true unless tag
         err "Don't need update application!" if tag == app[:tag]
         display "Selected tag: ",false
         display "#{tag}"
       else    
         tags = client.project_binary(app[:projectName])
         err "No version!" if tags.nil? || tags.empty?
-        tag_choices = Array.new
-        tags.each do |t|
-          tag_choices << t[:versionName]
-        end
-        tag = ask "Select Version", :choices => tag_choices, :indexed => true  
+        tag = ask "Select Version", :choices => tags.collect { |b| b[:versionName] }, :indexed => true unless tag
         err "Don't need update application!" if tag == app[:tag]     
       end
       display "Updating application: ",false
@@ -328,7 +323,7 @@ module PI::Cli::Command
       end
       end
       
-      client.update_app(app[:id],tag) 
+      client.update_app(appid,tag) 
       result = check_status(app[:targetName], app[:name], "rollback")
       Thread.kill(t)
       if result[:code] == 200 
@@ -344,8 +339,9 @@ module PI::Cli::Command
     
     def status(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)
-      status = client.status(app[:id])
+      app, appid = choose_app_help_target_not_all(appid_or_appname) 
+      appid = (appid == nil ? app[:id] : appid)
+      status = client.status(appid)
       return display JSON.pretty_generate(status) if @options[:json]
       return display "No Status!" if status.nil? || status.empty?
       status_table = table do |t|
@@ -359,8 +355,9 @@ module PI::Cli::Command
     
     def app_env(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)     
-      env = client.app_env(app[:id])
+      app, appid = choose_app_help_target_not_all(appid_or_appname) 
+      appid = (appid == nil ? app[:id] : appid)
+      env = client.app_env(appid)      
       return display JSON.pretty_generate(env) if @options[:json]
       return display "No Environments!" if env.nil? || env.empty?
       env.sort! {|a, b| a[:name] <=> b[:name] }
@@ -375,16 +372,18 @@ module PI::Cli::Command
     
     def create_env(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)
+      name = @options[:name]
+      value = @options[:value]
+      app, appid = choose_app_help_target_not_all(appid_or_appname) 
+      appid = (appid == nil ? app[:id] : appid)
       
-      name = nil
       loop{        
         name = ask "Environment Name" unless name
         if not check_envname_valid?(name)
           display "Invalid environment name '#{name}'." 
           name =nil 
           next
-        else if env_exists?(app[:id],name)
+        else if env_exists?(appid,name)
           display "Environment '#{name}' already exists." 
           name =nil 
           next 
@@ -393,54 +392,66 @@ module PI::Cli::Command
         end
         end
       }  
-      value = ask "Environment Value"
+      loop{
+        value = ask "Environment Value" unless value
+        if not check_envvalue_valid?(value)
+          display "Invalid environment value '#{value}'." 
+          value =nil
+          next
+        else
+          break
+        end
+      }     
       manifest = {
         :name => name,
         :value => value
       }
-      client.create_env(app[:id], manifest)
+      client.create_env(appid, manifest)
       display "OK".green
     end
     
     def delete_env(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)
-      
-      envs = client.app_env(app[:id])
-      err "No Environments!" if envs.nil? || envs.empty?
-      choices = Array.new
-      envs.each do |s|
-        choices << s[:name]
+      name = @options[:name]
+      app, appid = choose_app_help_target_not_all(appid_or_appname)
+      appid = (appid == nil ? app[:id] : appid)
+      envs = client.app_env(appid)
+      err "No environments available to delete" if envs.nil? || envs.empty?
+      if name
+        name = name.split(",")
+      else
+        name = asks "Environment Name", :choices => envs.collect { |e| e[:name] }, :indexed => true
+        display "Selected Environment Name: ",false
+        name.each do |m|
+          display "#{m} ",false
+        end
+        display "\n"
       end
-      name = asks "Environment Name", :choices => choices, :indexed => true    
-      display "Selected Environment Name: ",false
-      name.each do |m|
-        display "#{m} ",false
-      end 
-      display "\n"
-
+      
       delete_envs = Array.new
       envs.each do |e|
         name.each do |n|
           delete_envs.push("#{n}=#{e[:value]}") if n == e[:name]
         end        
-      end
+      end      
+      err " The environment is not exist!" if delete_envs.nil? || delete_envs.empty?
 
       delete_envs.each do |env|
         display "Deleting environment '#{env}': ",false 
-        client.delete_env(app[:id], env)
+        client.delete_env(appid, env)
         display "OK".green
       end 
     end
     
     def app_log(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)
-            
+      app, appid = choose_app_help_target_not_all(appid_or_appname)
+      appid = (appid == nil ? app[:id] : appid)
+           
       max_index = app[:instances]-1
       instanceindex = ask "Select instance index(from 0 to #{max_index})", :default => 0
       filepath = "logs/"
-      logs = client.app_log(app[:id],filepath,instanceindex)
+      logs = client.app_log(appid,filepath,instanceindex)
       logs = logs[1].split("\n")
       file = ask "Select logs, indexed list?", :choices => logs, :indexed => true
       display "Selected logs: ",false
@@ -448,7 +459,7 @@ module PI::Cli::Command
       file = file[0]
       display "#{file}" 
       filepath = "logs/#{file}" 
-      logs = client.app_log(app[:id],filepath,instanceindex)
+      logs = client.app_log(appid,filepath,instanceindex)
       display "\n"
       display logs[1]
     end
@@ -465,7 +476,7 @@ module PI::Cli::Command
       "true" == env[1] ? false : true 
     end
     
-    def do_start_app(app)
+    def do_start_app(app, appid)
       display "Starting application '#{app[:name]}'(target:#{app[:targetName]}): ",false
       t = Thread.new do
         loop do
@@ -474,7 +485,7 @@ module PI::Cli::Command
           break unless t.alive?
         end
       end
-      client.start_app(app[:id])
+      client.start_app(appid)
       result = check_status(app[:targetName], app[:name], "start")
       Thread.kill(t)
       if result[:code] == 200
@@ -488,9 +499,9 @@ module PI::Cli::Command
       end
     end
     
-    def do_stop_app(app)
+    def do_stop_app(app, appid)
       display "Stoping application '#{app[:name]}'(target:#{app[:targetName]}): ",false
-      client.stop_app(app[:id])
+      client.stop_app(appid)
       display "OK".green
     end