pi 0.1.23 → 0.1.24

data/lib/cli.rb

@@ -10,6 +10,7 @@ module PI
     autoload :Config,         "#{ROOT}/cli/config"
     autoload :Runner,         "#{ROOT}/cli/runner"
     autoload :ChooseHelper,   "#{ROOT}/cli/choose_helper"
+    autoload :InteractHelper, "#{ROOT}/cli/interact_helper"
     
     module Command
       autoload :Base,         "#{ROOT}/cli/commands/base"

data/lib/cli/choose_helper.rb

@@ -1,50 +1,148 @@
+require "set"
 module PI::Cli
   module ChooseHelper
     
+    YES_SET = Set.new(["y", "Y", "yes", "YES"])
+    NO_SET = Set.new(["n", "N", "no", "NO"])
+    
     def choose_project
       projects = client.projects
       err "No Projects" if projects.nil? || projects.empty?
-      useproject = nil
       projects.sort! {|a, b| a[:name] <=> b[:name] }
-      choose do |menu|
-        display "=============Project Name==========="
-        menu.prompt = "Select Project: "
-        menu.select_by = :index_or_name
-        projects.each do |project|
-          menu.choice("#{project[:name]}") { useproject = project }
-        end
+      project_choices = Array.new
+      projects.each do |p|
+        project_choices << p[:name]
       end
+      useproject = ask "Select Project", :choices => project_choices, :indexed => true
       display "Selected Project: ",false
-      display "#{useproject[:name]}".green
-      return useproject
+      display "#{useproject}"
+      projects.each do |p|
+        return p if p[:name] == useproject
+      end     
+    end
+    
+    def choose_target
+      targets = client.targets
+      err "No Targets" if targets.nil? || targets.empty?
+      targets.sort! {|a, b| a[:name] <=> b[:name] }
+      target_choices = Array.new
+      targets.each do |p|
+        target_choices << p[:name]
+      end
+      usetarget = ask "Select Target", :choices => target_choices, :indexed => true
+      display "Selected Target: ",false
+      display "#{usetarget}"
+      targets.each do |p|
+        return p if p[:name] == usetarget
+      end     
     end
     
-    def choose_app(projectid)
-      apps = client.apps(projectid)
-      err "No Applications" if apps.nil? || apps.empty?
-      useapp = nil
-      apps.sort! {|a, b| a[:name] <=> b[:name] }
-      choose do |menu|
-        display "=============Application Name==========="
-        menu.prompt = "Select Application: "
-        menu.select_by = :index_or_name
-        apps.each do |app|
-          menu.choice("#{app[:name]}") { useapp = app }
+    def select_apps
+      choices = ["all","project","target"]
+      select_type = ask"Select application by", :choices => choices, :indexed => true  
+      display "Select application by #{select_type}"    
+      case select_type
+      when "all"
+        app = client.apps
+      when "project"
+        useproject = choose_project
+        app = client.apps(useproject[:name])
+      when "target"
+        usetarget = choose_target
+        project=nil
+        app = client.apps(project, usetarget[:name])
+      else
+        if select_type
+        err "Unknown select type [#{select_type}]"
         end
       end
+    end
+    
+    def choose_app
+      apps = select_apps
+      err "No application!" if apps.nil? || apps.empty?
+      app_choices = Array.new
+      apps.each do |a|
+        app_choices << a[:name]
+      end
+      appname = ask "Select Application", :choices => app_choices, :indexed => true
       display "Selected Application: ",false
-      display "#{useapp[:name]}".green
-      return useapp
+      display "#{appname}"
+      apps.each do |a|
+        return a if a[:name] == appname
+      end
     end
     
-     def check_status(appname, eventname)
+    def choose_app_help(appid_or_appname)
+      target = @options[:target] 
+      target_not_all = true
+      if appid_or_appname =~ /^[1-9]\d*$/
+        appid = appid_or_appname
+        app = client.app_get_byid(appid)
+        return target_not_all, app
+      elsif appid_or_appname == nil 
+        if target.nil?
+          app = choose_app
+          return target_not_all, app
+        else 
+          err "Not enough arguments" 
+        end
+      else 
+        appname = appid_or_appname
+        err "Not enough arguments" if target == nil
+        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
+        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        
+        end
+      end   
+    end  
+    
+    def choose_app_help_target_not_all(appid_or_appname)
+      target = @options[:target]       
+      if appid_or_appname =~ /^[1-9]\d*$/
+        appid = appid_or_appname
+        app = client.app_get_byid(appid)
+        return app
+      elsif appid_or_appname == nil 
+        if target.nil?
+          app = choose_app
+          return app
+        else 
+          err "Not enough arguments" 
+        end
+      else 
+        appname = appid_or_appname
+        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       
+      end   
+    end 
+    
+    def check_status(target, appname, eventname)
       for i in 1..12 do  
-        result = client.app_message(appname,eventname)
+        result = client.app_message(target,appname,eventname)
         break result unless result[:text].empty? 
         sleep(10)         
       end 
       return result 
     end
+ 
+# 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)     
+    def check_envname_valid?(name)
+      (name =~ /\b(?!vcap_|vmc_)\D+\b/ && name =~ /^[^\'\"\\]+$/ && name.size <= 18) ? true : false
+    end
     
   end
 end

data/lib/cli/commands/apps.rb

@@ -1,10 +1,9 @@
 require "rubygems"
-require "interact"
-require "set"
+
 module PI::Cli::Command
   class Apps < Base
     include PI::Cli::ChooseHelper
-    include Interactive
+    include PI::Cli::InteractHelper
     DEFAULTS = {
       "mem"         => "64M",
       "instances"   => 1,
@@ -12,16 +11,18 @@ module PI::Cli::Command
       "isDebug"     => false,
       "needMonitor" => false
     }
-    YES_SET = Set.new(["y", "Y", "yes", "YES"])
     
-    def apps(projectid=nil)
-      unless projectid
-        useproject = choose_project
-        projectid = useproject[:id]
-      end      
-      app_sum = client.app_sum(projectid)
+    def apps
+      client.check_login_status
+      project = @options[:project]
+      target = @options[:target]   
+      project = nil if project == "all"  
+      target = nil if target == "all"
+      app_sum = client.app_sum(project, target)
       total_app = Integer(app_sum[1])
       return display "No Applications" if total_app == 0
+      pageNum = -1
+      numPerPage = -1
       if total_app >= 50
         puts "Total applications: #{total_app}."  
         numPerPage = nil     
@@ -47,103 +48,82 @@ module PI::Cli::Command
           break
         end
        } 
-       pageNum = pageNum.to_i
-      else
-        pageNum = -1
-        numPerPage = -1
-      end     
-      queryParam = {
-        :pageNum => pageNum,
-        :NumPerPage => numPerPage
-        }   
-      apps = client.apps(projectid, queryParam)         
+       pageNum = pageNum.to_i        
+      end       
+      apps = client.apps(project, target, pageNum, numPerPage)
+      return display "No Applications" if apps.nil? || apps.empty?        
       return display JSON.pretty_generate(apps) if @options[:json]
-      return display "No Applications" if apps.nil? || apps.empty?
       apps.sort! {|a, b| a[:name] <=> b[:name] }
       apps_table = table do |t|
-        t.headings = 'Target', 'App name', 'URL', 'Deploy Type','Version', 'Status', 'Instances', 'Running Instances'
+        t.headings = 'ID', 'Target', 'App name', 'URL', 'Deploy Type','Version', 'Status', 'Instances', 'Running Instances'
         apps.each do |app|
-          t << [app[:targetName], app[:name] ,app[:url], app[:deployType], app[:tag], app[:status], app[:instances], app[:runInstances]]
+          t << [app[:id], app[:targetName], app[:name] ,app[:url], app[:deployType], app[:tag], app[:status], app[:instances], app[:runInstances]]
         end
       end
       display apps_table
     end
 
     def create_app(appname=nil)
-      projectid, mem, tag, binarylist, branch, deployType, instances = nil, nil, nil, nil, nil, nil, nil
-      loop{        
+      client.check_login_status
+      binarylist, deployType, instances = nil, nil, nil
+      # 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
+      display "Selected Target: ",false
+      display "#{target}"
+      target_memory = client.target_memory(target)
+      target_memory = target_memory[1]
+      display ("Available memory: #{target_memory} M")
+      
+      # choose the project
+      useproject = choose_project
+      projectname = useproject[:name]
+      projectid = useproject[:id]
+      
+      loop{       
         appname = ask "Application Name" unless appname
-        if app_exists_byappname?(appname)
+        if not check_name_valid?(appname)
+          display "Invalid application name '#{appname}'." 
+          appname =nil
+          next
+        else if app_exists?(target, appname) 
           display "Application '#{appname}' already exists." 
           appname =nil 
-          next
-        else
+          next 
+        else         
           break
+          end
         end
       }  
-
-      # choose the project
-      useproject = choose_project
-      projectid = useproject[:id]
-
+      
       # choose the tag
       if useproject[:runtime] =~ /^(ruby)/i
-        tag = client.project_tags(useproject[:name])
-        err "No tags!" if tag.nil? || tag.empty?
-        if tag.count == 1
-          tag = tag[0]
-          display "Tag: #{tag}"
-          deployType = "git"
-        else
-          choose do |menu|
-            display "=============Tags==============="
-            menu.prompt = "Select Tag: "
-            menu.select_by = :index_or_name
-            tag.each do |t|
-              menu.choice(t) { tag = t }
-            end
-          end
-          display "Selected Version: ",false
-          display "#{tag}"
-          deployType = "git"
-        end
+        tags = client.project_tags(useproject[:name])
+        err "No tags!" if tags.nil? || tags.empty?
+        tag = ask "Select Tag", :choices => tags, :indexed => true
+        display "Selected Tag: ",false
+        display "#{tag}"
+        deployType = "git"
       else
-        binarylist = client.project_binary(projectid)
+        binarylist = client.project_binary(projectname)
         err "No version!" if binarylist.nil? || binarylist.empty?
-        choose do |menu|
-          display "=============Versions============"
-          menu.prompt = "Select Version: "
-          menu.select_by = :index_or_name
-          binarylist.each do |version|
-            menu.choice("#{version[:versionName]}") { tag = version }
-          end
+        binary_choices = Array.new
+        binarylist.each do |b|
+          binary_choices << b[:versionName]
         end
+        tag = ask "Select Version", :choices => binary_choices, :indexed => true
         display "Selected Version: ",false
-        display "#{tag[:versionName]}"
-        tag = tag[:versionName]
+        display "#{tag}"
         deployType = "binary"
-      end
-
-      # choose the target
-      targets = client.targets  
-      err "No Targets!" if targets.nil? || targets.empty?
-      usetarget = nil
-      choose do |menu|
-         display "=============Targets============"
-         menu.prompt = "Select Target: "
-         menu.select_by = :index_or_name
-         targets.each do |target|
-           menu.choice("#{target[:name]}-#{target[:targetUrl]}") { usetarget = target }
-         end
-      end
-      display "Selected Target: ",false
-      display "#{usetarget[:name]}-#{usetarget[:targetUrl]}"
-      target_memory = client.target_memory(usetarget[:name])
-      target_memory = target_memory[1]
-      display ("Available memory: #{target_memory} M")
+      end      
       # URL combination
       user = client.user_info
-      url = "#{appname}.#{user[:userName]}.#{usetarget[:name]}.samsungpaas.com"
+      url = "#{appname}.#{user[:userName]}.#{target}.samsungpaas.com"
       display "URL: #{url}"  
       # choose the mem
       mem = ask "Memory reservation", :default => DEFAULTS["mem"], :choices => ["64M", "128M", "256M", "512M", "1G", "2G"]
@@ -161,48 +141,25 @@ module PI::Cli::Command
           break
         end
         }  
-
+      isDebug = false
       isDebug = ask "Need debug?", :default => DEFAULTS["isDebug"] if deployType == "binary"
       needRestart = ask "Need restart?", :default => DEFAULTS["needRestart"]
       needMonitor = ask "Need monitor?", :default => DEFAULTS["needMonitor"]
-      if not isDebug.nil?
-        isDebug = (isDebug == false ? "no" : "yes")
-      else
-        isDebug = "no"
-      end
-      if not needRestart.nil?
-        needRestart = (needRestart == false ? "no" : "yes")
-      else
-        needRestart = "no"
-      end
-      if not needMonitor.nil?
-        needMonitor = (needMonitor == false ? "no" : "yes")
-      else
-        needMonitor = "no"
-      end
+      isDebug = (isDebug == false ? "no" : "yes")
+      needRestart = (needRestart == false ? "no" : "yes")
+      needMonitor = (needMonitor == false ? "no" : "yes")
       # choose the branch
-      branch = client.project_branchs(useproject[:name])
-      err "No branchs!" if branch.nil? || branch.empty?
-      if branch.count == 1
-        branch = branch[0]
-        display "Branch: #{branch}"
-      else
-        choose do |menu|
-          display "=============Branchs============"
-          menu.prompt = "Select Branch: "
-          menu.default = "master"
-          menu.select_by = :index_or_name
-          branch.each do |b|
-            menu.choice(b) { branch = b }
-          end
-        end
-        display "Selected Branch: ",false
-        display "#{branch}"
-      end
+      branchs = client.project_branchs(useproject[:name])
+      err "No branchs!" if branchs.nil? || branchs.empty?
+      branch = ask "Select Branch", :choices => branchs, :indexed => true, :default => "master"
+      display "Selected Branch: ",false
+      display "#{branch}"
               
       manifest = {
+        :targetName  => target,
         :name        => "#{appname}",
-        :targetName  => "#{usetarget[:name]}",
+        :projectName => "#{projectname}",
+        :projectId   => "#{projectid}",
         :branch      => branch,
         :url         => url,
         :memory      => mem_quota,
@@ -224,8 +181,8 @@ module PI::Cli::Command
       end
       end
       
-      client.create_app(projectid, manifest)
-      result = check_status(appname, "create")
+      client.create_app(manifest)
+      result = check_status(target, appname, "create")
       Thread.kill(t)
       if result[:code] == 200 
         if not result[:text].empty?
@@ -238,14 +195,10 @@ module PI::Cli::Command
       end
     end
     
-    def delete_app(appid=nil)
-      unless appid         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appid = useapp[:id]
-      end           
-      err "The application is not found! App id :#{appid}" unless app_exists_byappid?(appid)      
+    def delete_app(appid_or_appname=nil)
+      client.check_login_status
+      app = choose_app_help_target_not_all(appid_or_appname)
+      
       display "Deleting application: ",false
       
       t = Thread.new do     
@@ -256,79 +209,62 @@ module PI::Cli::Command
       end
       end
       
-      client.delete_app(appid)
+      client.delete_app(app[:id])
       Thread.kill(t)
       display "OK".green
     end
     
-    def start_app(appid=nil)
-      unless appid         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appid = useapp[:id]
-      end
-      app  = client.app_get_byid(appid)
-      err "The application is not found! App id :#{appid}" unless (appid.to_f == app[:id] ? true : false)
-      display "Starting application: ",false
-      
-      t = Thread.new do     
-      loop do
-        display '.', false 
-        sleep (1)
-        break unless t.alive?
-      end
-      end
-      
-      client.start_app(appid)
-      result = check_status(app[:name], "start")
-      Thread.kill(t)
-      if result[:code] == 200
-        display "OK".green   
+    def start_app(appid_or_appname=nil)
+      client.check_login_status   
+      target_not_all, app = choose_app_help(appid_or_appname)       
+      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)     
       else
-        err result[:text]   
+        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)
+        end
       end
     end
     
-    def stop_app(appid=nil)
-      unless appid         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appid = useapp[:id]
+    def stop_app(appid_or_appname=nil)
+      client.check_login_status     
+      target_not_all, app = choose_app_help(appid_or_appname)
+      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)     
+      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)
+        end
       end
-      err "The application is not found! App id :#{appid}" unless app_exists_byappid?(appid)
-      display "Stoping application: ",false
-      client.stop_app(appid)
-      display "OK".green
     end
     
-    def restart_app(appid=nil)
-      unless appid         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appid = useapp[:id]
+    def restart_app(appid_or_appname=nil)
+      client.check_login_status
+      target_not_all, app = choose_app_help(appid_or_appname)
+      if target_not_all  
+        do_stop_app(app) if app[:status] == "STARTED"
+        do_start_app(app)   
+      else
+        app.each do |a|
+          do_stop_app(a) if a[:status] == "STARTED"
+          do_start_app(a)
+        end
       end
-      app  = client.app_get_byid(appid)
-      err "The application is not found! App id :#{appid}" unless (appid.to_f == app[:id] ? true : false)
-      stop_app(appid)
-      start_app(appid)
     end
     
-    def scale_app(appid=nil)
-      unless appid         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appid = useapp[:id]
-      end
-      app  = client.app_get_byid(appid)
-      err "The application is not found! App id :#{appid}" unless (appid.to_f == app[:id] ? true : false)
-      instance = nil
+    def scale_app(appid_or_appname=nil)
+      client.check_login_status
+      instance = @options[:instance]
+      app = choose_app_help_target_not_all(appid_or_appname)      
       loop{
-        instance = ask "How many instances?", :default => app[:instances]
-        instance = instance.to_s
+        unless instance
+          instance = ask "How many instances?", :default => app[:instances]
+          instance = instance.to_s
+        end
         if not instance =~ /^[1-9]\d*$/
           display "Invalid Number!" 
           instance =nil 
@@ -337,6 +273,7 @@ module PI::Cli::Command
           break
         end
         } 
+      err "Don't need scale application" if instance == app[:instances].to_s
       display "Scaling application: ",false
       
       t = Thread.new do     
@@ -347,59 +284,39 @@ module PI::Cli::Command
       end
       end
       
-      client.scale_app(appid,instance)
-      result = check_status(app[:name], "scale")
+      client.scale_app(app[:id],instance)
+      result = check_status(app[:targetName],app[:name], "scale")
       Thread.kill(t)
-      if result[:code] == 200
-        display "OK".green   
+      if result[:code] == 200 
+        if not result[:text].empty?
+          display "OK".green
+        else
+          display "Please try again"
+        end            
       else
         err result[:text]   
       end     
     end
     
-    def update_app(appid=nil)
-      unless appid         
-        useproject = choose_project
-        projectid = useproject[:id]
-        projectname = useproject[:name]
-        useapp = choose_app(projectid)
-        appid = useapp[:id]
-      end   
-      app  = client.app_get_byid(appid)
-      err "The application is not found! App id :#{appid}" unless (appid.to_f == app[:id] ? true : false)
-      if app[:deployType] == "git"      
-        unless useproject
-          projects = client.projects
-          projects.each do |p|
-          projectname = p[:name] if p[:id] == app[:projectId]
-        end
-        end
-        tag = client.project_tags(projectname)
-        err "No tags!" if tag.nil? || tag.empty?
-        choose do |menu|
-          display "=============Tags==============="
-          menu.prompt = "Select Tag: "
-          menu.select_by = :index_or_name
-          tag.each do |t|
-            menu.choice(t) { tag = t }
-          end
-        end
+    def update_app(appid_or_appname=nil)
+      client.check_login_status
+      app = choose_app_help_target_not_all(appid_or_appname)      
+      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
+        err "Don't need update application!" if tag == app[:tag]
         display "Selected tag: ",false
         display "#{tag}"
-      else
-        tag = client.project_binary(app[:projectId])
-        err "No version!" if tag.nil? || tag.empty?
-        choose do |menu|
-          display "=============Versions============"
-          menu.prompt = "Select Version: "
-          menu.select_by = :index_or_name
-          tag.each do |version|
-            menu.choice("#{version[:versionName]}") { tag = version }
-          end
+      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
-        display "Selected Version: ",false
-        display "#{tag[:versionName]}"   
-        tag = tag[:versionName]   
+        tag = ask "Select Version", :choices => tag_choices, :indexed => true  
+        err "Don't need update application!" if tag == app[:tag]     
       end
       display "Updating application: ",false
       
@@ -411,26 +328,24 @@ module PI::Cli::Command
       end
       end
       
-      client.update_app(appid,tag) 
-      result = check_status(app[:name], "rollback")
+      client.update_app(app[:id],tag) 
+      result = check_status(app[:targetName], app[:name], "rollback")
       Thread.kill(t)
-      if result[:code] == 200
-        display "OK".green   
+      if result[:code] == 200 
+        if not result[:text].empty?
+          display "OK".green
+        else
+          display "Please try again"
+        end            
       else
         err result[:text]   
-      end    
+      end         
     end
     
-    def status(appname=nil)
-      unless appname         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appname = useapp[:name]
-      end
-      app  = client.app_get_byname(appname)
-      err "The application is not found! App name :#{appname}" unless (appname == app[:name] ? true : false )      
-      status = client.status(appname)
+    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])
       return display JSON.pretty_generate(status) if @options[:json]
       return display "No Status!" if status.nil? || status.empty?
       status_table = table do |t|
@@ -442,16 +357,10 @@ module PI::Cli::Command
       display status_table
     end
     
-    def app_env(appname=nil)
-      unless appname         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appname = useapp[:name]
-      end
-      app  = client.app_get_byname(appname)
-      err "The application is not found! App name :#{appname}" unless (appname == app[:name] ? true : false)      
-      env = client.app_env(appname)
+    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])
       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] }
@@ -464,70 +373,75 @@ module PI::Cli::Command
       display env_table
     end
     
-    def create_env(appname=nil)
-      unless appname         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appname = useapp[:name]
-      end
-      app  = client.app_get_byname(appname)
-      err "The application is not found! App name :#{appname}" unless (appname == app[:name] ? true : false)      
+    def create_env(appid_or_appname=nil)
+      client.check_login_status
+      app = choose_app_help_target_not_all(appid_or_appname)
+      
       name = nil
       loop{        
         name = ask "Environment Name" unless name
-        if env_exists_byappname?(app[:name],name)
-          display "Environment '#{name}' already exists." 
+        if not check_envname_valid?(name)
+          display "Invalid environment name '#{name}'." 
           name =nil 
           next
+        else if env_exists?(app[:id],name)
+          display "Environment '#{name}' already exists." 
+          name =nil 
+          next 
         else
           break
         end
+        end
       }  
       value = ask "Environment Value"
       manifest = {
         :name => name,
         :value => value
       }
-      client.create_env(appname, manifest)
+      client.create_env(app[:id], manifest)
       display "OK".green
     end
     
-    def delete_env(appname=nil)
-      unless appname         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appname = useapp[:name]
-      end
-      app  = client.app_get_byname(appname)
-      err "The application is not found! App name :#{appname}" unless (appname == app[:name] ? true : false)      
-      name = ask "Environment Name"
-      err "No Environment '#{name}'!" unless env_exists_byappname?(app[:name],name)     
-      value = nil
-      env = client.app_env(app[:name])
-      env.each do |e|
-        value = e[:value] if name == e[:name]
+    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]
+      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
-      manifest = "#{name}=#{value}".to_a
-      client.delete_env(appname,manifest)
-      display "OK".green
+
+      delete_envs.each do |env|
+        display "Deleting environment '#{env}': ",false 
+        client.delete_env(app[:id], env)
+        display "OK".green
+      end 
     end
     
-    def app_log(appid=nil)
-      unless appid         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appid = useapp[:id]
-      end
-      app  = client.app_get_byid(appid)
-      err "The application is not found! App id :#{appid}" unless (appid.to_f == app[:id] ? true : false)      
+    def app_log(appid_or_appname=nil)
+      client.check_login_status
+      app = choose_app_help_target_not_all(appid_or_appname)
+            
       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 = logs[1].to_a
+      logs = logs[1].split("\n")
       file = ask "Select logs, indexed list?", :choices => logs, :indexed => true
       display "Selected logs: ",false
       file = file.split(' ')
@@ -541,19 +455,43 @@ module PI::Cli::Command
     
     private 
    
-    def app_exists_byappname?(appname=nil)
-      app  = client.app_get_byname(appname)
-      appname == app[:name] ? true : false     
+    def app_exists?(target, appname)
+      app = client.app_search(target,appname)
+      app[:id] != 0 ? true : false
     end
     
-    def app_exists_byappid?(appid=nil)
-      app  = client.app_get_byid(appid)
-      appid.to_f == app[:id] ? true : false     
+    def env_exists?(appid, envname)
+      env  = client.env_verify(appid, envname)
+      "true" == env[1] ? false : true 
     end
     
-    def env_exists_byappname?(appname,name)
-      env  = client.env_verify(appname,name)
-      "true" == env[1] ? false : true 
+    def do_start_app(app)
+      display "Starting application '#{app[:name]}'(target:#{app[:targetName]}): ",false
+      t = Thread.new do
+        loop do
+          display '.', false
+          sleep (1)
+          break unless t.alive?
+        end
+      end
+      client.start_app(app[:id])
+      result = check_status(app[:targetName], app[:name], "start")
+      Thread.kill(t)
+      if result[:code] == 200
+        if not result[:text].empty?
+          display "OK".green
+        else
+          display "Please try again"
+        end
+      else
+        err result[:text]
+      end
+    end
+    
+    def do_stop_app(app)
+      display "Stoping application '#{app[:name]}'(target:#{app[:targetName]}): ",false
+      client.stop_app(app[:id])
+      display "OK".green
     end
       
     def mem_choice_to_quota(mem_choice)