pi 0.1.33 → 0.1.34

data/lib/cli/commands/dns.rb

@@ -1,8 +1,8 @@
 module PI::Cli::Command
   class Dns < Base
-    include PI::Cli::ChooseHelper  
+    include PI::Cli::ChooseHelper
     include PI::Cli::InteractHelper
-    
+
     def app_dns(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
@@ -20,8 +20,8 @@ module PI::Cli::Command
       dns.each do |s|
         display "#{s}"
       end
-    end  
-    
+    end
+
     def map_dns(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|dns)/i}
@@ -39,9 +39,9 @@ module PI::Cli::Command
       appid = (appid == nil ? app[:id] : appid)
       dns = client.usable_dns(appid)
       err "No usable dns!" if dns.nil? || dns.empty?
-      if dnsname        
+      if dnsname
         usable_dnsnames = dns.collect { |d| d[:name] }
-        err "Invalid dns name" unless usable_dnsnames.include?(dnsname)        
+        err "Invalid dns name" unless usable_dnsnames.include?(dnsname)
         tmp = dnsname.split(",")
         manifest = Array.new
         tmp.each do |t|
@@ -49,22 +49,22 @@ module PI::Cli::Command
         end
       else
         manifest = asks "Select dns, indexed list?", :choices => dns.collect { |d| d[:name] }, :indexed => true
-      end      
+      end
       display "Mapping dns: ",false
-      
-      t = Thread.new do     
+
+      t = Thread.new do
       loop do
-        display '.', false 
+        display '.', false
         sleep (1)
         break unless t.alive?
       end
       end
-      
+
       client.map_dns(appid,manifest)
       Thread.kill(t)
-      display "OK".green   
-    end  
-    
+      display "OK".green
+    end
+
     def unmap_dns(appid_or_appname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|dns)/i}
@@ -76,18 +76,18 @@ module PI::Cli::Command
       app, appid = choose_app_help_target_not_all(appid_or_appname)
       appid = (appid == nil ? app[:id] : appid)
       dns = client.app_dns(appid)
-      err "No mapped dns!" if dns.nil? || dns.empty? 
-      if dnsname 
+      err "No mapped dns!" if dns.nil? || dns.empty?
+      if dnsname
         urls = dnsname.split(",")
       else
         urls = asks "Select DNS", :choices => dns, :indexed => true
       end
-      
+
       urls.each do |url|
         do_unmap_dns(appid, url)
-      end  
+      end
     end
-    
+
     def dns
       all_opts = total_opts
       all_opts.each_value do |value|
@@ -95,7 +95,7 @@ module PI::Cli::Command
       end
       client.check_login_status
       dns = client.dns
-      return display "No Services" if dns.nil? || dns.empty?        
+      return display "No Services" if dns.nil? || dns.empty?
       return display JSON.pretty_generate(dns) if @options[:json]
       dns.sort! {|a, b| a[:name] <=> b[:name] }
       dns_table = table do |t|
@@ -106,7 +106,7 @@ module PI::Cli::Command
       end
       display dns_table
     end
-    
+
     def zones
       all_opts = total_opts
       all_opts.each_value do |value|
@@ -124,7 +124,7 @@ module PI::Cli::Command
       end
       display zones_table
     end
-       
+
     def create_dns(dnsname=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(projectid|desc|zoneid)/i}
@@ -135,9 +135,9 @@ module PI::Cli::Command
       projectid = @options[:projectid]
       description = @options[:desc]
       zoneid = @options[:zoneid]
-      if dnsname              
+      if dnsname
         if not check_name_valid?(dnsname)
-          err "Invalid dns name '#{dnsname}'." 
+          err "Invalid dns name '#{dnsname}'."
         end
       end
       dns_zone = client.dns_zone_list
@@ -149,8 +149,8 @@ module PI::Cli::Command
         end
         err"The dns zone id is not exist!" if zoneid_flag != true
       end
-      
-      projects = client.projects  
+
+      projects = client.projects
       if projectid
         projectid_flag = false
         projects.each do |p|
@@ -158,12 +158,12 @@ module PI::Cli::Command
         end
         err"Invalid project id: #{projectid}" if projectid_flag != true
       else
-        projectname = ask"Project name", :choices => projects.collect { |p| p[:name] }, :indexed => true  
+        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           
-        
+        end
+      end
+
       unless zoneid
         zonename = ask"Select dns zone", :choices => dns_zone.collect { |d| d[:name] }, :indexed => true
         dns_zone.each do |d|
@@ -171,24 +171,24 @@ module PI::Cli::Command
         end
         err"Invalid zone" if zoneid.nil?
       end
-      
+
       loop{
         dnsname = ask"DNS name" unless dnsname
         tmp = client.verify_dns(dnsname, zoneid)
         if not check_name_valid?(dnsname)
-          display "Invalid dns name '#{dnsname}'." 
+          display "Invalid dns name '#{dnsname}'."
           dnsname =nil
           next
         else if tmp[1] == "false"
-          display "DNS '#{dnsname}' already exists." 
+          display "DNS '#{dnsname}' already exists."
           dnsname =nil
           next
         else
           break
           end
         end
-      }   
-      # dnsname = dnsname.concat(".#{zone}")        
+      }
+      # dnsname = dnsname.concat(".#{zone}")
       description = ask"Description", :default => nil unless description
       manifest = {
         :name        => dnsname,
@@ -197,9 +197,9 @@ module PI::Cli::Command
         :bak         => description
       }
       client.create_dns(manifest)
-      display"OK".green    
+      display"OK".green
     end
-    
+
     def delete_dns(dnsid=nil)
       all_opts = total_opts
       all_opts.each_value do |value|
@@ -212,7 +212,7 @@ module PI::Cli::Command
       client.delete_dns(dnsid)
       display"OK".green
     end
-    
+
     def register_dns(dnsid=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|continent|country)/i}
@@ -247,7 +247,7 @@ module PI::Cli::Command
         display "Select continent: #{continent}"
         continent = continents.invert["#{continent}"]
       end
-      if continent.to_s == "DEFAULT" 
+      if continent.to_s == "DEFAULT"
         manifest = {
         :continentCode => continent,
         :countryCode   => "DEFAULT"
@@ -266,11 +266,11 @@ module PI::Cli::Command
         :continentCode => continent,
         :countryCode   => country
       }
-      end     
+      end
       client.register_dns(dnsid, target, manifest)
       display "OK".green
     end
-    
+
     def deregister_dns(dnsid=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(recordid)/i}
@@ -299,7 +299,7 @@ module PI::Cli::Command
       client.deregister_dns(recordid)
       display "OK".green
     end
-    
+
     def dns_records(dnsid=nil)
       all_opts = total_opts
       all_opts.each_value do |value|
@@ -326,24 +326,24 @@ module PI::Cli::Command
         end
       end
       display record_info_table
-      end      
+      end
     end
-    
+
     private
-    
+
     def do_unmap_dns(appid, url)
-      display "Unmapping dns '#{url}': ",false      
-      t = Thread.new do     
+      display "Unmapping dns '#{url}': ",false
+      t = Thread.new do
       loop do
-        display '.', false 
+        display '.', false
         sleep (1)
         break unless t.alive?
       end
-      end      
+      end
       client.unmap_dns(appid, url)
       Thread.kill(t)
       display "OK".green
     end
-    
+
   end
 end

data/lib/cli/commands/misc.rb

@@ -4,20 +4,21 @@ module PI::Cli::Command
     def version
       say "pi #{PI::Cli::VERSION}"
     end
-   
-    def set_target(target_url)
-      PI::Cli::Config.store_target(target_url)
-      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}"
+
+    def set_target(target_url)      
+      case target_url      
+      when "www" 
+        target_url = "http://api.samsungcloud.org"
+      when "staging"
+        target_url = "http://api.staging.samsungcloud.org"
+      when "qa"
+        target_url = "http://api.qa.samsungcloud.org"
       else
-        target_url = "http://#{target_url}" unless /^https?/ =~ target_url
+        
       end
-      target_url = target_url.gsub(/\/+$/, '')
+      #target_url = target_url.gsub(/\/+$/, '')
       client = PI::Client.new(target_url)
+      PI::Cli::Config.store_target(target_url)
     end
 
   end

data/lib/cli/commands/projects.rb

@@ -17,42 +17,42 @@ module PI::Cli::Command
       client.check_login_status
       user = client.user_info
       proj_sum = client.project_sum
-      total_proj = Integer(proj_sum[1])       
-      return display "No Projects" if total_proj == 0 
+      total_proj = Integer(proj_sum[1])
+      return display "No Projects" if total_proj == 0
       pageNum = -1
-      numPerPage = -1    
+      numPerPage = -1
       if total_proj >= 50
-        puts "Total projects: #{total_proj}."  
-        numPerPage = nil     
+        puts "Total projects: #{total_proj}."
+        numPerPage = nil
         loop{
         numPerPage = ask "Number per page"
         if not numPerPage =~ /^[1-9]\d*$/
-          display "Invalid Number! Please input number from 1 to #{total_proj}" 
+          display "Invalid Number! Please input number from 1 to #{total_proj}"
           numPerPage =nil
           next
         else
           break
         end
-       } 
+       }
        numPerPage = numPerPage.to_i
        maxpage = (total_proj.to_f/numPerPage).ceil
        loop{
         pageNum = ask "Page number"
         if not pageNum =~ /^[1-9]\d*$/
-          display "Invalid Number! Please input number from 1 to #{maxpage}" 
+          display "Invalid Number! Please input number from 1 to #{maxpage}"
           pageNum =nil
           next
         else
           break
         end
-       } 
-       pageNum = pageNum.to_i       
-      end 
+       }
+       pageNum = pageNum.to_i
+      end
       projects = client.projects(pageNum, numPerPage)
       return display "No Projects" if projects.nil? || projects.empty?
       return display JSON.pretty_generate(projects) if @options[:json]
       projects.sort! {|a, b| a[:name] <=> b[:name] }
-      display "\n"        
+      display "\n"
       projects_table = table do |t|
         t.headings = 'ID', 'Name', 'Runtime', 'Framework', 'Git Type','GitUrl', 'Description'
         projects.each do |project|
@@ -62,30 +62,30 @@ module PI::Cli::Command
       display projects_table
     end
 
-    def create_project(project=nil) 
+    def create_project(project=nil)
       all_opts = total_opts
       all_opts.each_value do |value|
         err "Invalid options" if value != nil
       end
-      client.check_login_status     
+      client.check_login_status
       loop{
         unless project
           project = ask "Project Name"
           err "Project Name required." if project.nil? || project.empty?
         end
         if not check_name_valid?(project)
-          display "Invalid project name '#{project}'." 
+          display "Invalid project name '#{project}'."
           project =nil
           next
         else if project_exists?(project)
-          display "Project '#{project}' already exists." 
-          project =nil 
+          display "Project '#{project}' already exists."
+          project =nil
           next
-        else         
+        else
           break
           end
         end
-      }       
+      }
 
       runtimes = client.runtimes
       err "No Runtimes" if runtimes.nil? || runtimes.empty?
@@ -98,19 +98,19 @@ module PI::Cli::Command
       framework = ask "Select Framework", :choices => frameworks, :indexed => true
       display "Selected Framework: ",false
       display "#{framework}"
-      
+
       description = ask "Please enter in the description", :default => nil unless description
-       
+
       github_info = client.github_info
-      
-      if github_info.nil?      
+
+      if github_info.nil?
         manifest = {
         :name => "#{project}",
         :runtime     => "#{runtime}",
         :framework   => "#{framework}",
         :description => "#{description}"
       }
-      else 
+      else
         repositoryTypes =["cloudpi","github"]
         repositoryType = ask "Select Repository Type", :choices => repositoryTypes, :indexed => true
         display "Selected Repository Type: ",false
@@ -119,7 +119,7 @@ module PI::Cli::Command
         if repositoryType == "github"
           isNew = "yes"
           publishTypes =["public","private"]
-          publishType = ask "Select Publish Type", :choices => publishTypes, :indexed => true          
+          publishType = ask "Select Publish Type", :choices => publishTypes, :indexed => true
           display "Selected publish Type: ",false
           display "#{publishType}"
         end
@@ -133,17 +133,17 @@ module PI::Cli::Command
           :publishType => "#{publishType}"
         }
       end
-     
+
       display "Creating project \"#{project}\": ",false
-      
-      t = Thread.new do     
+
+      t = Thread.new do
       loop do
-        display '.', false 
+        display '.', false
         sleep (1)
         break unless t.alive?
       end
       end
-            
+
       client.create_project(project, manifest)
       Thread.kill(t)
       display "OK".green
@@ -160,29 +160,29 @@ module PI::Cli::Command
         projectid = useproject[:id]
       end
       display "Deleting project: ",false
-      
-      t = Thread.new do     
+
+      t = Thread.new do
       loop do
-        display '.', false 
+        display '.', false
         sleep (1)
         break unless t.alive?
       end
       end
-      
+
       client.delete_project(projectid)
       Thread.kill(t)
       display 'OK'.green
     end
-    
+
     def upload(projectid=nil)
       all_opts = total_opts
       all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(path|ver|desc)/i}
       all_opts_except_valid_opts.each_value do |value|
         err "Invalid options" if value != nil
       end
-      client.check_login_status 
+      client.check_login_status
       path = @options[:path]
-      if path        
+      if path
         err "Not war file or path does not exist!" if not ((path =~ /\.(war)$/) && (File.exists? path))
       end
       version = @options[:ver]
@@ -193,37 +193,37 @@ module PI::Cli::Command
       java_projects.sort! {|a, b| a[:name] <=> b[:name] }
       if projectid
         flag = nil
-        java_projects.each do |j|  
+        java_projects.each do |j|
           flag = true if projectid == j[:id].to_s
         end
-        err "The project is not found or not a java project! " unless flag 
-      else    
+        err "The project is not found or not a java project! " unless flag
+      else
         project = ask "Select Project", :choices => java_projects.collect { |j| j[:name] }, :indexed => true
         display "Selected Project: ",false
         display "#{project}"
         project = client.project_search(project)
         projectid = project[:id]
       end
-            
+
       if version
         err "Invalid version name length. The max length of name is 30" unless check_version_name_valid?(version)
-        tmp = client.project_binary_existed(projectid, version)       
+        tmp = client.project_binary_existed(projectid, version)
         err "Version '#{version}' already exists." if tmp.include?("true")
       end
-      
-      unless path        
+
+      unless path
         loop{
         path = ask "Please enter the path of upload war file"
         if not ((path =~ /\.(war)$/) && (File.exists? path))
-          display "Not war file or path does not exist!" 
+          display "Not war file or path does not exist!"
           path =nil
           next
         else
           break
         end
-        } 
+        }
       end
-      
+
       unless version
         loop{
           version = ask "Please enter the version"
@@ -237,8 +237,8 @@ module PI::Cli::Command
           break
           end
         }
-      end  
-             
+      end
+
       description = ask "Please enter in the description", :default => nil unless description
       upload_file = File.new(path, 'rb')
       manifest = {
@@ -246,17 +246,17 @@ module PI::Cli::Command
         :fileWAR     => upload_file,
         :versionName => "#{version}",
         :description => "#{description}"
-      }     
+      }
       display "Uploading \"#{File.basename(path)}\": ",false
-      
-      t = Thread.new do     
+
+      t = Thread.new do
       loop do
-        display '.', false 
+        display '.', false
         sleep (1)
         break unless t.alive?
       end
       end
-      
+
       client.upload(manifest)
       Thread.kill(t)
       display 'OK'.green
@@ -271,16 +271,16 @@ module PI::Cli::Command
       unless projectid
         useproject = choose_project
         projectid = useproject[:id]
-      end 
+      end
       binary = client.project_binary(projectid)
-      err "No binary!" if binary.nil? || binary.empty?     
+      err "No binary!" if binary.nil? || binary.empty?
       binaryname = ask"Select Binary", :choices => binary.collect { |b| b[:versionName] }, :indexed => true
       display "Selected Binary: ",false
-      display "#{binaryname}"  
+      display "#{binaryname}"
       binaryid = nil
       binary.each do |b|
         binaryid = b[:id].to_s if binaryname == b[:versionName]
-      end   
+      end
       client.delete_binary(binaryid)
       display 'OK'.green
     end
@@ -294,7 +294,7 @@ module PI::Cli::Command
       unless projectid
         useproject = choose_project
         projectid = useproject[:id]
-      end           
+      end
       events = client.project_events(projectid)
       return display JSON.pretty_generate(events || []) if @options[:json]
       return display "No Events." if events.empty?
@@ -350,21 +350,21 @@ module PI::Cli::Command
       return display JSON.pretty_generate(commits || []) if @options[:json]
       return display "No Commits" if commits.nil? || commits.empty?
       commits_table = table do |t|
-        t.headings = 'CommitId', 'Date', 'Comment'  
+        t.headings = 'CommitId', 'Date', 'Comment'
         commits.each do |commit|
           t << [commit[:commit], commit[:date], commit[:comment]]
         end
       end
       display commits_table
     end
-    
-    private 
-    
+
+    private
+
     def project_exists?(projectname)
       project  = client.project_search(projectname)
-      project.nil? ? false : true 
+      project.nil? ? false : true
     end
-        
-    
- end     
+
+
+ end
 end