app42 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5b8f7a110424af73acd4b1847822ae7bfbfe7ed
-  data.tar.gz: aaf5f21ad1ce5e6935d8af8bc3a31e1eb79b83e0
+  metadata.gz: 0f2e93237bd27606f1fce898d696cc584ecf0c81
+  data.tar.gz: 22306a898c0e237d65af4729b03119bc78943c39
 SHA512:
-  metadata.gz: df400c060594ecdc8d45be5a691aa713e561f54867daf61066c378ffdab8cc5080c663ffe76637add38335085ae85746bd0454c8f03ef2aff5df789673047ced
-  data.tar.gz: 4f1d155bf9b9b876af03124478b5a0a50fa4daa56bc3f6e9d284ff2f294fe367ab1ab4487d9b5ebb0ab2edaf80af8c82ff2b3f018ccf3198e688182a50b04cf4
+  metadata.gz: eff3f34399f7a747fc522297eb2a2270c716c1fbe9c11064b2e52e055b74dd69ae1edb3685a568025f8cb3a2e6b9506ec275bdd797be0ad6d9c434eded1fa8dd
+  data.tar.gz: 5716d721469c36dfe52a936e225853fdb78a56a2dea06c80bbd94e8cab8bc7e12358bac0e88911fb02fe1685437881166cd2883e02b9369406a040c6223308b6

data/app42.gemspec

@@ -5,6 +5,7 @@ require 'app42/version'
 
 Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.2'
+  spec.add_runtime_dependency 'bundler'
   spec.post_install_message = "Thanks for installing!"
   spec.name          = "app42"
   spec.version       = App42::Version::VERSION::VERSION

data/lib/app42/base/constants.rb

@@ -20,12 +20,16 @@ module App42
     # Error codes
     APP42_HTTP_ERROR_CODES = [ 1500 ]
 
-    DATABASE_NAME_NOT_ALLOWED = %w(mysql couchdb mongodb postgresql database)
+    DATABASE_NAME_NOT_ALLOWED = %w(mysql couchdb mongodb postgresql database sql)
 
     # regex for special character
     SPECIAL = "?<>',?[]}{=-)(*&^%$#`~{}@ .+!_/"
     REGEX = /[#{SPECIAL.gsub(/./){|char| "\\#{char}"}}]/
 
+    # regex for special character (Database Name)
+    DBNAME_SPECIAL = "?<>',?[]}{=-)(*&^%$#`~{}@ .+!/"
+    DBNAME_REGEX = /[#{DBNAME_SPECIAL.gsub(/./){|char| "\\#{char}"}}]/
+
     # regex for IP Address
     IP_REGEX = /^([0]?\d\d?|1[0-1,3-9]\d|12[0-6,8-9]|2[0-4]d|25[0-5])\.([01]?\d\d?|2[0-4]\d|25[0-5])\.([01]?\d\d?|2[0-4]\d|25[0-5])\.((?!0)|(?!1)|010|(01[0-9]{1,1}&0[1-9]{1,2})|0[0-9]{1,1}[1-9]{1,1}|[2-9]{0,2}|1[0-9]{1,2}|2[0-4]\d|25[0-4])$/
 

data/lib/app42/base/help.rb

@@ -39,7 +39,7 @@ module App42
    apps                    #  List all the deployed applications with their meta details
    appInfo                 #  Show meta information of the application
    appState                #  Show current state of the application
-   logs                    #  Returns the log file URLs for the application
+   logs                    #  Returns the log file URL(s) for the application
 
   Services 
    createService           #  Creates a new service e.g. MySQL, MongoDB, CouchDB, PostgreSQL etc.
@@ -55,6 +55,7 @@ module App42
    supportedServices       #  List supported services by App42
    iaasProviders           #  List supported IaaS providers by App42
    runtimes                #  List supported runtimes by App42
+   activities              #  List all activities with their status
 
   Help
    version                 #  Show Ruby client gem version
@@ -104,7 +105,7 @@ Example:
           DESC
         end
 
-        def addKeys
+        def addkeys
           print <<-DESC
 Usage:
   app42 addKeys
@@ -124,52 +125,65 @@ Example:
           DESC
         end
 
-        def clearKeys
+        def clearkeys
           print <<-DESC
 Usage:
   app42 clearKeys
 
-  Clear API key and Secret key from dev system
+  Clear API key and Secret key
 
 Example:
   app42 clearKeys
-  == Local credentials cleared ==
+  Do you want to delete existing keys? [Yn]: y
+
+  === API key and Secret key have been deleted. ===
           DESC
         end
        
-        def setupInfra
+        def setupinfra
           print <<-DESC
 Usage:
   app42 setupInfra
 
-  Setup the complete runtime environment
+  Setup your deployment and runtime environment i.e. Instance(Memory, CPU) and Technology Stack
 
 Example:
   $app42 setupInfra
-  1: Shared
-  Select Virtual Machine Type: 1
-  1: Amazon
-  Select IaaS Provider: 1
   Application Name: demo
+
   Checking App Name Availability... OK
-  1: Ruby
-  2: Java
-  3: Php
-  4: Node
-  Select Runtime: 2
-  1: Grails 1.3.7
-  Select Framework: 1
-  1: Tomcat 6.0.36
-  Select Web Server: 1
-  1: 512MB
-  2: 1024MB
-  3: 2048MB
-  Memory Limit: 1
- Creating Infrastructure... OK
- Latest Status....|
- Setup Infrastructure successfully done.
-
- Default Application Deployed. URL is : demo.aws.app42paas.com
+
+  1: Shared
+  Select Instance Type [Shared]: 
+
+  1: Amazon US West-2a
+  Select IaaS Provider [Amazon US West-2a]: 1
+
+  1: Ruby 2.0
+  2: Java 6.0
+  3: Java 7.0
+  4: Php 5.3
+  5: Php 5.5
+  Select Runtime [Ruby 2.0]: 1
+
+  1: Rails 4.0
+  Select Framework [Rails 4.0]: 
+
+  1: nginx 1.4.2
+  Select Web Server [nginx 1.4.2]: 
+
+  1: 512 MB
+  2: 1024 MB
+  3: 2048 MB
+  Memory Limit [512 MB]: 
+
+  Setting up the infrastructure... OK
+  
+  Operation is in progress, Please wait.../
+  
+  Setup Infra completed successfully.
+
+  Default application has been deployed. You can visit 'demo.aws.app42paas.com' to see the default application.
           DESC
 
         end
@@ -179,7 +193,7 @@ Example:
 Usage:
   app42 apps
 
-  Deploy the application over runtime environment
+  List all the deployed applications with their meta details
 
 Example:
   $app42 apps
@@ -200,7 +214,7 @@ Example:
 Usage:
   app42 deploy
 
-  Deploy application
+  Deploy the application over your runtime environment
 
 Options:
   [--app APP]      # Name of app, you want to update
@@ -211,36 +225,13 @@ Example:
   Would you like to deploy from the current directory? [Yn]: n
   Binary Deployment Path: /home/ubuntu/workspace/Deploycode/ruby
   Deploying Application... OK
-  Latest Status....|
+  Operation is in progress, Please wait....|
   1 out of 1 Uploaded
   Application deployed successfully.
           DESC
 
         end
 
-        def update
-          print <<-DESC
-Usage:
-  app42 update
-
-  Update existing application
-
-Options:
-  [--app APP]      # Name of app, you want to update
-
-Example:
-  $app42 update
-  Enter App Name: demo
-  Would you like to deploy from the current directory? [Yn]: n
-  Binary Deployment Path: /home/ubuntu/workspace/Deploycode/ruby
-  Deploying Application... OK
-  Latest Status....|
-  1 out of 1 Uploaded
-  Application deployed successfully.
-
-          DESC
-        end
-
         def start
           print <<-DESC
 Usage:
@@ -290,7 +281,7 @@ Example:
           DESC
         end
 
-        def deleteInfra
+        def deleteinfra
           print <<-DESC
 Usage:
   app42 deleteInfra
@@ -320,9 +311,8 @@ Example:
   $app42 descale --app demo
   Descale by instance(s): 1
   Descaling Application demo by instance 1... OK
-  Please wait... It may take few minutes to complete.
-
-  Latest Status....|
+  
+  Operation is in progress, Please wait...|
   Descale completed successfully.
           DESC
         end
@@ -341,16 +331,13 @@ Example:
   $app42 scale --app demo
   Scale by instance(s): 1
   Scaling Application demo by instance 1... OK
-  Please wait... It may take few minutes to complete.
-
-  Latest Status....|
+  
+  Operation is in progress, Please wait...|
   Scale completed successfully.
-
-
           DESC
         end
 
-        def appInfo
+        def appinfo
           print <<-DESC
 Usage:
   app42 appInfo
@@ -373,7 +360,7 @@ Example:
           DESC
         end
 
-        def appState
+        def appstate
           print <<-DESC
 Usage:
   app42 appState
@@ -398,7 +385,7 @@ Example:
 Usage:
   app42 logs
 
-  Returns the log URLs for the application
+  Returns the log URL(s) for the application
 
 Example:
   $app42 logs
@@ -415,43 +402,54 @@ Example:
         end
 
 
-        def createService
+        def createservice
           print <<-DESC
 Usage:
   app42 createService
 
-  Creates a new service
+  Creates a new service e.g. MySQL, MongoDB, CouchDB, PostgreSQL etc.
 
 Example:
   $app42 createService
-  1: Mysql
-  2: Mongodb
-  Select Service: 1
-  Enter Service Name: mysql-demo
-  Enter Database Name: demo_dev
+  Enter Service Name: mysqldemo
+
+  Checking Service Name Availability... OK
+
+  1: MySQL 5.5.1
+  2: Mongodb 2.4
+  3: Couchdb 10.1
+  4: PostgreSQL 9.1
+  Select Service [MySQL 5.5.1]: 1
+
+  Enter Database Name: demodb  
+
   1: Shared
-  Select Virtual Machine Type: 1
-  1: Amazon
-  Select IaaS Provider: 1
-  1: 512MB
-  2: 1024MB
-  3: 2048MB
-  Memory Limit: 1
+  Select Virtual Machine Type [Shared]: 
+
+  1: Amazon US West-2a
+  Select IaaS Provider [Amazon US West-2a]: 1
+
+  1: 512 MB
+  2: 1024 MB
+  3: 2048 MB
+  Memory Limit [512 MB]: 1
+
   Creating Service... OK
-  Latest Status....|
-  Service successfully created.
-
-  +---------------+---------------+---------+---------------+------------------+---------+--------------+----------------------------------+--------------+
-  |                                                                 === mysql-demo Details ===                                                                  |
-  +---------------+---------------+---------+---------------+------------------+---------+--------------+----------------------------------+--------------+
-  | Database Name | Iaas Provider | Vm Type | Vm Ip         | User Name        | Vm Port | Service Type | Password                         | Service Name |
-  +---------------+---------------+---------+---------------+------------------+---------+--------------+----------------------------------+--------------+
-  | demo_dev      | Amazon        | Shared  | xx.yyy.zzz.aa | xxxxxxxxxxxxxxxx | 45074   | mysql55      | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | mysql-demo   |
-  +---------------+---------------+---------+---------------+------------------+---------+--------------+----------------------------------+--------------+
+  
+  Operation is in progress, Please wait...|
+  Service created successfully.
+
+  +---------------+---------------+-----------+---------+------------------+---------+--------------+----------------------------------+--------+--------------+
+  |                                                                 === mysqldemo Details ===                                                                  |
+  +---------------+---------------+-----------+---------+------------------+---------+--------------+----------------------------------+--------+--------------+
+  | Database Name | Iaas Provider | Vm Ip     | State   | User Name        | Vm Port | Service Type | Password                         | Memory | Service Name |
+  +---------------+---------------+-----------+---------+------------------+---------+--------------+----------------------------------+--------+--------------+
+  | demodb        | Amazon        | 10.0.0.52 | RUNNING | j7zz1jsx1bb4eiz1 | 49695   | MySQL 5.5.1  | teh77o4b6kpb22ab6oogfu9lwru9vrlj | 512 MB | mysqldemo    |
+  +---------------+---------------+-----------+---------+------------------+---------+--------------+----------------------------------+--------+--------------+
           DESC
         end
 
-        def deleteService
+        def deleteservice
           print <<-DESC
 Usage:
   app42 deleteService
@@ -463,13 +461,12 @@ Options:
 
 Example:
   $app42 deleteService
-  1: mysql-demo
-  2: mysql-test
-  Select Service: 1
-  Latest Status....-
-  1 out of 1 deleted
-  Service mysql-demo successfully deleted.
+  Enter Service Name: mysqldemo
+
+  Deleting Service... OK
   
+  Operation is in progress, Please wait...|
+  Service deleted successfully.  
           DESC
         end
 
@@ -482,22 +479,22 @@ Usage:
 
 Example:
   $app42 services
-  +---------------+---------+----------+--------------+
-  |             === Service List ===                  |
-  +---------------+---------+----------+--------------+
-  | Iaas Provider | Vm Type | Name     | Service Type |
-  +---------------+---------+----------+--------------+
-  | Amazon        | Shared  | demo_dev | mysql55      |
-  +---------------+---------+----------+--------------+
+  +---------------+---------------+-----------+-----------+---------+------------------+---------+--------------+----------------------------------+--------+
+  |                                                                  === Service List ===                                                                   |
+  +---------------+---------------+-----------+-----------+---------+------------------+---------+--------------+----------------------------------+--------+
+  | Database Name | Iaas Provider | Name      | Vm Ip     | State   | User Name        | Vm Port | Service Type | Password                         | Memory |
+  +---------------+---------------+-----------+-----------+---------+------------------+---------+--------------+----------------------------------+--------+
+  | demodb        | Amazon        | mysqldemo | 10.0.0.52 | RUNNING | j7zz1jsx1bb4eiz1 | 49695   | MySQL 5.5.1  | teh77o4b6kpb22ab6oogfu9lwru9vrlj | 512 MB |
+  +---------------+---------------+-----------+-----------+---------+------------------+---------+--------------+----------------------------------+--------+
           DESC
         end
 
-        def serviceInfo
+        def serviceinfo
           print <<-DESC
 Usage:
   app42 serviceInfo
 
-  Show the meta information of the provisioned service
+  Show meta information of the provisioned service
 
 Options:
   [--service SERVICE]      # Name of service
@@ -517,7 +514,7 @@ Example:
           DESC
         end
 
-        def supportedServices
+        def supportedservices
           print <<-DESC
 Usage:
   app42 supportedServices
@@ -526,14 +523,38 @@ Usage:
 
 Example:
   $app42 supportedServices
-  +--------------+-----------------+
-  |  === App42 PaaS Services ===   |
-  +--------------+-----------------+
-  | Name         | Service Version |
-  +--------------+-----------------+
-  | Mysql        | 5.5.1           |
-  | Mongodb      | 2.4             |
-  +--------------+-----------------+
+  +--------------+--------------+
+  | === App42 PaaS Services === |
+  +--------------+--------------+
+  | Name         | Version      |
+  +--------------+--------------+
+  | MySQL        | 5.5.1        |
+  | Mongodb      | 2.4          |
+  | Couchdb      | 10.1         |
+  | PostgreSQL   | 9.1          |
+  +--------------+--------------+
+          DESC
+        end
+
+        def activities
+          print <<-DESC
+Usage:
+  app42 activities
+
+  List all activities with their status 
+
+Example:
+  $app42 activities
+  +---------------+-----------+---------+---------+-----------------------+
+  |                        === User Activities ===                        |
+  +---------------+-----------+---------+---------+-----------------------+
+  | Operation     | Status    | Name    | Type    | Date                  |
+  +---------------+-----------+---------+---------+-----------------------+
+  | setupInfra    | COMPLETED | demo    | APP     | 2013-08-27 06:24:03.0 |
+  | scale         | COMPLETED | demo    | APP     | 2013-08-27 06:32:15.0 |
+  | createService | COMPLETED | couchdb | SERVICE | 2013-08-27 06:33:56.0 |
+  | setupInfra    | COMPLETED | demo1   | APP     | 2013-08-27 07:00:47.0 |
+  +---------------+-----------+---------+---------+-----------------------+
           DESC
         end
 
@@ -554,12 +575,13 @@ Example:
   | Ruby         | 2.0          |
   | Java         | 6.0          |
   | Java         | 7.0          |
+  | Php          | 5.3          |
   | Php          | 5.5          |
   +--------------+--------------+
           DESC
         end
  
-        def iaasProviders
+        def iaasproviders
           print <<-DESC
 Usage:
   app42 iaasProviders
@@ -605,7 +627,7 @@ Example:
           DESC
       end
 
-      def resetServicePassword
+      def resetservicepassword
         print <<-DESC
 Usage:
   resetServicePassword
@@ -614,85 +636,87 @@ Usage:
 
 Example:
   $resetServicePassword
-  Enter Service Name: mysql_demo
-  Enter Old Password: 1pc8a09ise98nutrqzouj5ya98vtd08y
+  Enter Service Name: mysqldemo
+
+  Enter Old Password: teh77o4b6kpb22ab6oogfu9lwru9vrlj
+
   Resetting Password... OK
-  Please wait it may takes few minutes.
+  
+  Operation is in progress, Please wait.../
+  Service Password has been reset successfully.
 
-  Latest Status....
-  Reset Password successful.Your new password is: quzg6bogsu0ak3rwyr0egs8a1ttgc9tt
+  Your new password is: z2qo1vxeadak6jsmt9upobytwptc5eo0
           DESC
       end
 
-      def bindIP
+      def bindip
         print <<-DESC
 Usage:
   app42 bindIP
 
-  Bind IP to a service
+  Bind IP to provisioned service
 
 Example:
   $app42 bindIP
-  Enter Service Name: mysql_demo
+  Enter Service Name: mysqldemo
+
   Please Provide Source IP
-  (0.0.0.0, for public access): 0.0.0.0/0
-  Please provide the time duration you want to access service(0 for unlimited access[in hours]): 2
+  (For public access, use '0.0.0.0'): <IP address>
+
   Binding IP to service... OK
-  Please wait it may takes few minutes.
-
-  Latest Status....|
-  Bind service successful.
-
-  +------------------+--------------+---------------+---------+----------------+-----------+------------------+---------+--------------+----------------------------------+--------+--------------+
-  |                                                                                  === mysql_demo Details ===                                                                                   |
-  +------------------+--------------+---------------+---------+----------------+-----------+------------------+---------+--------------+----------------------------------+--------+--------------+
-  | Database Name    | Os           | Iaas Provider | Vm Type | Vm Ip          | Source Ip | User Name        | Vm Port | Service Type | Password                         | Memory | Service Name |
-  +------------------+--------------+---------------+---------+----------------+-----------+------------------+---------+--------------+----------------------------------+--------+--------------+
-  | demo_development | Ubuntu 12.10 | Amazon        | Shared  | 54.218.127.245 | 0.0.0.0/0 | 4gxu2btjrh7p1ku5 | 20830   | MySQL 5.5.1  | c8f6ynn0p065wzh7i2802pi5nfpfyr58 | 512 MB | mysql_demo   |
-  +------------------+--------------+---------------+---------+----------------+-----------+------------------+---------+--------------+----------------------------------+--------+--------------+
+  
+  Operation is in progress, Please wait...-
+  Service bind with IP successfully.
+
+  +---------------+---------------+----------------+-----------------+---------+------------------+---------+--------------+----------------------------------+--------+--------------+
+  |                                                                             === mysqldemo Details ===                                                                             |
+  +---------------+---------------+----------------+-----------------+---------+------------------+---------+--------------+----------------------------------+--------+--------------+
+  | Database Name | Iaas Provider | Vm Ip          | Source Ip       | State   | User Name        | Vm Port | Service Type | Password                         | Memory | Service Name |
+  +---------------+---------------+----------------+-----------------+---------+------------------+---------+--------------+----------------------------------+--------+--------------+
+  | demodb        | Amazon        | 54.218.127.245 | 122.162.124.222 | RUNNING | j7zz1jsx1bb4eiz1 | 49695   | MySQL 5.5.1  | z2qo1vxeadak6jsmt9upobytwptc5eo0 | 512 MB | mysqldemo    |
+  +---------------+---------------+----------------+-----------------+---------+------------------+---------+--------------+----------------------------------+--------+--------------+
           DESC
       end
 
-      def unbindIP
+      def unbindip
         print <<-DESC
 Usage:
   app42 unbindIP
 
-  Unbind service from the application
+  Unbind IP from provisioned service
 
 Example:
   $app42 unbindIP
-  Enter Service Name: mysql_demo
-  Please Provide Source IP
-  (0.0.0.0, for public access): 0.0.0.0/0
-  Unbinding IP to service... OK
-  Please wait it may takes few minutes.
+  Enter Service Name: mysqldemo
+
+  Please Provide Source IP: <IP address>               
 
-  Latest Status....-
-  Unbind service successful.
+  Unbinding IP to service... OK
+  
+  Operation is in progress, Please wait...|
+  Service unbind with IP successfully.
           DESC
       end
 
-      def bindInfo
+      def bindinfo
         print <<-DESC
 Usage:
   app42 bindInfo
 
-  Show IP bind information 
+  Show IP bind information related to provisioned service
 
 Example:
   $app42 bindInfo
-  1: mysql_demo
-Select Service: 1
-+------------------+--------------+---------------+---------+----------------+-----------+------------------+---------+--------------+----------------------------------+--------+--------------+
-|                                                                                  === mysql_demo Details ===                                                                                   |
-+------------------+--------------+---------------+---------+----------------+-----------+------------------+---------+--------------+----------------------------------+--------+--------------+
-| Database Name    | Os           | Iaas Provider | Vm Type | Vm Ip          | Source Ip | User Name        | Vm Port | Service Type | Password                         | Memory | Service Name |
-+------------------+--------------+---------------+---------+----------------+-----------+------------------+---------+--------------+----------------------------------+--------+--------------+
-| demo_development | Ubuntu 12.10 | Amazon        | Shared  | 54.218.127.245 | 0.0.0.0/0 | 4gxu2btjrh7p1ku5 | 20830   | MySQL 5.5.1  | c8f6ynn0p065wzh7i2802pi5nfpfyr58 | 512 MB | mysql_demo   |
-+------------------+--------------+---------------+---------+----------------+-----------+------------------+---------+--------------+----------------------------------+--------+--------------+
-
-
+  1: mysqldemo
+  Select Service [mysqldemo]: 
+
+  +---------------+---------------+----------------+-----------------+---------+------------------+---------+--------------+----------------------------------+--------+--------------+
+  |                                                                             === mysqldemo Details ===                                                                             |
+  +---------------+---------------+----------------+-----------------+---------+------------------+---------+--------------+----------------------------------+--------+--------------+
+  | Database Name | Iaas Provider | Vm Ip          | Source Ip       | State   | User Name        | Vm Port | Service Type | Password                         | Memory | Service Name |
+  +---------------+---------------+----------------+-----------------+---------+------------------+---------+--------------+----------------------------------+--------+--------------+
+  | demodb        | Amazon        | 54.218.127.245 | 122.162.124.222 | RUNNING | j7zz1jsx1bb4eiz1 | 49695   | MySQL 5.5.1  | z2qo1vxeadak6jsmt9upobytwptc5eo0 | 512 MB | mysqldemo    |
+  +---------------+---------------+----------------+-----------------+---------+------------------+---------+--------------+----------------------------------+--------+--------------+
           DESC
       end
 

data/lib/app42/base/message.rb

@@ -14,8 +14,9 @@ module Message
   NO_BINARY            = "No binary exists at the specified location."
   NO_APP               = "No App found."
   WAIT_FOR_WHILE       = "Please be patient... This process may take a while to complete."
-  LATEST_S_WAIT        = "Please wait... It may take few minutes to complete."
-  NOT_A_VALID_NUM       = "Instance(s) count should be a valid number and greater than zero."
+  LATEST_S_WAIT        = "\nOperation is in progress, Please wait..."
+  LATEST_S_INTERRUPT   = "\nYour request is being processed. Please check the request status after sometime."
+  NOT_A_VALID_NUM      = "Instance(s) count should be a valid number and greater than zero."
   REQUEST_PROGRESS     = "\nYour request is in progress. Please check the request status after sometime."
   LOG_MESSAGE          = "Please visit below URL(s) to access app logs"
 

data/lib/app42/base/shell.rb

@@ -7,32 +7,33 @@ module App42
       'version',
       'list',
       'deploy',
-      'setupInfra',
+      'setupinfra',
       'keys',
-      'clearKeys',
-      'addKeys',
+      'clearkeys',
+      'addkeys',
       'scale',
       'descale',
-      'appState',
+      'appstate',
       'apps',
       'logs',
-      'appInfo',
+      'appinfo',
       'releases',
       'start',
       'restart',
       'stop',
-      'deleteInfra',
-      'iaasProviders',
+      'deleteinfra',
+      'iaasproviders',
       'runtimes',
       'services',
-      'createService',
-      'deleteService',
-      'supportedServices',
-      'serviceInfo',
-      'resetServicePassword',
-      'bindIP',
-      'unbindIP',
-      'bindInfo'
+      'createservice',
+      'deleteservice',
+      'supportedservices',
+      'activities',
+      'serviceinfo',
+      'resetservicepassword',
+      'bindip',
+      'unbindip',
+      'bindinfo'
     ]
 
   end

data/lib/app42/base/util.rb

@@ -19,11 +19,15 @@ module App42
       #
       # @return +input string+
       def input message, choices, indexed = true
-        list = choices.compact unless choices.empty? 
-        ans = ask Paint["#{message}", :cyan],
+        if choices.empty?
+          ans = ask Paint["#{message}", :cyan]
+        else
+          list = choices.compact unless choices.empty? 
+          ans = ask Paint["#{message}", :cyan],
             :choices => list,
             :default => list[0],
             :indexed => indexed
+        end
         print_new_line
         return ans    
       end
@@ -125,8 +129,7 @@ module App42
       def check_transaction_status transaction_id, previous_completed, what  
         begin
           flag = false
-          message "#{Message::LATEST_S_WAIT}", true, 'green'
-          print 'Latest Status....'
+          message "#{Message::LATEST_S_WAIT}", false, 'green'
           while flag == false  do
             response = status_call transaction_id
             re_try ||= 1
@@ -158,7 +161,7 @@ module App42
             sleep 5
           end
         rescue Interrupt
-          puts Paint[" Command cancelled.", :red]
+          message "#{Message::LATEST_S_INTERRUPT}", true, 'red'
           exit!
         end
       end
@@ -173,7 +176,7 @@ module App42
           response = get_request signature(query_params), resource_url('info', 'transaction'), query_params
           return response
         rescue Interrupt
-          puts Paint[" Command cancelled.", :red]
+          message "#{Message::LATEST_S_INTERRUPT}", true, 'red'
           exit!
         end  
       end
@@ -245,7 +248,7 @@ module App42
       # And should not contain any special character
       def validate_app_and_service_name name, str
         if str.match(App42::REGEX) || str.length > 30
-          message "#{name} should not contain any special character or white space and it's length should be less than 30.", true, 'red'
+          message "#{name} should not contain any special character or white space and length should be less than 30.", true, 'red'
           return false
         else
           return str
@@ -256,11 +259,11 @@ module App42
       # +database name+ lenght should not be more than 64 character
       # And should not contain any special character
       def validate_database_name name, str
-        if str.match(App42::REGEX) || str.length > 64
-          message "#{name} should not contain any special character and it's length should be less than 64.", true, 'red'
+        if str.match(App42::DBNAME_REGEX) || str.length > 64 || (numeric_including_zero? str)
+          message "Invalid database name. Should be less than 64 characters (Alphabets, alphanumeric and underscore(_) is allowed).", true, 'red'
           return false
         elsif App42::DATABASE_NAME_NOT_ALLOWED.include? str
-          message "Your can't create database name with: #{str}.", true, 'red'
+          message "Database Name should not be '#{str}'.", true, 'red'
           return false
         else
           return str

data/lib/app42/command/app.rb

@@ -113,8 +113,8 @@ module App42
       #
       def scale
         @options[:name] = get_app_name if @options[:name].nil?
-        instance = get_instance __method__ if is_app_exist? @options[:name]
-        scale_or_descal_res = scale_or_descale_app __method__, instance, @options[:name]
+        @options[:instance] = get_instance __method__ if is_app_exist? @options[:name] and @options[:instance].nil?
+        scale_or_descal_res = scale_or_descale_app __method__, @options[:instance], @options[:name]
         exit! if scale_or_descal_res
       end
 
@@ -123,8 +123,8 @@ module App42
       #
       def descale
         @options[:name] = get_app_name if @options[:name].nil?
-        instance = get_instance __method__ if is_app_exist? @options[:name]
-        scale_or_descal_res = scale_or_descale_app __method__, instance, @options[:name]
+        @options[:instance] = get_instance __method__ if is_app_exist? @options[:name] and @options[:instance].nil?
+        scale_or_descal_res = scale_or_descale_app __method__, @options[:instance], @options[:name]
         exit! if scale_or_descal_res
       end
 

data/lib/app42/command/authorize.rb

@@ -14,7 +14,7 @@ module App42::Command
       def is_authorize?(api_key, secret_key) 
         if api_key.nil? || secret_key.nil?
           message "#{Message::ADD_KEY}", true, 'red'
-          puts App42::Base::Help.addKeys
+          puts App42::Base::Help.addkeys
           exit!
         elsif api_key.size == 1 || secret_key.size == 1 
           message "#{Message::WRONG_KEY}", true, 'red'

data/lib/app42/command/base.rb

@@ -39,7 +39,7 @@ module App42
       def get_vm_types
         vm_type = App42::Command::Config.new.get_vm_type
         vm_type_array = vm_type['deploymentType'].map(&:capitalize)
-        input "Select Virtual Machine Type", vm_type_array, true
+        input "Select Instance Type", vm_type_array, true
       end
       
       # @return iaas providers
@@ -62,7 +62,7 @@ module App42
 
       # Ask application name from user and
       # will wait for user response (user will enter application name)
-      def get_app_name(prompt = Paint['Application Name', :cyan])
+      def get_app_name(prompt = Paint['Enter App Name', :cyan])
         app_name = ask(prompt) {|q| q.each = true}
         valid_app_name = validate_app_and_service_name "App name", app_name.strip
         valid_app_name ? (return valid_app_name) : get_app_name
@@ -184,7 +184,7 @@ module App42
         query_params = params
         query_params.store('appName', app_name)
         
-        response = with_progress(Paint["\nChecking App Name Availability", :yellow]) do |s|
+        response = with_progress(Paint["Checking App Name Availability", :yellow]) do |s|
           build_get_request query_params, 'app', 'availability'
         end
 
@@ -233,7 +233,7 @@ module App42
           query_params = params
           query_params.store('body', body)
        
-          response = with_progress(Paint["Creating Infrastructure", :yellow]) do |s|
+          response = with_progress(Paint["Setting up the infrastructure", :yellow]) do |s|
             build_post_request body, query_params, 'app', nil
           end  
    
@@ -248,7 +248,7 @@ module App42
           end
 
           if host_response['success']
-            puts Paint["Default Application Deployed. URL is: #{host_response['appInfo']['appUrl']}", :green]
+            puts Paint["Default application has been deployed. You can visit '#{host_response['appInfo']['appUrl']}' to see the default application.", :green]
             return true 
           else
             puts Paint["#{response['description']}", :red]
@@ -502,17 +502,17 @@ module App42
       #
       # ==== Parameters
       # service_name = service name provided by user
-      # old_password = service old password
+      # service_token = service token
       #
       # ==== return
       # true:: if reset password successful
       # OR
       # ERROR message in case failed
-      def reset_password service_name, old_password
+      def reset_password service_name, service_token
         begin
-          body = {'app42' => {"request"=> {
+          body = {'app42'  => {"request"=> {
               "serviceName"  => service_name,
-              "password"     => old_password
+              "token"        => service_token
           }}}.to_json
 
           query_params = params
@@ -642,7 +642,7 @@ module App42
         instance = @options[:instance] if @options[:instance]
         unless instance
           instance = nil
-          instance = ask Paint[ obj == 'new_vm' ?  "No of instances you want?" : "#{obj.capitalize} by instance(s)", :cyan]
+          instance = ask Paint[ obj == 'new_vm' ?  "No of instances you want?" : "#{obj.capitalize} by instance(s)", :cyan], :default => 1
 
         end
         

data/lib/app42/command/client.rb

@@ -59,8 +59,8 @@ module App42
         opts_parser = OptionParser.new do |opts|
           opts.banner = "\nAvailable options:\n\n"
 
-          opts.on('--api_key API_KEY')        { |api|      @options[:api] = api }
-          opts.on('--secret_key SECRET_KEY')  { |secret|   @options[:secret] = secret }
+          opts.on('--apiKey API_KEY')        { |api|      @options[:api] = api }
+          opts.on('--secretKey SECRET_KEY')  { |secret|   @options[:secret] = secret }
           opts.on('-a API_KEY')               { |api|      @options[:api] = api }
           opts.on('-s SECRET_KEY')            { |secret|   @options[:secret] = secret }
 
@@ -83,8 +83,8 @@ module App42
       # @param [Object] args
       def start(command, args = [])
         if is_available?(command)
-          parse_options(command, args)
-          execute command
+          parse_options(command.downcase, args)
+          execute command.downcase
           cmd = App42::Command.const_get(@kclass.to_s.capitalize)
           begin
             cmd.new(@options).send(@command)
@@ -95,7 +95,7 @@ module App42
             puts e
           end
         elsif command == 'help'
-          send(command)
+          send(command.downcase)
         else
           puts Paint["app42: Unknown command [#{command}]", :red]
           App42::Base::Help.how_to
@@ -105,7 +105,7 @@ module App42
 
       # @return true OR false
       def is_available? command
-        App42::Base::APP42_COMMAND.include?(command)
+        App42::Base::APP42_COMMAND.include?(command.downcase)
       end
 
       # choose action respective of class
@@ -123,7 +123,7 @@ module App42
           when 'deploy'
             set_cmd(:app, :deploy)
 
-          when 'setupInfra'
+          when 'setupinfra'
             set_cmd(:app, :setup_infra)
 
           when 'update'
@@ -132,10 +132,10 @@ module App42
           when 'keys'
             set_cmd(:user, :keys)
 
-          when 'clearKeys'
+          when 'clearkeys'
             set_cmd(:user, :clear)
 
-          when 'addKeys'
+          when 'addkeys'
             set_cmd(:user, :add)
 
           when 'scale'
@@ -144,10 +144,10 @@ module App42
           when 'descale'
             set_cmd(:app, :descale)
 
-          when 'appState'
+          when 'appstate'
             set_cmd(:info, :state)
 
-          when 'appInfo'
+          when 'appinfo'
             set_cmd(:info, :info)
 
           when 'logs'  
@@ -162,13 +162,13 @@ module App42
           when 'restart'
             set_cmd(:app, :restart)
 
-          when 'deleteInfra'
+          when 'deleteinfra'
             set_cmd(:app, :delete)
 
           when 'releases'
             set_cmd(:info, :releases)
 
-          when 'iaasProviders'
+          when 'iaasproviders'
             set_cmd(:config, :iaas_providers)
 
           when 'frameworks'
@@ -183,31 +183,34 @@ module App42
           when 'app42-update'
             set_cmd(:config, :update)
 
-          when 'supportedServices'
+          when 'supportedservices'
             set_cmd(:service, :app42pass_services)
 
+          when 'activities'
+            set_cmd(:info, :activities)  
+
           when 'services'
             set_cmd(:service, :services)
           
-          when 'serviceInfo'
+          when 'serviceinfo'
             set_cmd(:service, :info)
             
-          when 'createService'
+          when 'createservice'
             set_cmd(:service, :create)
             
-          when 'deleteService'
+          when 'deleteservice'
             set_cmd(:service, :delete)
 
-          when 'resetServicePassword'
+          when 'resetservicepassword'
             set_cmd(:service, :reset_pass) 
                                 
-          when 'bindIP'
+          when 'bindip'
             set_cmd(:service, :service_bind)
 
-          when 'unbindIP'
+          when 'unbindip'
             set_cmd(:service, :service_unbind)
             
-          when 'bindInfo'
+          when 'bindinfo'
             set_cmd(:service, :service_bindInfo)            
 
           else

data/lib/app42/command/info.rb

@@ -5,6 +5,13 @@ module App42
   module Command
     class Info < Base
 
+      #
+      # return user activites
+      #
+      def get_activities
+        build_get_request params, 'info', 'activities'
+      end
+
 
       #
       # show detailed app information
@@ -69,6 +76,22 @@ module App42
         puts table
       end
 
+      # will return details of user activities like operation, status, date etc.
+      def activities
+        rows, rows_header_final, rows_header = [], [], nil
+        user_activities = get_activities
+        if user_activities['success'] && user_activities['activities']
+          user_activities['activities'].each do |each_activity|
+            rows_header = each_activity.keys
+            rows << each_activity.values
+          end
+          rows_header.map { |e| rows_header_final << camel_case_to_whitespace(e) } 
+
+          table = Terminal::Table.new  :title => Paint["=== User Activities ===", :green], :headings => rows_header_final, :rows => rows
+          puts table
+        end
+      end
+
       #
       # list releases
       #

data/lib/app42/command/service.rb

@@ -25,14 +25,14 @@ module App42::Command
 
     # ask service name to user
     def ask_service_name
-      service_name = input "Enter Service Name", [], true
+      service_name = ask Paint["Enter Service Name", :cyan]
       valid_service_name = validate_app_and_service_name "Service name", service_name.strip
       valid_service_name ? (return valid_service_name) : ask_service_name
     end
 
     # ask old password to user
-    def ask_old_password
-      input "Enter Old Password", [], true
+    def ask_service_token
+      input "Enter Service Token", [], true
     end
 
     # ask source id to user which he want to bind to service
@@ -99,8 +99,8 @@ module App42::Command
     # collect service name from user and proceed service resetPassword request
     def reset_pass
       @options[:service] = ask_service_name  if @options[:service].nil?
-      old_password = ask_old_password if is_service_exist? @options[:service]
-      res = reset_password @options[:service], old_password
+      service_token = ask_service_token if is_service_exist? @options[:service]
+      res = reset_password @options[:service], service_token
       (puts message "Your new password is: #{res['service']['password']}", false, 'green') && exit! if res
     end
 

data/lib/app42/command/user.rb

@@ -28,7 +28,7 @@ module App42
         else
           message "#{Message::KEYS_NOT_FIND}", true, 'red'
           # TODO, should be dynamic
-          App42::Base::Help.addKeys
+          App42::Base::Help.addkeys
         end
 
       end

data/lib/app42/version.rb

@@ -3,7 +3,7 @@ module App42
   	module VERSION
       MAJOR = 0
       MINOR = 5
-      TINY  = 3
+      TINY  = 4
       PRE   = "alpha"
 
       STRING = [MAJOR, MINOR, TINY].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app42
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - ShepHertz
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement