cloudblocks 0.0.12c → 0.0.12d

data/bin/{quartz → cb-agent}

@@ -34,13 +34,18 @@ public
 
 def start
 	begin
-		@log.info "Starting CloudQuartz agent"
-		puts "Starting CloudQuartz agent"
+		@log.info "Starting the CloudBlocks Agent"
+		puts "Starting the CloudBlocks Agent"
 
 		pid = get_pid
 		if pid != 0
-			warn "Quartz is already running. Use stop command to stop it or --help for more info"
-			exit -1
+			#check if the process is actually running
+			if pid_process_running?(pid)
+				warn "The CloudBlocks Agent is already running. Use stop command to stop it or --help for more info"
+				exit -1
+			else
+				File.delete(@pid_full)
+			end
 		end
 
 		check_version
@@ -64,7 +69,7 @@ def start
 			Process.detach(pid)
 		rescue => exc
 			Process.kill('TERM', pid)
-			warn "Cannot start CloudQuartz agent: #{exc.message}"
+			warn "Cannot start the CloudBlocks Agent: #{exc.message}"
 		end
 	else
 		run
@@ -75,7 +80,7 @@ end
 
 def stop
 	pid = get_pid
-	@log.info "Stopping CloudQuartz agent"
+	@log.info "Stopping the CloudBlocks Agent"
 	begin
 		@quartz.status(2, @version, plugin_meta_data)
 		EM.stop
@@ -88,15 +93,15 @@ def stop
 		rescue
 		end
 		File.delete(@pid_full)
-		puts "Stopped"
+		puts "The CloudBlocks Agent was stopped"
 	else
-		warn "Quartz is not running"
+		warn "Did nothing - The CloudBlocks Agent was not running"
 		exit -1
 	end
 end
 
 def register
-	puts "Registering agent with #{@url} and API Key #{@api_key}"
+	puts "Registering the CloudBlocks Agent with #{@url} and API Key #{@api_key}"
 	os_name = RUBY_PLATFORM
 	os_id = os_name.include?('darwin') ? 5 : 1
 	agent = { :agent_type_id => os_id, :agent_name => Socket.gethostname, :agent_timezone => Time.new.zone, :extra => os_name}
@@ -113,7 +118,7 @@ def register
 end
 
 def unregister
-	puts "Unregister agent #{@agent_id} with #{@url}"
+	puts "Unregister the CloudBlocks Agent #{@agent_id} with #{@url}"
 	@agent_id = ""
 	@quartz.unregister(@agent_id)
 	save_config
@@ -226,10 +231,10 @@ def check_version
 		result = @quartz.check_version
 		if result['ok']
 			latest = result['latest']
-			@log.warn 'A newer version of CloudQuartz agent is available. Update the cloudblocks gem. See http://help.cloudblocks.co for more info' if latest > @version
+			@log.warn 'A newer version of the CloudBlocks Agent is available. Please update the cloudblocks gem. See http://help.cloudblocks.co for more info' if latest > @version
 		end
 	rescue => exc
-		warn "Cannot connect to the server"
+		warn "Cannot connect to the CloudBlocks server"
 		exit -1
 	end
 end
@@ -270,25 +275,38 @@ def get_pid
 		file = File.new(@pid_full, "r")
 		pid = file.read
 		file.close
-
 		pid
 	else
 		0
 	end
 end
 
+def pid_process_running?(pid)
+	begin
+		pid_number = pid.to_i
+  		Process.getpgid(pid_number)
+  		true
+	rescue Errno::ESRCH
+  		false
+	end
+end
+
 public
 
 @version = 1
 str_version = "0.0.#{@version}"
 
 config_file = 'cloudblocks.yaml'
-@pid_file = 'quartz.pid'
-@log_file = 'quartz.log'
+@pid_file = 'cb-agent.pid'
+@log_file = 'cb-agent.log'
 @config_dir = File.join(File.expand_path('~'), '.cloudblocks')
 @config_full = File.join(@config_dir, config_file)
-@pid_full = File.join('/tmp', @pid_file)
-@log_full = File.join('/tmp', @log_file)
+
+@cb_tmp_dir = '/tmp/cloudblocks'
+Dir.mkdir(@cb_tmp_dir) if !File.exists?(@cb_tmp_dir)
+
+@pid_full = File.join(@cb_tmp_dir, @pid_file)
+@log_full = File.join(@cb_tmp_dir, @log_file)
 
 @api_key = ''
 @faye_url = 'https://sockets.cloudblocks.co/push/'
@@ -303,10 +321,10 @@ command = nil
 @realtime = true
 OptionParser.new do |opts|
 	opts.banner = 	<<-EOF
-CloudQuartz Agent. v#{str_version} (c) 2012 CloudBlocks
+CloudBlocks Agent. v#{str_version} (c) 2012 CloudBlocks
 For more information please visit http://cloudblocks.co
 
-Usage: quartz [register|unregister|start|stop] [options]
+Usage: cb-agent [register|unregister|start|stop] [options]
 
 Options:
 EOF
@@ -328,7 +346,7 @@ EOF
 		@pid_full = v
 	end
 
-	opts.on('-l', '--log LOG', 'Log file path') do |v|
+	opts.on('-l', '--log LOG', 'Full log file path') do |v|
 		@log_full = v
 	end
 
@@ -362,10 +380,10 @@ EOF
 		puts <<-EOF
 
 Commands:
-	register 			Register the agent
-	start 				Starts agent as deamon
-	stop 				Stops agent daemon
-	unregister			Unregister the agent
+	register 			Register the CloudBlocks Agent
+	start 				Starts the CloudBlocks Agent as a deamon
+	stop 				Stops the CloudBlocks Agent daemon
+	unregister			Unregisters the CloudBlocks Agent
 
 		EOF
 		exit 0
@@ -392,7 +410,7 @@ end
 
 # still no api key, we need to get it
 if @api_key.empty?
-	puts 'CloudBlocks CloudQuartz'
+	puts 'CloudBlocks Agent'
 	@api_key = ask('Please enter your API key. (you can find it at https://cloudblocks.co/me): ')
 	if @api_key.length != 32
 		puts 'Invalid API key'
@@ -416,7 +434,7 @@ if @agent_id.empty?
 		@quartz = CloudQuartz.new(:api_key => @api_key, :url => @url, :secret_key => @secret_key)
 		register 
 
-		q = ask("Start the agent as daemon? ") { |q| q.default = "Y" }
+		q = ask("Start the agent as a daemon? ") { |q| q.default = "Y" }
 		if q.chomp.downcase != 'n'
 			@quartz = CloudQuartz.new(:api_key => @api_key, :url => @url, :agent_id => @agent_id, :secret_key => @secret_key)
 			start
@@ -429,7 +447,13 @@ if @agent_id.empty?
 end
 
 if command.nil? || command.empty?
-	puts 'No command found. Use --help for more information'
+	pid = get_pid
+	#check if the process is actually running
+	if pid != 0 && pid_process_running?(pid)
+		puts "The CloudBlocks Agent is currently running. Use the stop command to stop it or --help for more info"
+		exit -1
+	end
+	puts 'The CloudBlocks Agent is currently not running. Use the start command to start it or --help for more information'
 	exit -1
 end
 
@@ -439,7 +463,7 @@ unless commands.include?(command)
 end
 
 if (@agent_id.nil? || @agent_id.empty? || @agent_id.empty? || @secret_key.empty?) && command != 'register'
-	puts 'No Agent id found. Have you registered it yet? Use --help for more information'
+	puts 'No CloudBlocks Agent id found. Have you registered it yet? Use --help for more information'
 	exit -1
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudblocks
 version: !ruby/object:Gem::Version
-  version: 0.0.12c
+  version: 0.0.12d
   prerelease: 6
 platform: ruby
 authors:
@@ -140,10 +140,10 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.11
 description: See http://cloudblocks.co for more info
-email: hello@cloudblocks.co
+email: hello@thecloudblocks.com
 executables:
 - chief
-- quartz
+- cb-agent
 extensions: []
 extra_rdoc_files: []
 files:
@@ -161,7 +161,7 @@ files:
 - lib/plugins/tester.rb
 - lib/plugins/webget.rb
 - bin/chief
-- bin/quartz
+- bin/cb-agent
 homepage: http://cloudblocks.co
 licenses: []
 post_install_message: