app42 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72b1cf90b1aa79d2f2c7d7e07d09f21ad6d50ad0
-  data.tar.gz: 71e15470863e0a4c288294307c7e812dc2e1cfab
+  metadata.gz: b563b365eec3cf93e1160c083f5cc4f22b04b5e2
+  data.tar.gz: 78e962500cb7d379345e94b2f3594c774a89b17f
 SHA512:
-  metadata.gz: f773373c427bd715180ffdbf4f3eca4b21256e150faee645df1f734eb2044b3f0bbf0f329e608eba93bac2a3fc85b2c08758e909512eaf02db34a5d88fc7f144
-  data.tar.gz: 91ba3ce9113eb87ed77a00bfbb387669c651fe168ca77211cf78efad251dc009b84214a750d40c2f836f6e77885953b2780a0f6aae908cc6b960aba7e4165199
+  metadata.gz: 916f535b002c643f889b1d7e90394d09df490b29213b05cf31c72042aacc10905cd852da210a51eafa5b5ac25ccd726ca5f78528eaccfec46a16b7336d92c100
+  data.tar.gz: d84f0c05d59cd4a3f432cd818159bd305f4f43bf82a586b2943d460fe2206a2bdf5c99e84dd5010846394a4cc02da9028092fa7efc0ff68fd9e9462cc7e860d0

data/RELEASE.md

@@ -22,4 +22,9 @@ Client library and command-line tool to deploy and manage apps on App42PaaS.
    - BPaaS setup downgrade
    - WordPress setup donwgrade   
 
+### 0.6.1 (22-01-2014)
+   
+   - Add custom URL 
+   - Remove custom URL
+   - List custom URL
      

data/lib/app42/base/constants.rb

@@ -28,8 +28,9 @@ module App42
     DATABASE_NAME_NOT_ALLOWED = %w(mysql couchdb mongodb postgresql database sql)
 
     # regex for special character
