pi 0.1.26 → 0.1.27

data/README

@@ -75,14 +75,14 @@ _Copyright 2010-2012, Samsung.
   Project
     projects                                              List created projects 
     create-project [project]                              Create a new project                
-    delete-project [project]                              Delete the project             
-    project-events [project]                              List the event info for the project
-    project-tags [project]                                List the tags for the project
-    project-commits [project]                             List the commit log for the project
-    upload [project][--path,--ver,--desc]                 Upload the war package for java project
+    delete-project [projectid]                            Delete the project             
+    project-events [projectid]                            List the event info for the project
+    project-tags [projectid]                              List the tags for the project
+    project-commits [projectid]                           List the commit log for the project
+    upload [projectid][--path,--ver,--desc]               Upload the war package for java project
     
   Application 
-    apps [--project,--target]                             List deployed applications for the project
+    apps [--projectid,--target]                           List deployed applications
     create-app [appname]                                  Create a new application
     delete-app [appid]                                    Delete the application
     delete-app <appname> <--target TARGET>                Delete the application
@@ -131,7 +131,8 @@ _Copyright 2010-2012, Samsung.
     unmap-dns [appid] [--dns DNS]                         Unmap the urls for the application                                      
     unmap-dns <appname> <--target TARGET> [--dns DNS]     Unmap the urls for the application
     dns                                                   List the dns
-    create-dns [dnsname] [--zoneid,--project,--desc]      Create a new dns
+    zones                                                 List the dns zones
+    create-dns [dnsname] [--zoneid,--projectid,--desc]    Create a new dns
     register-dns [dnsid]                                  Register to target
     deregister-dns [dnsid]                                Deregister to target
     delete-dns [dnsid]                                    Delete the dns
@@ -161,12 +162,12 @@ Github Account Email: ruanzhimin@gmail.com
 
 ubuntu@admin:~$ pi targets
 
-+------------+------------------------------------+
-| Name       | URL                                |
-+------------+------------------------------------+
-| ap-ne-test | http://ap-ne-test.samsungcloud.org |
-| bst-dev    | http://bst-dev.samsungcloud.org    |
-+------------+------------------------------------+
++-----------+-----------------------------------+
+| Name      | URL                               |
++-----------+-----------------------------------+
+| bst-dev   | http://bst-dev.samsungcloud.org   |
+| target-hq | http://target-hq.samsungcloud.org |
++-----------+-----------------------------------+
 
 ubuntu@admin:~$ pi password 
 Old Password: *******
@@ -226,14 +227,14 @@ Currently available pi commands are:
   Project
     projects                                              List created projects 
     create-project [project]                              Create a new project                
-    delete-project [project]                              Delete the project             
-    project-events [project]                              List the event info for the project
-    project-tags [project]                                List the tags for the project
-    project-commits [project]                             List the commit log for the project
-    upload [project][--path,--ver,--desc]                 Upload the war package for java project
+    delete-project [projectid]                            Delete the project             
+    project-events [projectid]                            List the event info for the project
+    project-tags [projectid]                              List the tags for the project
+    project-commits [projectid]                           List the commit log for the project
+    upload [projectid][--path,--ver,--desc]               Upload the war package for java project
     
   Application 
-    apps [--project,--target]                             List deployed applications for the project
+    apps [--projectid,--target]                           List deployed applications
     create-app [appname]                                  Create a new application
     delete-app [appid]                                    Delete the application
     delete-app <appname> <--target TARGET>                Delete the application
@@ -282,7 +283,8 @@ Currently available pi commands are:
     unmap-dns [appid] [--dns DNS]                         Unmap the urls for the application                                      
     unmap-dns <appname> <--target TARGET> [--dns DNS]     Unmap the urls for the application
     dns                                                   List the dns
-    create-dns [dnsname] [--zoneid,--project,--desc]      Create a new dns
+    zones                                                 List the dns zones
+    create-dns [dnsname] [--zoneid,--projectid,--desc]    Create a new dns
     register-dns [dnsid]                                  Register to target
     deregister-dns [dnsid]                                Deregister to target
     delete-dns [dnsid]                                    Delete the dns
@@ -291,7 +293,6 @@ ubuntu@admin:~$ pi help options
 
 Available options:
 
-        --url URL
         --user USER
         --password PASS
         --name NAME
@@ -299,7 +300,7 @@ Available options:
         --path PATH
         --ver VERSION
         --desc DESC
-        --project PROJ
+        --projectid ID
         --target TARG
         --instance N
         --type TYPE
@@ -321,18 +322,20 @@ Usage: pi start-app [appid] or pi start-app <appname> <--target TARGET>
         
 ubuntu@admin:~$ pi projects
 
-+-------------+---------+-----------+----------+-------------------------------------------------------------------+-------------+
-| Name        | Runtime | Framework | Git Type | GitUrl                                                            | Description |
-+-------------+---------+-----------+----------+-------------------------------------------------------------------+-------------+
-| javagithub  | java    | spring    | github   | https://ruanzhimin@github.com/ruanzhimin/javagithub.git           | test        |
-| javawj      | java    | spring    | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/javawj.git  | test        |
-| railsgithub | ruby18  | rails3    | github   | https://ruanzhimin@github.com/ruanzhimin/railsgithub.git          | test        |
-| railswj     | ruby18  | rails3    | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/railswj.git | test        |
-| sinatra     | ruby18  | sinatra   | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/sinatra.git | test        |
-+-------------+---------+-----------+----------+-------------------------------------------------------------------+-------------+
++------+------------------+---------+-----------+----------+----------------------------------------------------------------------------+-------------+
+| ID   | Name             | Runtime | Framework | Git Type | GitUrl                                                                     | Description |
++------+------------------+---------+-----------+----------+----------------------------------------------------------------------------+-------------+
+| 2131 | javagithub       | java    | spring    | github   | https://ruanzhimin@github.com/ruanzhimin/javagithub.git                    | test        |
+| 2193 | javawj           | java    | spring    | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/javawj.git           | test        |
+| 2132 | railsgithub      | ruby18  | rails3    | github   | https://ruanzhimin@github.com/ruanzhimin/railsgithub.git                   | test        |
+| 2028 | railswj          | ruby18  | rails3    | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/railswj.git          | test        |
+| 2271 | sinatra          | ruby18  | sinatra   | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/sinatra.git          | test        |
+| 2414 | sinatra4rabbitmq | ruby18  | sinatra   | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/sinatra4rabbitmq.git | test        |
+| 2416 | sinatra4redis    | ruby18  | sinatra   | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/sinatra4redis.git    | test        |
++------+------------------+---------+-----------+----------+----------------------------------------------------------------------------+-------------+
 
 ubuntu@admin:~$ pi create-project
-Project Name: javatest
+Project Name: java
 1: java
 2: ruby18
 Select Runtime: 1
@@ -348,49 +351,48 @@ Please enter in the description: test
 2: github
 Select Repository Type: 1
 Selected Repository Type: cloudpi
-Creating project "javatest": ................OK
+Creating project "java": ............OK
 
-ubuntu@admin:~$ pi upload
-1: javagithub
-2: javatest
+ubuntu@admin:~$ pi upload 
+1: java
+2: javagithub
 3: javawj
-Select Project: 2
-Selected Project: javatest
+Select Project: 1
+Selected Project: java
 Please enter the path of upload war file: /home/wangjing/paashelp.war
-Please enter the version: test
+Please enter the version: paashelp
 Please enter in the description: test
-Uploading "paashelp.war": ..OK
+Uploading "paashelp.war": .OK
 
 ubuntu@admin:~$ pi create-app
-1: ap-ne-test
-2: bst-dev
+1: bst-dev
+2: target-hq
 Select Target: 1
-Selected Target: ap-ne-test
-Available memory: 5952 M
-1: javagithub
-2: javatest
+Selected Target: bst-dev
+Available memory: 1856 M
+1: java
+2: javagithub
 3: javawj
 4: railsgithub
 5: railswj
 6: sinatra
-Select Project: 2
-Selected Project: javatest
+7: sinatra4rabbitmq
+8: sinatra4redis
+Select Project: 1
+Selected Project: java
 Application Name: java
-1: test
+1: paashelp
 Select Version: 1
-Selected Version: test
-URL: java.wangjing.ap-ne-test.samsungpaas.com
+Selected Version: paashelp
+URL: java.wangjing.bst-dev.samsungpaas.com
 Memory reservation (64M, 128M, 256M, 512M, 1G, 2G) [64M]: 
 How many instances? [1]: 
 Need debug? [yN]: 
 1: restart
 2: notify
