pi 0.1.26 → 0.1.27

data/lib/cli/commands/dns.rb

@@ -32,6 +32,8 @@ module PI::Cli::Command
       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)
         tmp = dnsname.split(",")
         manifest = Array.new
         tmp.each do |t|
@@ -39,11 +41,11 @@ module PI::Cli::Command
         end
       else
         manifest = asks "Select dns, indexed list?", :choices => dns.collect { |d| d[:name] }, :indexed => true
-        display "Selected dns: ",false
-        manifest.each do |m|
-          display "#{m} ",false
-        end
-        display "\n"
+        #display "Selected dns: ",false
+        #manifest.each do |m|
+          #display "#{m} ",false
+        #end
+        #display "\n"
       end      
       display "Mapping dns: ",false
       
@@ -71,11 +73,6 @@ module PI::Cli::Command
         urls = dnsname.split(",")
       else
         urls = asks "Select DNS", :choices => dns, :indexed => true
-        display "Selected DNS: ",false
-        urls.each do |m|
-          display "#{m} ",false
-        end
-        display "\n"
       end
       
       urls.each do |url|
@@ -84,6 +81,7 @@ module PI::Cli::Command
     end
     
     def dns
+      client.check_login_status
       dns = client.dns
       return display "No Services" if dns.nil? || dns.empty?        
       return display JSON.pretty_generate(dns) if @options[:json]
@@ -98,6 +96,7 @@ module PI::Cli::Command
     end
     
     def zones
+      client.check_login_status
       zones = client.dns_zone_list
       return display JSON.pretty_generate(zones) if @options[:json]
       return display "No DNS!" if zones.nil? || zones.empty?
@@ -111,9 +110,15 @@ module PI::Cli::Command
     end
        
     def create_dns(dnsname=nil)
+      client.check_login_status
       projectid = @options[:projectid]
       description = @options[:desc]
       zoneid = @options[:zoneid]
+      if dnsname              
+        if not check_name_valid?(dnsname)
+          err "Invalid dns name '#{dnsname}'." 
+        end
+      end
       dns_zone = client.dns_zone_list
       err"No dns zone" if dns_zone.nil? || dns_zone.empty?
       if zoneid
@@ -123,6 +128,7 @@ module PI::Cli::Command
         end
         err"The dns zone id is not exist!" if zoneid_flag != true
       end
+      
       projects = client.projects             
       projectname = ask"Project name", :choices => projects.collect { |p| p[:name] }, :indexed => true  unless projectid 
       projects.each do |p|
@@ -165,6 +171,7 @@ module PI::Cli::Command
     end
     
     def delete_dns(dnsid=nil)
+      client.check_login_status
       unless dnsid
         dnsid = choose_dnsid
       end
@@ -173,23 +180,33 @@ module PI::Cli::Command
     end
     
     def register_dns(dnsid=nil)
+      client.check_login_status
+      target = @options[:target]
+      continent = @options[:continent]
+      country = @options[:country]
       unless dnsid
         dnsid = choose_dnsid
       end
-      targets = client.usable_dns_target(dnsid)
-      target = ask"Select target", :choices => targets.collect { |t| t[:targetName] }, :indexed => true
-      continents = client.dns_continents
-      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}"]
-      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}"]
+      unless target
+        targets = client.usable_dns_target(dnsid)
+        target = ask"Select target", :choices => targets.collect { |t| t[:targetName] }, :indexed => true
+      end
+      unless continent
+        continents = client.dns_continents
+        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,
         :countryCode   => country
@@ -199,24 +216,25 @@ module PI::Cli::Command
     end
     
     def deregister_dns(dnsid=nil)
+      client.check_login_status
+      recordid = @options[:recordid]
       unless dnsid
         dnsid = choose_dnsid
       end
-
-      targets = client.usable_dns_target(dnsid)
-      target = ask"Select target", :choices => targets.collect { |t| t[:targetName] }, :indexed => true
-      choices = Array.new
-      record = Array.new
-      targets.each do |t|
-        record = t[:records] if t[:targetName] == target
-      end
-      err"No record" if record.nil? || record.empty?
-      view = ask"Select record", :choices => record.collect { |t| t[:view] }, :indexed => true        
-      recordid = nil
-      record.each do |r|
-        recordid = r[:id] if r[:view] == view
+      unless recordid
+        targets = client.usable_dns_target(dnsid)
+        target = ask"Select target", :choices => targets.collect { |t| t[:targetName] }, :indexed => true
+        record = Array.new
+        targets.each do |t|
+          record = t[:records] if t[:targetName] == target
+        end
+        err"No record" if record.nil? || record.empty?
+        view = ask"Select record", :choices => record.collect { |t| t[:view] }, :indexed => true
+        recordid = nil
+        record.each do |r|
+          recordid = r[:id] if r[:view] == view
+        end
       end
-
       client.deregister_dns(recordid)
       display "OK".green
     end

data/lib/cli/commands/misc.rb

@@ -18,7 +18,6 @@ module PI::Cli::Command
       end
       target_url = target_url.gsub(/\/+$/, '')
       client = PI::Client.new(target_url)
-      # PI::Cli::Config.store_target(target_url)
     end
 
   end

data/lib/cli/commands/projects.rb

@@ -176,18 +176,18 @@ module PI::Cli::Command
       java_projects.sort! {|a, b| a[:name] <=> b[:name] }
       if projectid
         flag = nil
-        java_projects.each do |j|      
-          flag = true if projectid == j[:id]
+        java_projects.each do |j|  
+          flag = true if projectid == j[:id].to_s
         end
-        err "The project is not found or not a java project! " unless flag
+        err "The project is not found or not a java project! " unless flag 
       else    
         project = ask "Select Project", :choices => java_projects.collect { |j| j[:name] }, :indexed => true
         display "Selected Project: ",false
         display "#{project}"
+        project = client.project_search(project)
+        projectid = project[:id]
       end
-      project = client.project_search(project)
-      projectid = project[:id]
-      
+            
       if version
         tmp = client.project_binary_existed(projectid, version)       
         err "Version '#{version}' already exists." if tmp.include?("true")

data/lib/cli/commands/services.rb

@@ -29,6 +29,8 @@ module PI::Cli::Command
       err "No usable services!" if services.nil? || services.empty?
       
       if service
+        servicenames = services.collect { |s| s[:name] }
+        err "Invalid service name" unless servicenames.include?(service)
         tmp = service.split(",")
         manifest = Array.new
         tmp.each do |s|
@@ -36,13 +38,9 @@ module PI::Cli::Command
         end
       else
         manifest = asks "Select services, indexed list?", :choices => services.collect { |s| s[:name] }, :indexed => true
-        display "Selected services: ",false
-        manifest.each do |m|
-          display "#{m} ",false
-        end
-        display "\n"
       end
-        
+      graceful = get_graceful(app) 
+      lazy = get_lazy(app) 
       display "Binding service: ",false
       
       t = Thread.new do     
@@ -53,18 +51,10 @@ module PI::Cli::Command
       end
       end
       
-      client.bind_service(appid,manifest)
-      result = check_status(app[:targetName], app[:name], "bindservice")
+      tmp = client.bind_service(appid, graceful, lazy, 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 unbind_service(appid_or_appname=nil)
@@ -78,19 +68,16 @@ module PI::Cli::Command
         services = service.split(",")
       else
         services = asks "Select Service", :choices => services.collect { |s| s[:name] }, :indexed => true
-        display "Selected DNS: ",false
-        services.each do |m|
-          display "#{m} ",false
-        end
-        display "\n"
       end
-      
+      graceful = get_graceful(app) 
+      lazy = get_lazy(app) 
       services.each do |service|
-        do_unbind_service(app, service)
+        do_unbind_service(app, service, graceful, lazy)
       end  
     end
     
     def services
+      client.check_login_status
       services = client.services
       return display "No Services" if services.nil? || services.empty?        
       return display JSON.pretty_generate(services) if @options[:json]
@@ -105,6 +92,7 @@ module PI::Cli::Command
     end
     
     def service(serviceid=nil)     
+      client.check_login_status
       if serviceid
         services = client.services
         err "No services" if services.nil? || services.empty?        
@@ -123,20 +111,24 @@ module PI::Cli::Command
     end
     
     def import_service(importurl=nil)
+      client.check_login_status
       importurl = ask"Input the url to import" unless importurl
       client.import_service(importurl) 
       display"OK".green     
     end
     
     def export_service(serviceid=nil)
+      client.check_login_status
       unless serviceid
         serviceid = choose_serviceid
       end
-      serviceurl = client.export_service(serviceid)   
+      serviceurl = client.export_service(serviceid) 
+      display "The exported URL of service:"  
       display "#{serviceurl[1]}"   
     end
     
     def check_service(serviceid=nil)
+      client.check_login_status
       unless serviceid
         serviceid = choose_serviceid
       end
@@ -149,6 +141,7 @@ module PI::Cli::Command
     end
     
     def delete_service(serviceid=nil)
+      client.check_login_status
       unless serviceid
         serviceid = choose_serviceid
       end
@@ -157,6 +150,7 @@ module PI::Cli::Command
     end
     
     def register_service(serviceid=nil)
+      client.check_login_status
       target = @options[:target]
       servicetype = @options[:type]
       if servicetype
@@ -198,6 +192,7 @@ module PI::Cli::Command
     end
     
     def deregister_service(serviceid=nil)
+      client.check_login_status
       servicetargetname = @options[:target]
       unless serviceid
         serviceid = choose_serviceid
@@ -218,7 +213,7 @@ module PI::Cli::Command
     
     private
     
-    def do_unbind_service(app, service)
+    def do_unbind_service(app, service, graceful, lazy)
       display "Unbinding service '#{service}': ",false     
       t = Thread.new do     
       loop do
@@ -227,18 +222,10 @@ module PI::Cli::Command
         break unless t.alive?
       end
       end      
-      client.unbind_service(app[:id], service)
-      result = check_status(app[:targetName], app[:name], "unbindservice")
+      tmp = client.unbind_service(app[:id], service, graceful, lazy)
+      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
     
   end

data/lib/cli/commands/user.rb

@@ -20,14 +20,14 @@ module PI::Cli::Command
       url = "#{target_url}" if url.nil? || url.empty?
       eval("PI::Cli::Command::Misc").new().send("set_target", url)
       unless client.target_valid?        
-        display "Host is not available or is not valid: '#{target_url}'".red
-        display "\n<<<\n#{client.raw_info}\n>>>\n"             
+        display "Host is not available or is not valid: '#{url}'".red
+        display "\n<<<\n#{client.raw_info}\n>>>\n"                   
         exit(false)    
       end
          
       tries ||= 0
       user = ask "User" unless user
-      password = ask "Password", :echo => '*' unless password
+      password = ask "Password", :echo => '*' unless password      
       login_and_save_token(user, password)
       say "Successfully logged into [#{target_url}]".green
     rescue PI::Client::TargetError

data/lib/cli/runner.rb

@@ -25,7 +25,7 @@ class PI::Cli::Runner
     opts_parser = OptionParser.new do |opts|
       opts.banner = "\nAvailable options:\n\n"
       
-      opts.on('--url URL')         { |url|      @options[:url] = url }
+      # opts.on('--url URL')         { |url|      @options[:url] = url }
       opts.on('--user USER')       { |user|     @options[:user] = user }
       opts.on('--password PASS')   { |pass|     @options[:password] = pass }
       opts.on('--name NAME')       { |name|     @options[:name] = name }
@@ -41,9 +41,13 @@ class PI::Cli::Runner
       opts.on('--service SERVICE') { |service|  @options[:service] = service }
       opts.on('--dns DNS')         { |dns|      @options[:dns] = dns }
       opts.on('--zoneid ID')       { |id|       @options[:zoneid] = id }
-      # opts.on('--continent CONT')  { |cont|     @options[:continent] = cont }
-      # opts.on('--country COUNTRY') { |country|  @options[:country] = country }
-      # opts.on('--recordid ID')     { |id|       @options[:recordid] = id }
+      opts.on('--instanceid N')    { |inst|     @options[:instanceid] = inst }
+      opts.on('--file FILE')       { |file|     @options[:file] = file }
+      opts.on('--continent CONT')  { |cont|     @options[:continent] = cont }
+      opts.on('--country COUNTRY') { |country|  @options[:country] = country }
+      opts.on('--recordid ID')     { |id|       @options[:recordid] = id }
+      opts.on('--graceful')        {            @options[:graceful] = true }
+      opts.on('--lazy')            {            @options[:lazy] = true }
       # generic tracing and debugging
       opts.on('-t [TKEY]')         { |tkey|     @options[:trace] = tkey || true }
       opts.on('--trace [TKEY]')    { |tkey|     @options[:trace] = tkey || true }
@@ -96,8 +100,8 @@ class PI::Cli::Runner
     return if @namespace && @action
     
      # @help_only = false
-    
-    verb = @args.shift
+     
+    verb = @args.shift   
     case verb
       
     ###############################################################################
@@ -230,19 +234,19 @@ class PI::Cli::Runner
       set_cmd(:apps, :start_app, @args.size == 1 ? 1 : 0) 
       
     when 'stop-app'     
-      usage('pi stop-app [appid] or pi stop-app <appname> <--target TARGET>')
+      usage('pi stop-app [appid] [--graceful] or pi stop-app <appname> <--target TARGET> [--graceful]')
       set_cmd(:apps, :stop_app, @args.size == 1 ? 1 : 0)
       
     when 'restart-app'     
-      usage('pi restart-app [appid] or pi restart-app <appname> <--target TARGET>')
+      usage('pi restart-app [appid] [--graceful] [--lazy] or pi restart-app <appname> <--target TARGET> [--graceful] [--lazy]')
       set_cmd(:apps, :restart_app, @args.size == 1 ? 1 : 0)
       
     when 'scale-app'     
-      usage('pi scale-app [appid] [--instance N] or pi scale-app <appname> <--target TARGET> [--instance N]')
+      usage('pi scale-app [appid] [--instance N] [--graceful] or pi scale-app <appname> <--target TARGET> [--instance N] [--graceful]')
       set_cmd(:apps, :scale_app, @args.size == 1 ? 1 : 0)
       
     when 'update-app'     
-      usage('pi update-app [appid] [--ver VERSION] or pi update-app <appname> <--target TARGET> [--ver VERSION]')
+      usage('pi update-app [appid] [--ver VERSION] [--graceful] [--lazy] or pi update-app <appname> <--target TARGET> [--ver VERSION][--graceful] [--lazy]')
       set_cmd(:apps, :update_app, @args.size == 1 ? 1 : 0)
       
     when 'status'     
@@ -262,8 +266,12 @@ class PI::Cli::Runner
       set_cmd(:apps, :delete_env, @args.size == 1 ? 1 : 0)
       
     when 'app-log'     
-      usage('pi app-log [appid] or pi app-log <appname> <--target TARGET>')
+      usage('pi app-log [appid] [--instanceid,--file] or pi app-log <appname> <--target TARGET> [--instanceid,--file]')
       set_cmd(:apps, :app_log, @args.size == 1 ? 1 : 0)
+      
+    when 'app-debug'     
+      usage('pi app-debug [appid] or pi app-log <appname> <--target TARGET>')
+      set_cmd(:apps, :app_debug, @args.size == 1 ? 1 : 0)
            
     ###############################################################################
     # Services
@@ -274,11 +282,11 @@ class PI::Cli::Runner
       set_cmd(:services, :app_service, @args.size == 1 ? 1 : 0) 
       
     when 'bind-service'     
-      usage('pi bind-service [appid] [--service SERVICE] or pi bind-service <appname> <--target TARGET> [--service SERVICE]')
+      usage('pi bind-service [appid] [--service SERVICE] [--graceful] [--lazy] or pi bind-service <appname> <--target TARGET> [--service SERVICE] [--graceful] [--lazy]')
       set_cmd(:services, :bind_service, @args.size == 1 ? 1 : 0)
       
     when 'unbind-service'     
-      usage('pi unbind-service [appid] [--service SERVICE] or pi unbind-service <appname> <--target TARGET> [--service SERVICE]')
+      usage('pi unbind-service [appid] [--service SERVICE] [--graceful] [--lazy] or pi unbind-service <appname> <--target TARGET> [--service SERVICE] [--graceful] [--lazy]')
       set_cmd(:services, :unbind_service, @args.size == 1 ? 1 : 0)
       
     when 'services'     
@@ -346,11 +354,11 @@ class PI::Cli::Runner
       set_cmd(:dns, :delete_dns, @args.size == 1 ? 1 : 0)  
       
     when 'register-dns'     
-      usage('pi register-dns [dnsid]')
+      usage('pi register-dns [dnsid] [--target,--continent,--country]')
       set_cmd(:dns, :register_dns, @args.size == 1 ? 1 : 0) 
       
     when 'deregister-dns'     
-      usage('pi deregister-dns [dnsid]')
+      usage('pi deregister-dns [dnsid] [--recordid ID]')
       set_cmd(:dns, :deregister_dns, @args.size == 1 ? 1 : 0)      
          
     ############################################################################### 
@@ -409,11 +417,20 @@ class PI::Cli::Runner
     end
 
   rescue OptionParser::InvalidOption => e
+    puts(e.message.red)
+    puts("\n")
+    puts(basic_usage)
+    @exit_status = false
   rescue OptionParser::AmbiguousOption => e
     puts(e.message.red)
     puts("\n")
     puts(basic_usage)
     @exit_status = false
+  rescue OptionParser::MissingArgument => e
+    puts(e.message.red)
+    puts("\n")
+    puts(basic_usage)
+    @exit_status = false
   rescue PI::Client::AuthError => e
     if PI::Cli::Config.auth_token.nil?
       puts "Login Required".red