pi 0.1.25 → 0.1.26

data/lib/cli/choose_helper.rb

@@ -46,11 +46,11 @@ module PI::Cli
         app = client.apps
       when "project"
         useproject = choose_project
-        app = client.apps(useproject[:name])
+        app = client.apps(useproject[:id])
       when "target"
         usetarget = choose_target
-        project=nil
-        app = client.apps(project, usetarget[:name])
+        projectid = 0
+        app = client.apps(projectid, usetarget[:name])
       else
         if select_type
         err "Unknown select type [#{select_type}]"

data/lib/cli/commands/apps.rb

@@ -14,11 +14,11 @@ module PI::Cli::Command
     
     def apps
       client.check_login_status
-      project = @options[:project]
+      projectid = @options[:projectid]
       target = @options[:target]   
-      project = nil if project == "all"  
+      projectid = 0 if projectid == "all" || projectid == nil 
       target = nil if target == "all"
-      app_sum = client.app_sum(project, target)
+      app_sum = client.app_sum(projectid, target)
       total_app = Integer(app_sum[1])
       return display "No Applications" if total_app == 0
       pageNum = -1
@@ -50,7 +50,7 @@ module PI::Cli::Command
        } 
        pageNum = pageNum.to_i        
       end       
-      apps = client.apps(project, target, pageNum, numPerPage)
+      apps = client.apps(projectid, target, pageNum, numPerPage)
       return display "No Applications" if apps.nil? || apps.empty?        
       return display JSON.pretty_generate(apps) if @options[:json]
       apps.sort! {|a, b| a[:name] <=> b[:name] }
@@ -99,19 +99,32 @@ module PI::Cli::Command
       
       # choose the tag
       if useproject[:runtime] =~ /^(ruby)/i
-        tags = client.project_tags(useproject[:name])
-        err "No tags!" if tags.nil? || tags.empty?
-        tag = ask "Select Tag", :choices => tags, :indexed => true
-        display "Selected Tag: ",false
-        display "#{tag}"
         deployType = "git"
+        choices = ["By Tag Name","By Commit ID","Latest Revision"]
+        select_type = ask"Upgrade Type", :choices => choices, :indexed => true
+        case select_type
+        when "By Tag Name"
+          tags = client.project_tags(projectid)
+          err "No tags!" if tags.nil? || tags.empty?
+          tag = ask "Select Tag", :choices => tags, :indexed => true
+          display "Selected Tag: ",false
+          display "#{tag}"
+          display "Branch : Master"
+        when "By Commit ID"
+          commits = client.project_commits_bybranch(projectid)
+          tag = ask "Select Commit ID", :choices => commits.collect { |c| c[:commit] }, :indexed => true
+        when "Latest Revision"
+          tag = ""
+        else
+          err "Invalid Input"
+        end               
       else
-        binarylist = client.project_binary(projectname)
+        deployType = "binary"
+        binarylist = client.project_binary(projectid)
         err "No version!" if binarylist.nil? || binarylist.empty?
         tag = ask "Select Version", :choices => binarylist.collect { |b| b[:versionName] }, :indexed => true
         display "Selected Version: ",false
-        display "#{tag}"
-        deployType = "binary"
+        display "#{tag}"        
       end      
       # URL combination
       user = client.user_info
@@ -140,19 +153,13 @@ module PI::Cli::Command
       needMonitor = ask "Need monitor?", :default => DEFAULTS["needMonitor"]
       isDebug = (isDebug == false ? "no" : "yes")
       needMonitor = (needMonitor == false ? "no" : "yes")
-      # choose the branch
-      branchs = client.project_branchs(useproject[:name])
-      err "No branchs!" if branchs.nil? || branchs.empty?
-      branch = ask "Select Branch", :choices => branchs, :indexed => true, :default => "master"
-      display "Selected Branch: ",false
-      display "#{branch}"
               
       manifest = {
         :targetName        => target,
         :name              => "#{appname}",
         :projectName       => "#{projectname}",
         :projectId         => "#{projectid}",
-        :branch            => branch,
+        :branch            => "master",
         :url               => url,
         :memory            => mem_quota,
         :instances         => instances,
@@ -180,7 +187,7 @@ module PI::Cli::Command
         if not result[:text].empty?
           display "OK".green
         else
-          display "Please try again"
+          display "Time out"
         end            
       else
         err result[:text]   
@@ -288,7 +295,7 @@ module PI::Cli::Command
         if not result[:text].empty?
           display "OK".green
         else
-          display "Please try again"
+          display "Time out"
         end            
       else
         err result[:text]   
@@ -301,14 +308,14 @@ module PI::Cli::Command
       app, appid = choose_app_help_target_not_all(appid_or_appname) 
       appid = (appid == nil ? app[:id] : appid)      
       if app[:deployType] == "git"        
-        tags = client.project_tags(app[:projectName])
+        tags = client.project_tags(app[:projectId])
         err "No tags!" if tags.nil? || tags.empty?
         tag = ask "Select Tag", :choices => tags, :indexed => true unless tag
         err "Don't need update application!" if tag == app[:tag]
         display "Selected tag: ",false
         display "#{tag}"
       else    
-        tags = client.project_binary(app[:projectName])
+        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
         err "Don't need update application!" if tag == app[:tag]     
@@ -330,7 +337,7 @@ module PI::Cli::Command
         if not result[:text].empty?
           display "OK".green
         else
-          display "Please try again"
+          display "Time out"
         end            
       else
         err result[:text]   
@@ -492,7 +499,7 @@ module PI::Cli::Command
         if not result[:text].empty?
           display "OK".green
         else
-          display "Please try again"
+          display "Time out"
         end
       else
         err result[:text]

data/lib/cli/commands/dns.rb

@@ -11,13 +11,17 @@ module PI::Cli::Command
       dns = client.app_dns(appid)
       return display JSON.pretty_generate(dns) if @options[:json]
       return display "No DNS!" if dns.nil? || dns.empty?
-      dns_table = table do |t|
-        t.headings = 'Mapped DNS Name'
-        dns.each do |s|
-          t << s
-        end
+      display "Mapped DNS Name:"
+      dns.each do |s|
+        display "#{s}"
       end
-      display dns_table
+      # dns_table = table do |t|
+        # t.headings = 'Mapped DNS Name'
+        # dns.each do |s|
+          # t << s
+        # end
+      # end
+      # display dns_table
     end  
     
     def map_dns(appid_or_appname=nil)
@@ -93,8 +97,21 @@ module PI::Cli::Command
       display dns_table
     end
     
+    def zones
+      zones = client.dns_zone_list
+      return display JSON.pretty_generate(zones) if @options[:json]
+      return display "No DNS!" if zones.nil? || zones.empty?
+      zones_table = table do |t|
+        t.headings = 'ID', 'Name'
+        zones.each do |s|
+          t << [s[:id], s[:name]]
+        end
+      end
+      display zones_table
+    end
+       
     def create_dns(dnsname=nil)
-      projectname = @options[:project]
+      projectid = @options[:projectid]
       description = @options[:desc]
       zoneid = @options[:zoneid]
       dns_zone = client.dns_zone_list
@@ -107,12 +124,10 @@ module PI::Cli::Command
         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 projectname 
-      projectid = nil
+      projectname = ask"Project name", :choices => projects.collect { |p| p[:name] }, :indexed => true  unless projectid 
       projects.each do |p|
         projectid = p[:id] if p[:name] == projectname
       end   
-      err "Invild project" if projectid.nil? 
       unless zoneid
         zonename = ask"Select dns zone", :choices => dns_zone.collect { |d| d[:name] }, :indexed => true
         dns_zone.each do |d|
@@ -161,20 +176,20 @@ module PI::Cli::Command
       unless dnsid
         dnsid = choose_dnsid
       end
-      targets = client.usable_target(dnsid)
+      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.index("#{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.index("#{country}")
+      country = countries.invert["#{country}"]
       manifest = {
         :continentName => continent,
         :countryCode   => country
@@ -188,7 +203,7 @@ module PI::Cli::Command
         dnsid = choose_dnsid
       end
 
-      targets = client.usable_target(dnsid)
+      targets = client.usable_dns_target(dnsid)
       target = ask"Select target", :choices => targets.collect { |t| t[:targetName] }, :indexed => true
       choices = Array.new
       record = Array.new

data/lib/cli/commands/projects.rb

@@ -50,9 +50,9 @@ module PI::Cli::Command
       projects.sort! {|a, b| a[:name] <=> b[:name] }
       display "\n"        
       projects_table = table do |t|
-        t.headings = 'Name', 'Runtime', 'Framework', 'Git Type','GitUrl', 'Description'
+        t.headings = 'ID', 'Name', 'Runtime', 'Framework', 'Git Type','GitUrl', 'Description'
         projects.each do |project|
-          t << [project[:name], project[:runtime], project[:framework], project[:repositoryType], project[:gitUrl], project[:description]]
+          t << [project[:id], project[:name], project[:runtime], project[:framework], project[:repositoryType], project[:gitUrl], project[:description]]
         end
       end
       display projects_table
@@ -141,13 +141,13 @@ module PI::Cli::Command
       display "OK".green
     end
 
-    def delete_project(project=nil)
+    def delete_project(projectid=nil)
       client.check_login_status
-      unless project
+      unless projectid
         useproject = choose_project
-        project = useproject[:name]
+        projectid = useproject[:id]
       end
-      display "Deleting project \"#{project}\": ",false
+      display "Deleting project: ",false
       
       t = Thread.new do     
       loop do
@@ -157,12 +157,12 @@ module PI::Cli::Command
       end
       end
       
-      client.delete_project(project)
+      client.delete_project(projectid)
       Thread.kill(t)
       display 'OK'.green
     end
     
-    def upload(project=nil)
+    def upload(projectid=nil)
       client.check_login_status 
       path = @options[:path]
       if path        
@@ -174,22 +174,22 @@ module PI::Cli::Command
       err "No Projects" if projects.nil? || projects.empty?
       java_projects = projects.delete_if{ |p| p[:runtime] =~ /^(ruby)/i}
       java_projects.sort! {|a, b| a[:name] <=> b[:name] }
-      if project
+      if projectid
         flag = nil
         java_projects.each do |j|      
-          flag = true if project == j[:name]
+          flag = true if projectid == j[:id]
         end
-        err "The project is not found or not a java project! Project name :#{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}"
       end
       project = client.project_search(project)
-      project = project[:name]
+      projectid = project[:id]
       
       if version
-        tmp = client.project_binary_existed(project,version)       
+        tmp = client.project_binary_existed(projectid, version)       
         err "Version '#{version}' already exists." if tmp.include?("true")
       end
       
@@ -209,7 +209,7 @@ module PI::Cli::Command
       unless version
         loop{
           version = ask "Please enter the version"
-          tmp = client.project_binary_existed(project,version)
+          tmp = client.project_binary_existed(projectid, version)
           if tmp.include?("true")
             display "Version '#{version}' already exists."
             version =nil
@@ -223,7 +223,7 @@ module PI::Cli::Command
       description = ask "Please enter in the description", :default => nil unless description
       upload_file = File.new(path, 'rb')
       manifest = {
-        :projectName => "#{project}",
+        :projectId => "#{projectid}",
         :fileWAR     => upload_file,
         :versionName => "#{version}",
         :description => "#{description}"
@@ -243,13 +243,13 @@ module PI::Cli::Command
       display 'OK'.green
     end
 
-    def delete_binary(project=nil)
+    def delete_binary(projectid=nil)
       client.check_login_status
-      unless project
+      unless projectid
         useproject = choose_project
-        project = useproject[:name]
+        projectid = useproject[:id]
       end 
-      binary = client.project_binary(project)
+      binary = client.project_binary(projectid)
       err "No binary!" if binary.nil? || binary.empty?     
       binaryname = ask"Select Binary", :choices => binary.collect { |b| b[:versionName] }, :indexed => true
       display "Selected Binary: ",false
@@ -262,13 +262,13 @@ module PI::Cli::Command
       display 'OK'.green
     end
 
-    def project_events(project=nil)
+    def project_events(projectid=nil)
       client.check_login_status
-      unless project
+      unless projectid
         useproject = choose_project
-        project = useproject[:name]
+        projectid = useproject[:id]
       end           
-      events = client.project_events(project)
+      events = client.project_events(projectid)
       return display JSON.pretty_generate(events || []) if @options[:json]
       return display "No Events." if events.empty?
       events_table = table do |t|
@@ -280,13 +280,13 @@ module PI::Cli::Command
       display events_table
     end
 
-    def project_tags(project=nil)
+    def project_tags(projectid=nil)
       client.check_login_status
-      unless project
+      unless projectid
         useproject = choose_project
-        project = useproject[:name]
+        projectid = useproject[:id]
       end
-      tags ||= client.project_tags(project)
+      tags ||= client.project_tags(projectid)
       return display JSON.pretty_generate(tags || []) if @options[:json]
       return display "No Tags." if tags.size == 0
       tags_table = table do |t|
@@ -297,20 +297,20 @@ module PI::Cli::Command
       display tags_table
     end
 
-    def project_commits(project=nil)
+    def project_commits(projectid=nil)
       client.check_login_status
-      unless project
+      unless projectid
         useproject = choose_project
-        project = useproject[:name]
+        projectid = useproject[:id]
       end
-      tags = client.project_tags(project)
+      tags = client.project_tags(projectid)
       return display JSON.pretty_generate(tags || []) if @options[:json]
       return display "No Commits" if tags.nil? || tags.empty?
       tag = ask "Select Tag", :choices => tags, :indexed => true
       display "Selected Tag: ",false
       display "#{tag}"
 
-      commits = client.project_commits(project,tag)
+      commits = client.project_commits_bytag(projectid,tag)
       commits.sort! {|a, b| a[:date] <=> b[:date] }
       return display JSON.pretty_generate(commits || []) if @options[:json]
       return display "No Commits" if commits.nil? || commits.empty?

data/lib/cli/commands/services.rb

@@ -60,7 +60,7 @@ module PI::Cli::Command
         if not result[:text].empty?
           display "OK".green
         else
-          display "Please try again"
+          display "Time out"
         end            
       else
         err result[:text]   
@@ -173,7 +173,7 @@ module PI::Cli::Command
       else 
         serviceid = choose_serviceid
       end      
-      targets = client.usable_target(serviceid)
+      targets = client.usable_service_target(serviceid)
       err "No targets" if targets.nil? || targets.empty?
       if target
         target_flag = false
@@ -234,7 +234,7 @@ module PI::Cli::Command
         if not result[:text].empty?
           display "OK".green
         else
-          display "Please try again"
+          display "Time out"
         end            
       else
         err result[:text]   

data/lib/cli/interact_helper.rb

@@ -209,12 +209,18 @@ module PI::Cli
           res = res.push(choices.to_a[ans.to_i - 1])
         [true, res]
         #add
-      elsif choices and ans =~ /^\s*(\d+,)*\d+\s*$/ and \
+      # elsif choices and ans =~ /^\s*(\d+,)*\d+\s*$/ and \
+      elsif choices and ans =~ /^\s*(\d+,)+\d+\s*$/ and \
           ans.to_i - 1 >= 0 
           ans = ans.split(",")
           res = Array.new
           ans.each do |a|
-            res.push(choices[a.to_i - 1])
+            if a.to_i - 1 < choices.to_a.size
+              res.push(choices[a.to_i - 1])
+            else
+              puts "Unknown answer, please try again!"
+              return [false, nil]
+            end
           end 
           # res =  ["rails.samsungpaas.comrailstest.samsungpaas.com"]
         [true, res]    

data/lib/cli/runner.rb

@@ -33,7 +33,7 @@ class PI::Cli::Runner
       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('--projectid ID')    { |id|       @options[:projectid] = id }
       opts.on('--target TARG')     { |targ|     @options[:target] = targ }
       opts.on('--instance N')      { |inst|     @options[:instance] = inst }
       opts.on('--type TYPE')       { |type|     @options[:type] = type }
@@ -182,11 +182,11 @@ class PI::Cli::Runner
       set_cmd(:projects, :create_project, @args.size == 1 ? 1 : 0)
   
     when 'delete-project'
-      usage('pi delete-project [project]')
+      usage('pi delete-project [projectid]')
       set_cmd(:projects, :delete_project, @args.size == 1 ? 1 : 0) 
       
     when 'upload'
-      usage('pi upload [project] [--path PATH] [--ver VERSION] [--desc DESC]')
+      usage('pi upload [projectid] [--path PATH] [--ver VERSION] [--desc DESC]')
       if @args.size == 1
         set_cmd(:projects, :upload, 1)
       else
@@ -198,15 +198,15 @@ class PI::Cli::Runner
       set_cmd(:projects, :delete_binary, @args.size == 1 ? 1 : 0)
       
     when 'project-events' 
-      usage('pi project-events [project]')
+      usage('pi project-events [projectid]')
       set_cmd(:projects, :project_events, @args.size == 1 ? 1 : 0) 
         
     when 'project-tags'
-      usage('pi project-tags [project]')
+      usage('pi project-tags [projectid]')
       set_cmd(:projects, :project_tags, @args.size == 1 ? 1 : 0) 
     
     when 'project-commits'
-      usage('pi project-commits [project]')
+      usage('pi project-commits [projectid]')
       set_cmd(:projects, :project_commits, @args.size == 1 ? 1 : 0) 
       
     ###############################################################################
@@ -214,7 +214,7 @@ class PI::Cli::Runner
     ###############################################################################
     
     when 'apps'
-      usage('pi apps [--project PROJ] [--target TARG]')
+      usage('pi apps [--projectid ID] [--target TARG]')
       set_cmd(:apps, :apps)  
       
     when 'create-app'
@@ -332,9 +332,13 @@ class PI::Cli::Runner
     when 'dns'     
       usage('pi dns')
       set_cmd(:dns, :dns)
+      
+    when 'zones'     
+      usage('pi zones')
+      set_cmd(:dns, :zones)
     
     when 'create-dns'     
-      usage('pi create-dns [dnsname] [--zoneid ID] [--project PROJ] [--desc DESC]')
+      usage('pi create-dns [dnsname] [--zoneid ID] [--projectid ID] [--desc DESC]')
       set_cmd(:dns, :create_dns, @args.size == 1 ? 1 : 0)
       
     when 'delete-dns'     

data/lib/cli/usage.rb

@@ -41,14 +41,14 @@ Currently available pi commands are:
   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
+    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 
-    apps [--project,--target]                             List deployed applications for the project
+    apps [--projectid,--target]                           List deployed applications
     create-app [appname]                                  Create a new application
     delete-app [appid]                                    Delete the application
     delete-app <appname> <--target TARGET>                Delete the application
@@ -97,7 +97,8 @@ Currently available pi commands are:
     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
-    create-dns [dnsname] [--zoneid,--project,--desc]      Create a new dns
+    zones                                                 List the dns zones
+    create-dns [dnsname] [--zoneid,--projectid,--desc]    Create a new dns
     register-dns [dnsid]                                  Register to target
     deregister-dns [dnsid]                                Deregister to target
     delete-dns [dnsid]                                    Delete the dns

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module PI
   module Cli
-    VERSION = '0.1.25'
+    VERSION = '0.1.26'
   end
 end

data/lib/pi/client.rb

@@ -81,7 +81,7 @@ class PI::Client
   end
   
   def github_info
-    json_get("#{PI::USER_PATH}/github")
+    json_get("#{PI::USER_PATH}/repository/bind?type=github")
   end
   
   def targets
@@ -93,7 +93,7 @@ class PI::Client
   end
   
   def github(manifest={})
-    json_post("#{PI::USER_PATH}/github/bind",manifest)
+    json_post("#{PI::USER_PATH}/repository/bind?type=github",manifest)
   end
   
   def runtimes
@@ -113,19 +113,19 @@ class PI::Client
   end
   
   def projects(pageNum=-1, numPerPage=-1)
-    json_get("#{PI::PROJECTS_PATH}/search?pageNum=#{pageNum}&numPerPage=#{numPerPage}")
+    json_get("#{PI::PROJECTS_PATH}?pageNum=#{pageNum}&numPerPage=#{numPerPage}")
   end
   
   def project_sum
-    http_get("#{PI::PROJECTS_PATH}/search/sum")
+    http_get("#{PI::PROJECTS_PATH}/sum")
   end
   
   def create_project(name, manifest={})
     status, body, headers = json_post("#{PI::PROJECT_PATH}/", manifest)
   end
   
-  def delete_project(projectname)
-    http_delete("#{PI::PROJECT_PATH}/#{projectname}",'application/json')
+  def delete_project(projectid)
+    http_delete("#{PI::PROJECT_PATH}/#{projectid}",'application/json')
   end
   
   def upload(manifest={})
@@ -137,36 +137,36 @@ class PI::Client
     http_delete("#{PI::PROJECT_PATH}/binary/#{binaryid}",'application/json')
   end
   
-  def project_events(projectname)
-    json_get("#{PI::PROJECT_PATH}/events/#{projectname}")
+  def project_events(projectid)
+    json_get("#{PI::PROJECT_PATH}/events/#{projectid}")
   end
   
-  def project_tags(projectname)
-    json_get("#{PI::PROJECT_PATH}/tags/#{projectname}")
+  def project_tags(projectid)
+    json_get("#{PI::PROJECT_PATH}/tags/#{projectid}")
   end
   
-  def project_commits(projectname,tag)
-    json_get("#{PI::PROJECT_PATH}/commitinfo/#{projectname}/#{tag}")
+  def project_commits_bytag(projectid,tag)
+    json_get("#{PI::PROJECT_PATH}/commitinfo/#{projectid}/#{tag}")
   end
   
-  def project_binary(projectname)
-    json_get("#{PI::PROJECT_PATH}/binary/list/#{projectname}")
+  def project_commits_bybranch(projectid,branch="master")
+    json_get("#{PI::PROJECT_PATH}/commitinfo/branch/#{projectid}/#{branch}")
   end
   
-  def project_binary_existed(projectname,versionname)
-    http_get("#{PI::PROJECT_PATH}/binary/existed/#{projectname}/#{versionname}")
+  def project_binary(projectid)
+    json_get("#{PI::PROJECT_PATH}/binary/list/#{projectid}")
   end
-
-  def project_branchs(projectname)
-    json_get("#{PI::PROJECT_PATH}/branchs/#{projectname}")
+  
+  def project_binary_existed(projectid,versionname)
+    http_get("#{PI::PROJECT_PATH}/binary/existed/#{projectid}/#{versionname}")
   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}")
+  def apps(projectid=0, targetname=nil, pageNum=-1, numPerPage=-1)    
+    json_get("#{PI::PROJECT_PATH}/apps?projectId=#{projectid}&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}")
+  def app_sum(projectid=0, targetname=nil)
+    http_get("#{PI::PROJECT_PATH}/apps/sum?projectId=#{projectid}&targetName=#{targetname}")
   end
 
   #####################################################
@@ -285,7 +285,7 @@ class PI::Client
     http_delete("#{PI::SERVICE_PATH}/#{serviceid}", 'application/json')
   end
   
-  def usable_target(serviceid)
+  def usable_service_target(serviceid)
     json_get("#{PI::SERVICE_PATH}/target/usable/#{serviceid}")
   end
   
@@ -341,7 +341,7 @@ class PI::Client
     http_delete("#{PI::DNS_PATH}/#{dnsid}",'application/json')
   end
   
-  def usable_target(dnsid)
+  def usable_dns_target(dnsid)
     json_get("#{PI::DNS_PATH}/dnstarget/#{dnsid}")
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pi
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 1
-  - 25
-  version: 0.1.25
+  - 26
+  version: 0.1.26
 platform: ruby
 authors: 
 - Samsung
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-10 00:00:00 Z
+date: 2012-08-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure