pi 0.1.19 → 0.1.20

data/lib/cli/commands/user.rb

@@ -3,26 +3,21 @@ require 'set'
 module PI::Cli::Command
 
   class User < Base
-    
-    YES_SET = Set.new(["y", "Y", "yes", "YES"])
        
     def login(url=nil)
       unless url
-        url = ask("URL: '#{target_url}'? ") 
-        if YES_SET.member?(url)
+        url = ask "Attempting login to '#{target_url}'?", :default => true
+        if url == true
           url = "#{target_url}"
-        else if url.empty?
-          url =target_url
-          else
-            url = ask("URL: ")
-          end
+        else 
+          url = ask "Please input URL"
         end
-      end
+      end      
       url = "#{target_url}" if url.nil? || url.empty?
-      eval("PI::Cli::Command::Misc").new().send("set_target", url)
+      eval("PI::Cli::Command::Misc").new().send("set_target", url)     
       tries ||= 0
-      user = ask("User: ")
-      password = ask("Password: ") {|q| q.echo = '*'} 
+      user = ask "User"
+      password = ask "Password", :echo => '*'
       err "Need a valid user" unless user
       err "Need a password" unless password
       login_and_save_token(user, password)
@@ -41,7 +36,7 @@ module PI::Cli::Command
       say "Successfully logged out of [#{target_url}]".green
     end
 
-    def info
+    def info      
       info = client.info
       return display JSON.pretty_generate(info) if @options[:json]
       display "\nName: #{info[:name]}"
@@ -83,8 +78,8 @@ module PI::Cli::Command
     def password(newpassword=nil)      
       unless newpassword
         loop{
-        newpassword = ask("New Password: ") {|q| q.echo = '*'}
-        newpassword2 = ask("Verify Password: ") {|q| q.echo = '*'} 
+        newpassword = ask "New Password", :echo => '*'
+        newpassword2 = ask "Verify Password", :echo => '*'
         if newpassword != newpassword2
           display "Passwords did not match, try again" 
           newpassword =nil 
@@ -99,9 +94,9 @@ module PI::Cli::Command
     end
     
     def github(name=nil)
-      name = ask("Please input your name: ") unless name
-      email = ask("Please input your email: ") 
-      password = ask("Please input your password: ") {|q| q.echo = '*'} 
+      name = ask "Please input your name" unless name
+      email = ask "Please input your email" 
+      password = ask "Please input your password", :echo => '*'
       manifest = {
         :name => "#{name}",
         :password     => "#{password}",

data/lib/cli/runner.rb

@@ -74,7 +74,9 @@ 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
     case verb
       
@@ -123,9 +125,17 @@ class PI::Cli::Runner
       set_cmd(:misc, :version)
       
     when 'help'
-      display_help if @args.size == 0
-      @help_only = true
-      parse_command!
+      if @args.size == 0 
+        display_help
+        break
+      else if @args == ["help"] && @args.size == 1
+        usage('pi help [command]')
+      else
+        @help_only = true        
+        parse_command!   
+      end
+      end
+      
       
     when 'options'
       @args = @args.unshift('--options')
@@ -167,6 +177,104 @@ class PI::Cli::Runner
       usage('pi project-apps [projectname]')
       set_cmd(:projects, :project_apps, @args.size == 1 ? 1 : 0)
       
+    ###############################################################################
+    # Applications
+    ###############################################################################
+    
+    when 'apps'
+      usage('pi apps [projectid]')
+      set_cmd(:apps, :apps, @args.size == 1 ? 1 : 0)  
+      
+    when 'create-app'
+      usage('pi create-app [appname]')
+      set_cmd(:apps, :create_app, @args.size == 1 ? 1 : 0) 
+      
+    when 'delete-app'     
+      usage('pi delete-app [appid]')
+      set_cmd(:apps, :delete_app, @args.size == 1 ? 1 : 0) 
+      
+    when 'start-app'     
+      usage('pi start-app [appid]')
+      set_cmd(:apps, :start_app, @args.size == 1 ? 1 : 0)
+      
+    when 'stop-app'     
+      usage('pi stop-app [appid]')
+      set_cmd(:apps, :stop_app, @args.size == 1 ? 1 : 0)
+      
+    when 'restart-app'     
+      usage('pi restart-app [appid]')
+      set_cmd(:apps, :restart_app, @args.size == 1 ? 1 : 0)
+      
+    when 'scale-app'     
+      usage('pi scale-app [appid]')
+      set_cmd(:apps, :scale_app, @args.size == 1 ? 1 : 0)
+      
+    when 'update-app'     
+      usage('pi update-app [appid]')
+      set_cmd(:apps, :update_app, @args.size == 1 ? 1 : 0)
+      
+    when 'status'     
+      usage('pi status [appname]')
+      set_cmd(:apps, :status, @args.size == 1 ? 1 : 0)
+      
+    when 'app-env'     
+      usage('pi app-env [appname]')
+      set_cmd(:apps, :app_env, @args.size == 1 ? 1 : 0)
+      
+    when 'create-env'     
+      usage('pi create-env [appname]')
+      set_cmd(:apps, :create_env, @args.size == 1 ? 1 : 0)
+      
+    when 'delete-env'     
+      usage('pi delete-env [appname]')
+      set_cmd(:apps, :delete_env, @args.size == 1 ? 1 : 0)
+      
+    when 'app-log'     
+      usage('pi app-log [appid]')
+      set_cmd(:apps, :app_log, @args.size == 1 ? 1 : 0)
+           
+    ###############################################################################
+    # Services
+    ###############################################################################
+      
+    when 'app-service'     
+      usage('pi app-service [appname]')
+      set_cmd(:services, :app_service, @args.size == 1 ? 1 : 0) 
+      
+    when 'bind-service'     
+      usage('pi bind-service [appname]')
+      set_cmd(:services, :bind_service, @args.size == 1 ? 1 : 0)
+      
+    when 'unbind-service'     
+      usage('pi unbind-service [appname]')
+      set_cmd(:services, :unbind_service, @args.size == 1 ? 1 : 0)
+      
+    ###############################################################################
+    # Dns
+    ###############################################################################
+      
+    when 'app-dns'     
+      usage('pi app-dns [appname]')
+      set_cmd(:dns, :app_dns, @args.size == 1 ? 1 : 0) 
+      
+    when 'map-dns'     
+      usage('pi map-dns [appname]')
+      set_cmd(:dns, :map_dns, @args.size == 1 ? 1 : 0)
+      
+    when 'unmap-dns'     
+      usage('pi unmap-dns [appname]')
+      set_cmd(:dns, :unmap_dns, @args.size == 1 ? 1 : 0)
+    
+    ###############################################################################
+    # Admin
+    ###############################################################################
+    
+    when 'users'     
+      usage('pi users')
+      set_cmd(:admin, :users)
+      
+    ############################################################################### 
+           
     when 'usage'
       display basic_usage
       exit(true)

data/lib/cli/usage.rb

@@ -47,6 +47,30 @@ Currently available pi commands are:
     project-commits [projectname]                List the commit log for the project
     project-apps [projectname]                   List the applications for the project
     upload [projectname]                         Upload the war package for java project
+    
+  Application
+    apps                                         List deployed applications for the project
+    create-app [appname]                         Create a new application
+    delete-app [appid]                           Delete the application
+    start-app [appid]                            Start the application
+    stop-app [appid]                             Stop the application
+    restart-app [appid]                          Restart the application
+    scale-app [appid]                            Scale the application instances up or down
+    update-app [appid]                           Update the application
+    status [appname]                             Display resource usage for the application
+    app-env [appid]                              Display the environments for the application
+    create-env [appid]                           Create the environment for the application
+    delete-env [appid]                           Delete the environment for the application
+    app-log [appid]                              List the logs for the application
+ 
+  Service
+    app-service [appname]                        Display the bind services for the application
+    bind-service [appname]                       Bind a service to an application
+    unbind-service [appname]                     Unbind a service to an application
+  DNS
+    app-dns [appname]                            Display the mapped urls for the application
+    map-dns [appname]                            Map the url for the application
+    unmap-dns [appname]                          Unmap the url for the application
 USAGE
 
   end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module PI
   module Cli
-    VERSION = '0.1.19'
+    VERSION = '0.1.20'
   end
 end

data/lib/pi/client.rb

@@ -37,6 +37,10 @@ class PI::Client
   # Users
   #####################################################
 
+  def check_url
+    http_get    
+  end
+  
   def login(user, password)
     status, body, headers = json_post("#{PI::TOKEN_PATH}", {:password => password,:userName => user})
     response_info = json_parse(body)
@@ -74,7 +78,7 @@ class PI::Client
   end  
   
   def frameworks(runtime)
-    json_get("#{PI::INFO_PATH}/frameworks/#{runtime}")
+    json_get("#{PI::INFO_PATH}/frameworks?runtime=#{runtime}")
   end
   
   #####################################################
@@ -85,6 +89,10 @@ class PI::Client
     json_get("#{PI::PROJECT_PATH}/list")
   end
   
+  def project_get(projectname)
+    json_get("#{PI::PROJECT_PATH}/get?projectName=#{projectname}")
+  end
+  
   def create_project(name, manifest={})
     status, body, headers = json_post("#{PI::PROJECT_PATH}/create", manifest)
   end
@@ -113,7 +121,144 @@ class PI::Client
   def project_apps(projectname)
     json_get("#{PI::PROJECT_PATH}/apps/#{projectname}")
   end
+  
+  def project_binary(projectid)
+    json_get("#{PI::PROJECT_PATH}/binary/list?query=project_id%3D#{projectid}")
+  end
+
+  def project_branchs(projectname)
+    json_get("#{PI::PROJECT_PATH}/branchs/#{projectname}")
+  end
 
+  #####################################################
+  # applications
+  #####################################################
+  
+  def apps(projectid, queryParam = nil)    
+    queryParam = { :pageNum => -1, :NumPerPage => -1} unless queryParam
+    json_get("#{PI::APP_PATH}/list?projectId=#{projectid}&pageNum=#{queryParam[:pageNum]}&numPerPage=#{queryParam[:NumPerPage]}")
+  end
+  
+  def app_sum(projectid)
+    http_get("#{PI::APP_PATH}/sum?projectId=#{projectid}")
+  end
+  
+  def app_get_byname(appname)
+    json_get("#{PI::APP_PATH}/get?appName=#{appname}")
+  end
+  
+  def app_get_byid(appid)
+    json_get("#{PI::APP_PATH}/get?appId=#{appid}")
+  end
+  
+  def create_app(projectid,manifest={})
+    status, body, headers = json_post("#{PI::APP_PATH}/create?projectId=#{projectid}", manifest)
+  end
+  
+  def target_memory(targetname)
+    http_get("#{PI::APP_PATH}/target/memory?targetName=#{targetname}")
+  end
+  
+  def app_message(appname,message)
+    json_get("#{PI::APP_PATH}/message?appName=#{appname}&eventName=#{message}")
+  end
+  
+  def delete_app(appid)
+    http_delete("#{PI::APP_PATH}/delete?appId=#{appid}",'application/json')
+  end
+  
+  def start_app(appid)
+    json_get("#{PI::APP_PATH}/start?appId=#{appid}")
+  end
+  
+  def stop_app(appid)
+    json_get("#{PI::APP_PATH}/stop?appId=#{appid}")
+  end
+  
+  def scale_app(appid,instance)
+    json_get("#{PI::APP_PATH}/scale?appId=#{appid}&instance=#{instance}")
+  end
+  
+  def update_app(appid,tag)
+    json_get("#{PI::APP_PATH}/rollback?appId=#{appid}&tag=#{tag}")
+  end
+ 
+  def status(appname)
+    json_get("#{PI::APP_PATH}/monitor?appName=#{appname}")
+  end
+ 
+  def app_env(appname)
+    json_get("#{PI::APP_PATH}/env/list?appName=#{appname}")
+  end 
+ 
+  def create_env(appname,manifest=nil)
+    json_post("#{PI::APP_PATH}/env/save?appName=#{appname}",manifest)
+  end
+  
+  def delete_env(appname,manifest=nil)
+    json_post("#{PI::APP_PATH}/env/delete?appName=#{appname}",manifest)
+  end
+  
+  def env_verify(appname,name)
+    http_get("#{PI::APP_PATH}/env/verify?appName=#{appname}&name=#{name}")
+  end
+  
+  def app_log(appid,filepath,instanceindex)
+    http_get("#{PI::APP_PATH}/logs?appId=#{appid}&filePath=#{filepath}&instanceIndex=#{instanceindex}")
+  end
+ 
+  #####################################################
+  # services
+  #####################################################
+  
+  def usable_services(appname)
+    json_get("#{PI::APP_PATH}/service/usable?appName=#{appname}")
+  end
+  
+  def app_service(appname)
+    json_get("#{PI::APP_PATH}/service/binded?appName=#{appname}")
+  end
+  
+  def bind_service(appname, manifest=nil)
+    json_post("#{PI::APP_PATH}/service/bind?appName=#{appname}",manifest)
+  end
+  
+  def unbind_service(appname, manifest=nil)
+    json_post("#{PI::APP_PATH}/service/unbind?appName=#{appname}",manifest)
+  end
+  
+  #####################################################
+  # dns
+  #####################################################
+  
+  def usable_dns(appname)
+    json_get("#{PI::APP_PATH}/url/usable?appName=#{appname}")
+  end
+  
+  def app_dns(appname)
+    json_get("#{PI::APP_PATH}/url/mapped?appName=#{appname}")
+  end
+  
+  def map_dns(appname, manifest=nil)
+    json_post("#{PI::APP_PATH}/url/map?appName=#{appname}",manifest)
+  end
+  
+  def unmap_dns(appname, manifest=nil)
+    json_post("#{PI::APP_PATH}/url/unmap?appName=#{appname}",manifest)
+  end
+
+  #####################################################
+  # administration
+  #####################################################
+  
+  def admin_domains
+    json_get("#{PI::ADMIN_PATH}/domains")
+  end
+  
+  def admin_users(domainid)
+    json_get("#{PI::ADMIN_PATH}/users?query=domain_id%3D#{domainid}")
+  end
+  
   ######################################################
 
   private
@@ -162,7 +307,7 @@ class PI::Client
     request(:delete, path,content_type)
   end
 
-  def request(method, path, content_type = nil, payload = nil, headers = {})
+  def request(method, path, content_type = nil,  payload = nil, headers = {})
     headers = headers.dup
     headers['Authentication'] = @auth_token if @auth_token
     if content_type
@@ -232,11 +377,11 @@ class PI::Client
 
   def parse_error_message(status, body)
     parsed_body = json_parse(body.to_s)
-    if parsed_body && parsed_body[:code] && parsed_body[:description]
-      desc = parsed_body[:description].gsub("\"","'")
-      "Error #{parsed_body[:code]}: #{desc}"
+    if parsed_body && parsed_body[:errorCode] && parsed_body[:errorDescription]
+      desc = parsed_body[:errorDescription].gsub("\"","'")
+      "\nError (#{parsed_body[:errorCode]}): #{desc}"
     else
-      "Error (HTTP #{status}): #{body}"
+      "\nError (HTTP #{status}): #{body}"
     end
   rescue JSON::ParserError
     if body.nil? || body.empty?

data/lib/pi/const.rb

@@ -11,5 +11,7 @@ module PI
   TOKEN_PATH           = '/token'
   PROJECT_PATH         = '/project'
   USER_PATH            = '/user'
+  APP_PATH             = '/app'
+  ADMIN_PATH           = '/admin'
   
 end