pi 0.1.33 → 0.1.34

data/lib/cli/runner.rb

@@ -24,7 +24,7 @@ class PI::Cli::Runner
   def parse_options!
     opts_parser = OptionParser.new do |opts|
       opts.banner = "\nAvailable options:\n\n"
-      
+
       # opts.on('--url URL')         { |url|      @options[:url] = url }
       opts.on('--user USER')       { |user|     @options[:user] = user }
       opts.on('--password PASS')   { |pass|     @options[:password] = pass }
@@ -63,7 +63,7 @@ class PI::Cli::Runner
     @args.concat instances_delta_arg
     self
   end
-   
+
   def check_instances_delta!
     return unless @args
     instance_args = @args.select { |arg| /^[-]\d+$/ =~ arg } || []
@@ -88,7 +88,7 @@ class PI::Cli::Runner
     else
       @exit_status = false
       if @args.size > args_range.last
-        usage_error("Invalid arguments for [#{action}]") 
+        usage_error("Invalid arguments for [#{action}]")
         # usage_error("Too many arguments for [#{action}]: %s" % [ @args[args_range.last..-1].map{|a| "'#{a}'"}.join(', ') ])
       else
         usage_error("Not enough arguments for [#{action}]")
@@ -99,44 +99,44 @@ class PI::Cli::Runner
   def parse_command!
     # just return if already set, happends with -v, -h
     return if @namespace && @action
-    
+
      # @help_only = false
-     
-    verb = @args.shift   
+
+    verb = @args.shift
     case verb
-      
+
     ###############################################################################
     # Users
     ###############################################################################
-    
+
     when 'login'
-      usage('pi login [url] [--user USER] [--password PASS]')
+      usage('pi login [env] [--user USER] [--password PASS]')
       if @args.size == 1
         set_cmd(:user, :login, 1)
       else
         set_cmd(:user, :login)
       end
-      
+
     when 'logout'
       usage('pi logout')
       set_cmd(:user, :logout)
-      
+
     when 'info'
       usage ('pi info')
       set_cmd(:user, :info)
-      
+
     when 'user'
       usage ('pi user')
       set_cmd(:user, :user)
-      
+
     when 'targets'
       usage ('pi targets')
       set_cmd(:user, :targets)
-      
+
     when 'password'
       usage ('pi password [oldpassword] [--password PASS]')
       set_cmd(:user, :password, @args.size == 1 ? 1 : 0)
-      
+
     when 'github'
       usage ('pi github [name] [--email EMAIL] [--password PASS]')
       if @args.size == 1
@@ -144,7 +144,7 @@ class PI::Cli::Runner
       else
         set_cmd(:user, :github)
       end
-      
+
     when 'runtimes'
       usage('pi runtimes')
       set_cmd(:user, :runtimes)
@@ -152,44 +152,44 @@ class PI::Cli::Runner
     when 'frameworks'
       usage('pi frameworks')
       set_cmd(:user, :frameworks)
-      
+
     when 'version', 'v'
       usage('pi version')
       set_cmd(:misc, :version)
-      
+
     when 'help'
-      if @args.size == 0 
+      if @args.size == 0
         display_help
 #        break
       else if @args == ["help"] && @args.size == 1
         usage('pi help [command]')
       else
-        @help_only = true        
-        parse_command!   
+        @help_only = true
+        parse_command!
       end
       end
-      
-      
+
+
     when 'options'
       @args = @args.unshift('--options')
       parse_options!
-    
+
     ###############################################################################
     # Projects
     ###############################################################################
-    
+
     when 'projects'
       usage('pi projects')
       set_cmd(:projects, :projects)
-      
+
     when 'create-project'
       usage('pi create-project [project]')
       set_cmd(:projects, :create_project, @args.size == 1 ? 1 : 0)
-  
+
     when 'delete-project'
       usage('pi delete-project [projectid]')
-      set_cmd(:projects, :delete_project, @args.size == 1 ? 1 : 0) 
-      
+      set_cmd(:projects, :delete_project, @args.size == 1 ? 1 : 0)
+
     when 'upload'
       usage('pi upload [projectid] [--path PATH] [--ver VERSION] [--desc DESC]')
       if @args.size == 1
@@ -197,177 +197,177 @@ class PI::Cli::Runner
       else
         set_cmd(:projects, :upload)
       end
-      
+
     when 'delete-binary'
       usage('pi delete-binary [project]')
       set_cmd(:projects, :delete_binary, @args.size == 1 ? 1 : 0)
-      
-    when 'project-events' 
+
+    when 'project-events'
       usage('pi project-events [projectid]')
-      set_cmd(:projects, :project_events, @args.size == 1 ? 1 : 0) 
-        
+      set_cmd(:projects, :project_events, @args.size == 1 ? 1 : 0)
+
     when 'project-tags'
       usage('pi project-tags [projectid]')
-      set_cmd(:projects, :project_tags, @args.size == 1 ? 1 : 0) 
-    
+      set_cmd(:projects, :project_tags, @args.size == 1 ? 1 : 0)
+
     when 'project-commits'
       usage('pi project-commits [projectid]')
-      set_cmd(:projects, :project_commits, @args.size == 1 ? 1 : 0) 
-      
+      set_cmd(:projects, :project_commits, @args.size == 1 ? 1 : 0)
+
     ###############################################################################
     # Applications
     ###############################################################################
-    
+
     when 'apps'
       usage('pi apps [--projectid ID] [--target TARG]')
-      set_cmd(:apps, :apps)  
-      
+      set_cmd(:apps, :apps)
+
     when 'create-app'
       usage('pi create-app [appname]')
-      set_cmd(:apps, :create_app, @args.size == 1 ? 1 : 0) 
-      
-    when 'delete-app'     
+      set_cmd(:apps, :create_app, @args.size == 1 ? 1 : 0)
+
+    when 'delete-app'
       usage('pi delete-app [appid] or pi delete-app <appname> <--target TARGET>')
-      set_cmd(:apps, :delete_app, @args.size == 1 ? 1 : 0) 
-      
-    when 'start-app'     
+      set_cmd(:apps, :delete_app, @args.size == 1 ? 1 : 0)
+
+    when 'start-app'
       usage('pi start-app [appid] or pi start-app <appname> <--target TARGET>')
-      set_cmd(:apps, :start_app, @args.size == 1 ? 1 : 0) 
-      
-    when 'stop-app'     
+      set_cmd(:apps, :start_app, @args.size == 1 ? 1 : 0)
+
+    when 'stop-app'
       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'     
+
+    when 'restart-app'
       usage('pi restart-app [appid] [--graceful] or pi restart-app <appname> <--target TARGET> [--graceful]')
       set_cmd(:apps, :restart_app, @args.size == 1 ? 1 : 0)
-      
-    when 'scale-app'     
+
+    when 'scale-app'
       usage('pi scale-app [appid] [--instance N] or pi scale-app <appname> <--target TARGET> [--instance N]')
       set_cmd(:apps, :scale_app, @args.size == 1 ? 1 : 0)
-      
-    when 'update-app'     
+
+    when 'update-app'
       usage('pi update-app [appid] [--ver VERSION] [--graceful] or pi update-app <appname> <--target TARGET> [--ver VERSION][--graceful] ')
       set_cmd(:apps, :update_app, @args.size == 1 ? 1 : 0)
-      
-    when 'status'     
+
+    when 'status'
       usage('pi status-app [appid] or pi status-app <appname> <--target TARGET>')
       set_cmd(:apps, :status, @args.size == 1 ? 1 : 0)
-      
-    when 'app-env'     
+
+    when 'app-env'
       usage('pi start-app [appid] or pi start-app <appname> <--target TARGET>')
       set_cmd(:apps, :app_env, @args.size == 1 ? 1 : 0)
-      
-    when 'create-env'     
+
+    when 'create-env'
       usage('pi app-env [appid][--name,--value] or pi app-env <appname> <--target TARGET> [--name,--value]')
       set_cmd(:apps, :create_env, @args.size == 1 ? 1 : 0)
-      
-    when 'delete-env'     
+
+    when 'delete-env'
       usage('pi delete-env [appid] [--name NAME] or pi delete-env <appname> <--target TARGET> [--name NAME]')
       set_cmd(:apps, :delete_env, @args.size == 1 ? 1 : 0)
-      
-    when 'app-log'     
+
+    when 'app-log'
       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'     
+
+    # 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
     ###############################################################################
-      
-    when 'app-service'     
+
+    when 'app-service'
       usage('pi app-service [appid] or pi app-service <appname> <--target TARGET>')
-      set_cmd(:services, :app_service, @args.size == 1 ? 1 : 0) 
-      
-    when 'bind-service'     
+      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]')
       set_cmd(:services, :bind_service, @args.size == 1 ? 1 : 0)
-      
-    when 'unbind-service'     
+
+    when 'unbind-service'
       usage('pi unbind-service [appid] [--service SERVICE] or pi unbind-service <appname> <--target TARGET> [--service SERVICE]')
       set_cmd(:services, :unbind_service, @args.size == 1 ? 1 : 0)
-      
-    when 'services'     
+
+    when 'services'
       usage('pi services')
       set_cmd(:services, :services)
-      
-    when 'service'     
+
+    when 'service'
       usage('pi service [serviceid]')
       set_cmd(:services, :service, @args.size == 1 ? 1 : 0)
-      
-    when 'import-service'     
+
+    when 'import-service'
       usage('pi import-service [url]')
       set_cmd(:services, :import_service, @args.size == 1 ? 1 : 0)
-      
-    when 'export-service'     
+
+    when 'export-service'
       usage('pi export-service [serviceid]')
-      set_cmd(:services, :export_service, @args.size == 1 ? 1 : 0)      
-      
-    when 'check-service'     
+      set_cmd(:services, :export_service, @args.size == 1 ? 1 : 0)
+
+    when 'check-service'
       usage('pi check-service [serviceid]')
-      set_cmd(:services, :check_service, @args.size == 1 ? 1 : 0) 
-      
-    when 'register-service'     
+      set_cmd(:services, :check_service, @args.size == 1 ? 1 : 0)
+
+    when 'register-service'
       usage('pi register-service [serviceid] [--target TARGET]')
-      set_cmd(:services, :register_service, @args.size == 1 ? 1 : 0)  
-      
-    when 'deregister-service'     
+      set_cmd(:services, :register_service, @args.size == 1 ? 1 : 0)
+
+    when 'deregister-service'
       usage('pi deregister-service [serviceid] [--target TARGET]')
       set_cmd(:services, :deregister_service, @args.size == 1 ? 1 : 0)
-    
-    when 'delete-service'     
+
+    when 'delete-service'
       usage('pi delete-service [serviceid]')
-      set_cmd(:services, :delete_service, @args.size == 1 ? 1 : 0)  
-           
+      set_cmd(:services, :delete_service, @args.size == 1 ? 1 : 0)
+
     ###############################################################################
     # Dns
     ###############################################################################
-      
-    when 'app-dns'     
+
+    when 'app-dns'
       usage('pi app-dns [appid] or pi app-dns <appname> <--target TARGET>')
-      set_cmd(:dns, :app_dns, @args.size == 1 ? 1 : 0) 
-      
-    when 'map-dns'     
+      set_cmd(:dns, :app_dns, @args.size == 1 ? 1 : 0)
+
+    when 'map-dns'
       usage('pi map-dns [appid] [--dns DNS] or pi map-dns <appname> <--target TARGET> [--dns DNS]')
       set_cmd(:dns, :map_dns, @args.size == 1 ? 1 : 0)
-      
-    when 'unmap-dns'     
+
+    when 'unmap-dns'
       usage('pi unmap-dns [appid] [--dns DNS] or pi unmap-dns <appname> <--target TARGET> [--dns DNS]')
       set_cmd(:dns, :unmap_dns, @args.size == 1 ? 1 : 0)
-      
-    when 'dns'     
+
+    when 'dns'
       usage('pi dns')
       set_cmd(:dns, :dns)
-      
-    when 'zones'     
+
+    when 'zones'
       usage('pi zones')
       set_cmd(:dns, :zones)
-    
-    when 'create-dns'     
+
+    when 'create-dns'
       usage('pi create-dns [dnsname] [--zoneid ID] [--projectid ID] [--desc DESC]')
       set_cmd(:dns, :create_dns, @args.size == 1 ? 1 : 0)
-      
-    when 'delete-dns'     
+
+    when 'delete-dns'
       usage('pi delete-dns [dnsid]')
-      set_cmd(:dns, :delete_dns, @args.size == 1 ? 1 : 0)  
-      
-    when 'register-dns'     
+      set_cmd(:dns, :delete_dns, @args.size == 1 ? 1 : 0)
+
+    when 'register-dns'
       usage('pi register-dns [dnsid] [--target,--continent,--country]')
-      set_cmd(:dns, :register_dns, @args.size == 1 ? 1 : 0) 
-    
+      set_cmd(:dns, :register_dns, @args.size == 1 ? 1 : 0)
+
     when 'dns-records'
       usage('pi dns-records [dnsid]')
-      set_cmd(:dns, :dns_records, @args.size == 1 ? 1 : 0) 
-      
-    when 'deregister-dns'     
+      set_cmd(:dns, :dns_records, @args.size == 1 ? 1 : 0)
+
+    when 'deregister-dns'
       usage('pi deregister-dns [dnsid] [--recordid ID]')
-      set_cmd(:dns, :deregister_dns, @args.size == 1 ? 1 : 0)      
-         
-    ############################################################################### 
-           
+      set_cmd(:dns, :deregister_dns, @args.size == 1 ? 1 : 0)
+
+    ###############################################################################
+
     when 'usage'
       display basic_usage
       exit(true)
@@ -391,8 +391,8 @@ class PI::Cli::Runner
     @usage_error
   end
 
-  def run    
-        
+  def run
+
     trap('TERM') { print "\nTerminated\n"; exit(false)}
 
     parse_options!
@@ -407,7 +407,7 @@ class PI::Cli::Runner
     # set -o noglob
     # system('set -o noglob')
     # Kernel.exec('sudo set -o noglob')
-    # `set -o noglob`   
+    # `set -o noglob`
     parse_command!
     # system('set +o noglob')
     # set +o noglob
@@ -431,10 +431,10 @@ class PI::Cli::Runner
     puts("\n")
     puts(basic_usage)
     @exit_status = false
-  rescue OptionParser::MissingArgument => e 
+  rescue OptionParser::MissingArgument => e
     puts(e.message.red)
     puts("\n")
-    puts(basic_usage)       
+    puts(basic_usage)
     @exit_status = false
   rescue OptionParser::InvalidArgument => e
     puts(e.message.red)

data/lib/cli/usage.rb

@@ -25,7 +25,7 @@ class PI::Cli::Runner
 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
@@ -37,17 +37,17 @@ Currently available pi commands are:
     version                                                     Display version information
     help [command]                                              Get general help or help on a specific command
     help options                                                Get help on available options
-    
+
   Project
-    projects                                                    List created projects 
-    create-project [project]                                    Create a new project                
-    delete-project [projectid]                                  Delete the project             
+    projects                                                    List created projects
+    create-project [project]                                    Create a new 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 
+
+  Application
     apps [--projectid,--target]                                 List deployed applications
     create-app [appname]                                        Create a new application
     delete-app [appid]                                          Delete the application
@@ -75,7 +75,7 @@ Currently available pi commands are:
     delete-env <appname> <--target TARGET> [--name NAME]        Delete the environment for the application
     app-log [appid] [--instanceid,--file]                       List the logs for the application
     app-log <appname> <--target TARGET> [--instanceid,--file]   List the logs for the application
-    
+
   Service
     app-service [appid]                                         Display the binded services for the application
     app-service <appname> <--target TARGET>                     Display the binded services for the application
@@ -87,17 +87,17 @@ Currently available pi commands are:
     service [serviceid]                                         List the connection info for the service
     export-service [serviceid]                                  Export dedicated service url
     import-service [url]                                        Import dedicated service
-    check-service [serviceid]                                   Check availability for the service 
+    check-service [serviceid]                                   Check availability for the service
     delete-service [serviceid]                                  Delete the service
     register-service [serviceid] [--target TARGET]              Register to target
     deregister-service [serviceid] [--target TARGET]            Deregister to target
-    
+
   DNS
     app-dns [appid]                                             Display the mapped urls for the application
     app-dns <appname> <--target TARGET>                         Display the mapped urls for the application
     map-dns [appid] [--dns DNS]                                 Map the urls for the application
     map-dns <appname> <--target TARGET> [--dns DNS]             Map the urls for the application
-    unmap-dns [appid] [--dns DNS]                               Unmap the urls for the application                                      
+    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
     zones                                                       List the dns zones