pi 0.1.19 → 0.1.20

data/lib/cli/commands/base.rb

@@ -1,4 +1,4 @@
-
+require "interact"
 require 'rubygems'
 require 'terminal-table/import'
 require 'highline/import'
@@ -8,7 +8,7 @@ module PI::Cli
   module Command
 
     class Base
-
+    include Interactive
       def initialize(options={})
         @options = options.dup
 

data/lib/cli/commands/dns.rb

@@ -0,0 +1,120 @@
+require "interact"
+module PI::Cli::Command
+  class Dns < Base
+    include PI::Cli::ChooseHelper  
+    include Interactive
+    
+    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)
+      return display JSON.pretty_generate(dns) if @options[:json]
+      return display "No DNS!" if dns.nil? || dns.empty?
+      dns_table = table do |t|
+        t.headings = 'Mapped DNS Name'
+        dns.each do |s|
+          t << s
+        end
+      end
+      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)
+      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
+      display "Selected dns: ",false
+      display "#{manifest}"  
+      display "Mapping dns: ",false
+      
+      t = Thread.new do     
+      loop do
+        display '.', false 
+        sleep (1)
+        break unless t.alive?
+      end
+      end
+      
+      client.map_dns(appname,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
+      display "Selected DNS: ",false
+      display "#{usedns}"  
+      manifest = [usedns] 
+      display "Unmapping dns: ",false
+      
+      t = Thread.new do     
+      loop do
+        display '.', false 
+        sleep (1)
+        break unless t.alive?
+      end
+      end
+      
+      client.unmap_dns(appname,manifest)
+      Thread.kill(t)
+      display "OK".green   
+    end
+    
+  end
+end

data/lib/cli/commands/projects.rb

@@ -7,19 +7,36 @@ require 'set'
 module PI::Cli::Command
 
   class Projects < Base
-
-    YES_SET = Set.new(["y", "Y", "yes", "YES"])
+    include PI::Cli::ChooseHelper
 
     def projects
-      projects = client.projects     
-      projects.sort! {|a, b| a[:name] <=> b[:name] }
-      display "\n"
+      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  
       return display JSON.pretty_generate(projects) if @options[:json]
-      return display "No Projects" if projects.nil? || projects.empty?
+      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', 'Description'
+        t.headings = 'Name', 'Runtime', 'Framework', 'Git Type','GitUrl', 'ID', 'Description'
         projects.each do |project|
-          t << [project[:name], project[:runtime] ,project[:framework], project[:repositoryType], project[:gitUrl],project[:description]]
+          t << [project[:name], project[:runtime] ,project[:framework], project[:repositoryType], project[:gitUrl],project[:id],project[:description]]
         end
       end
       display projects_table
@@ -28,8 +45,8 @@ module PI::Cli::Command
     def create_project(projectname=nil)            
       loop{
         unless projectname
-        projectname = ask("Project Name: ")
-        err "Project Name required." if projectname.nil? || projectname.empty?
+          projectname = ask "Project Name"
+          err "Project Name required." if projectname.nil? || projectname.empty?
         end
         if project_exists?(projectname)
           display "Project '#{projectname}' already exists." 
@@ -67,7 +84,7 @@ module PI::Cli::Command
       display "Selected Framework: ",false
       display "#{framework}".green
       
-      description = ask("Please enter in the description: ")
+      description = ask "Please enter in the description"
        
       github_info = client.github_info
       
@@ -119,35 +136,43 @@ module PI::Cli::Command
         }
       end
      
-      display "Creating project #{projectname}: ",false
+      display "Creating project \"#{projectname}\": ",false
+      
+      t = Thread.new do     
+      loop do
+        display '.', false 
+        sleep (1)
+        break unless t.alive?
+      end
+      end
+            
       client.create_project(projectname, manifest)
+      Thread.kill(t)
       display "OK".green
     end
 
     def delete_project(projectname=nil)
       unless projectname
-      projects = client.projects
-      err "No Projects" if projects.nil? || projects.empty?
-      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
+        useproject = choose_project
+        projectname = useproject[:name]
       end
-      display "Selected Project: ",false
-      display "#{projectname}".green
+      display "Deleting project \"#{projectname}\": ",false
+      
+      t = Thread.new do     
+      loop do
+        display '.', false 
+        sleep (1)
+        break unless t.alive?
       end
-      display "Deleting project [#{projectname}]: ", false
+      end
+      
       client.delete_project(projectname)
+      Thread.kill(t)
       display 'OK'.green
     end
     
     def upload(projectname=nil)
-      file = nil
-      java_projects = nil  
+      file, java_projects = nil, nil  
       unless projectname    
       projects = client.projects
       err "No Projects" if projects.nil? || projects.empty?
@@ -165,18 +190,15 @@ module PI::Cli::Command
       display "#{projectname}".green
       end
          
-      version = ask("Please enter the version: ")
-      description = ask("Please enter in the description: ")       
+      version = ask "Please enter the version"
+      description = ask "Please enter in the description"       
       
       path = nil
       loop{
-        path = ask("Please enter the path of upload war file: ") do |p|
-          p.validate = /\.(war)$/
-          p.responses[:not_valid] = "Please enter the path of upload war file:"
-        end
-        if not File.exists? path
-          display "Deployment path does not exist!" 
-          path =nil 
+        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!" 
+          path =nil
           next
         else
           break
@@ -190,26 +212,25 @@ module PI::Cli::Command
         :versionName => "#{version.downcase}",
         :description => "#{description}"
       }     
-      display "Uploading ",false
+      display "Uploading \"#{File.basename(path)}\": ",false
+      
+      t = Thread.new do     
+      loop do
+        display '.', false 
+        sleep (1)
+        break unless t.alive?
+      end
+      end
+      
       client.upload(manifest)
+      Thread.kill(t)
       display 'OK'.green
     end
 
     def project_events(projectname=nil)
       unless projectname
-      projects = client.projects
-      err "No Projects" if projects.nil? || projects.empty?
-      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
-      end
-      display "Selected Project: ",false
-      display "#{projectname}".green
+        useproject = choose_project
+        projectname = useproject[:name]
       end
       events = client.project_events(projectname)
       return display JSON.pretty_generate(events || []) if @options[:json]
@@ -225,19 +246,8 @@ module PI::Cli::Command
 
     def project_tags(projectname=nil)
       unless projectname
-      projects = client.projects
-      err "No Projects" if projects.nil? || projects.empty?
-      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
-      end
-      display "Selected Project: ",false
-      display "#{projectname}".green
+        useproject = choose_project
+        projectname = useproject[:name]
       end
       tags ||= client.project_tags(projectname)
       return display JSON.pretty_generate(tags || []) if @options[:json]
@@ -252,21 +262,9 @@ module PI::Cli::Command
 
     def project_commits(projectname=nil)
       unless projectname
-      projects = client.projects
-      err "No Projects" if projects.nil? || projects.empty?
-      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
+        useproject = choose_project
+        projectname = useproject[:name]
       end
-      display "Selected Project: ",false
-      display "#{projectname}".green
-      end
-
       tag =nil
       tags = client.project_tags(projectname)
       return display JSON.pretty_generate(tags || []) if @options[:json]
@@ -298,43 +296,28 @@ module PI::Cli::Command
  
     def project_apps(projectname=nil)
       unless projectname
-      projects = client.projects
-      err "No Projects" if projects.nil? || projects.empty?
-      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
-      end
-      display "Selected Project: ",false
-      display "#{projectname}".green
-      end
-      
-      apps = client.project_apps(projectname)
-      apps.sort! {|a, b| a[:appname] <=> b[:appname] }
+        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[:appName], app[:url], app[:tag], app[:status], app[:instances]]
+          t << [app[:targetName], app[:name], app[:url], app[:tag], app[:status], app[:instances]]
         end
       end
       display apps_table
     end
     
     private 
