pi 0.1.20 → 0.1.21

data/README

@@ -58,19 +58,19 @@ _Copyright 2010-2012, Samsung.
   Currently available pi commands are:
 
   User
-    pi login [url]                               Login
-    pi logout                                    Logs current user out of the system
-    pi info                                      List system information
-    pi user                                      Display user information
-    pi targets                                   List available targets infomation
-    pi password [newpassword]                    Change the password for the current user
-    pi github [name]                             Bind to the github account
-    pi runtimes                                  Display the supported runtimes of the system
-    pi frameworks                                Display the supported frameworks of the system
-    pi version                                   Display version information
-    pi help [command]                            Get general help or help on a specific command
-    pi help options                              Get help on available options
-    
+    login [url]                                  Login
+    logout                                       Logs current user out of the system
+    info                                         List system information
+    user                                         Display user information
+    targets                                      List available targets infomation
+    password [newpassword]                       Change the password for the current user
+    github [name]                                Bind to the github account
+    runtimes                                     Display the supported runtimes of the system
+    frameworks                                   Display the supported frameworks of the system
+    version                                      Display version information
+    help [command]                               Get general help or help on a specific command
+    help options                                 Get help on available options
+
   Project
     projects                                     List created projects 
     create-project [projectname]                 Create a new project                
@@ -107,14 +107,14 @@ _Copyright 2010-2012, Samsung.
 
 4. Example 
 
