pi 0.1.28 → 0.1.29

data/lib/cli/commands/dns.rb

@@ -134,11 +134,20 @@ 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 projectid 
-      projects.each do |p|
-        projectid = p[:id] if p[:name] == projectname
-      end   
+      projects = client.projects  
+      if projectid
+        projectid_flag = false
+        projects.each do |p|
+          projectid_flag = true if p[:id].to_s == projectid
+        end
+        err"Invalid project id: #{projectid}" if projectid_flag != true
+      else
+        projectname = ask"Project name", :choices => projects.collect { |p| p[:name] }, :indexed => true  
+        projects.each do |p|
+          projectid = p[:id] if p[:name] == projectname
+        end 
+      end           
+        
       unless zoneid
         zonename = ask"Select dns zone", :choices => dns_zone.collect { |d| d[:name] }, :indexed => true
         dns_zone.each do |d|
@@ -263,6 +272,29 @@ module PI::Cli::Command
       display "OK".green
     end
     
+    def dns_records(dnsid=nil)
+      client.check_login_status
+      unless dnsid
+        dnsid = choose_dnsid
+      end
+      record_info = Array.new
+      targets = client.usable_dns_target(dnsid)
+      targets.each do |t|
+        t[:records].each do |v|
+          i = 0
+          record_info.push({ :id => v[:id],:targetName => t[:targetName],:view => v[:view]}) if not t[:records].empty?
+          i = i + 1
+        end
+      end
+      record_info_table = table do |t|
+        t.headings = 'Record ID', 'Target Name', 'View Name'
+        record_info.each do |s|
+          t << [s[:id],s[:targetName], s[:view]]
+        end
+      end
+      display record_info_table
+    end
+    
     private
     
     def do_unmap_dns(appid, url)

data/lib/cli/commands/user.rb

@@ -105,6 +105,7 @@ module PI::Cli::Command
         end
         }  
       end
+      err "New password is same with old one. Don't need to change password." if oldpassword == newpassword
       manifest = {
         :newPassword => newpassword,
         :oldPassword => oldpassword

data/lib/cli/runner.rb

@@ -242,7 +242,7 @@ class PI::Cli::Runner
       set_cmd(:apps, :restart_app, @args.size == 1 ? 1 : 0)
       
     when 'scale-app'     
-      usage('pi scale-app [appid] [--instance N] [--graceful] or pi scale-app <appname> <--target TARGET> [--instance N] [--graceful]')
+      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'     
@@ -282,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] [--graceful] or pi bind-service <appname> <--target TARGET> [--service SERVICE] [--graceful]')
+      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'     
-      usage('pi unbind-service [appid] [--service SERVICE] [--graceful] or pi unbind-service <appname> <--target TARGET> [--service SERVICE] [--graceful]')
+      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'     
@@ -356,6 +356,10 @@ class PI::Cli::Runner
     when 'register-dns'     
       usage('pi register-dns [dnsid] [--target,--continent,--country]')
       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'     
       usage('pi deregister-dns [dnsid] [--recordid ID]')

data/lib/cli/usage.rb

@@ -62,7 +62,6 @@ Currently available pi commands are:
     restart-app --graceful                                      Restart the application in a graceful mode
     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
-    scale-app --graceful                                        Scale the application instances in a graceful mode
     update-app [appid] [--ver VERSION]                          Update the application
     update-app <appname> <--target TARGET> [--ver VERSION]      Update the application
     update-app --graceful                                       Update the application in a graceful mode
@@ -84,10 +83,8 @@ Currently available pi commands are:
     app-service <appname> <--target TARGET>                     Display the binded services for the application
     bind-service [appid] [--service SERVICE]                    Bind the services for the application
     bind-service <appname> <--target TARGET> [--service]        Bind the services for the application
-    bind-service --graceful                                     Bind the services for the application in a graceful mode
     unbind-service [appid] [--service SERVICE]                  Unbind the services for the application
     unbind-service <appname> <--target TARGET> [--service]      Unbind the services for the application
-    unbind-service --graceful                                   Unbind the services for the application in a graceful mode
     services                                                    List dedicated services
     service [serviceid]                                         List the connection info for the service
     export-service [serviceid]                                  Export dedicated service url
@@ -106,6 +103,7 @@ Currently available pi commands are:
     unmap-dns <appname> <--target TARGET> [--dns DNS]           Unmap the urls for the application
     dns                                                         List the dns
     zones                                                       List the dns zones
+    dns-records [dnsid]                                         List the record info for the registered dns
     create-dns [dnsname] [--zoneid,--projectid,--desc]          Create a new dns
     register-dns [dnsid] [--target,--continent,--country]       Register to target
     deregister-dns [dnsid] [--recordid ID]                      Deregister to target

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module PI
   module Cli
-    VERSION = '0.1.28'
+    VERSION = '0.1.29'
   end
 end

data/lib/pi/client.rb

@@ -125,6 +125,7 @@ class PI::Client
   end
   
   def delete_project(projectid)
+    projectid = uri_encode(projectid)
     http_delete("#{PI::PROJECT_PATH}/#{projectid}",'application/json')
   end
   
@@ -134,39 +135,52 @@ class PI::Client
   end
   
   def delete_binary(binaryid)
+    binaryid = uri_encode(binaryid)
     http_delete("#{PI::PROJECT_PATH}/binary/#{binaryid}",'application/json')
   end
   
   def project_events(projectid)
+    projectid = uri_encode(projectid)
     json_get("#{PI::PROJECT_PATH}/events/#{projectid}")
   end
   
   def project_tags(projectid)
+    projectid = uri_encode(projectid)
     json_get("#{PI::PROJECT_PATH}/tags/#{projectid}")
   end
   
   def project_commits_bytag(projectid,tag)
+    projectid = uri_encode(projectid)
+    tag = uri_encode(tag)
     json_get("#{PI::PROJECT_PATH}/commitinfo/#{projectid}/#{tag}")
   end
   
   def project_commits_bybranch(projectid,branch="master")
+    projectid = uri_encode(projectid)
+    branch = uri_encode(branch)
     json_get("#{PI::PROJECT_PATH}/commitinfo/branch/#{projectid}/#{branch}")
   end
   
   def project_binary(projectid)
+    projectid = uri_encode(projectid)
     json_get("#{PI::PROJECT_PATH}/binary/list/#{projectid}")
   end
   
   def project_binary_existed(projectid,versionname)
     versionname = uri_encode(versionname)
+    projectid = uri_encode(projectid)
     http_get("#{PI::PROJECT_PATH}/binary/existed/#{projectid}/#{versionname}")
   end
   
   def apps(projectid=0, targetname=nil, pageNum=-1, numPerPage=-1)    
+    projectid = uri_encode(projectid)
+    targetname = uri_encode(targetname)
     json_get("#{PI::PROJECT_PATH}/apps?projectId=#{projectid}&targetName=#{targetname}&pageNum=#{pageNum}&numPerPage=#{numPerPage}")
   end
   
   def app_sum(projectid=0, targetname=nil)
+    projectid = uri_encode(projectid)
+    targetname = uri_encode(targetname)
     http_get("#{PI::PROJECT_PATH}/apps/sum?projectId=#{projectid}&targetName=#{targetname}")
   end
 
@@ -175,6 +189,7 @@ class PI::Client
   #####################################################
   
   def app_get_byid(appid)
+    appid = uri_encode(appid)
     json_get("#{PI::APP_PATH}/#{appid}")
   end
   
@@ -185,6 +200,7 @@ class PI::Client
   end
   
   def app_search_target_is_all(appname)    
+    appname = uri_encode(appname)
     json_get("#{PI::PROJECT_PATH}/apps?appName=#{appname}")
   end
   
@@ -193,6 +209,7 @@ class PI::Client
   end
   
   def target_memory(targetname)
+    targetname = uri_encode(targetname)
     http_get("#{PI::APP_PATH}/target/#{targetname}/memory")
   end
   
@@ -201,57 +218,73 @@ class PI::Client
   end
   
   def delete_app(appid)
+    appid = uri_encode(appid)
     http_delete("#{PI::APP_PATH}/#{appid}",'application/json')
   end
   
   def start_app(appid)
+    appid = uri_encode(appid)
     json_post("#{PI::APP_PATH}/#{appid}/start",manifest={})
   end
   
   def stop_app(appid, graceful)
+    appid = uri_encode(appid)
     json_post("#{PI::APP_PATH}/#{appid}/stop?graceful=#{graceful}",manifest={})
   end
   
   def restart_app(appid, graceful)
+    appid = uri_encode(appid)
     json_post("#{PI::APP_PATH}/#{appid}/restart?graceful=#{graceful}",manifest={})
   end
   
   def scale_app(appid, instance)
+    appid = uri_encode(appid)
+    instance = uri_encode(instance)
     json_post("#{PI::APP_PATH}/#{appid}/scale?instance=#{instance}", manifest={})
   end
   
   def update_app(appid, tag, graceful)
+    tag = uri_encode(tag)
+    appid = uri_encode(appid)
     json_post("#{PI::APP_PATH}/#{appid}/rollback/#{tag}?graceful=#{graceful}", manifest={})
   end
  
   def status(appid)
+    appid = uri_encode(appid)
     json_get("#{PI::APP_PATH}/#{appid}/monitor")
   end
  
   def app_log(appid, filepath, instanceindex)
     filepath = uri_encode(filepath)
+    appid = uri_encode(appid)
+    instanceindex = uri_encode(instanceindex)
     http_get("#{PI::APP_PATH}/#{appid}/logs?filePath=#{filepath}&instanceIndex=#{instanceindex}")
   end
   
   def app_env(appid)
+    appid = uri_encode(appid)
     json_get("#{PI::APP_PATH}/#{appid}/env/list")
   end 
  
   def create_env(appid, manifest={})
+    appid = uri_encode(appid)
     json_post("#{PI::APP_PATH}/#{appid}/env", manifest)
   end
   
   def delete_env(appid, env)
     env = uri_encode(env)
+    appid = uri_encode(appid)
     http_delete("#{PI::APP_PATH}/#{appid}/env/#{env}",'application/json')
   end
   
   def env_verify(appid, name)
     name = uri_encode(name)
+    appid = uri_encode(appid)
     http_get("#{PI::APP_PATH}/#{appid}/env/verify?name=#{name}")
   end
   
   def app_debug_info(appid)
+    appid = uri_encode(appid)
     json_get("#{PI::APP_PATH}/#{appid}/debug")
   end
  
@@ -260,18 +293,23 @@ class PI::Client
   #####################################################
   
   def usable_services(appid)
+    appid = uri_encode(appid)
     json_get("#{PI::APP_PATH}/#{appid}/service/usable")
   end
   
   def app_service(appid)
+    appid = uri_encode(appid)
     json_get("#{PI::APP_PATH}/#{appid}/service/bind")
   end
   
   def bind_service(appid, manifest={})
+    appid = uri_encode(appid)
     json_post("#{PI::APP_PATH}/#{appid}/service/bind",manifest)
   end
   
   def unbind_service(appid, servicename)
+    appid = uri_encode(appid)
+    servicename = uri_encode(servicename)
     http_delete("#{PI::APP_PATH}/#{appid}/service/unbind/#{servicename}",'application/json')
   end
   
@@ -280,6 +318,7 @@ class PI::Client
   end
   
   def service(serviceid)
+    serviceid = uri_encode(serviceid)
     json_get("#{PI::SERVICE_PATH}/#{serviceid}")
   end
   
@@ -288,30 +327,39 @@ class PI::Client
   end
   
   def export_service(serviceid)
+    serviceid = uri_encode(serviceid)
     http_get("#{PI::SERVICE_PATH}/exporturl/#{serviceid}")
   end
   
   def check_service(serviceid)
+    serviceid = uri_encode(serviceid)
     http_get("#{PI::SERVICE_PATH}/check/#{serviceid}")
   end
   
   def delete_service(serviceid)
+    serviceid = uri_encode(serviceid)
     http_delete("#{PI::SERVICE_PATH}/#{serviceid}", 'application/json')
   end
   
   def usable_service_target(serviceid)
+    serviceid = uri_encode(serviceid)
     json_get("#{PI::SERVICE_PATH}/target/usable/#{serviceid}")
   end
   
   def service_target(serviceid)
+    serviceid = uri_encode(serviceid)
     json_get("#{PI::SERVICE_PATH}/servicetarget/#{serviceid}")
   end
   
   def register_service(serviceid, targetname, servicetype, manifest={})
+    serviceid = uri_encode(serviceid)
+    targetname = uri_encode(targetname)
+    servicetype = uri_encode(servicetype)
     json_post("#{PI::SERVICE_PATH}/register/#{targetname}/#{serviceid}?serviceType=#{servicetype}",manifest)
   end
 
   def deregister_service(servicetargetid)
+    servicetargetid = uri_encode(servicetargetid)
     http_delete("#{PI::SERVICE_PATH}/unregister/#{servicetargetid}",'application/json')
   end
   
@@ -320,18 +368,23 @@ class PI::Client
   #####################################################
   
   def usable_dns(appid)
+    appid = uri_encode(appid)
     json_get("#{PI::APP_PATH}/#{appid}/url/usable")
   end
   
   def app_dns(appid)
+    appid = uri_encode(appid)
     json_get("#{PI::APP_PATH}/#{appid}/url/map")
   end
   
   def map_dns(appid, manifest={})
+    appid = uri_encode(appid)
     json_post("#{PI::APP_PATH}/#{appid}/url/map", manifest)
   end
   
   def unmap_dns(appid, url)
+    appid = uri_encode(appid)
+    url = uri_encode(url)
     http_delete("#{PI::APP_PATH}/#{appid}/url/unmap/#{url}", 'application/json')
   end
   
@@ -348,14 +401,18 @@ class PI::Client
   end
   
   def verify_dns(dnsname, zoneid)
+    dnsname = uri_encode(dnsname)
+    zoneid = uri_encode(zoneid)
     http_get("#{PI::DNS_PATH}/verify?dnsName=#{dnsname}&zoneId=#{zoneid}")
   end 
   
   def delete_dns(dnsid)
+    dnsid = uri_encode(dnsid)
     http_delete("#{PI::DNS_PATH}/#{dnsid}",'application/json')
   end
   
   def usable_dns_target(dnsid)
+    dnsid = uri_encode(dnsid)
     json_get("#{PI::DNS_PATH}/dnstarget/#{dnsid}")
   end
   
@@ -364,14 +421,18 @@ class PI::Client
   end
   
   def dns_country(continents)
+    continents = uri_encode(continents)
     json_get("#{PI::DNS_PATH}/country/#{continents}")
   end
   
   def register_dns(dnsid, target, manifest={})
+    dnsid = uri_encode(dnsid)
+    target = uri_encode(target)
     json_post("#{PI::DNS_PATH}/view/#{dnsid}/#{target}", manifest)
   end
   
   def deregister_dns(recordid)
+    recordid = uri_encode(recordid)
     http_delete("#{PI::DNS_PATH}/record/#{recordid}",'application/json')
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pi
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 0
   - 1
-  - 28
-  version: 0.1.28
+  - 29
+  version: 0.1.29
 platform: ruby
 authors: 
 - Samsung
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-31 00:00:00 Z
+date: 2012-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure