pi 0.1.23 → 0.1.24

data/lib/cli/commands/dns.rb

@@ -1,37 +1,13 @@
-require "interact"
 module PI::Cli::Command
   class Dns < Base
     include PI::Cli::ChooseHelper  
-    include Interactive
+    include PI::Cli::InteractHelper
     
-    def usable_dns(appname=nil)
-      unless appname         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appname = useapp[:name]
-      end
-      dns = client.usable_dns(appname)
-      return display JSON.pretty_generate(dns) if @options[:json]
-      return display "No Dns" if dns.nil? || dns.empty?
-      dns.sort! {|a, b| a[:name] <=> b[:name] }
-      dns_table = table do |t|
-        t.headings = 'Name'
-        dns.each do |s|
-          t << [s[:name]]
-        end
-      end
-      display dns_table
-    end
-    
-    def app_dns(appname=nil)
-      unless appname         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appname = useapp[:name]
-      end
-      dns = client.app_dns(appname)
+    def app_dns(appid_or_appname=nil)
+      client.check_login_status
+      app = choose_app_help_target_not_all(appid_or_appname)
+
+      dns = client.app_dns(app[:id])
       return display JSON.pretty_generate(dns) if @options[:json]
       return display "No DNS!" if dns.nil? || dns.empty?
       dns_table = table do |t|
@@ -43,26 +19,21 @@ module PI::Cli::Command
       display dns_table
     end  
     
-    def map_dns(appname=nil)
-      unless appname         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appname = useapp[:name]
-      end
-      app  = client.app_get_byname(appname)
-      err "The application is not found! App name :#{appname}" unless (appname == app[:name] ? true : false)      
-
-      dns = client.usable_dns(appname)
+    def map_dns(appid_or_appname=nil)
+      client.check_login_status
+      app = choose_app_help_target_not_all(appid_or_appname)
+      dns = client.usable_dns(app[:id])
       err "No usable dns!" if dns.nil? || dns.empty?
       choices = Array.new
       dns.each do |s|
         choices << s[:name]
       end      
-      manifest = ask "Select dns, indexed list?", :choices => choices, :indexed => true
-      manifest = manifest.to_a
+      manifest = asks "Select dns, indexed list?", :choices => choices, :indexed => true
       display "Selected dns: ",false
-      display "#{manifest}"  
+      manifest.each do |m|
+        display "#{m} ",false
+      end 
+      display "\n"
       display "Mapping dns: ",false
       
       t = Thread.new do     
@@ -73,47 +44,41 @@ module PI::Cli::Command
       end
       end
       
-      client.map_dns(appname,manifest)
+      client.map_dns(app[:id],manifest)
       Thread.kill(t)
       display "OK".green   
     end  
     
-    def unmap_dns(appname=nil)
-       unless appname         
-        useproject = choose_project
-        projectid = useproject[:id]
-        useapp = choose_app(projectid)
-        appname = useapp[:name]
-      end
-      app  = client.app_get_byname(appname)
-      err "The application is not found! App name :#{appname}" unless (appname == app[:name] ? true : false)          
-      dns = client.app_dns(appname)
-      err "No mapped dns!" if dns.nil? || dns.empty?
-      usedns = nil
-      choose do |menu|
-        display "=============DNS============"
-        menu.prompt = "Select DNS: "
-        menu.select_by = :index_or_name
-        dns.each do |d|
-          menu.choice("#{d}") { usedns = d }
-        end
-      end
+    def unmap_dns(appid_or_appname=nil)
+      client.check_login_status
+      app = choose_app_help_target_not_all(appid_or_appname)
+      dns = client.app_dns(app[:id])
+      err "No mapped dns!" if dns.nil? || dns.empty? 
+      urls = asks "Select DNS", :choices => dns, :indexed => true  
       display "Selected DNS: ",false
-      display "#{usedns}"  
-      manifest = [usedns] 
-      display "Unmapping dns: ",false
-      
+      urls.each do |m|
+        display "#{m} ",false
+      end 
+      display "\n"
+      urls.each do |url|
+        do_unmap_dns(app[:id], url)
+      end  
+    end
+    
+    private
+    
+    def do_unmap_dns(appid, url)
+      display "Unmapping dns '#{url}': ",false      
       t = Thread.new do     
       loop do
         display '.', false 
         sleep (1)
         break unless t.alive?
       end
-      end
-      
-      client.unmap_dns(appname,manifest)
+      end      
+      client.unmap_dns(appid, url)
       Thread.kill(t)
-      display "OK".green   
+      display "OK".green
     end
     
   end

data/lib/cli/commands/projects.rb

@@ -2,141 +2,131 @@ require 'digest/sha1'
 require 'fileutils'
 require 'tempfile'
 require 'tmpdir'
-require 'set'
 
 module PI::Cli::Command
 
   class Projects < Base
     include PI::Cli::ChooseHelper
+    include PI::Cli::InteractHelper
 
     def projects
-      projects = client.projects      
-      # size = projects.size-1
-      # if size >= 100
-        # new_range_projects = Array.new
-        # puts "Total projects: #{size}"
-        # start = ask("start number:", Integer) { |q| q.in = 0..size }
-        # stop = ask("stop number:", Integer) { |q| q.in = 0..size }
-        # start.upto(stop) do |i|
-          # new_range_projects << projects[i]
-          # i += 1
-        # end
-        # new_range_projects_table = table do |t|
-          # t.headings = 'Name', 'Runtime', 'Framework', 'Git Type','GitUrl', 'Description'
-          # new_range_projects.each do |project|
-            # t << [project[:name], project[:runtime] ,project[:framework], project[:repositoryType], project[:gitUrl],project[:description]]
-          # end
-        # end
-        # display new_range_projects_table
-      # else  
+      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 
+      pageNum = -1
+      numPerPage = -1    
+      if total_proj >= 50
+        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}" 
+          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}" 
+          pageNum =nil
+          next
+        else
+          break
+        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]
-      return display "No Projects" if projects.nil? || projects.empty?       
       projects.sort! {|a, b| a[:name] <=> b[:name] }
       display "\n"        
       projects_table = table do |t|
-        t.headings = 'Name', 'Runtime', 'Framework', 'Git Type','GitUrl', 'ID', 'Description'
+        t.headings = 'Name', 'Runtime', 'Framework', 'Git Type','GitUrl', 'Description'
         projects.each do |project|
-          t << [project[:name], project[:runtime] ,project[:framework], project[:repositoryType], project[:gitUrl],project[:id],project[:description]]
+          t << [project[:name], project[:runtime], project[:framework], project[:repositoryType], project[:gitUrl], project[:description]]
         end
       end
       display projects_table
     end
 
-    def create_project(projectname=nil)            
+    def create_project(project=nil) 
+      client.check_login_status     
       loop{
-        unless projectname
-          projectname = ask "Project Name"
-          err "Project Name required." if projectname.nil? || projectname.empty?
+        unless project
+          project = ask "Project Name"
+          err "Project Name required." if project.nil? || project.empty?
         end
-        if project_exists?(projectname)
-          display "Project '#{projectname}' already exists." 
-          projectname =nil 
+        if not check_name_valid?(project)
+          display "Invalid project name '#{project}'." 
+          project =nil
           next
-        else
+        else if project_exists?(project)
+          display "Project '#{project}' already exists." 
+          project =nil 
+          next
+        else         
           break
+          end
         end
-      }  
+      }       
 
-      runtime = nil
       runtimes = client.runtimes
-      choose do |menu|
-         display "=============Runtime============"
-         menu.prompt = "Select Runtime: "
-         menu.select_by = :index_or_name
-         runtimes.each do |rt|
-           menu.choice(rt) { runtime = rt }
-         end
-      end
+      err "No Runtimes" if runtimes.nil? || runtimes.empty?
+      runtime = ask "Select Runtime", :choices => runtimes, :indexed => true
       display "Selected Runtime: ",false
-      display "#{runtime}".green 
+      display "#{runtime}"
 
-      framework = nil
       frameworks = client.frameworks(runtime)
       err "No Frameworks" if frameworks.nil? || frameworks.empty?
-      choose do |menu|
-         display "=============Frameworks============"
-         menu.prompt = "Select Framework: "
-         menu.select_by = :index_or_name
-         frameworks.each do |fk|
-           menu.choice(fk) { framework = fk }
-         end
-      end
+      framework = ask "Select Framework", :choices => frameworks, :indexed => true
       display "Selected Framework: ",false
-      display "#{framework}".green
+      display "#{framework}"
       
-      description = ask "Please enter in the description"
+      description = ask "Please enter in the description", :default => nil unless description
        
       github_info = client.github_info
       
       if github_info[:name].empty?      
         manifest = {
-        :name => "#{projectname}",
+        :name => "#{project}",
         :runtime     => "#{runtime}",
         :framework   => "#{framework}",
         :description => "#{description}"
       }
-      else
-        repositoryType = nil  
+      else 
         repositoryTypes =["cloudpi","github"]
-        choose do |menu|
-          display "=============Repository Types============"
-          menu.prompt = "Select Repository Type: "
-          menu.select_by = :index_or_name
-          repositoryTypes.each do |rt|
-            menu.choice(rt) { repositoryType = rt }
-          end
-        end
+        repositoryType = ask "Select Repository Type", :choices => repositoryTypes, :indexed => true
         display "Selected Repository Type: ",false
-        display "#{repositoryType}".green
+        display "#{repositoryType}"
 
         if repositoryType == "github"
-          isNew =nil
           isNew = "yes"
-          publishType = nil  
           publishTypes =["public","private"]
-          choose do |menu|
-            display "=============Publish Types============"
-            menu.prompt = "Select publish Type: "
-            menu.select_by = :index_or_name
-            publishTypes.each do |pt|
-              menu.choice(pt) { publishType = pt }
-            end
+          publishType = ask "Select Publish Type", :choices => publishTypes, :indexed => true          
+          display "Selected publish Type: ",false
+          display "#{publishType}"
         end
-        display "Selected publish Type: ",false
-        display "#{publishType}".green
-      end
-      manifest = {
-        :name => "#{projectname}",
-        :runtime     => "#{runtime}",
-        :framework   => "#{framework}",
-        :description => "#{description}",
-        :repositoryType => "#{repositoryType}",
-        :isNew       => "#{isNew}",
-        :publishType => "#{publishType}"
+        manifest = {
+          :name => "#{project}",
+          :runtime     => "#{runtime}",
+          :framework   => "#{framework}",
+          :description => "#{description}",
+          :repositoryType => "#{repositoryType}",
+          :isNew       => "#{isNew}",
+          :publishType => "#{publishType}"
         }
       end
      
-      display "Creating project \"#{projectname}\": ",false
+      display "Creating project \"#{project}\": ",false
       
       t = Thread.new do     
       loop do
@@ -146,17 +136,18 @@ module PI::Cli::Command
       end
       end
             
-      client.create_project(projectname, manifest)
+      client.create_project(project, manifest)
       Thread.kill(t)
       display "OK".green
     end
 
-    def delete_project(projectname=nil)
-      unless projectname
+    def delete_project(project=nil)
+      client.check_login_status
+      unless project
         useproject = choose_project
-        projectname = useproject[:name]
+        project = useproject[:name]
       end
-      display "Deleting project \"#{projectname}\": ",false
+      display "Deleting project \"#{project}\": ",false
       
       t = Thread.new do     
       loop do
@@ -166,35 +157,48 @@ module PI::Cli::Command
       end
       end
       
-      client.delete_project(projectname)
+      client.delete_project(project)
       Thread.kill(t)
       display 'OK'.green
     end
     
-    def upload(projectname=nil)
-      file, java_projects = nil, nil  
-      unless projectname    
+    def upload(project=nil)
+      client.check_login_status 
+      path = @options[:path]
+      if path        
+        err "Not war file or path does not exist!" if not ((path =~ /\.(war)$/) && (File.exists? path))
+      end
+      version = @options[:ver]
+      description = @options[:desc]
       projects = client.projects
       err "No Projects" if projects.nil? || projects.empty?
-      java_projects = projects.delete_if{ |p| p[:runtime] =~ /^(ruby)/i}    
+      java_projects = projects.delete_if{ |p| p[:runtime] =~ /^(ruby)/i}
       java_projects.sort! {|a, b| a[:name] <=> b[:name] }
-      choose do |menu|
-         display "=============Project Name======="
-         menu.prompt = "Select Project: "
-         menu.select_by = :index_or_name
-         projects.each do |project|
-           menu.choice(project[:name]) { projectname = project[:name] }
-         end
+      if project
+        flag = nil
+        java_projects.each do |j|      
+          flag = true if project == j[:name]
+        end
+        err "The project is not found or not a java project! Project name :#{project}" unless flag
+      else    
+        project_choices = Array.new
+        java_projects.each do |p|
+          project_choices << p[:name]
+        end
+        project = ask "Select Project", :choices => project_choices, :indexed => true
+        display "Selected Project: ",false
+        display "#{project}"
       end
-      display "Selected Project: ",false
-      display "#{projectname}".green
+      project = client.project_search(project)
+      project = project[:name]
+      
+      if version
+        tmp = client.project_binary_existed(project,version)       
+        err "Version '#{version}' already exists." if tmp.include?("true")
       end
-         
-      version = ask "Please enter the version"
-      description = ask "Please enter in the description"       
       
-      path = nil
-      loop{
+      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!" 
@@ -203,13 +207,29 @@ module PI::Cli::Command
         else
           break
         end
-      }  
-
+        } 
+      end
+      
+      unless version
+        loop{
+          version = ask "Please enter the version"
+          tmp = client.project_binary_existed(project,version)
+          if tmp.include?("true")
+            display "Version '#{version}' already exists."
+            version =nil
+          next
+          else
+          break
+          end
+        }
+      end  
+             
+      description = ask "Please enter in the description", :default => nil unless description
       upload_file = File.new(path, 'rb')
       manifest = {
-        :projectName => "#{projectname}",
+        :projectName => "#{project}",
         :fileWAR     => upload_file,
-        :versionName => "#{version.downcase}",
+        :versionName => "#{version}",
         :description => "#{description}"
       }     
       display "Uploading \"#{File.basename(path)}\": ",false
@@ -227,12 +247,36 @@ module PI::Cli::Command
       display 'OK'.green
     end
 
-    def project_events(projectname=nil)
-      unless projectname
+    def delete_binary(project=nil)
+      client.check_login_status
+      unless project
         useproject = choose_project
-        projectname = useproject[:name]
-      end
-      events = client.project_events(projectname)
+        project = useproject[:name]
+      end 
+      binary = client.project_binary(project)
+      err "No binary!" if binary.nil? || binary.empty?
+      choices = Array.new
+      binary.each do |b|
+        choices << b[:versionName]
+      end       
+      binaryname = ask"Select Binary", :choices => choices, :indexed => true
+      display "Selected Binary: ",false
+      display "#{binaryname}"  
+      binaryid = nil
+      binary.each do |b|
+        binaryid = b[:id].to_s if binaryname == b[:versionName]
+      end   
+      client.delete_binary(binaryid)
+      display 'OK'.green
+    end
+
+    def project_events(project=nil)
+      client.check_login_status
+      unless project
+        useproject = choose_project
+        project = useproject[:name]
+      end           
+      events = client.project_events(project)
       return display JSON.pretty_generate(events || []) if @options[:json]
       return display "No Events." if events.empty?
       events_table = table do |t|
@@ -244,12 +288,13 @@ module PI::Cli::Command
       display events_table
     end
 
-    def project_tags(projectname=nil)
-      unless projectname
+    def project_tags(project=nil)
+      client.check_login_status
+      unless project
         useproject = choose_project
-        projectname = useproject[:name]
+        project = useproject[:name]
       end
-      tags ||= client.project_tags(projectname)
+      tags ||= client.project_tags(project)
       return display JSON.pretty_generate(tags || []) if @options[:json]
       return display "No Tags." if tags.size == 0
       tags_table = table do |t|
@@ -260,28 +305,20 @@ module PI::Cli::Command
       display tags_table
     end
 
-    def project_commits(projectname=nil)
-      unless projectname
+    def project_commits(project=nil)
+      client.check_login_status
+      unless project
         useproject = choose_project
-        projectname = useproject[:name]
+        project = useproject[:name]
       end
-      tag =nil
-      tags = client.project_tags(projectname)
+      tags = client.project_tags(project)
       return display JSON.pretty_generate(tags || []) if @options[:json]
-      display "\n"
       return display "No Commits" if tags.nil? || tags.empty?
-      choose do |menu|
-        display "=============Tag======="
-        menu.prompt = "Select Tag: "
-        menu.select_by = :index_or_name
-        tags.each do |t|
-          menu.choice(t) { tag = t}
-        end
-      end
+      tag = ask "Select Tag", :choices => tags, :indexed => true
       display "Selected Tag: ",false
-      display "#{tag}".green
+      display "#{tag}"
 
-      commits = client.project_commits(projectname,tag)
+      commits = client.project_commits(project,tag)
       commits.sort! {|a, b| a[:date] <=> b[:date] }
       return display JSON.pretty_generate(commits || []) if @options[:json]
       return display "No Commits" if commits.nil? || commits.empty?
@@ -293,32 +330,14 @@ module PI::Cli::Command
       end
       display commits_table
     end
- 
-    def project_apps(projectname=nil)
-      unless projectname
-        useproject = choose_project
-        projectname = useproject[:name]
-      end      
-      apps = client.project_apps(projectname)      
-      return display JSON.pretty_generate(apps || []) if @options[:json]
-      return display "No applications" if apps.nil? || apps.empty?
-      
-      apps.sort! {|a, b| a[:name] <=> b[:name] }
-      apps_table = table do |t|
-        t.headings = 'Target', 'AppName', 'URL', 'Tag', 'Status', 'Instances'
-        apps.each do |app|
-          t << [app[:targetName], app[:name], app[:url], app[:tag], app[:status], app[:instances]]
-        end
-      end
-      display apps_table
-    end
     
     private 
     
     def project_exists?(projectname)
-      project  = client.project_get(projectname)
-      projectname == project[:name] ? true : false     
+      project  = client.project_search(projectname)
+      project[:id] != 0 ? true : false
     end
+        
     
  end     
 end