cloud66_agent 0.0.1.pre2 → 0.0.1.pre3

data/bin/cloud66_agent

@@ -67,14 +67,21 @@ if !$config.is_agent_configured? && command != 'configure'
 end
 
 # handle commands
-$logger.debug "Performing: \"#{command}\""
+$logger.info "Performing: \"#{command}\""
 if command == "configure"
 	Cloud66Agent.configure @server_uid
-elsif Cloud66Agent.respond_to? command
-	Cloud66Agent.send command
 else
-	$logger.error "Invalid command: #{command}"
-	exit -1
+	begin
+		arguments = ARGV[1..-1]
+		if arguments.empty?
+			Cloud66Agent.send command
+		else
+			Cloud66Agent.send(command, arguments)
+		end
+	rescue ArgumentError => exc
+		$logger.error "Invalid command/arguments: #{command} #{arguments}"
+		exit -1
+	end
 end
 exit 0
 

data/lib/cloud66_agent/commands/job_end.rb

@@ -0,0 +1,24 @@
+require 'cloud66_agent/utils/server'
+
+module Cloud66
+	module Commands
+		class JobEnd
+			def self.perform(job_uid, session_uid, results_file)
+				job_results = File.exists?(results_file) ? IO.read(results_file) : ''
+				data = {
+					session_uid: session_uid,
+					job_results: job_results
+				}
+				Utils::Server.send_job_end(job_uid, data)
+				exit 0
+			rescue => exc
+				$logger.error "job_end failed: #{exc.message}"
+				exit -1
+			ensure
+				# get rid of the old results
+				FileUtils.rm_rf(results_file) rescue nil
+			end
+
+		end
+	end
+end

data/lib/cloud66_agent/commands/job_start.rb

@@ -0,0 +1,15 @@
+require 'cloud66_agent/utils/server'
+
+module Cloud66
+	module Commands
+		class JobStart
+			def self.perform(job_uid)
+				result = Utils::Server.send_job_start job_uid
+				exit 0
+			rescue => exc
+				$logger.error "job_start failed: #{exc.message}"
+				exit -1
+			end
+		end
+	end
+end

data/lib/cloud66_agent/commands/pulse.rb

@@ -1,4 +1,3 @@
-require 'cloud66_agent/utils/vital_signs'
 require 'cloud66_agent/utils/server'
 
 module Cloud66
@@ -8,7 +7,7 @@ module Cloud66
 				Utils::Server.send_pulse
 				exit 0
 			rescue => exc
-				$logger.error "Pulse Failed: #{exc.message}"
+				$logger.error "pulse failed: #{exc.message}"
 				exit -1
 			end
 		end

data/lib/cloud66_agent/utils/server.rb

@@ -8,19 +8,27 @@ module Cloud66
 			include HTTParty
 
 			def self.send_configure(data)
-				process(do_post('/agent.json', build_content(data)))
+				process(do_post('/server/configure.json', build_content(data)))
 			end
 
 			def self.send_pulse
-				process(do_get("/agent/#{$config.agent_uid}/pulse.json", build_content))
+				process(do_get("/server/#{$config.agent_uid}/pulse.json", build_content))
 			end
 
 			def self.send_address(data)
-				process(do_post("/agent/#{$config.agent_uid}/address.json", build_content(data)))
+				process(do_post("/server/#{$config.agent_uid}/address.json", build_content(data)))
 			end
 
 			def self.send_vitals(data)
-				process(do_post("/agent/#{$config.agent_uid}/vitals.json", build_content(data)))
+				process(do_post("/server/#{$config.agent_uid}/vitals.json", build_content(data)))
+			end
+
+			def self.send_job_start(job_uid)
+				process(do_get("/server/#{job_uid}/job_start.json", build_content))
+			end
+
+			def self.send_job_end(job_uid, data)
+				process(do_post("/server/#{job_uid}/job_end.json", build_content(data)))
 			end
 
 			private

data/lib/cloud66_agent/utils/version.rb

@@ -16,7 +16,7 @@ module Cloud66
 			MAJOR, MINOR, PATCH = 0, 0, 1
 
 			#ie. PRERELEASE_MODIFIER = 'beta1'
-			PRERELEASE_MODIFIER = "pre2"
+			PRERELEASE_MODIFIER = "pre3"
 
 			##
 			# Returns the major version ( big release based off of multiple minor releases )

data/lib/cloud66_agent.rb

@@ -17,4 +17,18 @@ class Cloud66Agent
 	def self.address
 		Cloud66::Commands::Address.perform
 	end
+
+	def self.job_start(args)
+		job_uid = args[0]
+		raise ArgumentError.new if job_uid.nil?
+		Cloud66::Commands::JobStart.perform job_uid
+	end
+
+	def self.job_end(args)
+		job_uid = args[0]
+		session_uid = args[1]
+		results_file = args[2]
+		raise ArgumentError.new if job_uid.nil? || session_uid.nil? || results_file.nil?
+		Cloud66::Commands::JobEnd.perform(job_uid, session_uid, results_file)
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud66_agent
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre2
+  version: 0.0.1.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -61,6 +61,8 @@ files:
 - lib/cloud66_agent.rb
 - lib/cloud66_agent/commands/address.rb
 - lib/cloud66_agent/commands/configure.rb
+- lib/cloud66_agent/commands/job_end.rb
+- lib/cloud66_agent/commands/job_start.rb
 - lib/cloud66_agent/commands/pulse.rb
 - lib/cloud66_agent/commands/vitals.rb
 - lib/cloud66_agent/plugins/backup.rb