-   
+    
     def project_exists?(projectname)
-      projects  = client.projects 
-      projects.each do |project|
-        return true if project[:name] == projectname
-      end
-      return false
+      project  = client.project_get(projectname)
+      projectname == project[:name] ? true : false     
     end
     
  end     

data/lib/cli/commands/services.rb

@@ -0,0 +1,134 @@
+require "interact"
+module PI::Cli::Command
+  class Services < Base
+    include PI::Cli::ChooseHelper  
+    include Interactive
+    
+    def usable_services(appname=nil)
+      unless appname         
+        useproject = choose_project
+        projectid = useproject[:id]
+        useapp = choose_app(projectid)
+        appname = useapp[:name]
+      end
+      services = client.usable_services(appname)
+      return display JSON.pretty_generate(services) if @options[:json]
+      return display "No Services" if services.nil? || services.empty?
+      services.sort! {|a, b| a[:name] <=> b[:name] }
+      services_table = table do |t|
+        t.headings = 'Name', 'Version', 'Type'
+        services.each do |s|
+          t << [s[:name], s[:version] ,s[:service_type]]
+        end
+      end
+      display services_table
+    end
+    
+    def app_service(appname=nil)
+      unless appname         
+        useproject = choose_project
+        projectid = useproject[:id]
+        useapp = choose_app(projectid)
+        appname = useapp[:name]
+      end
+      services = client.app_service(appname)
+      return display JSON.pretty_generate(services) if @options[:json]
+      return display "No Services" if services.nil? || services.empty?
+      services.sort! {|a, b| a[:name] <=> b[:name] }
+      services_table = table do |t|
+        t.headings = 'Name', 'Version', 'Type'
+        services.each do |s|
+          t << [s[:name], s[:version] ,s[:service_type]]
+        end
+      end
+      display services_table
+    end  
+    
+    def bind_service(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)      
+
+      services = client.usable_services(appname)
+      err "No usable services!" if services.nil? || services.empty?
+      
+      choices = Array.new
+      services.each do |s|
+        choices << s[:name]
+      end 
+           
+      manifest = ask "Select services, indexed list?", :choices => choices, :indexed => true
+      manifest = manifest.to_a
+      display "Selected services: ",false
+      display "#{manifest}"  
+      display "Binding service: ",false
+      
+      t = Thread.new do     
+      loop do
+        display '.', false 
+        sleep (1)
+        break unless t.alive?
+      end
+      end
+      
+      client.bind_service(appname,manifest)
+      result = check_status(app[:name], "bindservice")
+      Thread.kill(t)
+      if result[:code] == 200
+        display "OK".green   
+      else
+        err result[:text]   
+      end
+    end  
+    
+    def unbind_service(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)      
+      services = client.app_service(appname)
+      err "No binded services!" if services.nil? || services.empty?
+      
+      useservice = nil
+      choose do |menu|
+        display "=============Services============"
+        menu.prompt = "Select Service: "
+        menu.select_by = :index_or_name
+        services.each do |service|
+          menu.choice("#{service[:name]}") { useservice = service }
+        end
+      end
+      display "Selected Service: ",false
+      display "#{useservice[:name]}"  
+      manifest = [useservice[:name]] 
+      display "Unbinding service: ",false
+      
+      t = Thread.new do     
+      loop do
+        display '.', false 
+        sleep (1)
+        break unless t.alive?
+      end
+      end
+      
+      client.unbind_service(appname,manifest)
+      result = check_status(app[:name], "unbindservice")
+      Thread.kill(t)
+      if result[:code] == 200
+        display "OK".green   
+      else
+        err result[:text]   
+      end
+    end
+    
+  end
+end