pi 0.1.27 → 0.1.28

data/lib/cli/choose_helper.rb

@@ -88,7 +88,7 @@ module PI::Cli
       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[:id] == 0
+        err"The application is not found!" if app.nil?
         return target_not_all, app, appid
       elsif appid_or_appname == nil 
         if target.nil?
@@ -101,8 +101,11 @@ module PI::Cli
         appname = appid_or_appname
         err "Not enough arguments" if target == nil
         if target != "all"
+          # targets = client.targets
+          # targets = targets.collect { |t| t[:name] }
+          # err "Invalid target" unless targets.include?(target)
           app = client.app_search(target, appname)
-          err "The application '#{appname}' is not found!" if app[:id] == 0
+          err "The application '#{appname}' is not found!" if app.nil?
           return target_not_all, app, appid
         else
           apps = client.app_search_target_is_all(appname)
@@ -119,7 +122,7 @@ module PI::Cli
       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[:id] == 0
+        err"The application is not found!" if app.nil?
         return app, appid
       elsif appid_or_appname == nil 
         if target.nil?
@@ -131,8 +134,11 @@ module PI::Cli
       else 
         appname = appid_or_appname
         err "Not enough arguments" if target == nil
+        # targets = client.targets
+        # targets = targets.collect { |t| t[:name] }
+        # err "Invalid target" unless targets.include?(target)
         app = client.app_search(target, appname)
-        err "The application '#{appname}' is not found!" if app[:id] == 0
+        err "The application '#{appname}' is not found!" if app.nil?
         return app, appid       
       end   
     end 
@@ -169,22 +175,7 @@ module PI::Cli
     
     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")  
+      graceful = ask "Need graceful?", :default => DEFAULTS["graceful"] unless graceful
     end
     
     # def check_status(uuid)
@@ -215,19 +206,23 @@ module PI::Cli
     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"
+        display "Digital cannot be included in Env name".red
         return false
       end
       if name =~ /^vcap_/i
-        display "Env name cannot be started with \"vcap_\" or \"VCAP_\""
+        display "Env name cannot be started with \"vcap_\" or \"VCAP_\"".red
         return false
       end
       if name =~ /^vmc_/i
-        display "Env name cannot be started with \"vmc_\" or \"VMC_\""
+        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!"
+      # 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

data/lib/cli/commands/apps.rb

@@ -31,7 +31,7 @@ module PI::Cli::Command
         loop{
         numPerPage = ask "Number per page"
         if not numPerPage =~ /^[1-9]\d*$/
-          display "Invalid Number! Please input number from 1 to #{total_app}" 
+          display "Invalid Number! Please input number from 1 to #{total_app}".red 
           numPerPage =nil
           next
         else
@@ -43,7 +43,7 @@ module PI::Cli::Command
        loop{
         pageNum = ask "Page number"
         if not pageNum =~ /^[1-9]\d*$/
-          display "Invalid Number! Please input number from 1 to #{maxpage}" 
+          display "Invalid Number! Please input number from 1 to #{maxpage}".red 
           pageNum =nil
           next
         else
@@ -86,11 +86,11 @@ module PI::Cli::Command
       loop{       
         appname = ask "Application Name" unless appname
         if not check_name_valid?(appname)
-          display "Invalid application name '#{appname}'." 
+          display "Invalid application name '#{appname}'.".red 
           appname =nil
           next
         else if app_exists?(target, appname) 
-          display "Application '#{appname}' already exists." 
+          display "Application '#{appname}' already exists.".red 
           appname =nil 
           next 
         else         
@@ -148,11 +148,11 @@ module PI::Cli::Command
       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!" 
+          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}" 
+          display "Invalid Number! Please input number from 1 to #{max_instance}".red 
           instances =nil 
           next       
         else
@@ -163,16 +163,8 @@ module PI::Cli::Command
       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
-      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")
               
@@ -189,8 +181,6 @@ module PI::Cli::Command
         :tag               => tag,
         :isDebug           => isDebug,
         :action_for_change => action_for_change,
-        :graceful          => graceful,
-        :lazy              => lazy,
         :needMonitor       => needMonitor
         }
      
@@ -250,7 +240,7 @@ module PI::Cli::Command
       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"     
+        # 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|
@@ -275,7 +265,7 @@ module PI::Cli::Command
     
     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)   
       target_memory = client.target_memory(app[:targetName])
@@ -285,11 +275,11 @@ module PI::Cli::Command
       loop{        
         instance = ask "Current instance: #{app[:instances]}, Instance number" unless instance
         if not instance.to_s =~ /^[1-9]\d*$/
-          display "Invalid Number!" 
+          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}" 
+          display "Invalid Number! Please input number from 1 to #{max_instance}".red 
           instance =nil 
           next
         else
@@ -297,8 +287,8 @@ module PI::Cli::Command
         end
         end
         } 
-      err "Don't need scale application" if instance == app[:instances].to_s
-      graceful = get_graceful(app)    
+      err "Don't need scale application" if instance.to_s == app[:instances].to_s
+      # graceful = get_graceful(app)    
       display "Scaling application: ",false
       
       t = Thread.new do     
@@ -309,7 +299,7 @@ module PI::Cli::Command
       end
       end
       
-      tmp = client.scale_app(appid, instance, graceful)
+      tmp = client.scale_app(appid, instance)
       uuid = tmp[1]
       result = check_status(uuid)
       Thread.kill(t)   
@@ -323,18 +313,25 @@ module PI::Cli::Command
       if app[:deployType] == "git"        
         tags = client.project_tags(app[:projectId])
         err "No tags!" if tags.nil? || tags.empty?
-        tag = ask "Select Tag", :choices => tags, :indexed => true unless tag
+        if tag
+          err "Invalid tag" unless tags.include?(tag)
+        else
+          tag = ask "Select Tag", :choices => tags, :indexed => true
+        end
         err "Don't need update application!" if tag == app[:tag]
-        display "Selected tag: ",false
-        display "#{tag}"
       else    
         tags = client.project_binary(app[:projectId])
         err "No version!" if tags.nil? || tags.empty?
-        tag = ask "Select Version", :choices => tags.collect { |b| b[:versionName] }, :indexed => true unless tag
+        if tag
+          tags = tags.collect { |b| b[:versionName] }
+          err "Invalid version" unless tags.include?(tag)
+        else
+          tag = ask "Select Version", :choices => tags.collect { |b| b[:versionName] }, :indexed => true
+        end
         err "Don't need update application!" if tag == app[:tag]     
       end
       graceful = get_graceful(app)
-      lazy = get_lazy(app)
+      # lazy = get_lazy(app)
       display "Updating application: ",false
       
       t = Thread.new do     
@@ -345,7 +342,7 @@ module PI::Cli::Command
       end
       end
       
-      tmp = client.update_app(appid,tag,graceful,lazy) 
+      tmp = client.update_app(appid,tag,graceful) 
       uuid = tmp[1]
       result = check_status(uuid)
       Thread.kill(t)      
@@ -394,11 +391,10 @@ module PI::Cli::Command
       loop{        
         name = ask "Environment Name" unless name
         if not check_envname_valid?(name)
-          #display "Invalid environment name '#{name}'." 
           name =nil 
           next
         else if env_exists?(appid,name)
-          display "Environment '#{name}' already exists." 
+          display "Environment '#{name}' already exists.".red 
           name =nil 
           next 
         else
@@ -409,7 +405,7 @@ module PI::Cli::Command
       loop{
         value = ask "Environment Value" unless value
         if not check_envvalue_valid?(value)
-          display "Invalid environment value '#{value}'." 
+          display "Invalid environment value '#{value}'.".red 
           value =nil
           next
         else
@@ -501,7 +497,7 @@ module PI::Cli::Command
    
     def app_exists?(target, appname)
       app = client.app_search(target,appname)
-      app[:id] != 0 ? true : false
+      app.nil? ? false : true 
     end
     
     def env_exists?(appid, envname)
@@ -533,7 +529,7 @@ module PI::Cli::Command
     
     def do_restart_app(app, appid)   
       graceful = get_graceful(app)
-      lazy = get_lazy(app)
+      # lazy = get_lazy(app)
       display "Restart application '#{app[:name]}'(target:#{app[:targetName]}): ",false
       t = Thread.new do
         loop do
@@ -542,7 +538,7 @@ module PI::Cli::Command
           break unless t.alive?
         end
       end
-      tmp = client.restart_app(appid, graceful,lazy)
+      tmp = client.restart_app(appid, graceful)
       uuid = tmp[1]
       result = check_status(uuid)
       Thread.kill(t)

data/lib/cli/commands/dns.rb

@@ -27,13 +27,18 @@ module PI::Cli::Command
     def map_dns(appid_or_appname=nil)
       client.check_login_status
       dnsname = @options[:dns]
+      if dnsname
+        dns_list = client.dns
+        dnsnames = dns_list.collect { |d| d[:name] }
+        err "Invalid dns name" unless dnsnames.include?(dnsname)
+      end
       app, appid = choose_app_help_target_not_all(appid_or_appname)
       appid = (appid == nil ? app[:id] : appid)
       dns = client.usable_dns(appid)
       err "No usable dns!" if dns.nil? || dns.empty?
-      if dnsname
-        dnsnames = dns.collect { |d| d[:name] }
-        err "Invalid dns name" unless dnsnames.include?(dnsname)
+      if dnsname        
+        usable_dnsnames = dns.collect { |d| d[:name] }
+        err "Invalid dns name" unless usable_dnsnames.include?(dnsname)        
         tmp = dnsname.split(",")
         manifest = Array.new
         tmp.each do |t|
@@ -183,7 +188,15 @@ module PI::Cli::Command
       client.check_login_status
       target = @options[:target]
       continent = @options[:continent]
+      if continent
+        continents = client.dns_continents
+        err "Invalid continent" unless continents.has_key?(continent.to_sym)
+      end
       country = @options[:country]
+      if country && continent
+        countries = client.dns_country(continent)
+        err "Invalid country" unless countries.has_key?(country.to_sym)
+      end
       unless dnsid
         dnsid = choose_dnsid
       end
@@ -193,24 +206,35 @@ module PI::Cli::Command
       end
       unless continent
         continents = client.dns_continents
+        err "No continents" if continents.nil? || continents.empty?
         tmp = continents.values
         tmp.sort! {|a, b| a <=> b }
         continent = ask"Select continent", :choices => tmp.collect { |t| t }, :indexed => true
         display "Select continent: #{continent}"
         continent = continents.invert["#{continent}"]
       end
-      unless country
-        countries = client.dns_country(continent)
-        tmp = countries.values
-        tmp.sort! {|a, b| a <=> b }
-        country = ask"Select country", :choices => tmp.collect { |t| t }, :indexed => true
-        display "Select country: #{country}"
-        country = countries.invert["#{country}"]
-      end
-      manifest = {
-        :continentName => continent,
+      if continent.to_s == "DEFAULT" 
+        manifest = {
+        # :continentName => continent,
+        :continentCode => continent,
+        :countryCode   => "DEFAULT"
+      }
+      else
+        unless country
+          countries = client.dns_country(continent)
+          err "No countries" if countries.nil? || countries.empty?
+          tmp = countries.values
+          tmp.sort! {|a, b| a <=> b }
+          country = ask"Select country", :choices => tmp.collect { |t| t }, :indexed => true
+          display "Select country: #{country}"
+          country = countries.invert["#{country}"]
+        end
+        manifest = {
+        # :continentName => continent,
+        :continentCode => continent,
         :countryCode   => country
       }
+      end     
       client.register_dns(dnsid, target, manifest)
       display "OK".green
     end

data/lib/cli/commands/projects.rb

@@ -95,7 +95,7 @@ module PI::Cli::Command
        
       github_info = client.github_info
       
-      if github_info[:name].empty?      
+      if github_info.nil?      
         manifest = {
         :name => "#{project}",
         :runtime     => "#{runtime}",
@@ -327,7 +327,7 @@ module PI::Cli::Command
     
     def project_exists?(projectname)
       project  = client.project_search(projectname)
-      project[:id] != 0 ? true : false
+      project.nil? ? false : true 
     end
         
     

data/lib/cli/commands/services.rb

@@ -39,8 +39,8 @@ module PI::Cli::Command
       else
         manifest = asks "Select services, indexed list?", :choices => services.collect { |s| s[:name] }, :indexed => true
       end
-      graceful = get_graceful(app) 
-      lazy = get_lazy(app) 
+      # graceful = get_graceful(app) 
+      # lazy = get_lazy(app) 
       display "Binding service: ",false
       
       t = Thread.new do     
@@ -51,7 +51,7 @@ module PI::Cli::Command
       end
       end
       
-      tmp = client.bind_service(appid, graceful, lazy, manifest)
+      tmp = client.bind_service(appid, manifest)
       uuid = tmp[1]
       result = check_status(uuid)
       Thread.kill(t)
@@ -69,10 +69,10 @@ module PI::Cli::Command
       else
         services = asks "Select Service", :choices => services.collect { |s| s[:name] }, :indexed => true
       end
-      graceful = get_graceful(app) 
-      lazy = get_lazy(app) 
+      # graceful = get_graceful(app) 
+      # lazy = get_lazy(app) 
       services.each do |service|
-        do_unbind_service(app, service, graceful, lazy)
+        do_unbind_service(app, service)
       end  
     end
     
@@ -213,7 +213,7 @@ module PI::Cli::Command
     
     private
     
-    def do_unbind_service(app, service, graceful, lazy)
+    def do_unbind_service(app, service)
       display "Unbinding service '#{service}': ",false     
       t = Thread.new do     
       loop do
@@ -222,7 +222,7 @@ module PI::Cli::Command
         break unless t.alive?
       end
       end      
-      tmp = client.unbind_service(app[:id], service, graceful, lazy)
+      tmp = client.unbind_service(app[:id], service)
       uuid = tmp[1]
       result = check_status(uuid)
       Thread.kill(t)