-Reaction when service changed [notify]: 1 
+Reaction when service changed [notify]: 
 Need monitor? [yN]: 
-1: master
-Select Branch [master]: 
-Selected Branch: master
-Creating application "java": .........................OK
+Creating application "java": .................................OK
 
 ubuntu@admin:~$ pi apps
 +------+------------+----------+----------------------------------------------+-------------+----------+---------+-----------+-------------------+

data/lib/cli/choose_helper.rb

@@ -4,7 +4,15 @@ module PI::Cli
     
     YES_SET = Set.new(["y", "Y", "yes", "YES"])
     NO_SET = Set.new(["n", "N", "no", "NO"])
-    
+    DEFAULTS = {
+      "mem"               => "64M",
+      "instances"         => 1,
+      "action_for_change" => "notify",
+      "graceful"          => true,
+      "lazy"              => true,
+      "isDebug"           => false,
+      "needMonitor"       => false
+    }
     def choose_project
       projects = client.projects
       err "No Projects" if projects.nil? || projects.empty?
@@ -159,28 +167,76 @@ module PI::Cli
       return dnsid
     end
     
-    def check_status(target, appname, eventname)
-      for i in 1..12 do  
-        result = client.app_message(target,appname,eventname)
-        break result unless result[:text].empty? 
-        sleep(10)         
-      end 
-      return result 
+    def get_graceful(app)
+      graceful = @options[:graceful]
+      if app[:action_for_change] == "restart"
+        graceful = ask "Need graceful?", :default => DEFAULTS["graceful"] unless graceful
+      else
+        graceful = false
+      end
+      graceful = (graceful == true ? "true" : "false")  
+    end
+    
+    def get_lazy(app)
+      lazy = @options[:lazy]
+      if app[:action_for_change] == "restart"
+        lazy = ask "Need lazy?", :default => DEFAULTS["lazy"] unless lazy
+      else
+        lazy = false
+      end
+      lazy = (lazy == true ? "true" : "false")  
+    end
+    
+    # def check_status(uuid)
+      # for i in 1..13 do  
+        # result = client.app_message(uuid)
+        # break result unless result[:text].empty? 
+        # sleep(10)         
+      # end 
+      # return result 
+    # end
+    
+    def check_status(uuid)
+      result = client.app_message(uuid)
+      if not result[:text].empty?
+        display "#{result[:text]}"
+      else
+        sleep(10)
+        check_status(uuid)
+      end
     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
+      (name =~ /^[a-zA-Z0-9]{1,18}$/) ? true : false
     end
 
-    #not include number, and cannot be started with vcap_, vmc_ for env name (size <= 18)     
+    #Env name can't start with 'vcap_', 'VCAP_', 'vmc_' & 'VMC_', and can include 'a-zA-Z`~!@#$%^&*()_+-{}' only. The max length of name is 18     
     def check_envname_valid?(name)
-      (name =~ /\b(?!vcap_|vmc_|VCAP_|VMC_)\D+\b/ &&  name.size <= 18) ? true : false
+      #(name =~ /\b(?!vcap_|vmc_|VCAP_|VMC_)\D+\b/ &&  name.size <= 18) ? true : false
+      if name =~ /[0-9]/
+        display "Digital cannot be included in Env name"
+        return false
+      end
+      if name =~ /^vcap_/i
+        display "Env name cannot be started with \"vcap_\" or \"VCAP_\""
+        return false
+      end
+      if name =~ /^vmc_/i
+        display "Env name cannot be started with \"vmc_\" or \"VMC_\""
+        return false
+      end
+      if not name =~ /^[a-zA-Z\`\~\!\@\#\$\%\^\&\*\(\)\_\+\-\{\}]{0,18}$/
+        display "the input is illegal!"
+        return false
+      end
+      return true
     end
     
-    #not include number, ', ", \, and begin with vcap_, vmc_ for env name (size <= 18)     
+    #not include number, ', ", \, and size <= 18   
     def check_envvalue_valid?(value)
-      (value =~ /^[^\'\"\\]+$/ && value.size <= 18) ? true : false
+      #(value =~ /^[^\'\"\\]+$/ && value.size <= 18) ? true : false
+      (value =~ /^[^\'\"\\=]{1,18}$/) ? true : false
     end
     
   end

data/lib/cli/commands/apps.rb

@@ -5,11 +5,13 @@ module PI::Cli::Command
     include PI::Cli::ChooseHelper
     include PI::Cli::InteractHelper
     DEFAULTS = {
-      "mem"             => "64M",
-      "instances"       => 1,
+      "mem"               => "64M",
+      "instances"         => 1,
       "action_for_change" => "notify",
-      "isDebug"         => false,
-      "needMonitor"     => false
+      "graceful"          => true,
+      "lazy"              => true,
+      "isDebug"           => false,
+      "needMonitor"       => false
     }
     
     def apps
@@ -57,7 +59,7 @@ module PI::Cli::Command
       apps_table = table do |t|
         t.headings = 'ID', 'Target', 'App name', 'URL', 'Deploy Type','Version', 'Status', 'Instances', 'Running Instances'
         apps.each do |app|
-          t << [app[:id], 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].empty? ? "Latest" : app[:tag], app[:status], app[:instances], app[:runInstances]]
         end
       end
       display apps_table
@@ -66,6 +68,13 @@ module PI::Cli::Command
     def create_app(appname=nil)
       client.check_login_status
       binarylist, deployType, instances = nil, nil, nil
+      
+      if appname              
+        if not check_name_valid?(appname)
+          err "Invalid application name '#{appname}'." 
+        end
+      end
+ 
       # choose the target
       targets = client.targets  
       err "No Targets!" if targets.nil? || targets.empty?
@@ -73,14 +82,7 @@ module PI::Cli::Command
       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 not check_name_valid?(appname)
@@ -97,6 +99,11 @@ module PI::Cli::Command
         end
       }  
       
+      # choose the project
+      useproject = choose_project
+      projectname = useproject[:name]
+      projectid = useproject[:id]
+      
       # choose the tag
       if useproject[:runtime] =~ /^(ruby)/i
         deployType = "git"
@@ -134,24 +141,39 @@ module PI::Cli::Command
       mem = ask "Memory reservation", :default => DEFAULTS["mem"], :choices => ["64M", "128M", "256M", "512M", "1G", "2G"]
       # Set to MB number
       mem_quota = mem_choice_to_quota(mem)
-  
+      
+      target_memory = Integer(target_memory[1])
+      max_instance = (target_memory.to_f/mem.to_i).floor
+      display ("Available memory: #{target_memory} M, maximum instances: #{max_instance}")
       loop{
-        instances = ask "How many instances?", :default => DEFAULTS["instances"]
-        instances = instances.to_s
-        if not instances =~ /^[1-9]\d*$/
+        instances = ask "How many instances(from 1 to #{max_instance})?", :default => DEFAULTS["instances"]
+        if not instances.to_s =~ /^[1-9]\d*$/
           display "Invalid Number!" 
           instances =nil 
-          next
+          next    
+        else if instances < 1 || instances > max_instance
+          display "Invalid Number! Please input number from 1 to #{max_instance}" 
+          instances =nil 
+          next       
         else
           break
         end
+        end
         }  
       isDebug = false
       isDebug = ask "Need debug?", :default => DEFAULTS["isDebug"] if deployType == "binary"
+      isDebug = (isDebug == false ? "no" : "yes")
+      graceful = false
+      lazy = false
       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")
+      if action_for_change == "restart"
+        graceful = ask "Need graceful?", :default => DEFAULTS["graceful"]
+        lazy = ask "Need lazy?", :default => DEFAULTS["lazy"]
+      end
+      graceful = (graceful == false ? "false" : "true")
+      lazy = (lazy == false ? "false" : "true")
+      needMonitor = ask "Need monitor?", :default => DEFAULTS["needMonitor"]    
       needMonitor = (needMonitor == false ? "no" : "yes")
               
       manifest = {
@@ -167,6 +189,8 @@ module PI::Cli::Command
         :tag               => tag,
         :isDebug           => isDebug,
         :action_for_change => action_for_change,
+        :graceful          => graceful,
+        :lazy              => lazy,
         :needMonitor       => needMonitor
         }
      
@@ -180,18 +204,10 @@ module PI::Cli::Command
       end
       end
       
-      client.create_app(manifest)
-      result = check_status(target, appname, "create")
+      tmp = client.create_app(manifest)
+      uuid = tmp[1]
+      result = check_status(uuid)
       Thread.kill(t)
-      if result[:code] == 200 
-        if not result[:text].empty?
-          display "OK".green
-        else
-          display "Time out"
-        end            
-      else
-        err result[:text]   
-      end
     end
     
     def delete_app(appid_or_appname=nil)
@@ -216,9 +232,9 @@ module PI::Cli::Command
     
     def start_app(appid_or_appname=nil)
       client.check_login_status   
-      target_not_all, app, appid = choose_app_help(appid_or_appname) 
-      appid = (appid == nil ? app[:id] : appid)      
+      target_not_all, app, appid = choose_app_help(appid_or_appname)             
       if target_not_all
+        appid = (appid == nil ? app[:id] : appid)
         return display "The application '#{app[:name]}'(target:#{app[:targetName]}) has already started.".yellow if app[:status] == "STARTED"     
         do_start_app(app, appid)     
       else
@@ -231,9 +247,9 @@ module PI::Cli::Command
     
     def stop_app(appid_or_appname=nil)
       client.check_login_status     
-      target_not_all, app, appid = choose_app_help(appid_or_appname) 
-      appid = (appid == nil ? app[:id] : appid) 
+      target_not_all, app, appid = choose_app_help(appid_or_appname)       
       if target_not_all
+        appid = (appid == nil ? app[:id] : appid)         
         return display "The application '#{app[:name]}'(target:#{app[:targetName]}) has already stopped.".yellow if app[:status] == "STOPPED"     
         do_stop_app(app, appid)     
       else
@@ -246,38 +262,43 @@ module PI::Cli::Command
     
     def restart_app(appid_or_appname=nil)
       client.check_login_status
-      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, appid) if app[:status] == "STARTED"
-        do_start_app(app, appid)   
+      target_not_all, app, appid = choose_app_help(appid_or_appname)       
+      if target_not_all 
+        appid = (appid == nil ? app[:id] : appid) 
+        do_restart_app(app, appid)   
       else
         app.each do |a|
-          do_stop_app(a, a[:id]) if a[:status] == "STARTED"
-          do_start_app(a, a[:id])
+          do_restart_app(a, a[:id])
         end
       end
     end
     
     def scale_app(appid_or_appname=nil)
       client.check_login_status
-      instance = @options[:instance]
+      instance = @options[:instance]     
       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]
-          instance = instance.to_s
-        end
-        if not instance =~ /^[1-9]\d*$/
+      appid = (appid == nil ? app[:id] : appid)   
+      target_memory = client.target_memory(app[:targetName])
+      target_memory = Integer(target_memory[1])
+      max_instance = (target_memory.to_f/app[:memory].to_i).floor
+      display ("Available memory: #{target_memory} M, maximum instances: #{max_instance}")  
+      loop{        
+        instance = ask "Current instance: #{app[:instances]}, Instance number" unless instance
+        if not instance.to_s =~ /^[1-9]\d*$/
           display "Invalid Number!" 
           instance =nil 
           next
+        else if instance.to_i < 1 || instance.to_i > max_instance
+          display "Invalid Number! Please input number from 1 to #{max_instance}" 
+          instance =nil 
+          next
         else
           break
         end
+        end
         } 
       err "Don't need scale application" if instance == app[:instances].to_s
+      graceful = get_graceful(app)    
       display "Scaling application: ",false
       
       t = Thread.new do     
@@ -288,18 +309,10 @@ module PI::Cli::Command
       end
       end
       
-      client.scale_app(appid,instance)
-      result = check_status(app[:targetName],app[:name], "scale")
-      Thread.kill(t)
-      if result[:code] == 200 
-        if not result[:text].empty?
-          display "OK".green
-        else
-          display "Time out"
-        end            
-      else
-        err result[:text]   
-      end     
+      tmp = client.scale_app(appid, instance, graceful)
+      uuid = tmp[1]
+      result = check_status(uuid)
+      Thread.kill(t)   
     end
     
     def update_app(appid_or_appname=nil)
@@ -320,6 +333,8 @@ module PI::Cli::Command
         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
+      graceful = get_graceful(app)
+      lazy = get_lazy(app)
       display "Updating application: ",false
       
       t = Thread.new do     
@@ -330,18 +345,10 @@ module PI::Cli::Command
       end
       end
       
-      client.update_app(appid,tag) 
-      result = check_status(app[:targetName], app[:name], "rollback")
-      Thread.kill(t)
-      if result[:code] == 200 
-        if not result[:text].empty?
-          display "OK".green
-        else
-          display "Time out"
-        end            
-      else
-        err result[:text]   
-      end         
+      tmp = client.update_app(appid,tag,graceful,lazy) 
+      uuid = tmp[1]
+      result = check_status(uuid)
+      Thread.kill(t)      
     end
     
     def status(appid_or_appname=nil)
@@ -387,7 +394,7 @@ module PI::Cli::Command
       loop{        
         name = ask "Environment Name" unless name
         if not check_envname_valid?(name)
-          display "Invalid environment name '#{name}'." 
+          #display "Invalid environment name '#{name}'." 
           name =nil 
           next
         else if env_exists?(appid,name)
@@ -452,25 +459,44 @@ module PI::Cli::Command
     
     def app_log(appid_or_appname=nil)
       client.check_login_status
+      instanceindex = @options[:instanceid]
+      file = @options[:file]
       app, appid = choose_app_help_target_not_all(appid_or_appname)
-      appid = (appid == nil ? app[:id] : appid)
-           
+      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(appid,filepath,instanceindex)
-      logs = logs[1].split("\n")
-      file = ask "Select logs, indexed list?", :choices => logs, :indexed => true
-      display "Selected logs: ",false
-      file = file.split(' ')
-      file = file[0]
-      display "#{file}" 
-      filepath = "logs/#{file}" 
+      instanceindex = ask "Select instance index(from 0 to #{max_index})", :default => 0 unless instanceindex
+      unless file
+        filepath = "logs/"
+        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
+        file = file.split(' ')
+        file = file[0]
+        display "#{file}"
+      end
+      filepath = "logs/#{file}"
       logs = client.app_log(appid,filepath,instanceindex)
       display "\n"
       display logs[1]
     end
     
+    def app_debug(appid_or_appname=nil)
+      client.check_login_status
+      app, appid = choose_app_help_target_not_all(appid_or_appname)
+      appid = (appid == nil ? app[:id] : appid)
+      debug_info = client.app_debug_info(appid)
+      return display JSON.pretty_generate(debug_info) if @options[:json]
+      return display "No debug info" if debug_info.nil? || debug_info.empty?
+      debug_table = table do |t|
+        t.headings = 'Debug IP', 'Debug Port', 'State'
+        debug_info.each do |d|
+          t << [d[:debug_ip], d[:debug_port], d[:state]]
+        end
+      end
+      display debug_table
+    end
+    
     private 
    
     def app_exists?(target, appname)
@@ -492,25 +518,35 @@ module PI::Cli::Command
           break unless t.alive?
         end
       end
-      client.start_app(appid)
-      result = check_status(app[:targetName], app[:name], "start")
+      tmp = client.start_app(appid)
+      uuid = tmp[1]
+      result = check_status(uuid)
       Thread.kill(t)
-      if result[:code] == 200
-        if not result[:text].empty?
-          display "OK".green
-        else
-          display "Time out"
-        end
-      else
-        err result[:text]
-      end
     end
     
     def do_stop_app(app, appid)
+      graceful = get_graceful(app)
       display "Stoping application '#{app[:name]}'(target:#{app[:targetName]}): ",false
-      client.stop_app(appid)
+      client.stop_app(appid, graceful)
       display "OK".green
     end
+    
+    def do_restart_app(app, appid)   
+      graceful = get_graceful(app)
+      lazy = get_lazy(app)
+      display "Restart application '#{app[:name]}'(target:#{app[:targetName]}): ",false
+      t = Thread.new do
+        loop do
+          display '.', false
+          sleep (1)
+          break unless t.alive?
+        end
+      end
+      tmp = client.restart_app(appid, graceful,lazy)
+      uuid = tmp[1]
+      result = check_status(uuid)
+      Thread.kill(t)
+    end
       
     def mem_choice_to_quota(mem_choice)
       (mem_choice =~ /(\d+)M/i) ? mem_quota = $1.to_i : mem_quota = mem_choice.to_i * 1024