pi 0.1.27 → 0.1.28

data/lib/cli/commands/user.rb

@@ -57,8 +57,11 @@ module PI::Cli::Command
       client.check_login_status
       user = client.user_info
       github_info = client.github_info
-      github_info[:name] = "null" if github_info[:name].empty? || github_info[:name].nil?
-      github_info[:email] = "null" if github_info[:email].empty? || github_info[:email].nil?
+      if github_info.nil?
+        github_info = Hash.new
+        github_info[:name] = "null"
+        github_info[:email] = "null"
+      end
       user_merge =user.merge(github_info) 
       return display JSON.pretty_generate(user_merge) if @options[:json]
       return display 'No user info' if user.empty?     

data/lib/cli/runner.rb

@@ -32,10 +32,10 @@ class PI::Cli::Runner
       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('--desc [DESC]')     { |desc|     @options[:desc] = desc || ""}
       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('--instance N', Integer)      { |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 }
@@ -47,7 +47,7 @@ class PI::Cli::Runner
       opts.on('--country COUNTRY') { |country|  @options[:country] = country }
       opts.on('--recordid ID')     { |id|       @options[:recordid] = id }
       opts.on('--graceful')        {            @options[:graceful] = true }
-      opts.on('--lazy')            {            @options[:lazy] = true }
+      # opts.on('--lazy')            {            @options[:lazy] = true }
       # generic tracing and debugging
       opts.on('-t [TKEY]')         { |tkey|     @options[:trace] = tkey || true }
       opts.on('--trace [TKEY]')    { |tkey|     @options[:trace] = tkey || true }
@@ -238,7 +238,7 @@ class PI::Cli::Runner
       set_cmd(:apps, :stop_app, @args.size == 1 ? 1 : 0)
       
     when 'restart-app'     
-      usage('pi restart-app [appid] [--graceful] [--lazy] or pi restart-app <appname> <--target TARGET> [--graceful] [--lazy]')
+      usage('pi restart-app [appid] [--graceful] or pi restart-app <appname> <--target TARGET> [--graceful]')
       set_cmd(:apps, :restart_app, @args.size == 1 ? 1 : 0)
       
     when 'scale-app'     
@@ -246,7 +246,7 @@ class PI::Cli::Runner
       set_cmd(:apps, :scale_app, @args.size == 1 ? 1 : 0)
       
     when 'update-app'     
-      usage('pi update-app [appid] [--ver VERSION] [--graceful] [--lazy] or pi update-app <appname> <--target TARGET> [--ver VERSION][--graceful] [--lazy]')
+      usage('pi update-app [appid] [--ver VERSION] [--graceful] or pi update-app <appname> <--target TARGET> [--ver VERSION][--graceful] ')
       set_cmd(:apps, :update_app, @args.size == 1 ? 1 : 0)
       
     when 'status'     
@@ -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] [--lazy] or pi bind-service <appname> <--target TARGET> [--service SERVICE] [--graceful] [--lazy]')
+      usage('pi bind-service [appid] [--service SERVICE] [--graceful] or pi bind-service <appname> <--target TARGET> [--service SERVICE] [--graceful]')
       set_cmd(:services, :bind_service, @args.size == 1 ? 1 : 0)
       
     when 'unbind-service'     
-      usage('pi unbind-service [appid] [--service SERVICE] [--graceful] [--lazy] or pi unbind-service <appname> <--target TARGET> [--service SERVICE] [--graceful] [--lazy]')
+      usage('pi unbind-service [appid] [--service SERVICE] [--graceful] or pi unbind-service <appname> <--target TARGET> [--service SERVICE] [--graceful]')
       set_cmd(:services, :unbind_service, @args.size == 1 ? 1 : 0)
       
     when 'services'     
@@ -386,8 +386,8 @@ class PI::Cli::Runner
     @usage_error
   end
 
-  def run
-
+  def run    
+        
     trap('TERM') { print "\nTerminated\n"; exit(false)}
 
     parse_options!
@@ -400,9 +400,9 @@ class PI::Cli::Runner
 
     # local shopts=$-
     # set -o noglob
-    # Kernel.system('set -o noglob')
+    # system('set -o noglob')
     # Kernel.exec('sudo set -o noglob')
-    # `set -o noglob`
+    # `set -o noglob`   
     parse_command!
     # system('set +o noglob')
     # set +o noglob
@@ -426,7 +426,12 @@ class PI::Cli::Runner
     puts("\n")
     puts(basic_usage)
     @exit_status = false
-  rescue OptionParser::MissingArgument => e
+  rescue OptionParser::MissingArgument => e 
+    puts(e.message.red)
+    puts("\n")
+    puts(basic_usage)       
+    @exit_status = false
+  rescue OptionParser::InvalidArgument => e
     puts(e.message.red)
     puts("\n")
     puts(basic_usage)

data/lib/cli/usage.rb

@@ -59,13 +59,13 @@ Currently available pi commands are:
     stop-app --graceful                                         Stop the application in a graceful mode
     restart-app [appid]                                         Restart the application
     restart-app <appname> <--target TARGET>                     Restart the application
-    restart-app --graceful --lazy                               Restart the application in a graceful and lazy mode
+    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 --lazy                                Update the application in a graceful and lazy mode
+    update-app --graceful                                       Update the application in a graceful mode
     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
@@ -84,10 +84,10 @@ 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 --lazy                              Bind the services for the application in a graceful and lazy mode
+    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 --lazy                            Unbind the services for the application in a graceful and lazy mode
+    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

data/lib/cli/version.rb

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

data/lib/pi/client.rb

@@ -179,6 +179,8 @@ class PI::Client
   end
   
   def app_search(targetname, appname)
+    targetname = uri_encode(targetname)
+    appname = uri_encode(appname)
     json_get("#{PI::APP_PATH}/search/#{targetname}/#{appname}")
   end
   
@@ -210,16 +212,16 @@ class PI::Client
     json_post("#{PI::APP_PATH}/#{appid}/stop?graceful=#{graceful}",manifest={})
   end
   
-  def restart_app(appid, graceful, lazy)
-    json_post("#{PI::APP_PATH}/#{appid}/restart?graceful=#{graceful}&lazy=#{lazy}",manifest={})
+  def restart_app(appid, graceful)
+    json_post("#{PI::APP_PATH}/#{appid}/restart?graceful=#{graceful}",manifest={})
   end
   
-  def scale_app(appid, instance, graceful)
-    json_post("#{PI::APP_PATH}/#{appid}/scale?instance=#{instance}&graceful=#{graceful}", manifest={})
+  def scale_app(appid, instance)
+    json_post("#{PI::APP_PATH}/#{appid}/scale?instance=#{instance}", manifest={})
   end
   
-  def update_app(appid, tag, graceful, lazy)
-    json_post("#{PI::APP_PATH}/#{appid}/rollback/#{tag}?graceful=#{graceful}&lazy=#{lazy}", manifest={})
+  def update_app(appid, tag, graceful)
+    json_post("#{PI::APP_PATH}/#{appid}/rollback/#{tag}?graceful=#{graceful}", manifest={})
   end
  
   def status(appid)
@@ -265,12 +267,12 @@ class PI::Client
     json_get("#{PI::APP_PATH}/#{appid}/service/bind")
   end
   
-  def bind_service(appid, graceful, lazy, manifest={})
-    json_post("#{PI::APP_PATH}/#{appid}/service/bind?graceful=#{graceful}&lazy=#{lazy}",manifest)
+  def bind_service(appid, manifest={})
+    json_post("#{PI::APP_PATH}/#{appid}/service/bind",manifest)
   end
   
-  def unbind_service(appid, servicename, graceful, lazy)
-    http_delete("#{PI::APP_PATH}/#{appid}/service/unbind/#{servicename}?graceful=#{graceful}&lazy=#{lazy}",'application/json')
+  def unbind_service(appid, servicename)
+    http_delete("#{PI::APP_PATH}/#{appid}/service/unbind/#{servicename}",'application/json')
   end
   
   def services

metadata

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