-ubuntu@admin:~$ pi login
-URL: 'http://api.staging.samsungcloud.org'? y
+ubuntu@admin:~$ pi login 
+Attempting login to 'http://api.staging.samsungcloud.org'? [Yn]: 
 User: wangjing
 Password: *******
 Successfully logged into [http://api.staging.samsungcloud.org]
 
 ubuntu@admin:~$ pi version
-pi 0.1.20
+pi 0.1.21
 
 ubuntu@admin:~$ pi user
 
@@ -127,12 +127,11 @@ Github Account Email: ruanzhimin@gmail.com
 
 ubuntu@admin:~$ pi targets
 
-+-----------------+-----------------------------------------+
-| Name            | URL                                     |
-+-----------------+-----------------------------------------+
-| us-east-staging | http://us-east-staging.samsungcloud.org |
-| ap-ne-test      | http://ap-ne-test.samsungcloud.org      |
-+-----------------+-----------------------------------------+
++------------+------------------------------------+
+| Name       | URL                                |
++------------+------------------------------------+
+| ap-ne-test | http://ap-ne-test.samsungcloud.org |
++------------+------------------------------------+
 
 ubuntu@admin:~$ pi runtimes
 
@@ -175,18 +174,18 @@ Try 'pi help [command]' or 'pi help options' for more information.
 Currently available pi commands are:
 
   User
-    pi login [url]                               Login
-    pi logout                                    Logs current user out of the system
-    pi info                                      List system information
-    pi user                                      Display user information
-    pi targets                                   List available targets infomation
-    pi password [newpassword]                    Change the password for the current user
-    pi github [name]                             Bind to the github account
-    pi runtimes                                  Display the supported runtimes of the system
-    pi frameworks                                Display the supported frameworks of the system
-    pi version                                   Display version information
-    pi help [command]                            Get general help or help on a specific command
-    pi help options                              Get help on available options
+    login [url]                                  Login
+    logout                                       Logs current user out of the system
+    info                                         List system information
+    user                                         Display user information
+    targets                                      List available targets infomation
+    password [newpassword]                       Change the password for the current user
+    github [name]                                Bind to the github account
+    runtimes                                     Display the supported runtimes of the system
+    frameworks                                   Display the supported frameworks of the system
+    version                                      Display version information
+    help [command]                               Get general help or help on a specific command
+    help options                                 Get help on available options
     
   Project
     projects                                     List created projects 
@@ -198,6 +197,30 @@ Currently available pi commands are:
     project-apps [projectname]                   List the applications for the project
     upload [projectname]                         Upload the war package for java project
     
+  Application
+    apps                                         List deployed applications for the project
+    create-app [appname]                         Create a new application
+    delete-app [appid]                           Delete the application
+    start-app [appid]                            Start the application
+    stop-app [appid]                             Stop the application
+    restart-app [appid]                          Restart the application
+    scale-app [appid]                            Scale the application instances up or down
+    update-app [appid]                           Update the application
+    status [appname]                             Display resource usage for the application
+    app-env [appid]                              Display the environments for the application
+    create-env [appid]                           Create the environment for the application
+    delete-env [appid]                           Delete the environment for the application
+    app-log [appid]                              List the logs for the application
+ 
+  Service
+    app-service [appname]                        Display the bind services for the application
+    bind-service [appname]                       Bind a service to an application
+    unbind-service [appname]                     Unbind a service to an application
+  DNS
+    app-dns [appname]                            Display the mapped urls for the application
+    map-dns [appname]                            Map the url for the application
+    unmap-dns [appname]                          Unmap the url for the application
+
 ubuntu@admin:~$ pi help options
 
 Available options:
@@ -213,57 +236,220 @@ Available options:
         
 ubuntu@admin:~$ pi projects
 
-+-----------------+---------+-----------+----------+---------------------------------------------------------------------+-------------+
-| Name            | Runtime | Framework | Git Type | GitUrl                                                              | Description |
-+-----------------+---------+-----------+----------+---------------------------------------------------------------------+-------------+
-| javatest        | java    | spring    | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/javatest.git  | test        |
-| javatestgithub  | java    | spring    | github   | git://github.com/ruanzhimin/javatestgithub.git                      | test        |
-| railstest       | ruby18  | rails3    | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/railstest.git | test        |
-| railstestgithub | ruby18  | rails3    | github   | git://github.com/ruanzhimin/railstestgithub.git                     | test        |
-| tmp1            | ruby18  | rails     | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/tmp1.git      | test        |
-+-----------------+---------+-----------+----------+---------------------------------------------------------------------+-------------+
++-----------------+---------+-----------+----------+---------------------------------------------------------------------+------+-------------+
+| Name            | Runtime | Framework | Git Type | GitUrl                                                              | ID   | Description |
++-----------------+---------+-----------+----------+---------------------------------------------------------------------+------+-------------+
+| javatest        | java    | spring    | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/javatest.git  | 1955 | test        |
+| javatestgithub  | java    | spring    | github   | https://ruanzhimin@github.com/ruanzhimin/javatestgithub.git         | 1931 | test        |
+| javawj          | java    | spring    | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/javawj.git    | 2031 | test        |
+| railstest       | ruby18  | rails3    | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/railstest.git | 1928 | test        |
+| railstestgithub | ruby18  | rails3    | github   | https://ruanzhimin@github.com/ruanzhimin/railstestgithub.git        | 1929 | test        |
+| railswj         | ruby18  | rails3    | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/railswj.git   | 2028 | test        |
+| tmp1            | ruby18  | rails     | cloudpi  | http://wangjing@git-staging.samsungcloud.org/wangjing/tmp1.git      | 1882 | test        |
++-----------------+---------+-----------+----------+---------------------------------------------------------------------+------+-------------+
 
 ubuntu@admin:~$ pi create-project
-Project Name: javatest
-Project 'javatest' already exists.
-Project Name: javademogithub
+Project Name: railsdemo
 =============Runtime============
 1. java
 2. ruby18
-Select Runtime: 1
-Selected Runtime: java
+Select Runtime: 2
+Selected Runtime: ruby18
 =============Frameworks============
-1. lift
-2. spring
-3. grails
-4. java_web
-Select Framework: 2
-Selected Framework: spring
+1. rails3
+2. sinatra
+Select Framework: 1
+Selected Framework: rails3
 Please enter in the description: test
 =============Repository Types============
 1. cloudpi
 2. github
-Select Repository Type: 2
-Selected Repository Type: github
-=============Publish Types============
-1. public
-2. private
-Select publish Type: 1
-Selected publish Type: public
-Creating project javademogithub: OK
+Select Repository Type: 1
+Selected Repository Type: cloudpi
+Creating project "railsdemo": ...........OK
 
-ubuntu@admin:~$ pi delete-project
-=============Project Name=======
-1. javademogithub
-2. javatest
-3. javatestgithub
-4. railstest
-5. railstestgithub
-6. tmp1
-Select Project: 1
-Selected Project: javademogithub
-Deleting project [javademogithub]: OK
+ubuntu@admin:~$ pi create-app
+Application Name: railsdemo
+=============Project Name===========
+1. javatest
+2. javatestgithub
+3. javawj
+4. railsdemo
+5. railstest
+6. railstestgithub
+7. railswj
+8. tmp1
+Select Project: 4
+Selected Project: railsdemo
+Tag: v0.0.0
+=============Targets============
+1. ap-ne-test-http://ap-ne-test.samsungcloud.org
+Select Target: 1
+Selected Target: ap-ne-test-http://ap-ne-test.samsungcloud.org
+Available memory: 5568 M
+URL: railsdemo.wangjing.ap-ne-test.samsungpaas.com
+Memory reservation (64M, 128M, 256M, 512M, 1G, 2G) [64M]: 
+How many instances? [1]: 
+Need restart? [yN]: 
+Need monitor? [yN]: 
+Branch: master
+Creating application "railsdemo": .....................................................OK
+
+ubuntu@admin:~$ pi apps
+=============Project Name===========
+1. javatest
+2. javatestgithub
+3. javawj
+4. railsdemo
+5. railstest
+6. railstestgithub
+7. railswj
+8. tmp1
+Select Project: 4
+Selected Project: railsdemo
++------------+-----------+-----------------------------------------------+-------------+---------+---------+-----------+-------------------+
+| Target     | App name  | URL                                           | Deploy Type | Version | Status  | Instances | Running Instances |
++------------+-----------+-----------------------------------------------+-------------+---------+---------+-----------+-------------------+
+| ap-ne-test | railsdemo | railsdemo.wangjing.ap-ne-test.samsungpaas.com | git         | v0.0.0  | STARTED | 1         | 1                 |
++------------+-----------+-----------------------------------------------+-------------+---------+---------+-----------+-------------------+
+
+ubuntu@admin:~$ pi stop-app
+=============Project Name===========
+1. javatest
+2. javatestgithub
+3. javawj
+4. railsdemo
+5. railstest
+6. railstestgithub
+7. railswj
+8. tmp1
+Select Project: 4
+Selected Project: railsdemo
+=============Application Name===========
+1. railsdemo
+Select Application: 1
+Selected Application: railsdemo
+Stoping application: OK
+
+ubuntu@admin:~$ pi start-app
+=============Project Name===========
+1. javatest
+2. javatestgithub
+3. javawj
+4. railsdemo
+5. railstest
+6. railstestgithub
+7. railswj
+8. tmp1
+Select Project: 4
+Selected Project: railsdemo
+=============Application Name===========
+1. railsdemo
+Select Application: 1
+Selected Application: railsdemo
+Starting application: ................................OK
+
+ubuntu@admin:~$ pi scale-app
+=============Project Name===========
+1. javatest
+2. javatestgithub
+3. javawj
+4. railsdemo
+5. railstest
+6. railstestgithub
+7. railswj
+8. tmp1
+Select Project: 4
+Selected Project: railsdemo
+=============Application Name===========
+1. railsdemo
+Select Application: 1
+Selected Application: railsdemo
+How many instances? [1]: 3
+Scaling application: .....................OK
+
+ubuntu@admin:~$ pi create-env railsdemo
+Environment Name: aa
+Environment Value: bb
+OK
+
+ubuntu@admin:~$ pi app-env railsdemo
++------+-------+
+| Name | Value |
++------+-------+
+| aa   | bb    |
++------+-------+
+
+ubuntu@admin:~$ pi delete-env railsdemo
+Environment Name: aa
+OK
+
+ubuntu@admin:~$ pi app-log
+=============Project Name===========
+1. javatest
+2. javatestgithub
+3. javawj
+4. railsdemo
+5. railstest
+6. railstestgithub
+7. railswj
+8. tmp1
+Select Project: 4
+Selected Project: railsdemo
+=============Application Name===========
+1. railsdemo
+Select Application: 1
+Selected Application: railsdemo
+Select instance index(from 0 to 2) [0]: 2
+1: migration.log                             578B
+2: staging.log                               966B
+3: stderr.log                                185B
+4: stdout.log                                148B
+Select logs, indexed list?: 1
+Selected logs: migration.log
+
+WARNING: Global access to Rake DSL methods is deprecated.  Please include
+    ...  Rake::DSL into classes and modules which use the Rake DSL methods.
+WARNING: DSL method Railshelloworld::Application#task called at /mnt/vcap.local/dea/apps/railsdemo-2-ef9982b6297fc51c2d4d4ca0f763bd71/app/rubygems/ruby/1.8/gems/railties-3.0.5/lib/rails/application.rb:214:in `initialize_tasks'
+** Invoke db:migrate (first_time)
+** Invoke environment (first_time)
+** Execute environment
+** Execute db:migrate
+** Invoke db:schema:dump (first_time)
+** Invoke environment 
+** Execute db:schema:dump
+
+ubuntu@admin:~$ pi delete-app
+=============Project Name===========
+1. javatest
+2. javatestgithub
+3. javawj
+4. railsdemo
+5. railstest
+6. railstestgithub
+7. railswj
+8. tmp1
+Select Project: 4
+Selected Project: railsdemo
+=============Application Name===========
+1. railsdemo
+Select Application: 1
+Selected Application: railsdemo
+Deleting application: ........OK
 
+ubuntu@admin:~$ pi delete-project
+=============Project Name===========
+1. javatest
+2. javatestgithub
+3. javawj
+4. railsdemo
+5. railstest
+6. railstestgithub
+7. railswj
+8. tmp1
+Select Project: 4
+Selected Project: railsdemo
+Deleting project "railsdemo": .......OK
 
 ubuntu@admin:~$ pi project-apps
 =============Project Name=======
@@ -327,16 +513,15 @@ ubuntu@admin:~$ pi upload
 =============Project Name=======
 1. javatest
 2. javatestgithub
+3. javawj
 Select Project: 1
 Selected Project: javatest
 Please enter the version: v1
 Please enter in the description: test
-Please enter the path of upload war file: /home/demo.war                       
-Deployment path does not exist!
-Please enter the path of upload war file: /home/ubuntu/demo
-Please enter the path of upload war file:
-?  /home/ubuntu/demo.war
-Uploading OK
+Please enter the path of upload war file: /home/wangjing/sample.war
+Not war file or path does not exist!
+Please enter the path of upload war file: /home/ubuntu/demo.war
+Uploading "demo.war": .OK
 
 ubuntu@admin:~$ pi logout
 Successfully logged out of [http://api.staging.samsungcloud.org]
@@ -344,19 +529,20 @@ Successfully logged out of [http://api.staging.samsungcloud.org]
 5. Common Exception
 
 ubuntu@admin:~$ pi login
-URL: 'http://api.staging.samsungcloud.org'? n
-URL: http://test.org
+Attempting login to 'http://api.staging.samsungcloud.org'? [Yn]: n
+Please input URL: http://test.org
 User: wangjing
 Password: *******
 Problem with login, Cannot access target (getaddrinfo: Name or service not known), try again or register for an account.
 
-ubuntu@admin:~$ pi github 
+ubuntu@admin:~$ pi github
 Please input your name: ruanzhimin
 Please input your email: ruanzhimin@gmail.com
-Please input your password: ************
-Error (HTTP 500): {"httpCode":500,"errorCode":1007,"httpDescription":"Internal Server Error","errorDescription":"Invalid github account."}
+Please input your password: ***
+
+Error (1007): Invalid github account.
 
 ubuntu@admin:~$ pi project-events tmp4
-Error (HTTP 500): {"httpCode":500,"errorCode":3004,"httpDescription":"Internal Server Error","errorDescription":"The project is 
-not belongs to current account.Project name : tmp4"}
+
+Error (3004): The project is not belongs to current account.Project name : tmp4
 

data/lib/cli/commands/apps.rb

@@ -435,9 +435,9 @@ module PI::Cli::Command
       return display JSON.pretty_generate(status) if @options[:json]
       return display "No Status!" if status.nil? || status.empty?
       status_table = table do |t|
-        t.headings = 'Instance ID', 'CPU', 'Memory', 'Disk', 'RequestCount', 'ErrorCount'
+        t.headings = 'Instance ID', 'Status', 'CPU(%)', 'Memory(M)', 'Disk(M)', 'RequestCount', 'ErrorCount'
         status.each do |s|
-          t << [s[:instancesId], s[:cpu], s[:memory], s[:disk], s[:requestCount], s[:errorCount]]
+          t << [s[:instancesId][0,6], s[:status], s[:cpu], s[:memory], s[:disk], s[:requestCount], s[:errorCount]]
         end
       end
       display status_table

data/lib/cli/usage.rb

@@ -25,18 +25,17 @@ class PI::Cli::Runner
 Currently available pi commands are:
 
   User
-    pi login [url]                               Login
-    pi logout                                    Logs current user out of the system
-    pi info                                      List system information
-    pi user                                      Display user information
-    pi targets                                   List available targets infomation
-    pi password [newpassword]                    Change the password for the current user
-    pi github [name]                             Bind to the github account
-    pi runtimes                                  Display the supported runtimes of the system
-    pi frameworks                                Display the supported frameworks of the system
-    pi version                                   Display version information
-    pi help [command]                            Get general help or help on a specific command
-    pi help options                              Get help on available options
+    login [url]                                  Login
+    logout                                       Logs current user out of the system
+    info                                         List system information
+    user                                         Display user information
+    targets                                      List available targets infomation
+    github [name]                                Bind to the github account
+    runtimes                                     Display the supported runtimes of the system
+    frameworks                                   Display the supported frameworks of the system
+    version                                      Display version information
+    help [command]                               Get general help or help on a specific command
+    help options                                 Get help on available options
     
   Project
     projects                                     List created projects 

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module PI
   module Cli
-    VERSION = '0.1.20'
+    VERSION = '0.1.21'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pi
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 1
-  - 20
-  version: 0.1.20
+  - 21
+  version: 0.1.21
 platform: ruby
 authors: 
 - Samsung
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-19 00:00:00 Z
+date: 2012-07-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure