cwp 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDExZmI2NGM5ZmZiNDFjNzIyZmU4Yjg2MjlmNTgwYTQ4N2Q1NTlhYw==
+    YWI0MTM5ZTEzOTBjOTQ5NTZhOTBjYjNjMTM5Y2VjMGU3MjhhNWY1Yg==
   data.tar.gz: !binary |-
-    MjIzNGUzZWU5Yjg5Yzk2YTIyNjM4YjZlNGZkNWY1OTNkODdiNjA5Mw==
+    ZjBmMjJjMDQ2NjdmZDczYzNjNDY1NmExZThkMTUzNzZiYmVlMDMxOA==
 SHA512:
   metadata.gz: !binary |-
-    NjhiODJmMDVjMjRmNGViMWQ0MTE1ODI0MmJhYWYwOTM1YjNlNWFiYThmODZi
-    NTA2Y2MzNDlkYjM2NTM2NDI3NjUwMzJlOGY5YzYwMmIwODBkYzc2ZGI0NWI2
-    ZWE0YTU5OTE3YzM5MTc5MTBlZWI4ZDBhYWRiZGY4M2JjYTRmMGQ=
+    MzY2NWI0MWNjZTM2MjEwMzhiZjVhMGIwOThiNzJiMWI5M2FmNGEzZmRhMWU3
+    ZDFjNWNhMjRjMWEwYTdmNmQ4YTM4YzFjYmIwMzA1ODg2YjJmZDAwMDYxNGZl
+    M2IwYjlmMmUxOWI4M2RhMWY3YTc1MDRjYjE2MjU5NDBlYzYxNTI=
   data.tar.gz: !binary |-
-    MDFkY2RjZGMyNjU5ZTIzMzFkYmRiMTVhMzcyZGYyNThlN2U1NGM3ZmZkYTZi
-    NTAxMzJiYmY4YzFhOTBjMmQ3MDQxOTJiOGU4NTdlMzdjYzczYzMxN2ZlNGMz
-    ZGZjNTg1MGM1M2VjYmEzZTYyMmVjMjcxM2U5OTAyNTk2NTQ5NGI=
+    NGJjMWUzMDk5NzQwMjA0ZmRhZjg3MzRmOGQ2NWRlNWYxMzEwODNlMDZjYjdj
+    YTY4MmI2MGNmZTMzMDY4YjMyMzIzY2Q5YTI0MTIyZTkxY2ViOWQyMjc3Y2Rh
+    MTkwNWEwNGNhZTQ5YjNiMzFhYzY5YTFiOTg2OGFlZWNkZGIxNDk=

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 gem 'colorize', '~> 0.7.3'
+gem 'json'
 # Specify your gem's dependencies in cwp.gemspec
 gemspec

data/bin/cwp

@@ -9,7 +9,7 @@ if !ARGV[0].nil?
     if RUBY_PLATFORM =~ /linux/
 		[ "/etc/cwp.conf", "#{File.expand_path('~')}/.cwp/cwp.conf", "#{File.expand_path('.')}/cwp.conf"]
 	else
-		[]
+		[ "#{File.expand_path('~')}/.cwp/cwp.conf", "#{File.expand_path('.')}/cwp.conf"]
 	end
 	# populate all the command line parameters in arr
 	arr = []

data/cwp.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = ["cwp"]
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
+  s.add_dependency "json"
   s.add_dependency "colorize","~> 0.7.3"
   # s.add_development_dependency "bundler", "~> 1.6"
   # s.add_development_dependency "rake"

data/lib/commands/platform.rb

@@ -66,12 +66,28 @@ module Platform
 			exit
 		end
 		begin
+			if response.body["error"]
+				error = JSON.parse(response.body)["error"]
+				errors = JSON.parse(response.body)["error"]["errors"]
+				unless errors.nil?
+					errors.each do |key,value|
+						puts "INFO ".colorize(:yellow)+"#{value.join(',')}".colorize(:red)
+					end
+				end
+				puts "INFO ".colorize(:yellow)+"#{error['message']}".colorize(:red) unless error["message"].nil?
+			else
+				puts "INFO ".colorize(:yellow)+" Data were successfully sent to Cloud Portal. Please check deployment status ".colorize(:white)
+			end
 			# Pretty print response json from API
-			puts "[ RESPONSE CODE ]".colorize(:blue)
-			puts response.code.colorize(:white)
-			puts "[ RESPONSE JSON ]".colorize(:blue)
-			puts JSON.pretty_generate(JSON.parse(response.body)).colorize(:white)
+			loglevel = hash["parameters"]["loglevel"].downcase if !hash["parameters"]["loglevel"].nil?
+			if (loglevel == "debug")
+				puts "[ RESPONSE CODE ]".colorize(:blue)
+				puts response.code.colorize(:white)
+				puts "[ RESPONSE JSON ]".colorize(:blue)
+				puts JSON.pretty_generate(JSON.parse(response.body)).colorize(:white)
+			end
 		rescue Exception => e
+			puts e.backtrace
 			puts response.body
 		end
 	end
@@ -124,7 +140,7 @@ module Platform
 	def self.validate_delete_platform(hash)
 		if self.validate_delete_and_status_params(hash)
 			begin
-				url = URI.parse("#{hash['parameters']['url']}/api/platforms/#{hash['parameters']['env']} ")
+				url = URI.parse("#{hash['parameters']['url']}/api/platforms/#{hash['parameters']['env']}")
 				http = Net::HTTP.new(url.host, url.port)
 				request = Net::HTTP::Delete.new(url.request_uri)
 				request.basic_auth(hash['parameters']['login'],hash['parameters']['password'])
@@ -136,21 +152,30 @@ module Platform
 				exit
 			end
 			begin
-        # Pretty print response json from API
-        puts "[ RESPONSE CODE ]".colorize(:blue)
-        puts response.code.colorize(:white)
-        puts "[ RESPONSE JSON ]".colorize(:blue)
-        puts JSON.pretty_generate(JSON.parse(response.body)).colorize(:white)
-    rescue Exception => e
-    	puts response.body
-    end
-end
-end
+				if response.body["error"]
+					msg = JSON.parse(response.body)
+					puts "INFO ".colorize(:yellow)+" #{msg['error']['message']}".colorize(:red)
+				else
+					puts "INFO ".colorize(:yellow)+" Successfully deleted platform".colorize(:white)
+				end
+				loglevel = hash["parameters"]["loglevel"].downcase if !hash["parameters"]["loglevel"].nil?
+				if (loglevel == "debug")
+			        # Pretty print response json from API
+			        puts "[ RESPONSE CODE ]".colorize(:blue)
+			        puts response.code.colorize(:white)
+			        puts "[ RESPONSE JSON ]".colorize(:blue)
+			        puts JSON.pretty_generate(JSON.parse(response.body)).colorize(:white)
+		    	end	
+		    rescue Exception => e
+		    	puts response.body
+		    end
+		end
+	end
 	# method to return status log
 	def self.validate_and_check_status(hash)
 		if self.validate_delete_and_status_params(hash)
 			response = self.call_status_api(hash)
-			self.print_status(response)
+			self.print_status(response,hash["parameters"]["loglevel"])
 		end
 	end
 	# wait status method
@@ -176,35 +201,35 @@ end
 				rescue Exception => e
 					( 2*60 )
 				end
-				# untill custom timeout is expired. 
-				(custom_timeout+1).times do |num|
-					if ( num == custom_timeout )
+
+				looping_time = Time.now + ( custom_timeout * 60 )
+				loop do
+					if ( Time.now >= looping_time )
 						puts "[ TIMEOUT ]".colorize(:red)+" error status code 2".colorize(:white)
-						exit
+						break;
 					else
 						response = self.call_status_api(hash) 
 						begin
-							body = JSON.parse(response.body)
+							body = JSON.parse(response.body, hash["loglevel"])
 							if (body["deploy_status"]["status"] == "failed")
 								puts "[ PLATFORM DEPLOYMENT FAILED ]".colorize(:red)+" error status code 1".colorize(:white)
-								self.print_status(response)
+								self.print_status(response, hash["parameters"]["loglevel"])
 								break
 							else
 								if (body["deploy_status"]["status"] == hash["parameters"]["status"])
 									puts "[ PLATFORM DEPLOYED SUCCESSFULLY ]".colorize(:green)+" error status code 0".colorize(:white)
-									self.print_status(response)
+									self.print_status(response, hash["parameters"]["loglevel"])
 									break
 								else
-									self.print_status(response)
+									self.print_status(response, hash["parameters"]["loglevel"])
 								end
 							end
 						rescue Exception => e
-							self.print_status(response)
+							self.print_status(response, hash["parameters"]["loglevel"])
 							break
-						end	
+						end
 					end
-					puts "[ CHECKING STATUS PLEASE WAIT ] ".colorize(:yellow)
-					sleep(60)
+					sleep(10) 
 				end
 			end
 		end
@@ -246,15 +271,62 @@ end
 		end
 	end
 	# print status check common for wait and status
-	def self.print_status(response)
+	def self.print_status(response, loglevel)
+		log = loglevel.nil? ? "info" : loglevel.downcase
 		begin
-			# Pretty print response json from API
-			puts "[ RESPONSE CODE ]".colorize(:blue)
-			puts response.code.colorize(:white)
-			puts "[ RESPONSE JSON ]".colorize(:blue)
-			puts JSON.pretty_generate(JSON.parse(response.body)).colorize(:white)
+			json = JSON.parse(response.body)["deploy_status"]
+			if ( log == "info" )
+				if @old_json.nil?
+					if json.nil?
+						json = JSON.parse(response.body)
+						puts "INFO : ".colorize(:yellow)+json["error"]["message"].colorize(:white)
+					else
+						json.each do |key,value|
+							puts "INFO :".colorize(:yellow)+" #{key} : #{json[key]}".colorize(:white)
+						end
+					end
+				else
+					@old_json.each do |key,value|
+						if ( @old_json[key] != json[key] )
+							puts "INFO :".colorize(:yellow)+" #{key} : #{json[key]}".colorize(:white)
+						end
+					end
+				end	
+				@old_json = json			
+			elsif ( log == "debug" )
+				if @old_json.nil?
+					if json.nil?
+						json = JSON.parse(response.body)
+						puts "INFO : ".colorize(:yellow)+json["error"]["message"].colorize(:white)
+					else
+						json.each do |key,value|
+							puts "INFO :".colorize(:yellow)+" #{key} : #{json[key]}".colorize(:white)
+						end
+					end
+				else
+					@old_json.each do |key,value|
+						if ( @old_json[key] != json[key] )
+							puts "INFO :".colorize(:yellow)+" #{key} : #{json[key]}".colorize(:white)
+						end
+					end
+				end	
+				@old_json = json
+				# "----- ABOVE IS THE INFO MODE------"
+				puts "[ DEBUG ]".colorize(:red)+" [ RESPONSE CODE ]".colorize(:blue)
+				puts response.code.colorize(:white)
+				puts "[ DEBUG ]".colorize(:red)+" [ RESPONSE CONTENT TYPE ]".colorize(:blue)
+				puts response.content_type.colorize(:white)
+				puts "[ DEBUG ]".colorize(:red)+" [ RESPONSE JSON ]".colorize(:blue)
+				puts JSON.pretty_generate(JSON.parse(response.body)).colorize(:white)
+			else
+				puts "INVALID LOG LEVEL".colorize(:red)
+				puts "Log Level must be either INFO or DEBUG".colorize(:white)
+			end
 		rescue Exception => e
 			puts response.body
 		end
 	end
+
+
+
 end

data/lib/cwp.rb

@@ -31,29 +31,20 @@ module Cwp
 			puts " http://sysgit01.lab.services.ingenico.com/nhd/cloud_web_portal_cli/tree/master".colorize(:white)
 		end
 		def configuration_help_text
+			puts "Please pass configuration parameters through file by one of the below option".colorize(:white)
 			if RUBY_PLATFORM =~ /linux/
-				puts "Please pass configuration parameters through file by one of the below option".colorize(:white)
-				puts "1 ]".colorize(:white)+" /etc/cwp.conf".colorize(:white)
-				puts "2 ]".colorize(:white)+" /HOME_DIR/.cwp/cwp.conf".colorize(:white)
-				puts "3 ]".colorize(:white)+" CURRENT_DIR/cwp.conf".colorize(:white)
-				puts "4 ]".colorize(:white)+" Pass configuration file path as argument EX:".colorize(:white)+" cwp deploy config_path=PATH_TO_YOUR_CONFIGURATION_FILE".colorize(:yellow)
-				puts "[ NOTE ]".colorize(:blue)+" File format of cwp.conf".colorize(:white)
-				puts "parameters:".colorize(:yellow)
-				puts " login:".colorize(:yellow)+" xxx".colorize(:white)
-				puts " password:".colorize(:yellow)+" yyy".colorize(:white)
-				puts " url:".colorize(:yellow)+" http://example.com".colorize(:white)
-				puts " organization:".colorize(:yellow)+" abc".colorize(:white)
-				puts " compute_resource:".colorize(:yellow)+" peru".colorize(:white)
-			else
-				puts "1 ]".colorize(:white)+" Pass configuration file path as argument EX:".colorize(:white)+" cwp deploy config_path=PATH_TO_YOUR_CONFIGURATION_FILE".colorize(:yellow)
-				puts "[ NOTE ]".colorize(:blue)+" File format of cwp.conf".colorize(:white)
-				puts "parameters:".colorize(:yellow)
-				puts " login:".colorize(:yellow)+" xxx".colorize(:white)
-				puts " password:".colorize(:yellow)+" yyy".colorize(:white)
-				puts " url:".colorize(:yellow)+" http://example.com".colorize(:white)
-				puts " organization:".colorize(:yellow)+" abc".colorize(:white)
-				puts " compute_resource:".colorize(:yellow)+" peru".colorize(:white)
+				puts " - ".colorize(:white)+" /etc/cwp.conf".colorize(:white)
 			end
+			puts " - ".colorize(:white)+" /HOME_DIR/.cwp/cwp.conf".colorize(:white)
+			puts " - ".colorize(:white)+" CURRENT_DIR/cwp.conf".colorize(:white)
+			puts " - ".colorize(:white)+" Pass configuration file path as argument EX:".colorize(:white)+" cwp deploy config_path=PATH_TO_YOUR_CONFIGURATION_FILE".colorize(:yellow)
+			puts "[ NOTE ]".colorize(:blue)+" File format of cwp.conf".colorize(:white)
+			puts "parameters:".colorize(:yellow)
+			puts " login:".colorize(:yellow)+" xxx".colorize(:white)
+			puts " password:".colorize(:yellow)+" yyy".colorize(:white)
+			puts " url:".colorize(:yellow)+" http://example.com".colorize(:white)
+			puts " organization:".colorize(:yellow)+" abc".colorize(:white)
+			puts " compute_resource:".colorize(:yellow)+" peru".colorize(:white)
 		end
 	end
 end

data/lib/cwp/version.rb

@@ -1,3 +1,3 @@
 module Cwp
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cwp
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nagendra HD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  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: colorize
   requirement: !ruby/object:Gem::Requirement