pi 0.1.24 → 0.1.25

data/lib/cli/commands/user.rb

@@ -85,8 +85,10 @@ module PI::Cli::Command
       display targets_table
     end
 
-    def password(newpassword=nil)   
+    def password(oldpassword=nil)   
       client.check_login_status   
+      newpassword = @options[:password]
+      oldpassword = ask "Old Password", :echo => '*' unless oldpassword
       unless newpassword
         loop{
         newpassword = ask "New Password", :echo => '*'
@@ -100,7 +102,11 @@ module PI::Cli::Command
         end
         }  
       end
-      client.password(newpassword)
+      manifest = {
+        :newPassword => newpassword,
+        :oldPassword => oldpassword
+      }
+      client.password(manifest)
       display "ok".green
     end
     

data/lib/cli/config.rb

@@ -7,7 +7,8 @@ require 'json/pure'
 module PI::Cli
   class Config
 
-    DEFAULT_TARGET  = 'api.staging.samsungcloud.org'
+    # DEFAULT_TARGET  = 'api.staging.samsungcloud.org'
+    DEFAULT_TARGET  = 'staging.samsungcloud.org'
     DEFAULT_SUGGEST = 'samsungcloud.org'
 
     TARGET_FILE    = '~/.pi_target'

data/lib/cli/runner.rb

@@ -36,6 +36,14 @@ class PI::Cli::Runner
       opts.on('--project PROJ')    { |proj|     @options[:project] = proj }
       opts.on('--target TARG')     { |targ|     @options[:target] = targ }
       opts.on('--instance N')      { |inst|     @options[:instance] = inst }
+      opts.on('--type TYPE')       { |type|     @options[:type] = type }
+      opts.on('--value VALUE')     { |value|    @options[:value] = value }
+      opts.on('--service SERVICE') { |service|  @options[:service] = service }
+      opts.on('--dns DNS')         { |dns|      @options[:dns] = dns }
+      opts.on('--zoneid ID')       { |id|       @options[:zoneid] = id }
+      # opts.on('--continent CONT')  { |cont|     @options[:continent] = cont }
+      # opts.on('--country COUNTRY') { |country|  @options[:country] = country }
+      # opts.on('--recordid ID')     { |id|       @options[:recordid] = id }
       # generic tracing and debugging
       opts.on('-t [TKEY]')         { |tkey|     @options[:trace] = tkey || true }
       opts.on('--trace [TKEY]')    { |tkey|     @options[:trace] = tkey || true }
@@ -121,7 +129,7 @@ class PI::Cli::Runner
       set_cmd(:user, :targets)
       
     when 'password'
-      usage ('pi password [newpassword]')
+      usage ('pi password [oldpassword] [--password PASS]')
       set_cmd(:user, :password, @args.size == 1 ? 1 : 0)
       
     when 'github'
@@ -234,7 +242,7 @@ class PI::Cli::Runner
       set_cmd(:apps, :scale_app, @args.size == 1 ? 1 : 0)
       
     when 'update-app'     
-      usage('pi update-app [appid] or pi update-app <appname> <--target TARGET>')
+      usage('pi update-app [appid] [--ver VERSION] or pi update-app <appname> <--target TARGET> [--ver VERSION]')
       set_cmd(:apps, :update_app, @args.size == 1 ? 1 : 0)
       
     when 'status'     
@@ -246,11 +254,11 @@ class PI::Cli::Runner
       set_cmd(:apps, :app_env, @args.size == 1 ? 1 : 0)
       
     when 'create-env'     
-      usage('pi app-env [appid] or pi app-env <appname> <--target TARGET>')
+      usage('pi app-env [appid][--name,--value] or pi app-env <appname> <--target TARGET> [--name,--value]')
       set_cmd(:apps, :create_env, @args.size == 1 ? 1 : 0)
       
     when 'delete-env'     
-      usage('pi delete-env [appid] or pi delete-env <appname> <--target TARGET>')
+      usage('pi delete-env [appid] [--name NAME] or pi delete-env <appname> <--target TARGET> [--name NAME]')
       set_cmd(:apps, :delete_env, @args.size == 1 ? 1 : 0)
       
     when 'app-log'     
@@ -266,13 +274,45 @@ class PI::Cli::Runner
       set_cmd(:services, :app_service, @args.size == 1 ? 1 : 0) 
       
     when 'bind-service'     
-      usage('pi bind-service [appid] or pi bind-service <appname> <--target TARGET>')
+      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] or pi unbind-service <appname> <--target TARGET>')
+      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'     
+      usage('pi services')
+      set_cmd(:services, :services)
+      
+    when 'service'     
+      usage('pi service [serviceid]')
+      set_cmd(:services, :service, @args.size == 1 ? 1 : 0)
+      
+    when 'import-service'     
+      usage('pi import-service [url]')
+      set_cmd(:services, :import_service, @args.size == 1 ? 1 : 0)
+      
+    when 'export-service'     
+      usage('pi export-service [serviceid]')
+      set_cmd(:services, :export_service, @args.size == 1 ? 1 : 0)      
+      
+    when 'check-service'     
+      usage('pi check-service [serviceid]')
+      set_cmd(:services, :check_service, @args.size == 1 ? 1 : 0) 
+      
+    when 'register-service'     
+      usage('pi register-service [serviceid] [--target TARGET] [--type TYPE]')
+      set_cmd(:services, :register_service, @args.size == 1 ? 1 : 0)  
+      
+    when 'deregister-service'     
+      usage('pi deregister-service [serviceid] [--target TARGET]')
+      set_cmd(:services, :deregister_service, @args.size == 1 ? 1 : 0)
+    
+    when 'delete-service'     
+      usage('pi delete-service [serviceid]')
+      set_cmd(:services, :delete_service, @args.size == 1 ? 1 : 0)  
+           
     ###############################################################################
     # Dns
     ###############################################################################
@@ -282,12 +322,32 @@ class PI::Cli::Runner
       set_cmd(:dns, :app_dns, @args.size == 1 ? 1 : 0) 
       
     when 'map-dns'     
-      usage('pi map-dns [appid] or pi map-dns <appname> <--target TARGET>')
+      usage('pi map-dns [appid] [--dns DNS] or pi map-dns <appname> <--target TARGET> [--dns DNS]')
       set_cmd(:dns, :map_dns, @args.size == 1 ? 1 : 0)
       
     when 'unmap-dns'     
-      usage('pi unmap-dns [appid] or pi unmap-dns <appname> <--target TARGET>')
+      usage('pi unmap-dns [appid] [--dns DNS] or pi unmap-dns <appname> <--target TARGET> [--dns DNS]')
       set_cmd(:dns, :unmap_dns, @args.size == 1 ? 1 : 0)
+      
+    when 'dns'     
+      usage('pi dns')
+      set_cmd(:dns, :dns)
+    
+    when 'create-dns'     
+      usage('pi create-dns [dnsname] [--zoneid ID] [--project PROJ] [--desc DESC]')
+      set_cmd(:dns, :create_dns, @args.size == 1 ? 1 : 0)
+      
+    when 'delete-dns'     
+      usage('pi delete-dns [dnsid]')
+      set_cmd(:dns, :delete_dns, @args.size == 1 ? 1 : 0)  
+      
+    when 'register-dns'     
+      usage('pi register-dns [dnsid]')
+      set_cmd(:dns, :register_dns, @args.size == 1 ? 1 : 0) 
+      
+    when 'deregister-dns'     
+      usage('pi deregister-dns [dnsid]')
+      set_cmd(:dns, :deregister_dns, @args.size == 1 ? 1 : 0)      
          
     ############################################################################### 
            
@@ -328,7 +388,7 @@ class PI::Cli::Runner
 
     # local shopts=$-
     # set -o noglob
-    Kernel.system('set -o noglob')
+    # Kernel.system('set -o noglob')
     # Kernel.exec('sudo set -o noglob')
     # `set -o noglob`
     parse_command!

data/lib/cli/usage.rb

@@ -30,6 +30,7 @@ Currently available pi commands are:
     info                                                  List system information
     user                                                  Display user information
     targets                                               List available targets infomation
+    password [oldpassword] [--password PASS]              Change the password for the current user
     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
@@ -59,34 +60,47 @@ Currently available pi commands are:
     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
+    update-app [appid] [--ver VERSION]                    Update the application
+    update-app <appname> <--target TARGET>[--ver VERSION] 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
+    create-env [appid][--name,--value]                    Create the environment for the application
+    create-env <appname><--target TARGET>[--name,--value] Create the environment for the application
+    delete-env [appid] [--name NAME]                      Delete the environment for the application
+    delete-env <appname> <--target TARGET> [--name NAME]  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 [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
-  
+    bind-service [appid][--service SERVICE]               Bind the services for the application
+    bind-service <appname> <--target TARGET> [--service]  Bind the services for the application
+    unbind-service [appid][--service SERVICE]             Unbind the services for the application
+    unbind-service <appname> <--target TARGET>[--service] Unbind the services for the application
+    services                                              List dedicated services
+    service [serviceid]                                   List the connection info for the service
+    export-service [serviceid]                            Export dedicated service url
+    import-service [url]                                  Import dedicated service
+    check-service [serviceid]                             Check availability for the service 
+    delete-service [serviceid]                            Delete the service
+    register-service [serviceid] [--target,--type]        Register to target
+    deregister-service [serviceid] [--target TARGET]      Deregister to target
+    
   DNS
     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
+    map-dns [appid] [--dns DNS]                           Map the urls for the application
+    map-dns <appname> <--target TARGET> [--dns DNS]       Map the urls for the application
+    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
+    register-dns [dnsid]                                  Register to target
+    deregister-dns [dnsid]                                Deregister to target
+    delete-dns [dnsid]                                    Delete the dns
 USAGE
 
   end

data/lib/cli/version.rb

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

data/lib/pi/client.rb

@@ -26,10 +26,18 @@ class PI::Client
   class HTTPException <  RuntimeError; end
 
 
-  def initialize(target_urls=PI::DEFAULT_TARGET, auth_token=nil)
-    target_urls = "http://#{target_urls}" unless /^https?/ =~ target_urls
-    target_urls = target_urls.gsub(/\/+$/, '')
-    @target =  target_urls
+  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
   end
 
@@ -80,13 +88,12 @@ class PI::Client
     json_get("#{PI::USER_PATH}/targets")
   end
 
-  def password(newpassword)
-    # status, body, headers = json_post("#{PI::USER_PATH}/password/#{newpassword}",{:newpass => newpassword})
-    json_get("#{PI::USER_PATH}/password/#{newpassword}")
+  def password(manifest={})
+    status, body, headers = json_post("#{PI::USER_PATH}/password", manifest)
   end
   
   def github(manifest={})
-    json_post("#{PI::USER_PATH}/bind",manifest)
+    json_post("#{PI::USER_PATH}/github/bind",manifest)
   end
   
   def runtimes
@@ -254,6 +261,46 @@ class PI::Client
     http_delete("#{PI::APP_PATH}/#{appid}/service/unbind/#{servicename}",'application/json')
   end
   
+  def services
+    json_get("#{PI::SERVICE_PATH}/search")
+  end
+  
+  def service(serviceid)
+    json_get("#{PI::SERVICE_PATH}/#{serviceid}")
+  end
+  
+  def import_service(manifest={})
+    http_post("#{PI::SERVICE_PATH}/import",manifest)
+  end
+  
+  def export_service(serviceid)
+    http_get("#{PI::SERVICE_PATH}/exporturl/#{serviceid}")
+  end
+  
+  def check_service(serviceid)
+    http_get("#{PI::SERVICE_PATH}/check/#{serviceid}")
+  end
+  
+  def delete_service(serviceid)
+    http_delete("#{PI::SERVICE_PATH}/#{serviceid}", 'application/json')
+  end
+  
+  def usable_target(serviceid)
+    json_get("#{PI::SERVICE_PATH}/target/usable/#{serviceid}")
+  end
+  
+  def service_target(serviceid)
+    json_get("#{PI::SERVICE_PATH}/servicetarget/#{serviceid}")
+  end
+  
+  def register_service(serviceid, targetname, servicetype, manifest={})
+    json_post("#{PI::SERVICE_PATH}/register/#{targetname}/#{serviceid}?serviceType=#{servicetype}",manifest)
+  end
+
+  def deregister_service(servicetargetid)
+    http_delete("#{PI::SERVICE_PATH}/unregister/#{servicetargetid}",'application/json')
+  end
+  
   #####################################################
   # dns
   #####################################################
@@ -274,6 +321,46 @@ class PI::Client
     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}/dnszone/list")
+  end
+  
+  def verify_dns(dnsname, zoneid)
+    http_get("#{PI::DNS_PATH}/verify?dnsName=#{dnsname}&zoneId=#{zoneid}")
+  end 
+  
+  def delete_dns(dnsid)
+    http_delete("#{PI::DNS_PATH}/#{dnsid}",'application/json')
+  end
+  
+  def usable_target(dnsid)
+    json_get("#{PI::DNS_PATH}/dnstarget/#{dnsid}")
+  end
+  
+  def dns_continents
+    json_get("#{PI::DNS_PATH}/continents")
+  end
+  
+  def dns_country(continents)
+    json_get("#{PI::DNS_PATH}/country/#{continents}")
+  end
+  
+  def register_dns(dnsid, target, manifest={})
+    json_post("#{PI::DNS_PATH}/view/#{dnsid}/#{target}", manifest)
+  end
+  
+  def deregister_dns(recordid)
+    http_delete("#{PI::DNS_PATH}/record/#{recordid}",'application/json')
+  end
+  
   ######################################################
 
   private

data/lib/pi/const.rb

@@ -3,7 +3,7 @@ module PI
   VERSION = 'Bougatsa 0.6.0'
 
   # Targets
-  DEFAULT_TARGET = 'https://api.staging.samsungcloud.org'
+  DEFAULT_TARGET = 'https://staging.samsungcloud.org'
   DEFAULT_LOCAL_TARGET = 'http://www.samsungcloud.org'
 
   # General Paths
@@ -15,5 +15,7 @@ module PI
   APP_PATH             = '/app'
   APPS_PATH            = '/apps'
   ADMIN_PATH           = '/admin'
+  SERVICE_PATH         = '/service'
+  DNS_PATH             = '/dns'
   
 end

metadata

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