app42 0.5.5 → 0.5.6

data/lib/app42/base/message.rb

@@ -17,6 +17,7 @@ module Message
   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."
+  NOT_A_VALID_KONTENA  = "Kontena(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"
 
@@ -26,6 +27,7 @@ module Message
   BIND_NOTE            = "Please Provide Source IP\n(For public access, use '0.0.0.0')"
   UNBIND_NOTE          = "Please Provide Source IP"
   ACCESS_TIME_NOTE     = "Please provide the time duration(in hours) you want to bind IP(0 for unlimited access)"
+  GIT_URL_NOT_VALID    = "App git url is not valid."
 
   # REST CLIENT EXCEPTION
   SERVER_ERROR         = "Something went wrong. We will look into the issue. For further information, Please drop a mail to 'support@shephertz.com'."

data/lib/app42/base/shell.rb

@@ -7,6 +7,7 @@ module App42
       'version',
       'list',
       'deploy',
+      'update',
       'setupinfra',
       'keys',
       'clearkeys',
@@ -30,10 +31,17 @@ module App42
       'supportedservices',
       'activities',
       'serviceinfo',
+      'startservice',
+      'restartservice',
+      'stopservice',
       'resetservicepassword',
       'bindip',
       'unbindip',
-      'bindinfo'
+      'bindinfo',
+      'setupcloudapi',
+      'deletecloudapi',
+      'setupinfo',
+      'setups'
     ]
 
   end

data/lib/app42/base/util.rb

@@ -48,7 +48,7 @@ module App42
       end
 
       
-      def request_failed?(status)
+      def request_failed?(status) #:nodoc:
         # TODO, if more than one error code
         # APP42_HTTP_ERROR_CODES.detect{|error_code| status >= error_code}
         APP42_HTTP_ERROR_CODES.include? status
@@ -60,8 +60,6 @@ module App42
           desc = body["details"].gsub("\"","'")
           # TODO, may need later
           # app42_client_info
-          # FIXME, should be proper message
-          # message "#{body["message"]}: #{body["details"]}", true, 'red'
           message "#{body["details"]}", true, 'red'
           exit!
         else
@@ -96,7 +94,7 @@ module App42
         what.nil? ? (resource_url = "/#{resource}") : (resource_url = "/#{resource}/#{what}")
       end
 
-      # will build signature using requested params and Secret key
+      # Generate signature using requested params and Secret key
       #
       # @params +requested params+
       #
@@ -166,6 +164,49 @@ module App42
         end
       end
 
+      # checks transaction status of setup cloud API
+      #
+      #REVIEW, need to verify FAILED use case
+      def check_transaction_status_of_setup transaction_id, previous_completed, what  
+        begin
+          flag = false
+          message "#{Message::LATEST_S_WAIT}", false, 'green'
+          while flag == false  do
+            response = status_call transaction_id
+            re_try ||= 1
+
+            if response["success"] == true && response["transactionStatus"] == "COMPLETED" 
+              print_new_line
+              message "#{response["message"]}", true, 'green'
+              return true
+            elsif response["success"] == true && response["transactionStatus"] == "INPROGRESS" 
+              if previous_completed != response["completed"]
+                print_new_line
+                puts Paint["#{response["completed"]} out of #{response["requested"]} #{what}", :green]
+                previous_completed = response["completed"]
+              end 
+                show_wait_spinner{
+                   sleep rand(4)+2
+                }
+                unless what.to_s == 'Uploaded'
+                  if(re_try += 1 ) >= 250
+                    message "#{Message::REQUEST_PROGRESS}", true, 'red'
+                    exit!
+                  end
+                end
+            else response["success"] == true && response["transactionStatus"] == "FAILED"              
+              print_new_line
+              message "#{response["message"]}", true, 'red'
+              exit!
+            end
+            sleep 5
+          end
+        rescue Interrupt
+          message "#{Message::LATEST_S_INTERRUPT}", true, 'red'
+          exit!
+        end
+      end
+
       # rest call for transaction status check
       def status_call transaction_id
         begin
@@ -244,7 +285,7 @@ module App42
       end
 
       # Check whether +app OR service+ name is valid OR not
-      # +app OR service+ name lenght should not be more than 30 character
+      # +app OR service+ name length should not be more than 30 character
       # And should not contain any special character
       def validate_app_and_service_name name, str
         if str.match(App42::REGEX) || str.length > 30
@@ -255,8 +296,20 @@ module App42
         end
       end
 
+      # Check whether +setup+ name is valid OR not
+      # +setup+ name length should not be more than 30 character
+      # And should not contain any special character
+      def validate_setup_name name, str
+        if str.match(App42::REGEX) || str.length > 30
+          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
+        end
+      end
+
       # Check whether +database name+ is valid OR not
-      # +database name+ lenght should not be more than 64 character
+      # +database name+ length should not be more than 64 character
       # And should not contain any special character
       def validate_database_name name, str
         if str.match(App42::DBNAME_REGEX) || str.length > 64 || (numeric_including_zero? str)
@@ -270,6 +323,18 @@ module App42
         end
       end
 
+      # Check whether +vm config+ is valid OR not
+      # +vm config+ should be a valid number
+      # And should not contain any special character
+      def validate_vm_config kontena
+        unless numeric?(kontena)
+          message "#{Message::NOT_A_VALID_KONTENA}", true, 'red'
+          false
+        else
+          return kontena
+        end
+      end
+
       # rest call to server to check whether +application+ exist OR not.
       # return true if +application+ exist else display ERROR message and exit
       def is_app_exist? app_name
@@ -301,6 +366,32 @@ module App42
           exit!
         end
       end
+      
+      # rest call to server to check whether +setup name+ exist OR not.
+      # return true if +setup name+ exist else display ERROR message and exit
+      def is_setup_name_exist? setup_name
+        query_params = params
+        query_params.store('setupName', setup_name)
+        
+        response = build_get_request query_params, 'setup', 'availability'
+        unless response["success"] 
+          return true
+        else
+          message "Setup name with the name #{setup_name} does not exist.", true, 'red'
+          exit!
+        end
+      end
+
+      # Check whether +git URL+ is valid OR not
+      # given +git URL+ must end with +.git+ extension
+      def validate_git_url git_url
+        unless git_url.include?('.git')
+          message "#{Message::GIT_URL_NOT_VALID}", true, 'red'
+          return false
+        else
+          return git_url
+        end
+      end
 
     end
   end

data/lib/app42/client/app42_rest_client.rb

@@ -14,13 +14,11 @@ module App42
         @exception_msg = nil
       end
 
-      #
       # @param signature
       # @param url
       # @param params
       # @return
       # @rescue Exception
-      #
       def get(signature, url, params)
         params.store("signature", signature)
         resource, json_obj = "", nil
@@ -98,14 +96,12 @@ module App42
         exit!
       end
 
-      #
       # @param signature
       # @param url
       # @param params
       # @param bodyPayload
       # @return
       # @rescue Exception
-      #
       def post(signature, url, params, body)        
         params.store("signature", signature)
         resource = ""
@@ -181,14 +177,12 @@ module App42
         exit!
       end
 
-      #
       # @param signature
       # @param url
       # @param params
       # @param bodyPayload
       # @return
       # @rescue Exception
-      #
       def put(signature, url, params, body)      
         params.store("signature", signature)
         resource = ""
@@ -264,13 +258,11 @@ module App42
         exit!
       end
 
-      #
       # @param signature
       # @param url
       # @param params
       # @return
       # @rescue Exception
-      #
       def delete(signature, url, params)        
         params.store("signature", signature)
         resource = ""

data/lib/app42/command/app.rb

@@ -7,7 +7,7 @@ module App42
   module Command
     class App < Base
 
-      # will collect all required attributes for new VM spawn
+      # collect all required attributes for new VM spawn
       def setup_infra
         app_name = get_app_name_and_check_app_url_availability
         vm_type = get_vm_types
@@ -15,37 +15,60 @@ module App42
         app_name, source_url = get_app_source app_name, iaas, vm_type
       end
 
-      # will collect all required attributes for app deploy
+      # collect all required attributes for app deploy
       def deploy
         @options[:name] = get_app_name if @options[:name].nil?
         response = interactive_get 'info', 'app/uploadtypes' if is_app_exist? @options[:name]
         app_source_type = response['sourceTypes']
          
         if response['sourceTypes'].count > 1
-          # TODO, for future release
-          # get_git_url
+          source_type = ask_app_source response['sourceTypes']
+          if source_type == 'Source'
+            git_url = get_git_url
+            status = upload_binary @options[:name], source_type, git_url if validate_git_url git_url
+          else
+            status = get_binary_url @options[:name]
+          end
         else
           status = get_binary_url @options[:name]
         end
         exit! if status
       end
 
+      # collect all required attributes for app update
+      def update
+        @options[:name] = get_app_name if @options[:name].nil?
+        response = interactive_get 'info', 'app/uploadtypes' if is_app_exist? @options[:name]
+        app_source_type = response['sourceTypes']
+         
+        if response['sourceTypes'].count > 1
+          source_type = ask_app_source response['sourceTypes']
+          if source_type == 'Source'
+            status = update_binary @options[:name]
+          else
+            status = get_binary_url @options[:name]
+          end
+        else
+          status = get_binary_url @options[:name]
+        end
+        exit! if status
+      end      
+
       # @param app_name
-      # @return binary
-      # @return deployment path
+      # 
+      # collect app source type
       #
+      # pass app name, app source and source url to binary upload methods
       def get_binary_url app_name
         app_source, source_url = collect_app_source app_name
         status = upload_binary app_name, app_source, source_url
         return status
       end
 
-      #
       # @param app_name
       # @param iaas
       # @param vm_type
       # @return host name
-      #
       def collect_vm_details app_name, iaas, vm_type
         runtime = get_runtime
         framework = get_framework iaas, vm_type, runtime
@@ -53,16 +76,14 @@ module App42
         os = get_os_for_app iaas, vm_type, runtime, framework, webserver
         # FIXME, may be configure out later
         # instance = get_instance 'new_vm'
-        vmconfig = get_vmconfig 'info/app',vm_type, iaas
-        setup_infra_res = App42::Command::Base.new.create_infrastructure app_name, iaas, vm_type, runtime, framework, webserver, os, vmconfig
+        kontena = get_vmconfig
+        setup_infra_res = App42::Command::Base.new.create_infrastructure app_name, iaas, vm_type, runtime, framework, webserver, os, kontena
         exit! if setup_infra_res
       end
 
-      #
       # @param deployment path
       # @param app_name
-      # @return true/SystemExit
-      #
+      # @return binary name
       def is_binary_exist? source_url, app_name
         path = escape_path(source_url)
         app_file_name = nil
@@ -80,37 +101,31 @@ module App42
         return app_file_name
       end
 
-      #
       # ask existing app url for deploy
-      #
       def ask_existing_app_url
         input "Enter App URL", [], true
       end
 
       # @param app_source_url
+      # @return upload type
       def ask_app_source app_source_type
-        input "Choose Source Type", app_source_type, true
+        input "Choose Upload Type", app_source_type, true
       end
 
-      #
       # @param binary/git
       # @return path
-      #
       def get_source_path app_source
         path = ask(Paint["#{app_source.capitalize} Deployment Path", :cyan])
         return path.strip 
       end
 
-      #
       # collect git URL from user
-      #
-      def get_git_url(prompt = Paint["Deployment Path?", :cyan])
+      def get_git_url(prompt = Paint["Enter Git URL?", :cyan])
         ask(prompt) {|q| q.each = true}
       end
       
-      #
-      # Will scale app by no of instance
-      #
+      # read +app name+ and number of +instance+ from user
+      # then scale app by no of instance
       def scale
         @options[:name] = get_app_name if @options[:name].nil?
         @options[:instance] = get_instance __method__ if is_app_exist? @options[:name] and @options[:instance].nil?
@@ -118,9 +133,8 @@ module App42
         exit! if scale_or_descal_res
       end
 
-      #
-      # Will descale app by no of instance
-      #
+      # read +app name+ and number of +instance+ from user
+      # then descale app by no of instance
       def descale
         @options[:name] = get_app_name if @options[:name].nil?
         @options[:instance] = get_instance __method__ if is_app_exist? @options[:name] and @options[:instance].nil?
@@ -130,7 +144,7 @@ module App42
 
       # app42 start
       #
-      # will start the app, return true or error code/message
+      # start the app, return true or error code/message
       #
       def start
         @options[:name] = get_app_name if @options[:name].nil?
@@ -140,7 +154,7 @@ module App42
 
       # app42 stop
       #
-      # will stop the app, return true or error code/message
+      # stop the app, return true or error code/message
       #
       def stop
         @options[:name] = get_app_name if @options[:name].nil?
@@ -148,9 +162,9 @@ module App42
         exit! if app_operation_req
       end
 
-      # app42 start
+      # app42 restart
       #
-      # will restart the app, return true or error code/message
+      # restart the app, return true or error code/message
       #
       def restart 
         @options[:name] = get_app_name if @options[:name].nil?
@@ -158,8 +172,9 @@ module App42
         exit! if app_operation_req
       end
 
+      # app42 delete
       #
-      # will delete the app, return true or error code/message
+      # delete the app, return true or error code/message
       #
       def delete
         @options[:name] = get_app_name if @options[:name].nil?
@@ -167,9 +182,7 @@ module App42
         exit! if app_operation_req
       end
 
-      #
       # List deployed applications
-      #
       def apps
         response = build_get_request params, 'app', nil
         rows, rows_header_final, rows_header = [], [], nil