pi 0.1.33 → 0.1.34

data/README

@@ -59,7 +59,7 @@ Try 'pi help [command]' or 'pi help options' for more information.
 Currently available pi commands are:
 
   User
-    login [url] [--user,--password]                             Login
+    login [env] [--user,--password]                             Login
     logout                                                      Logs current user out of the system
     info                                                        List system information
     user                                                        Display user information
@@ -144,16 +144,19 @@ Currently available pi commands are:
 4. Example 
 
 wangjing@wangjing-pc:~$ pi login
-Attempting login to 'http://staging.samsungcloud.org'? [Yn]: 
+1: www
+2: staging
+3: qa
+Select CloudPi Environment [www]: 1
 User: wangjing
 Password: *******
-Successfully logged into [http://staging.samsungcloud.org]
+Successfully logged into [http://api.samsungcloud.org]
 
-wangjing@wangjing-pc:~$ pi login staging.samsungcloud.org --user wangjing --password cloudpi
-Successfully logged into [http://staging.samsungcloud.org]
+wangjing@wangjing-pc:~$ pi login www --user wangjing --password cloudpi
+Successfully logged into [http://api.samsungcloud.org]
 
 wangjing@wangjing-pc:~$ pi version
-pi 0.1.32
+pi 0.1.34
 
 wangjing@wangjing-pc:~$ pi info
 
@@ -170,7 +173,7 @@ Try 'pi help [command]' or 'pi help options' for more information.
 Currently available pi commands are:
 
   User
-    login [url] [--user,--password]                             Login
+    login [env] [--user,--password]                             Login
     logout                                                      Logs current user out of the system
     info                                                        List system information
     user                                                        Display user information
@@ -763,12 +766,6 @@ Successfully logged out of [http://api.staging.samsungcloud.org]
 
 5. Common Exception
 
-ubuntu@admin:~$ pi login
-Attempting login to 'http://api.staging.samsungcloud.org'? [Yn]: n
-Please input URL: http://test.org
-Host is not available or is not valid: 'http://test.org'
-Problem with login, Cannot access target (getaddrinfo: Name or service not known), try again.
-
 ubuntu@admin:~$ pi github
 Please input your name: ruanzhimin
 Please input your email: ruanzhimin@gmail.com

data/lib/cli.rb

@@ -11,7 +11,7 @@ module PI
     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"
       autoload :Projects,     "#{ROOT}/cli/commands/projects"

data/lib/cli/choose_helper.rb

@@ -1,7 +1,7 @@
 require "set"
 module PI::Cli
   module ChooseHelper
-    
+
     YES_SET = Set.new(["y", "Y", "yes", "YES"])
     NO_SET = Set.new(["n", "N", "no", "NO"])
     DEFAULTS = {
@@ -13,7 +13,7 @@ module PI::Cli
       "isDebug"           => false,
       "needMonitor"       => false
     }
-    
+
     def total_opts
       all_opts = Hash.new
       all_opts = {
@@ -40,7 +40,7 @@ module PI::Cli
         :graceful     => @options[:graceful]
       }
     end
-    
+
     def choose_project
       projects = client.projects
       err "No Projects" if projects.nil? || projects.empty?
@@ -54,9 +54,9 @@ module PI::Cli
       display "#{useproject}"
       projects.each do |p|
         return p if p[:name] == useproject
-      end     
+      end
     end
-    
+
     def choose_target
       targets = client.targets
       err "No Targets" if targets.nil? || targets.empty?
@@ -70,13 +70,13 @@ module PI::Cli
       display "#{usetarget}"
       targets.each do |p|
         return p if p[:name] == usetarget
-      end     
+      end
     end
-    
+
     def select_apps
       choices = ["all","project","target"]
-      select_type = ask"Select application by", :choices => choices, :indexed => true  
-      display "Select application by #{select_type}"    
+      select_type = ask"Select application by", :choices => choices, :indexed => true
+      display "Select application by #{select_type}"
       case select_type
       when "all"
         app = client.apps
@@ -93,7 +93,7 @@ module PI::Cli
         end
       end
     end
-    
+
     def choose_app
       apps = select_apps
       err "No application!" if apps.nil? || apps.empty?
@@ -107,7 +107,7 @@ module PI::Cli
         apps.each do |a|
           if a[:name] == appname
             flag = true
-            return a 
+            return a
           end
         end
         if flag == false
@@ -115,11 +115,11 @@ module PI::Cli
           next
         end
       }
-      
+
     end
-    
+
     def choose_app_help(appid_or_appname)
-      target = @options[:target] 
+      target = @options[:target]
       target_not_all = true
       appid = nil
       if appid_or_appname =~ /^[1-9]\d*$/
@@ -127,14 +127,14 @@ module PI::Cli
         app = client.app_get_byid(appid)
         err"The application is not found!" if app.nil?
         return target_not_all, app, appid
-      elsif appid_or_appname == nil 
+      elsif appid_or_appname == nil
         if target.nil?
           app = choose_app
           return target_not_all, app, appid
-        else 
-          err "Not enough arguments" 
+        else
+          err "Not enough arguments"
         end
-      else 
+      else
         appname = appid_or_appname
         err "Not enough arguments" if target == nil
         if target != "all"
@@ -147,28 +147,28 @@ module PI::Cli
         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, appid        
+          target_not_all = false
+          return target_not_all, apps, appid
         end
-      end   
-    end  
-    
+      end
+    end
+
     def choose_app_help_target_not_all(appid_or_appname)
-      target = @options[:target]  
-      appid = nil     
+      target = @options[:target]
+      appid = nil
       if appid_or_appname =~ /^[1-9]\d*$/
         appid = appid_or_appname
         app = client.app_get_byid(appid)
         err"The application is not found!" if app.nil?
         return app, appid
-      elsif appid_or_appname == nil 
+      elsif appid_or_appname == nil
         if target.nil?
           app = choose_app
           return app, appid
-        else 
-          err "Not enough arguments" 
+        else
+          err "Not enough arguments"
         end
-      else 
+      else
         appname = appid_or_appname
         err "Not enough arguments" if target == nil
         # targets = client.targets
@@ -176,10 +176,10 @@ module PI::Cli
         # err "Invalid target" unless targets.include?(target)
         app = client.app_search(target, appname)
         err "The application '#{appname}' is not found!" if app.nil?
-        return app, appid       
-      end   
-    end 
-    
+        return app, appid
+      end
+    end
+
     def choose_serviceid
       services = client.services
       err "No services" if services.nil? || services.empty?
@@ -194,7 +194,7 @@ module PI::Cli
       end
       return serviceid
     end
-    
+
     def choose_dnsid
       dns = client.dns
       err "No DNS" if dns.nil? || dns.empty?
@@ -209,21 +209,21 @@ module PI::Cli
       end
       return dnsid
     end
-    
+
     def get_graceful(app)
       graceful = @options[:graceful]
       graceful = ask "Need graceful?", :default => DEFAULTS["graceful"] unless graceful
     end
-    
+
     # def check_status(uuid)
-      # for i in 1..13 do  
+      # for i in 1..13 do
         # result = client.app_message(uuid)
-        # break result unless result[:text].empty? 
-        # sleep(10)         
-      # end 
-      # return result 
+        # 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?
@@ -233,21 +233,21 @@ module PI::Cli
         check_status(uuid)
       end
     end
-    
+
     def check_version_name_valid?(version)
       version.size > 30 ? false : true
     end
- 
+
     # only [a-zA-Z0-9] for project name and app name (size <=18)
     def check_name_valid?(name)
       (name =~ /^[a-zA-Z0-9]{1,18}$/) ? true : false
     end
 
-    #Env name can't start with 'vcap_', 'VCAP_', 'vmc_' & 'VMC_', and can include 'a-zA-Z`~!@#$%^&*()_+-{}' only. The max length of name is 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
-      if name =~ /[0-9]/
-        display "Digital cannot be included in Env name".red
+      unless name =~ /^[a-zA-Z_][[:alnum:]_]*$/
+        display "Env name must be started with \"a-zA-Z_\", and can include \"a-zA-Z_0-9\"".red
         return false
       end
       if name =~ /^vcap_/i
@@ -258,22 +258,18 @@ module PI::Cli
         display "Env name cannot be started with \"vmc_\" or \"VMC_\"".red
         return false
       end
-      # if not name =~ /^[a-zA-Z\`\~\!\@\#\$\%\^\&\*\(\)\_\+\-\{\}]{0,18}$/
-        # display "the input is illegal!".red
-        # return false
-      # end
       if name.size > 18
         display "Invalid name length. The max length of name is 18"
         return false
       end
       return true
     end
-    
-    #not include number, ', ", \, and size <= 18   
+
+    #not include number, ', ", \, =,and size <= 18
     def check_envvalue_valid?(value)
       #(value =~ /^[^\'\"\\]+$/ && value.size <= 18) ? true : false
       (value =~ /^[^\'\"\\=]{1,18}$/) ? true : false
     end
-    
+
   end
 end

data/lib/cli/commands/apps.rb

@@ -14,7 +14,7 @@ module PI::Cli::Command
       "needMonitor"       => false,
       "probe"             => false
     }
-    
+
     def apps
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(projectid|target)/i}
@@ -23,8 +23,8 @@ module PI::Cli::Command
       end
       client.check_login_status
       projectid = @options[:projectid]
-      target = @options[:target]   
-      projectid = 0 if projectid == "all" || projectid == nil 
+      target = @options[:target]
+      projectid = 0 if projectid == "all" || projectid == nil
       target = nil if target == "all"
       app_sum = client.app_sum(projectid, target)
       total_app = Integer(app_sum[1])
@@ -32,34 +32,34 @@ module PI::Cli::Command
       pageNum = -1
       numPerPage = -1
       if total_app >= 50
-        puts "Total applications: #{total_app}."  
-        numPerPage = nil     
+        puts "Total applications: #{total_app}."
+        numPerPage = nil
         loop{
         numPerPage = ask "Number per page"
         if not numPerPage =~ /^[1-9]\d*$/
-          display "Invalid Number! Please input number from 1 to #{total_app}".red 
+          display "Invalid Number! Please input number from 1 to #{total_app}".red
           numPerPage =nil
           next
         else
           break
         end
-       } 
+       }
        numPerPage = numPerPage.to_i
        maxpage = (total_app.to_f/numPerPage).ceil
        loop{
         pageNum = ask "Page number"
         if not pageNum =~ /^[1-9]\d*$/
-          display "Invalid Number! Please input number from 1 to #{maxpage}".red 
+          display "Invalid Number! Please input number from 1 to #{maxpage}".red
           pageNum =nil
           next
         else
           break
         end
-       } 
-       pageNum = pageNum.to_i        
-      end       
+       }
+       pageNum = pageNum.to_i
+      end
       apps = client.apps(projectid, target, pageNum, numPerPage)
-      return display "No Applications" if apps.nil? || apps.empty?        
+      return display "No Applications" if apps.nil? || apps.empty?
       return display JSON.pretty_generate(apps) if @options[:json]
       apps.sort! {|a, b| a[:name] <=> b[:name] }
       apps_table = table do |t|
@@ -78,42 +78,42 @@ module PI::Cli::Command
       end
       client.check_login_status
       binarylist, deployType, instances = nil, nil, nil
-      
-      if appname              
+
+      if appname
         if not check_name_valid?(appname)
-          err "Invalid application name '#{appname}'." 
+          err "Invalid application name '#{appname}'."
         end
       end
- 
+
       # choose the target
-      targets = client.targets  
+      targets = client.targets
       err "No Targets!" if targets.nil? || targets.empty?
       target = ask "Select Target", :choices => targets.collect { |t| t[:name] }, :indexed => true
       display "Selected Target: ",false
       display "#{target}"
       target_memory = client.target_memory(target)
-     
-      loop{       
+
+      loop{
         appname = ask "Application Name" unless appname
         if not check_name_valid?(appname)
-          display "Invalid application name '#{appname}'.".red 
+          display "Invalid application name '#{appname}'.".red
           appname =nil
           next
-        else if app_exists?(target, appname) 
-          display "Application '#{appname}' already exists.".red 
-          appname =nil 
-          next 
-        else         
+        else if app_exists?(target, appname)
+          display "Application '#{appname}' already exists.".red
+          appname =nil
+          next
+        else
           break
           end
         end
-      }  
-      
+      }
+
       # choose the project
       useproject = choose_project
       projectname = useproject[:name]
       projectid = useproject[:id]
-      
+
       # choose the tag
       if useproject[:runtime] =~ /^(ruby)/i
         deployType = "git"
@@ -134,42 +134,42 @@ module PI::Cli::Command
           tag = ""
         else
           err "Invalid Input"
-        end               
+        end
       else
         deployType = "binary"
         binarylist = client.project_binary(projectid)
         err "No version!" if binarylist.nil? || binarylist.empty?
         tag = ask "Select Version", :choices => binarylist.collect { |b| b[:versionName] }, :indexed => true
         display "Selected Version: ",false
-        display "#{tag}"        
-      end      
+        display "#{tag}"
+      end
       # URL combination
       user = client.user_info
       url = "#{appname}.#{user[:userName]}.#{target}.samsungpaas.com"
-      display "URL: #{url}"  
+      display "URL: #{url}"
       # choose the mem
       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(from 1 to #{max_instance})?", :default => DEFAULTS["instances"]
         if not instances.to_s =~ /^[1-9]\d*$/
-          display "Invalid Number!".red 
-          instances =nil 
-          next    
+          display "Invalid Number!".red
+          instances =nil
+          next
         else if instances < 1 || instances > max_instance
-          display "Invalid Number! Please input number from 1 to #{max_instance}".red 
-          instances =nil 
-          next       
+          display "Invalid Number! Please input number from 1 to #{max_instance}".red
+          instances =nil
+          next
         else
           break
         end
         end
-        }  
+        }
       isDebug = false
       isDebug = ask "Need debug?", :default => DEFAULTS["isDebug"] if deployType == "binary"
       isDebug = (isDebug == false ? "no" : "yes")
@@ -178,9 +178,9 @@ module PI::Cli::Command
       probe = false
       probe = ask "Need JMX monitoring?", :default => DEFAULTS["probe"] if deployType == "binary"
       probe = (probe == false ? "no" : "yes")
-      # needMonitor = ask "Need monitor?", :default => DEFAULTS["needMonitor"]    
+      # needMonitor = ask "Need monitor?", :default => DEFAULTS["needMonitor"]
       # needMonitor = (needMonitor == false ? "no" : "yes")
-              
+
       manifest = {
         :targetName        => target,
         :name              => "#{appname}",
@@ -197,23 +197,23 @@ module PI::Cli::Command
         :needMonitor       => "no",
         :probe             => probe
         }
-     
+
       display "Creating application \"#{appname}\": ",false
-      
-      t = Thread.new do     
+
+      t = Thread.new do
       loop do
-        display '.', false 
+        display '.', false
         sleep (1)
         break unless t.alive?
       end
       end
-      
+
       tmp = client.create_app(manifest)
       uuid = tmp[1]
       result = check_status(uuid)
       Thread.kill(t)
     end
-    
+
     def delete_app(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
@@ -221,64 +221,64 @@ module PI::Cli::Command
         err "Invalid options" if value != nil
       end
       client.check_login_status
-      app, appid = 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
-      
-      t = Thread.new do     
+
+      t = Thread.new do
       loop do
-        display '.', false 
+        display '.', false
         sleep (1)
         break unless t.alive?
       end
       end
-      
+
       client.delete_app(appid)
       Thread.kill(t)
       display "OK".green
     end
-    
+
     def start_app(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
       all_opts_except_valid_opts.each_value do |value|
         err "Invalid options" if value != nil
       end
-      client.check_login_status   
-      target_not_all, app, appid = choose_app_help(appid_or_appname)             
+      client.check_login_status
+      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)     
+        return display "The application '#{app[:name]}'(target:#{app[:targetName]}) has already started.".yellow if app[:status] == "STARTED"
+        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"     
+          next display "The application '#{a[:name]}'(target:#{a[:targetName]}) has already started.".yellow if a[:status] == "STARTED"
           do_start_app(a, a[:id])
         end
       end
     end
-    
+
     def stop_app(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|graceful)/i}
       all_opts_except_valid_opts.each_value do |value|
         err "Invalid options" if value != nil
       end
-      client.check_login_status     
-      target_not_all, app, appid = choose_app_help(appid_or_appname)       
+      client.check_login_status
+      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)     
+        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
         app.each do |a|
-          next display "The application '#{a[:name]}'(target:#{a[:targetName]}) has already stopped.".yellow if a[:status] == "STOPPED"     
+          next display "The application '#{a[:name]}'(target:#{a[:targetName]}) has already stopped.".yellow if a[:status] == "STOPPED"
           do_stop_app(a, a[:id])
         end
       end
     end
-    
+
     def restart_app(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|graceful)/i}
@@ -286,17 +286,17 @@ module PI::Cli::Command
         err "Invalid options" if value != nil
       end
       client.check_login_status
-      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)   
+      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_restart_app(a, a[:id])
         end
       end
     end
-    
+
     def scale_app(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|instance)/i}
@@ -304,46 +304,46 @@ module PI::Cli::Command
         err "Invalid options" if value != nil
       end
       client.check_login_status
-      instance = @options[:instance]   
-      app, appid = choose_app_help_target_not_all(appid_or_appname) 
-      appid = (appid == nil ? app[:id] : appid)   
+      instance = @options[:instance]
+      app, appid = choose_app_help_target_not_all(appid_or_appname)
+      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
+      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!".red 
-          instance =nil 
+          display "Invalid Number!".red
+          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}".red 
-          instance =nil 
+          display "Invalid Number! Please input number from 1 to #{max_instance}".red
+          instance =nil
           next
         else
           break
         end
         end
-        } 
+        }
       err "Don't need scale application" if instance.to_s == app[:instances].to_s
-      # graceful = get_graceful(app)    
+      # graceful = get_graceful(app)
       display "Scaling application: ",false
-      
-      t = Thread.new do     
+
+      t = Thread.new do
       loop do
-        display '.', false 
+        display '.', false
         sleep (1)
         break unless t.alive?
       end
       end
-      
+
       tmp = client.scale_app(appid, instance)
       uuid = tmp[1]
       result = check_status(uuid)
-      Thread.kill(t)   
+      Thread.kill(t)
     end
-    
+
     def update_app(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|ver|graceful)/i}
@@ -352,9 +352,9 @@ module PI::Cli::Command
       end
       client.check_login_status
       tag = @options[:ver]
-      app, appid = choose_app_help_target_not_all(appid_or_appname) 
-      appid = (appid == nil ? app[:id] : appid)      
-      if app[:deployType] == "git"        
+      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[:projectId])
         err "No tags!" if tags.nil? || tags.empty?
         if tag
@@ -363,7 +363,7 @@ module PI::Cli::Command
           tag = ask "Select Tag", :choices => tags, :indexed => true
         end
         err "Don't need update application!" if tag == app[:tag]
-      else    
+      else
         tags = client.project_binary(app[:projectId])
         err "No version!" if tags.nil? || tags.empty?
         if tag
@@ -372,26 +372,26 @@ module PI::Cli::Command
         else
           tag = ask "Select Version", :choices => tags.collect { |b| b[:versionName] }, :indexed => true
         end
-        err "Don't need update application!" if tag == app[: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     
+
+      t = Thread.new do
       loop do
-        display '.', false 
+        display '.', false
         sleep (1)
         break unless t.alive?
       end
       end
-      
-      tmp = client.update_app(appid,tag,graceful) 
+
+      tmp = client.update_app(appid,tag,graceful)
       uuid = tmp[1]
       result = check_status(uuid)
-      Thread.kill(t)      
+      Thread.kill(t)
     end
-    
+
     def status(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
@@ -399,7 +399,7 @@ module PI::Cli::Command
         err "Invalid options" if value != nil
       end
       client.check_login_status
-      app, appid = 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)
       status = client.status(appid)
       return display JSON.pretty_generate(status) if @options[:json]
@@ -412,7 +412,7 @@ module PI::Cli::Command
       end
       display status_table
     end
-    
+
     def app_env(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
@@ -420,9 +420,9 @@ module PI::Cli::Command
         err "Invalid options" if value != nil
       end
       client.check_login_status
-      app, appid = 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)
-      env = client.app_env(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] }
@@ -434,7 +434,7 @@ module PI::Cli::Command
       end
       display env_table
     end
-    
+
     def create_env(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|name|value)/i}
@@ -444,33 +444,33 @@ module PI::Cli::Command
       client.check_login_status
       name = @options[:name]
       value = @options[:value]
-      app, appid = 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{        
+
+      loop{
         name = ask "Environment Name" unless name
         if not check_envname_valid?(name)
-          name =nil 
+          name =nil
           next
         else if env_exists?(appid,name)
-          display "Environment '#{name}' already exists.".red 
-          name =nil 
-          next 
+          display "Environment '#{name}' already exists.".red
+          name =nil
+          next
         else
           break
         end
         end
-      }  
+      }
       loop{
         value = ask "Environment Value" unless value
         if not check_envvalue_valid?(value)
-          display "Invalid environment value '#{value}'.".red 
+          display "Invalid environment value '#{value}'.".red
           value =nil
           next
         else
           break
         end
-      }     
+      }
       manifest = {
         :name => name,
         :value => value
@@ -478,7 +478,7 @@ module PI::Cli::Command
       client.create_env(appid, manifest)
       display "OK".green
     end
-    
+
     def delete_env(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|name)/i}
@@ -501,22 +501,22 @@ module PI::Cli::Command
         end
         display "\n"
       end
-      
+
       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
+      end
       err " The environment is not exist!" if delete_envs.nil? || delete_envs.empty?
 
       delete_envs.each do |env|
-        display "Deleting environment '#{env}': ",false 
+        display "Deleting environment '#{env}': ",false
         client.delete_env(appid, env)
         display "OK".green
-      end 
+      end
     end
-    
+
     def app_log(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|instanceid|file)/i}
@@ -527,7 +527,7 @@ module PI::Cli::Command
       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 unless instanceindex
       unless file
@@ -545,7 +545,7 @@ module PI::Cli::Command
       display "\n"
       display logs[1]
     end
-    
+
     # def app_debug(appid_or_appname=nil)
       # all_opts = total_opts
       # all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
@@ -573,19 +573,19 @@ module PI::Cli::Command
       # end
       # display debug_table
     # end
-    
-    private 
-   
+
+    private
+
     def app_exists?(target, appname)
       app = client.app_search(target,appname)
-      app.nil? ? false : true 
+      app.nil? ? false : true
     end
-    
+
     def env_exists?(appid, envname)
       env  = client.env_verify(appid, envname)
-      "true" == env[1] ? false : true 
+      "true" == env[1] ? false : true
     end
-    
+
     def do_start_app(app, appid)
       display "Starting application '#{app[:name]}'(target:#{app[:targetName]}): ",false
       t = Thread.new do
@@ -600,15 +600,15 @@ module PI::Cli::Command
       result = check_status(uuid)
       Thread.kill(t)
     end
-    
+
     def do_stop_app(app, appid)
       graceful = get_graceful(app)
       display "Stoping application '#{app[:name]}'(target:#{app[:targetName]}): ",false
       client.stop_app(appid, graceful)
       display "OK".green
     end
-    
-    def do_restart_app(app, appid)   
+
+    def do_restart_app(app, appid)
       graceful = get_graceful(app)
       # lazy = get_lazy(app)
       display "Restart application '#{app[:name]}'(target:#{app[:targetName]}): ",false
@@ -624,11 +624,11 @@ module PI::Cli::Command
       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
       mem_quota
     end
-    
+
   end
 end