-    SPECIAL = "?<>',?[]}{=-)(*&^%$#`~{}@ .+!_/"
-    REGEX = /[#{SPECIAL.gsub(/./){|char| "\\#{char}"}}]/
+    SPECIAL   = "?<>',?[]}{=-)(*&^%$#`~{}@ .+!_/"
+    REGEX     = /[#{SPECIAL.gsub(/./){|char| "\\#{char}"}}]/
+    URL_REGEX = /(((^https?)|(^ftp)):\/\/([\-\w]+\.)+\w{2,3}(\/[%\-\w]+(\.\w{2,})?)*(([\w\-\.\?\\\/+@&#;`~=%!]*)(\.\w{2,})?)*\/?)/
 
     # regex for special character (Database Name)
     DBNAME_SPECIAL = "?<>',?[]}{=-)(*&^%$#`~{}@ .+!/"

data/lib/app42/base/help.rb

@@ -45,6 +45,9 @@ module App42
    appInfo                 #  Show meta information of the application
    appState                #  Show current state of the application
    logs                    #  Returns the log file URL(s) for the application
+   addCustomURL            #  Add a custom URL to an app
+   removeCustomURL         #  Remove a custom URL from an app
+   customURLInfo           #  List all custom URLs of an app
 
   Services 
    createService           #  Creates a new service e.g. MySQL, MongoDB, CouchDB, PostgreSQL etc.
@@ -1092,10 +1095,9 @@ Example:
   $app42 upgradeBPaaS
   Enter Setup Name: demo
 
-  1: Light
-  2: Medium
-  3: Heavy
-  Select Flavour [Light]: 2
+  1: Medium
+  2: Heavy
+  Select Flavour [Medium]: 2
 
   Upgrading Setup... OK
 
@@ -1208,10 +1210,9 @@ Example:
   $app42 upgradeWordPress
   Enter Setup Name: demo
 
-  1: Light
-  2: Medium
-  3: Heavy
-  Select Flavour [Light]: 2
+  1: Medium
+  2: Heavy
+  Select Flavour [Medium]: 2
 
   Upgrading Setup... OK
 
@@ -1306,6 +1307,66 @@ Example:
          DESC
         end
 
+        def addcustomurl
+          print <<-DESC
+Usage:
+  app42 addCustomURL
+
+  Add a custom URL to an app
+
+Example:
+  $app42 addCustomURL
+  Enter App Name: demo
+
+  Enter Custom URL: http://test.naveengoswami.com
+
+  Adding Custom URL To Application demo... OK
+  Custom URL added successfully.
+
+         DESC
+        end
+
+        def removecustomurl
+          print <<-DESC
+Usage:
+  app42 removeCustomURL
+
+  Remove a custom URL from an app
+
+Example:
+  $ app42 removeCustomURL
+  Enter App Name: demo
+
+  Enter Custom URL: http://test.naveengoswami.com
+
+  Removing Custom URL... OK
+  Custom URL deleted successfully.
+
+         DESC
+        end
+
+      def customurlinfo
+          print <<-DESC
+Usage:
+  app42 customURLInfo
+
+  List all custom URLs of an app
+
+Example:
+  $app42 customURLInfo
+  Enter App Name: demo
+
+  +----------+-----------------------+-------------------------------+
+  |                === testPhp Custome URLs Details ===              |
+  +----------+-----------------------+-------------------------------+
+  | App Name | Created On            | Url                           |
+  +-------------+-----------------------+----------------------------+
+  | demo     | 2014-01-27 06:35:55.0 | http://test.naveengoswami.com |
+  +----------+-----------------------+-------------------------------+
+
+         DESC
+        end 
+
       def version
         print <<-DESC
 Usage:

data/lib/app42/base/message.rb

@@ -13,6 +13,7 @@ module Message
   MORE_THAN_ONE_BINARY = "More than one binary exists at the specified location. Please choose one."
   NO_BINARY            = "No binary exists at the specified location."
   NO_APP               = "No App found."
+  NO_CUSTOM_URLS       = "No Custom URLs found."
   WAIT_FOR_WHILE       = "Please be patient... This process may take a while to complete."
   LATEST_S_WAIT        = "\nOperation is in progress, Please wait..."
   LATEST_S_INTERRUPT   = "\nYour request is being processed. Please check the request status after sometime."
@@ -37,6 +38,6 @@ module Message
   BAD_RESPONSE_ERROR   = "Received bad HTTP response from"
 
   # BPaaS and WordPress
-  HIGHLY_CONF          = "Sorry, You are already at highest configuration."
-  LOW_CONF             = "Sorry, You are already at lowest configuration."
+  HIGHLY_CONF          = "You are already at highest configuration."
+  LOW_CONF             = "You are already at lowest configuration."
 end

data/lib/app42/base/shell.rb

@@ -56,7 +56,10 @@ module App42
       'startwordpress',
       'stopwordpress',
       'wordpresssetups',
-      'wordpressinfo'
+      'wordpressinfo',
+      'addcustomurl',
+      'removecustomurl',
+      'customurlinfo'
     ]
 
   end

data/lib/app42/base/util.rb

@@ -1,4 +1,5 @@
 require "interact"
+require 'uri'
 require "ipaddress"
 
 module App42
@@ -297,6 +298,19 @@ module App42
         end
       end
 
+      # Check whether +URL+ is valid OR not
+      # +URL+ should start with +http+ and +https+
+      # And should not contain any special character
+      def validate_url url
+        # Using the URI module distributed with Ruby, We can write own URL_REGEX(defined in constant.rb) too.
+        unless url =~ /^#{URI::regexp}$/
+          message "The provided URL (#{url}) is either not valid or contains white space and special character.", true, 'red'
+          return false
+        else
+          return url
+        end
+      end
+
       # Check whether +uploadbackup+ path is valid OR not
       # predefined extension are allowed only like .sql, .zip, .dump etc
       def validate_upload_backup_path path

data/lib/app42/command/app.rb

@@ -244,6 +244,42 @@ module App42
         puts table
       end
 
+      # Add custom URL to app 
+      def add_custom_url
+        @options[:name] = get_app_name if @options[:name].nil?
+        custom_url = get_custom_url if is_app_exist? @options[:name]
+        costom_url_res = costom_url_operation "addcustomurl", @options[:name], custom_url
+        exit! if costom_url_res
+      end
+
+      # Remove custom URL of app
+      def remove_custom_url
+        @options[:name] = get_app_name if @options[:name].nil?
+        custom_url = get_custom_url if is_app_exist? @options[:name]
+        costom_url_res = costom_url_operation "removecustomurl", @options[:name], custom_url
+        exit! if costom_url_res
+      end
+
+      # List all custom urls of apps
+      def urls
+        @options[:name] = get_app_name if @options[:name].nil?
+
+        rows, rows_header_final, rows_header = [], [], nil
+        custom_url_info = custom_url_information @options[:name]
+        if custom_url_info && custom_url_info['urls']
+          custom_url_info['urls'].each do |e|
+            rows_header = e.keys 
+            rows << e.values
+          end
+
+          rows_header.map { |e| rows_header_final << camel_case_to_whitespace(e) } 
+
+          table = Terminal::Table.new  :title => Paint["=== #{@options[:name]} Custome URLs Details ===", :green], :headings => rows_header_final, :rows => rows
+          puts table
+        end
+
+      end
+
     end
   end 
 end

data/lib/app42/command/base.rb

@@ -90,6 +90,13 @@ module App42
         valid_app_name ? (return valid_app_name) : get_app_name
       end
 
+      # Ask custom URL from user and validate
+      def get_custom_url
+        url = input "Enter Custom URL", [], true
+        valid_url = validate_url url.strip
+        valid_url ? (return valid_url) : get_custom_url
+      end
+
       # Ask wordpress name from user and
       # will wait for user response (user will enter wordpress name)
       def get_wordpress_name
@@ -743,6 +750,49 @@ module App42
         end  
       end
 
+      # Custom operation will take placed like add, remove etc.
+      # expect +what+ as operation, +app_name+ as application name and +url+ custom url.
+      def costom_url_operation what, app_name, url
+        begin
+          if what.to_s == 'addcustomurl'
+            response = with_progress(Paint[ "Adding Custom URL To Application #{app_name}", :yellow]) do |s|
+              body = {'app42' => {"request"=> {
+                "appName" => app_name,
+                "url"     => url
+              }}}.to_json
+              query_params = params
+              query_params.store('body', body)
+              build_post_request body, query_params, "app", "customurl"      
+            end
+          else
+            response = with_progress(Paint[ "Removing Custom URL", :yellow]) do |s|
+              query_params = params
+              query_params.store('appName', app_name)
+              query_params.store('url', url)
+              build_delete_request query_params, "app", "customurl"      
+            end
+          end 
+
+          response['success'] ? (print Paint["#{response['message']}\n", :green]) : (message "#{response['message']}", true, 'red')
+        rescue Interrupt
+          puts Paint[" Command cancelled.", :red]
+          exit!
+        end  
+      end
+
+      # Get custom URL details
+      def custom_url_information app_name
+        query_params = params
+        query_params.store('appName', app_name)
+        begin
+          response = build_get_request query_params, "app/customurl", nil
+        rescue  Exception => e
+          puts e
+          exit!
+        end
+        return response
+      end
+
       # create service and get all relevant service information post service creation.
       #
       # ==== Parameters

data/lib/app42/command/client.rb

@@ -286,7 +286,16 @@ module App42
             set_cmd(:wordpress, :wordpresssetups)
             
           when 'wordpressinfo'
-            set_cmd(:wordpress, :info)                               
+            set_cmd(:wordpress, :info)
+
+          when 'addcustomurl'
+            set_cmd(:app, :add_custom_url)
+            
+          when 'removecustomurl'
+            set_cmd(:app, :remove_custom_url)
+            
+          when 'customurlinfo'
+            set_cmd(:app, :urls)       
 
           else
           puts Paint["app42: Unknown command [#{action}]", :red]

data/lib/app42/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app42
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - ShepHertz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler