pi 0.1.33 → 0.1.34

data/lib/cli/commands/services.rb

@@ -1,8 +1,8 @@
 module PI::Cli::Command
   class Services < Base
-    include PI::Cli::ChooseHelper  
-    include PI::Cli::InteractHelper 
-    
+    include PI::Cli::ChooseHelper
+    include PI::Cli::InteractHelper
+
     def app_service(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
@@ -23,8 +23,8 @@ module PI::Cli::Command
         end
       end
       display services_table
-    end  
-    
+    end
+
     def bind_service(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|service)/i}
@@ -37,7 +37,7 @@ module PI::Cli::Command
       appid = (appid == nil ? app[:id] : appid)
       services = client.usable_services(appid)
       err "No usable services!" if services.nil? || services.empty?
-      
+
       if service
         servicenames = services.collect { |s| s[:name] }
         err "Invalid service name" unless servicenames.include?(service)
@@ -49,24 +49,24 @@ module PI::Cli::Command
       else
         manifest = asks "Select services, indexed list?", :choices => services.collect { |s| s[:name] }, :indexed => true
       end
-      # graceful = get_graceful(app) 
-      # lazy = get_lazy(app) 
+      # graceful = get_graceful(app)
+      # lazy = get_lazy(app)
       display "Binding service: ",false
-      
-      t = Thread.new do     
+
+      t = Thread.new do
       loop do
-        display '.', false 
+        display '.', false
         sleep (1)
         break unless t.alive?
       end
       end
-      
+
       tmp = client.bind_service(appid, manifest)
       uuid = tmp[1]
       result = check_status(uuid)
       Thread.kill(t)
-    end  
-    
+    end
+
     def unbind_service(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|service)/i}
@@ -78,19 +78,19 @@ module PI::Cli::Command
       app, appid = choose_app_help_target_not_all(appid_or_appname)
       appid = (appid == nil ? app[:id] : appid)
       services = client.app_service(appid)
-      err "No binded services!" if services.nil? || services.empty?      
-      if service 
+      err "No binded services!" if services.nil? || services.empty?
+      if service
         services = service.split(",")
       else
         services = asks "Select Service", :choices => services.collect { |s| s[:name] }, :indexed => true
       end
-      # graceful = get_graceful(app) 
-      # lazy = get_lazy(app) 
+      # graceful = get_graceful(app)
+      # lazy = get_lazy(app)
       services.each do |service|
         do_unbind_service(app, service)
-      end  
+      end
     end
-    
+
     def services
       all_opts = total_opts
       all_opts.each_value do |value|
@@ -98,7 +98,7 @@ module PI::Cli::Command
       end
       client.check_login_status
       services = client.services
-      return display "No Services" if services.nil? || services.empty?        
+      return display "No Services" if services.nil? || services.empty?
       return display JSON.pretty_generate(services) if @options[:json]
       services.sort! {|a, b| a[:name] <=> b[:name] }
       services_table = table do |t|
@@ -109,30 +109,30 @@ module PI::Cli::Command
       end
       display services_table
     end
-    
-    def service(serviceid=nil)    
+
+    def service(serviceid=nil)
       all_opts = total_opts
       all_opts.each_value do |value|
         err "Invalid options" if value != nil
-      end 
+      end
       client.check_login_status
       if serviceid
         services = client.services
-        err "No services" if services.nil? || services.empty?        
+        err "No services" if services.nil? || services.empty?
         serviceid_flag = false
         services.each do |s|
           serviceid_flag = true if s[:id].to_s == serviceid
         end
         err"The service is not exist!" if serviceid_flag != true
-      else 
+      else
         serviceid = choose_serviceid
       end
       service = client.service(serviceid)
-      return display "No Services" if service.nil? || service.empty?        
+      return display "No Services" if service.nil? || service.empty?
       return display JSON.pretty_generate(service) if @options[:json]
       display service[:new_data]
     end
-    
+
     def import_service(importurl=nil)
       all_opts = total_opts
       all_opts.each_value do |value|
@@ -140,10 +140,10 @@ module PI::Cli::Command
       end
       client.check_login_status
       importurl = ask"Input the url to import" unless importurl
-      client.import_service(importurl) 
-      display"OK".green     
+      client.import_service(importurl)
+      display"OK".green
     end
-    
+
     def export_service(serviceid=nil)
       all_opts = total_opts
       all_opts.each_value do |value|
@@ -153,11 +153,11 @@ module PI::Cli::Command
       unless serviceid
         serviceid = choose_serviceid
       end
-      serviceurl = client.export_service(serviceid) 
-      display "The exported URL of service:"  
-      display "#{serviceurl[1]}"   
+      serviceurl = client.export_service(serviceid)
+      display "The exported URL of service:"
+      display "#{serviceurl[1]}"
     end
-    
+
     def check_service(serviceid=nil)
       all_opts = total_opts
       all_opts.each_value do |value|
@@ -167,14 +167,14 @@ module PI::Cli::Command
       unless serviceid
         serviceid = choose_serviceid
       end
-      check = client.check_service(serviceid)   
-      if check[1] == "true"  
-        display "Service is available." 
+      check = client.check_service(serviceid)
+      if check[1] == "true"
+        display "Service is available."
       else
         display "Service is unavailable."
-      end 
+      end
     end
-    
+
     def delete_service(serviceid=nil)
       all_opts = total_opts
       all_opts.each_value do |value|
@@ -185,9 +185,9 @@ module PI::Cli::Command
         serviceid = choose_serviceid
       end
       client.delete_service(serviceid)
-      display"OK".green  
+      display"OK".green
     end
-    
+
     def register_service(serviceid=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|type)/i}
@@ -202,15 +202,15 @@ module PI::Cli::Command
       # end
       if serviceid
         services = client.services
-        err "No services" if services.nil? || services.empty?        
+        err "No services" if services.nil? || services.empty?
         serviceid_flag = false
         services.each do |s|
           serviceid_flag = true if s[:id].to_s == serviceid
         end
         err"The service is not exist!" if serviceid_flag != true
-      else 
+      else
         serviceid = choose_serviceid
-      end      
+      end
       targets = client.usable_service_target(serviceid)
       err "No targets" if targets.nil? || targets.empty?
       if target
@@ -221,11 +221,11 @@ module PI::Cli::Command
         err"Invalid target name" if target_flag != true
       else
         target = ask"Select target", :choices => targets.collect { |t| t[:name] }, :indexed => true
-      end      
+      end
       # unless servicetype
         # choices = ["App Service", "Session Service"]
         # servicetype = ask"Select service type", :choices => choices, :indexed => true
-        # if servicetype == "App Service" 
+        # if servicetype == "App Service"
           # servicetype = 1
         # else
           # servicetype = 2
@@ -235,7 +235,7 @@ module PI::Cli::Command
       client.register_service(serviceid, target)
       display "OK".green
     end
-    
+
     def deregister_service(serviceid=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
@@ -247,7 +247,7 @@ module PI::Cli::Command
       unless serviceid
         serviceid = choose_serviceid
       end
-      service_target = client.service_target(serviceid)   
+      service_target = client.service_target(serviceid)
       err"No target available to deregister" if service_target.nil? || service_target.empty?
       unless servicetargetname
         servicetargetname = ask"Select target", :choices => service_target.collect { |t| t[:targetName] }, :indexed => true
@@ -260,23 +260,23 @@ module PI::Cli::Command
       client.deregister_service(servicetargetid)
       display "OK".green
     end
-    
+
     private
-    
+
     def do_unbind_service(app, service)
-      display "Unbinding service '#{service}': ",false     
-      t = Thread.new do     
+      display "Unbinding service '#{service}': ",false
+      t = Thread.new do
       loop do
-        display '.', false 
+        display '.', false
         sleep (1)
         break unless t.alive?
       end
-      end      
+      end
       tmp = client.unbind_service(app[:id], service)
       uuid = tmp[1]
       result = check_status(uuid)
       Thread.kill(t)
     end
-    
+
   end
 end

data/lib/cli/commands/user.rb

@@ -4,9 +4,9 @@ module PI::Cli::Command
 
   class User < Base
     include PI::Cli::ChooseHelper
-    YES_SET = Set.new(["y", "Y", "yes", "YES"])   
+    YES_SET = Set.new(["y", "Y", "yes", "YES"])
     NO_SET = Set.new(["n", "N", "no", "NO"])
-    
+
     def login(url=nil)
       user = @options[:user]
       password = @options[:password]
@@ -16,24 +16,20 @@ module PI::Cli::Command
         err "Invalid options" if value != nil
       end
       unless url
-        url = ask "Attempting login to '#{target_url}'?", :default => true
-        if url == true
-          url = "#{target_url}"
-        else 
-          url = ask "Please input URL"
-        end
-      end      
+        env_choices = ["www", "staging", "qa"]
+        url = ask "Select CloudPi Environment", :choices => env_choices, :indexed => true, :default => "www"
+      end
       url = "#{target_url}" if url.nil? || url.empty?
       eval("PI::Cli::Command::Misc").new().send("set_target", url)
-      unless client.target_valid?        
+      unless client.target_valid?
         display "Host is not available or is not valid: '#{url}'".red
-        display "\n<<<\n#{client.raw_info}\n>>>\n"                   
-        exit(false)    
+        display "\n<<<\n#{client.raw_info}\n>>>\n"
+        exit(false)
       end
-         
+
       tries ||= 0
       user = ask "User" unless user
-      password = ask "Password", :echo => '*' unless password      
+      password = ask "Password", :echo => '*' unless password
       login_and_save_token(user, password)
       say "Successfully logged into [#{target_url}]".green
     rescue PI::Client::TargetError
@@ -44,7 +40,7 @@ module PI::Cli::Command
       display "Problem with login, #{e}, try again.".red
       exit 1
     end
-    
+
     def logout
       all_opts = total_opts
       all_opts.each_value do |value|
@@ -54,7 +50,7 @@ module PI::Cli::Command
       say "Successfully logged out of [#{target_url}]".green
     end
 
-    def info      
+    def info
       all_opts = total_opts
       all_opts.each_value do |value|
         err "Invalid options" if value != nil
@@ -64,9 +60,9 @@ module PI::Cli::Command
       display "\nName: #{info[:name]}"
       display "Description: #{info[:description]}"
       display "Build: #{info[:build]}"
-      display "Version: #{info[:version]}"      
+      display "Version: #{info[:version]}"
     end
-    
+
     def user
       all_opts = total_opts
       all_opts.each_value do |value|
@@ -80,9 +76,9 @@ module PI::Cli::Command
         github_info[:name] = "null"
         github_info[:email] = "null"
       end
-      user_merge =user.merge(github_info) 
+      user_merge =user.merge(github_info)
       return display JSON.pretty_generate(user_merge) if @options[:json]
-      return display 'No user info' if user.empty?     
+      return display 'No user info' if user.empty?
       display "\nUserName: #{user[:userName]}"
       display "DomainName: #{user[:domainName]}"
       display "RoleName: #{user[:roleName]}"
@@ -90,7 +86,7 @@ module PI::Cli::Command
       display "Github Account Name: #{github_info[:name]}"
       display "Github Account Email: #{github_info[:email]}"
     end
-    
+
     def targets
       all_opts = total_opts
       all_opts.each_value do |value|
@@ -102,7 +98,7 @@ module PI::Cli::Command
       return display 'No Targets' if targets.empty?
       targets_table = table do |t|
         t.headings = 'Name', 'URL'
-        targets.each do |target| 
+        targets.each do |target|
           t << [target[:name], target[:targetUrl]]
         end
       end
@@ -110,13 +106,13 @@ module PI::Cli::Command
       display targets_table
     end
 
-    def password(oldpassword=nil)  
+    def password(oldpassword=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(password)/i}
       all_opts_except_valid_opts.each_value do |value|
         err "Invalid options" if value != nil
-      end 
-      client.check_login_status   
+      end
+      client.check_login_status
       newpassword = @options[:password]
       oldpassword = ask "Old Password", :echo => '*' unless oldpassword
       unless newpassword
@@ -124,13 +120,13 @@ module PI::Cli::Command
         newpassword = ask "New Password", :echo => '*'
         newpassword2 = ask "Verify Password", :echo => '*'
         if newpassword != newpassword2
-          display "Passwords did not match, try again" 
-          newpassword =nil 
+          display "Passwords did not match, try again"
+          newpassword =nil
           next
-        else 
+        else
           break
         end
-        }  
+        }
       end
       err "New password is same with old one. Don't need to change password." if oldpassword == newpassword
       manifest = {
@@ -140,16 +136,16 @@ module PI::Cli::Command
       client.password(manifest)
       display "ok".green
     end
-    
+
     def github(name=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(email|password)/i}
       all_opts_except_valid_opts.each_value do |value|
         err "Invalid options" if value != nil
-      end 
+      end
       client.check_login_status
       email = @options[:email]
-      password = @options[:password]           
+      password = @options[:password]
       name = ask "Please input your name" unless name
       email = ask "Please input your email" unless email
       password = ask "Please input your password", :echo => '*' unless password
@@ -162,7 +158,7 @@ module PI::Cli::Command
       github = client.github(manifest)
       display "ok".green
     end
-    
+
     def runtimes
       all_opts = total_opts
       all_opts.each_value do |value|

data/lib/cli/interact_helper.rb

@@ -211,13 +211,13 @@ module PI::Cli
         #add
       # 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(",")         
+          ans.to_i - 1 >= 0
+          ans = ans.split(",")
           ans_uniq = ans.uniq
           unless ans_uniq == ans
-            puts "Numbers repeat, please try again!" 
+            puts "Numbers repeat, please try again!"
             return [false, nil]
-          end         
+          end
           res = Array.new
           ans.each do |a|
             if a.to_i - 1 < choices.to_a.size
@@ -226,10 +226,10 @@ module PI::Cli
               puts "Unknown answer, please try again!"
               return [false, nil]
             end
-          end 
+          end
           # res =  ["rails.samsungpaas.comrailstest.samsungpaas.com"]
-        [true, res]    
-        #add    
+        [true, res]
+        #add
       elsif matches.size == 1
         [true, matches.first]
       elsif matches.size > 1
@@ -245,7 +245,7 @@ module PI::Cli
           puts "Please disambiguate: #{matches_list}?"
           [false, nil]
         end
-        
+
       else
         puts "Unknown answer, please try again!"
         [false, nil]
@@ -550,6 +550,6 @@ module PI::Cli
       end
     end
   end
-  
+
  end
 end