pi 0.1.33 → 0.1.34

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module PI
   module Cli
-    VERSION = '0.1.33'
+    VERSION = '0.1.34'
   end
 end

data/lib/pi/client.rb

@@ -27,15 +27,6 @@ class PI::Client
 
 
   def initialize(target_url=PI::DEFAULT_TARGET, auth_token=nil)
-    if target_url =~ /(https?:\/\/)?staging.samsungcloud.org/
-      if /^https?/ =~ target_url
-        target_url = target_url.split("//", 2)
-        target_url = target_url[1]
-      end
-      target_url = "http://api.#{target_url}"
-    else
-      target_url = "http://#{target_url}" unless /^https?/ =~ target_url
-    end
     target_url = target_url.gsub(/\/+$/, '')
     @target =  target_url
     @auth_token = auth_token
@@ -55,15 +46,15 @@ class PI::Client
   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)
     status, body, headers = json_post("#{PI::TOKEN_PATH}", {:password => password,:userName => user})
     response_info = json_parse(body)
@@ -75,15 +66,15 @@ class PI::Client
   def info
     json_get(PI::INFO_PATH)
   end
-  
+
   def user_info
     json_get(PI::USER_PATH)
   end
-  
+
   def github_info
     json_get("#{PI::USER_PATH}/repository/bind?type=github")
   end
-  
+
   def targets
     json_get("#{PI::USER_PATH}/targets")
   end
@@ -91,93 +82,93 @@ class PI::Client
   def password(manifest={})
     status, body, headers = json_post("#{PI::USER_PATH}/password", manifest)
   end
-  
+
   def github(manifest={})
     json_post("#{PI::USER_PATH}/repository/bind?type=github",manifest)
   end
-  
+
   def runtimes
     json_get("#{PI::INFO_PATH}/runtimes")
-  end  
-  
+  end
+
   def frameworks(runtime)
     json_get("#{PI::INFO_PATH}/frameworks?runtime=#{runtime}")
   end
-  
+
   #####################################################
   # projects
   #####################################################
-  
+
   def project_search(projectname=nil)
     json_get("#{PI::PROJECT_PATH}/search/#{projectname}")
   end
-  
+
   def projects(pageNum=-1, numPerPage=-1)
     json_get("#{PI::PROJECTS_PATH}?pageNum=#{pageNum}&numPerPage=#{numPerPage}")
   end
-  
+
   def project_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(projectid)
     projectid = uri_encode(projectid)
     http_delete("#{PI::PROJECT_PATH}/#{projectid}",'application/json')
   end
-  
+
   def upload(manifest={})
     status, body, headers = http_post("#{PI::PROJECT_PATH}/upload", manifest)
     response_info = json_parse(body)
   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)    
+
+  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)
@@ -187,170 +178,170 @@ class PI::Client
   #####################################################
   # applications
   #####################################################
-  
+
   def app_get_byid(appid)
     appid = uri_encode(appid)
     json_get("#{PI::APP_PATH}/#{appid}")
   end
-  
+
   def app_search(targetname, appname)
     targetname = uri_encode(targetname)
     appname = uri_encode(appname)
     json_get("#{PI::APP_PATH}/search/#{targetname}/#{appname}")
   end
-  
-  def app_search_target_is_all(appname)    
+
+  def app_search_target_is_all(appname)
     appname = uri_encode(appname)
     json_get("#{PI::PROJECT_PATH}/apps?appName=#{appname}")
   end
-  
+
   def create_app(manifest={})
     status, body, headers = json_post("#{PI::APP_PATH}/", manifest)
   end
-  
+
   def target_memory(targetname)
     targetname = uri_encode(targetname)
     http_get("#{PI::APP_PATH}/target/#{targetname}/memory")
   end
-  
+
   def app_message(uuid)
     json_get("#{PI::APP_PATH}/message/#{uuid}")
   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 
- 
+  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}/instances")
   end
- 
+
   #####################################################
   # services
   #####################################################
-  
+
   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
-  
+
   def services
     json_get("#{PI::SERVICE_PATH}/search")
   end
-  
+
   def service(serviceid)
     serviceid = uri_encode(serviceid)
     json_get("#{PI::SERVICE_PATH}/#{serviceid}")
   end
-  
+
   def import_service(manifest={})
     http_post("#{PI::SERVICE_PATH}/import",manifest)
   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, manifest={})
     serviceid = uri_encode(serviceid)
     targetname = uri_encode(targetname)
@@ -362,82 +353,82 @@ class PI::Client
     servicetargetid = uri_encode(servicetargetid)
     http_delete("#{PI::SERVICE_PATH}/unregister/#{servicetargetid}",'application/json')
   end
-  
+
   #####################################################
   # dns
   #####################################################
-  
+
   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
-  
+
   def dns
     json_get("#{PI::DNS_PATH}/search")
   end
-  
+
   def create_dns(manifest={})
     json_post("#{PI::DNS_PATH}/", manifest)
   end
-  
+
   def dns_zone_list
     json_get("#{PI::DNS_PATH}/dnszones")
   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 
-  
+  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
-  
+
   def dns_continents
     json_get("#{PI::DNS_PATH}/continents")
   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
-  
+
   ######################################################
-  
+
   def uri_encode(name)
     URI.encode name.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
   end