pi 0.1.23 → 0.1.24

data/lib/cli/runner.rb

@@ -24,15 +24,27 @@ 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 }
+      opts.on('--name NAME')       { |name|     @options[:name] = name }
+      opts.on('--email EMAIL')     { |email|    @options[:email] = email }
+      opts.on('--path PATH')       { |path|     @options[:path] = path }
+      opts.on('--ver VERSION')     { |version|  @options[:ver] = version }
+      opts.on('--desc DESC')       { |desc|     @options[:desc] = desc }
+      opts.on('--project PROJ')    { |proj|     @options[:project] = proj }
+      opts.on('--target TARG')     { |targ|     @options[:target] = targ }
+      opts.on('--instance N')      { |inst|     @options[:instance] = inst }
       # generic tracing and debugging
-      opts.on('-t [TKEY]')         { |tkey|  @options[:trace] = tkey || true }
-      opts.on('--trace [TKEY]')    { |tkey|  @options[:trace] = tkey || true }
-      opts.on('-q', '--quiet')     {         @options[:quiet] = true }
-      opts.on('--verbose')         {         @options[:verbose] = true }
-      opts.on('--json')            {         @options[:json] = true }
-      opts.on('-v', '--version')   {         set_cmd(:misc, :version) }
-      opts.on('-h', '--help')      {         puts "#{command_usage}\n"; exit }
-      opts.on_tail('--options')    {         puts "#{opts}\n"; exit }
+      opts.on('-t [TKEY]')         { |tkey|     @options[:trace] = tkey || true }
+      opts.on('--trace [TKEY]')    { |tkey|     @options[:trace] = tkey || true }
+      opts.on('-q', '--quiet')     {            @options[:quiet] = true }
+      opts.on('--verbose')         {            @options[:verbose] = true }
+      opts.on('--json')            {            @options[:json] = true }
+      opts.on('-v', '--version')   {            set_cmd(:misc, :version) }
+      opts.on('-h', '--help')      {            puts "#{command_usage}\n"; exit }
+      opts.on_tail('--options')    {            puts "#{opts}\n"; exit }
     end
     instances_delta_arg = check_instances_delta!
     @args = opts_parser.parse!(@args)
@@ -85,8 +97,12 @@ class PI::Cli::Runner
     ###############################################################################
     
     when 'login'
-      usage('pi login [url]')
-      set_cmd(:user, :login, @args.size == 1 ? 1 : 0)
+      usage('pi login [url] [--user USER] [--password PASS]')
+      if @args.size == 1
+        set_cmd(:user, :login, 1)
+      else
+        set_cmd(:user, :login)
+      end
       
     when 'logout'
       usage('pi logout')
@@ -109,8 +125,12 @@ class PI::Cli::Runner
       set_cmd(:user, :password, @args.size == 1 ? 1 : 0)
       
     when 'github'
-      usage ('pi github [name]')
-      set_cmd(:user, :github,@args.size == 1 ? 1 : 0)
+      usage ('pi github [name] [--email EMAIL] [--password PASS]')
+      if @args.size == 1
+        set_cmd(:user, :github, 1)
+      else
+        set_cmd(:user, :github)
+      end
       
     when 'runtimes'
       usage('pi runtimes')
@@ -150,87 +170,91 @@ class PI::Cli::Runner
       set_cmd(:projects, :projects)
       
     when 'create-project'
-      usage('pi create-project [projectname]')
-      set_cmd(:projects, :create_project, @args.size == 1 ? 1 : 0) 
+      usage('pi create-project [project]')
+      set_cmd(:projects, :create_project, @args.size == 1 ? 1 : 0)
   
     when 'delete-project'
-      usage('pi delete-project [projectname]')
+      usage('pi delete-project [project]')
       set_cmd(:projects, :delete_project, @args.size == 1 ? 1 : 0) 
       
     when 'upload'
-      usage('pi upload [projectname]')
-      set_cmd(:projects, :upload, @args.size == 1 ? 1 : 0)
+      usage('pi upload [project] [--path PATH] [--ver VERSION] [--desc DESC]')
+      if @args.size == 1
+        set_cmd(:projects, :upload, 1)
+      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' 
-      usage('pi project-events [projectname]')
+      usage('pi project-events [project]')
       set_cmd(:projects, :project_events, @args.size == 1 ? 1 : 0) 
         
     when 'project-tags'
-      usage('pi project-tags [projectname]')
+      usage('pi project-tags [project]')
       set_cmd(:projects, :project_tags, @args.size == 1 ? 1 : 0) 
     
     when 'project-commits'
-      usage('pi project-commits [projectname]')
+      usage('pi project-commits [project]')
       set_cmd(:projects, :project_commits, @args.size == 1 ? 1 : 0) 
-    
-    when 'project-apps'
-      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)  
+      usage('pi apps [--project PROJ] [--target TARG]')
+      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'     
-      usage('pi delete-app [appid]')
+      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'     
-      usage('pi start-app [appid]')
-      set_cmd(:apps, :start_app, @args.size == 1 ? 1 : 0)
+      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'     
-      usage('pi stop-app [appid]')
+      usage('pi stop-app [appid] or pi stop-app <appname> <--target TARGET>')
       set_cmd(:apps, :stop_app, @args.size == 1 ? 1 : 0)
       
     when 'restart-app'     
-      usage('pi restart-app [appid]')
+      usage('pi restart-app [appid] or pi restart-app <appname> <--target TARGET>')
       set_cmd(:apps, :restart_app, @args.size == 1 ? 1 : 0)
       
     when 'scale-app'     
-      usage('pi scale-app [appid]')
+      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'     
-      usage('pi update-app [appid]')
+      usage('pi update-app [appid] or pi update-app <appname> <--target TARGET>')
       set_cmd(:apps, :update_app, @args.size == 1 ? 1 : 0)
       
     when 'status'     
-      usage('pi status [appname]')
+      usage('pi status-app [appid] or pi status-app <appname> <--target TARGET>')
       set_cmd(:apps, :status, @args.size == 1 ? 1 : 0)
       
     when 'app-env'     
-      usage('pi app-env [appname]')
+      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'     
-      usage('pi create-env [appname]')
+      usage('pi app-env [appid] or pi app-env <appname> <--target TARGET>')
       set_cmd(:apps, :create_env, @args.size == 1 ? 1 : 0)
       
     when 'delete-env'     
-      usage('pi delete-env [appname]')
+      usage('pi delete-env [appid] or pi delete-env <appname> <--target TARGET>')
       set_cmd(:apps, :delete_env, @args.size == 1 ? 1 : 0)
       
     when 'app-log'     
-      usage('pi app-log [appid]')
+      usage('pi app-log [appid] or pi app-log <appname> <--target TARGET>')
       set_cmd(:apps, :app_log, @args.size == 1 ? 1 : 0)
            
     ###############################################################################
@@ -238,15 +262,15 @@ class PI::Cli::Runner
     ###############################################################################
       
     when 'app-service'     
-      usage('pi app-service [appname]')
+      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'     
-      usage('pi bind-service [appname]')
+      usage('pi bind-service [appid] or pi bind-service <appname> <--target TARGET>')
       set_cmd(:services, :bind_service, @args.size == 1 ? 1 : 0)
       
     when 'unbind-service'     
-      usage('pi unbind-service [appname]')
+      usage('pi unbind-service [appid] or pi unbind-service <appname> <--target TARGET>')
       set_cmd(:services, :unbind_service, @args.size == 1 ? 1 : 0)
       
     ###############################################################################
@@ -254,25 +278,17 @@ class PI::Cli::Runner
     ###############################################################################
       
     when 'app-dns'     
-      usage('pi app-dns [appname]')
+      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'     
-      usage('pi map-dns [appname]')
+      usage('pi map-dns [appid] or pi map-dns <appname> <--target TARGET>')
       set_cmd(:dns, :map_dns, @args.size == 1 ? 1 : 0)
       
     when 'unmap-dns'     
-      usage('pi unmap-dns [appname]')
+      usage('pi unmap-dns [appid] or pi unmap-dns <appname> <--target TARGET>')
       set_cmd(:dns, :unmap_dns, @args.size == 1 ? 1 : 0)
-    
-    ###############################################################################
-    # Admin
-    ###############################################################################
-    
-    when 'users'     
-      usage('pi users')
-      set_cmd(:admin, :users)
-      
+         
     ############################################################################### 
            
     when 'usage'
@@ -310,7 +326,15 @@ class PI::Cli::Runner
     PI::Cli::Config.trace      = @options.delete(:trace)
     PI::Cli::Config.output   ||= STDOUT unless @options[:quiet]
 
+    # local shopts=$-
+    # set -o noglob
+    Kernel.system('set -o noglob')
+    # Kernel.exec('sudo set -o noglob')
+    # `set -o noglob`
     parse_command!
+    # system('set +o noglob')
+    # set +o noglob
+    # set -$shopts
     if @namespace && @action
       eval("PI::Cli::Command::#{@namespace.to_s.capitalize}").new(@options).send(@action.to_sym, *@args)
     elsif @help_only || @usage

data/lib/cli/usage.rb

@@ -25,52 +25,68 @@ class PI::Cli::Runner
 Currently available pi commands are:
 
   User
-    login [url]                                  Login
-    logout                                       Logs current user out of the system
-    info                                         List system information
-    user                                         Display user information
-    targets                                      List available targets infomation
-    github [name]                                Bind to the github account
-    runtimes                                     Display the supported runtimes of the system
-    frameworks                                   Display the supported frameworks of the system
-    version                                      Display version information
-    help [command]                               Get general help or help on a specific command
-    help options                                 Get help on available options
+    login [url] [--user,--password]                       Login
+    logout                                                Logs current user out of the system
+    info                                                  List system information
+    user                                                  Display user information
+    targets                                               List available targets infomation
+    github [name] [--email,--password]                    Bind to the github account
+    runtimes                                              Display the supported runtimes of the system
+    frameworks                                            Display the supported frameworks of the system
+    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 [projectname]                 Create a new project                
-    delete-project [projectname]                 Delete the project             
-    project-events [projectname]                 List the event info for the project
-    project-tags [projectname]                   List the tags for the project
-    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
+    projects                                              List created projects 
+    create-project [project]                              Create a new project                
+    delete-project [project]                              Delete the project             
+    project-events [project]                              List the event info for the project
+    project-tags [project]                                List the tags for the project
+    project-commits [project]                             List the commit log for the project
+    upload [project][--path,--ver,--desc]                 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
+  Application 
+    apps [--project,--target]                             List deployed applications for the project
+    create-app [appname]                                  Create a new application
+    delete-app [appid]                                    Delete the application
+    delete-app <appname> <--target TARGET>                Delete the application
+    start-app [appid]                                     Start the application
+    start-app <appname> <--target TARGET>                 Start the application
+    stop-app [appid]                                      Stop the application
+    stop-app <appname> <--target TARGET>                  Stop the application
+    restart-app [appid]                                   Restart the application
+    restart-app <appname> <--target TARGET>               Restart the application
+    scale-app [appid] [--instance N]                      Scale the application instances up or down
+    scale-app <appname> <--target TARGET> [--instance N]  Scale the application instances up or down
+    update-app [appid]                                    Update the application
+    update-app <appname> <--target TARGET>                Update the application
+    status [appid]                                        Display resource usage for the application
+    status <appname> <--target TARGET>                    Display resource usage for the application
+    app-env [appid]                                       Display the environments for the application
+    app-env <appname> <--target TARGET>                   Display the environments for the application
+    create-env [appid]                                    Create the environment for the application
+    create-env <appname> <--target TARGET>                Create the environment for the application
+    delete-env [appid]                                    Delete the environment for the application
+    delete-env <appname> <--target TARGET>                Delete the environment for the application
+    app-log [appid]                                       List the logs for the application
+    app-log <appname> <--target TARGET>                   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
+    app-service [appid]                                   Display the binded services for the application
+    app-service <appname> <--target TARGET>               Display the binded services for the application
+    bind-service [appid]                                  Bind the services for the application
+    bind-service <appname> <--target TARGET>              Bind the services for the application
+    unbind-service [appid]                                Unbind the service for the application
+    unbind-service <appname> <--target TARGET>            Unbind the service for the 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
+    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]                                       Map the urls for the application
+    map-dns <appname> <--target TARGET>                   Map the urls for the application
+    unmap-dns [appid]                                     Unmap the url for the application                                      
+    unmap-dns <appname> <--target TARGET>                 Unmap the url for the application
 USAGE
 
   end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module PI
   module Cli
-    VERSION = '0.1.23'
+    VERSION = '0.1.24'
   end
 end

data/lib/pi/client.rb

@@ -37,8 +37,23 @@ class PI::Client
   # Users
   #####################################################
 
-  def check_url
-    http_get    
+  def target_valid?
+    return false unless descr = info
+    return false unless descr[:name]
+    return false unless descr[:build]
+    return false unless descr[:version]
+    return false unless descr[:description]
+    true
+  rescue
+    false
+  end
+  
+  def raw_info
+    http_get(PI::INFO_PATH)
+  end
+  
+  def check_login_status
+    raise AuthError unless @auth_token
   end
   
   def login(user, password)
@@ -66,7 +81,8 @@ class PI::Client
   end
 
   def password(newpassword)
-    status, body, headers = json_post("#{PI::USER_PATH}/password/#{newpassword}",{:newpass => newpassword})
+    # status, body, headers = json_post("#{PI::USER_PATH}/password/#{newpassword}",{:newpass => newpassword})
+    json_get("#{PI::USER_PATH}/password/#{newpassword}")
   end
   
   def github(manifest={})
@@ -85,20 +101,24 @@ class PI::Client
   # projects
   #####################################################
   
-  def projects
-    json_get("#{PI::PROJECT_PATH}/list")
+  def project_search(projectname=nil)
+    json_get("#{PI::PROJECT_PATH}/search/#{projectname}")
   end
   
-  def project_get(projectname)
-    json_get("#{PI::PROJECT_PATH}/get?projectName=#{projectname}")
+  def projects(pageNum=-1, numPerPage=-1)
+    json_get("#{PI::PROJECTS_PATH}/search?pageNum=#{pageNum}&numPerPage=#{numPerPage}")
+  end
+  
+  def project_sum
+    http_get("#{PI::PROJECTS_PATH}/search/sum")
   end
   
   def create_project(name, manifest={})
-    status, body, headers = json_post("#{PI::PROJECT_PATH}/create", manifest)
+    status, body, headers = json_post("#{PI::PROJECT_PATH}/", manifest)
   end
   
   def delete_project(projectname)
-    http_delete("#{PI::PROJECT_PATH}/delete/#{projectname}",'application/json')
+    http_delete("#{PI::PROJECT_PATH}/#{projectname}",'application/json')
   end
   
   def upload(manifest={})
@@ -106,6 +126,10 @@ class PI::Client
     response_info = json_parse(body)
   end
   
+  def delete_binary(binaryid)
+    http_delete("#{PI::PROJECT_PATH}/binary/#{binaryid}",'application/json')
+  end
+  
   def project_events(projectname)
     json_get("#{PI::PROJECT_PATH}/events/#{projectname}")
   end
@@ -118,145 +142,136 @@ class PI::Client
     json_get("#{PI::PROJECT_PATH}/commitinfo/#{projectname}/#{tag}")
   end
   
-  def project_apps(projectname)
-    json_get("#{PI::PROJECT_PATH}/apps/#{projectname}")
+  def project_binary(projectname)
+    json_get("#{PI::PROJECT_PATH}/binary/list/#{projectname}")
   end
   
-  def project_binary(projectid)
-    json_get("#{PI::PROJECT_PATH}/binary/list?query=project_id%3D#{projectid}")
+  def project_binary_existed(projectname,versionname)
+    http_get("#{PI::PROJECT_PATH}/binary/existed/#{projectname}/#{versionname}")
   end
 
   def project_branchs(projectname)
     json_get("#{PI::PROJECT_PATH}/branchs/#{projectname}")
   end
+  
+  def apps(projectname=nil, targetname=nil, pageNum=-1, numPerPage=-1)    
+    json_get("#{PI::PROJECT_PATH}/apps?projectName=#{projectname}&targetName=#{targetname}&pageNum=#{pageNum}&numPerPage=#{numPerPage}")
+  end
+  
+  def app_sum(projectname=nil, targetname=nil)
+    http_get("#{PI::PROJECT_PATH}/apps/sum?projectName=#{projectname}&targetName=#{targetname}")
+  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]}")
+  def app_get_byid(appid)
+    json_get("#{PI::APP_PATH}/#{appid}")
   end
   
-  def app_sum(projectid)
-    http_get("#{PI::APP_PATH}/sum?projectId=#{projectid}")
+  def app_search(targetname, appname)
+    json_get("#{PI::APP_PATH}/search/#{targetname}/#{appname}")
   end
   
-  def app_get_byname(appname)
-    json_get("#{PI::APP_PATH}/get?appName=#{appname}")
+  def app_search_target_is_all(appname)    
+    json_get("#{PI::PROJECT_PATH}/apps?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)
+  def create_app(manifest={})
+    status, body, headers = json_post("#{PI::APP_PATH}/", manifest)
   end
   
   def target_memory(targetname)
-    http_get("#{PI::APP_PATH}/target/memory?targetName=#{targetname}")
+    http_get("#{PI::APP_PATH}/target/#{targetname}/memory")
   end
   
-  def app_message(appname,message)
-    json_get("#{PI::APP_PATH}/message?appName=#{appname}&eventName=#{message}")
+  def app_message(targetname,appname,message)
+    json_get("#{PI::APP_PATH}/message/#{targetname}/#{appname}?eventName=#{message}")
   end
   
   def delete_app(appid)
-    http_delete("#{PI::APP_PATH}/delete?appId=#{appid}",'application/json')
+    http_delete("#{PI::APP_PATH}/#{appid}",'application/json')
   end
   
   def start_app(appid)
-    json_get("#{PI::APP_PATH}/start?appId=#{appid}")
+    json_post("#{PI::APP_PATH}/#{appid}/start",manifest={})
   end
   
   def stop_app(appid)
-    json_get("#{PI::APP_PATH}/stop?appId=#{appid}")
+    json_post("#{PI::APP_PATH}/#{appid}/stop",manifest={})
   end
   
   def scale_app(appid,instance)
-    json_get("#{PI::APP_PATH}/scale?appId=#{appid}&instance=#{instance}")
+    json_post("#{PI::APP_PATH}/#{appid}/scale?instance=#{instance}", manifest={})
   end
   
-  def update_app(appid,tag)
-    json_get("#{PI::APP_PATH}/rollback?appId=#{appid}&tag=#{tag}")
+  def update_app(appid, tag)
+    json_post("#{PI::APP_PATH}/#{appid}/rollback/#{tag}", manifest={})
   end
  
-  def status(appname)
-    json_get("#{PI::APP_PATH}/monitor?appName=#{appname}")
+  def status(appid)
+    json_get("#{PI::APP_PATH}/#{appid}/monitor")
   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)
+  def app_log(appid,filepath,instanceindex)
+    http_get("#{PI::APP_PATH}/#{appid}/logs?filePath=#{filepath}&instanceIndex=#{instanceindex}")
   end
   
-  def delete_env(appname,manifest=nil)
-    json_post("#{PI::APP_PATH}/env/delete?appName=#{appname}",manifest)
+  def app_env(appid)
+    json_get("#{PI::APP_PATH}/#{appid}/env/list")
+  end 
+ 
+  def create_env(appid, manifest={})
+    json_post("#{PI::APP_PATH}/#{appid}/env", manifest)
   end
   
-  def env_verify(appname,name)
-    http_get("#{PI::APP_PATH}/env/verify?appName=#{appname}&name=#{name}")
+  def delete_env(appid, env)
+    http_delete("#{PI::APP_PATH}/#{appid}/env/#{env}",'application/json')
   end
   
-  def app_log(appid,filepath,instanceindex)
-    http_get("#{PI::APP_PATH}/logs?appId=#{appid}&filePath=#{filepath}&instanceIndex=#{instanceindex}")
+  def env_verify(appid,name)
+    http_get("#{PI::APP_PATH}/#{appid}/env/verify?name=#{name}")
   end
  
   #####################################################
   # services
   #####################################################
   
-  def usable_services(appname)
-    json_get("#{PI::APP_PATH}/service/usable?appName=#{appname}")
+  def usable_services(appid)
+    json_get("#{PI::APP_PATH}/#{appid}/service/usable")
   end
   
-  def app_service(appname)
-    json_get("#{PI::APP_PATH}/service/binded?appName=#{appname}")
+  def app_service(appid)
+    json_get("#{PI::APP_PATH}/#{appid}/service/bind")
   end
   
-  def bind_service(appname, manifest=nil)
-    json_post("#{PI::APP_PATH}/service/bind?appName=#{appname}",manifest)
+  def bind_service(appid, manifest={})
+    json_post("#{PI::APP_PATH}/#{appid}/service/bind",manifest)
   end
   
-  def unbind_service(appname, manifest=nil)
-    json_post("#{PI::APP_PATH}/service/unbind?appName=#{appname}",manifest)
+  def unbind_service(appid, servicename)
+    http_delete("#{PI::APP_PATH}/#{appid}/service/unbind/#{servicename}",'application/json')
   end
   
   #####################################################
   # dns
   #####################################################
   
-  def usable_dns(appname)
-    json_get("#{PI::APP_PATH}/url/usable?appName=#{appname}")
+  def usable_dns(appid)
+    json_get("#{PI::APP_PATH}/#{appid}/url/usable")
   end
   
-  def app_dns(appname)
-    json_get("#{PI::APP_PATH}/url/mapped?appName=#{appname}")
+  def app_dns(appid)
+    json_get("#{PI::APP_PATH}/#{appid}/url/map")
   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")
+  def map_dns(appid, manifest={})
+    json_post("#{PI::APP_PATH}/#{appid}/url/map", manifest)
   end
   
-  def admin_users(domainid)
-    json_get("#{PI::ADMIN_PATH}/users?query=domain_id%3D#{domainid}")
+  def unmap_dns(appid, url)
+    http_delete("#{PI::APP_PATH}/#{appid}/url/unmap/#{url}", 'application/json')
   end
   
   ######################################################