cloudblocks 0.0.10 → 0.0.11

data/bin/quartz

@@ -5,9 +5,11 @@ require File.expand_path("../../lib/cloud-quartz", __FILE__)
 require 'optparse'
 require 'socket'
 require 'logger'
+require 'highline/import'
 begin
 	gem 'eventmachine', '~>1.0.0.beta.4'
 	gem 'faye', '~>0.8.0'
+	gem 'highline', '~>1.6.11'
 
 	require 'eventmachine'
 	require 'faye'
@@ -138,8 +140,7 @@ def load_plugins
 				else
 					@log.error "Invalid plugin found #{clazz}"
 				end
-			rescue => exc
-				@log.error "Error during loading plugin #{classname} due to #{exc}"
+			rescue 
 			end
 		end
 	end
@@ -177,8 +178,9 @@ def get_job
 				EM.defer(operation)
 			else
 				@log.error "No plugin found with uid #{guid}"
-				# TODO: Send this back to server as run error
-				#@quartz.post_results(job_id, data)
+				job_id = message['job_id']
+				data = { :run_start => Time.now.utc.to_i, :run_end => Time.now.utc.to_i, :agent_uid => @agent_id, :ok => false, :fail_reason => "Requested plugin not found. Does this agent support this job type?" }
+				@quartz.post_results(job_id, data)
 			end
 		end
 	else
@@ -234,9 +236,9 @@ def run
 	    Signal.trap('TERM'){ stop }
 
 	    if @realtime
-	    	@log.info "Listening to realtime nofitifications from /quartz/jobs/#{@agent_id} on #{@faye_url}" 
+	    	@log.info "Listening to realtime nofitifications from /quartz/agents/#{@agent_id} on #{@faye_url}" 
 	    	client = Faye::Client.new(@faye_url)
-			client.subscribe("/quartz/jobs/#{@agent_id}") do |message|
+			client.subscribe("/quartz/agents/#{@agent_id}") do |message|
     			@log.info "Got realtime notice for a new job #{message}"
     			get_job
 			end
@@ -269,13 +271,13 @@ str_version = "0.0.#{@version}"
 config_file = 'cloudblocks.yaml'
 @pid_file = 'quartz.pid'
 @log_file = 'quartz.log'
-@config_dir = File.join(Dir.home, '.cloudblocks')
+@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)
 
 @api_key = ''
-@faye_url = 'https://socket.thecloudblocks.com:8443/'
+@faye_url = 'https://socket.thecloudblocks.com:8443/push/'
 commands = %w[register unregister start stop]
 
 @plugins = {}
@@ -368,8 +370,7 @@ end
 # still no api key, we need to get it
 if @api_key.empty?
 	puts 'CloudBlocks CloudQuartz'
-	print 'Please enter your API key. (you can find it at https://www.thecloudblocks.com/me):'
-	@api_key = gets.chomp
+	@api_key = ask('Please enter your API key. (you can find it at https://www.thecloudblocks.com/me): ')
 	if @api_key.length != 32
 		puts 'Invalid API key'
 		exit -1
@@ -381,13 +382,13 @@ end
 
 # no agent id?
 if @agent_id.empty?
-	print 'Register the agent? [Y/n]'
-	if gets.chomp.downcase != 'n'
+	q = ask("Register the agent? ") { |q| q.default = "Y" }
+	if q.chomp.downcase != 'n'
 		@quartz = CloudQuartz.new(:api_key => @api_key, :url => @url)
 		register 
 
-		print 'Start the agent as daemon? [Yn]'
-		if gets.chomp.downcase != 'n'
+		q = ask("Start the agent as daemon? ") { |q| q.default = "Y" }
+		if q.chomp.downcase != 'n'
 			@quartz = CloudQuartz.new(:api_key => @api_key, :url => @url, :agent_id => @agent_id)
 			start
 		else

data/lib/plugins/redis.rb

@@ -0,0 +1,91 @@
+require File.join(File.dirname(__FILE__), 'quartz_plugin')
+require 'fileutils'
+
+class Redis < QuartzPlugin
+
+	def info
+		{ :uid => "6342c1ef0d8bb2a47ab1362a6b02c058", :name => "Redis Backup", :version => "0.0.0" }
+	end
+
+	def run(message)
+		pl = payload(message)
+
+		@job_name 			= pl['job_name'].gsub(/[^\w\s_-]+/, '').gsub(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2').gsub(/\s/, '_')
+		@redisdump_utility 	= pl['redis client'] || '/usr/bin/redis-cli'
+		@name 				= pl['db name'] || 'dump'
+		@password 			= pl['password']
+		@socket 			= pl['socket']
+		@host 				= pl['host'] || '127.0.0.1'
+		@port 				= pl['port'] || 6379
+		@additional_options = pl['additional options'] || []
+		@path 				= pl['db path']
+		@dump_path			= pl['backup folder']
+
+		@name = 'dump' if @name.empty?
+		@host = '127.0.0.1' if @host.empty?
+		@port = 6379 if @port.empty?
+		@additional_options = [] if @additional_options.empty?
+		@redisdump_utility = '/usr/bin/redis-cli' if @redisdump_utility.empty?
+
+		save_result = invoke_save
+		return save_result unless save_result.nil?
+
+		result = copy
+		if result[:ok]
+			run_result(true, "Redis Backup finished successfully")
+		else
+			run_result(false, result[:message])
+		end
+	end
+
+	private 
+
+	## based on Backup Gem with minor modifications
+
+	def database
+		"#{@name}.rdb"
+	end
+
+	def credential_options
+		@password.to_s.empty? ? '' : "-a '#{@password}'"
+	end
+
+	def connectivity_options
+		%w[host port socket].map do |option|
+			value = instance_variable_get("@#{option}")
+			next if value.to_s.empty?
+			"-#{option[0,1]} '#{value}'"
+		end.compact.join(' ')
+	end
+
+	def user_options
+		@additional_options.join(' ')
+	end
+
+	def invoke_save
+		command = "#{@redisdump_utility} #{credential_options} #{connectivity_options} #{user_options} SAVE"
+		@log.debug "Running #{command}"
+		response = run_shell(command)
+		@log.debug "redis-cli run result: #{response}"
+		unless response[:ok]
+			run_result(false, "Failed to save from server '#{response[:message]}'")
+		else
+			nil
+		end
+    end
+
+	def copy
+		src_path = File.join(@path, database)
+		unless File.exist?(src_path)
+			raise "Redis database dump not found at #{src_path}"
+		end
+
+		FileUtils.mkdir_p(@dump_path)
+
+		dst_path = File.join(@dump_path, database)
+		dump_cmd = "gzip -c #{src_path} > #{dst_path}.gz"
+		@log.debug "Running #{dump_cmd}"
+		run_shell dump_cmd
+	end
+
+end	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudblocks
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-24 00:00:00.000000000Z
+date: 2012-04-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70183955918280 !ruby/object:Gem::Requirement
+  requirement: &70213937662760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70183955918280
+  version_requirements: *70213937662760
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70183955902580 !ruby/object:Gem::Requirement
+  requirement: &70213937659840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70183955902580
+  version_requirements: *70213937659840
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70183955876500 !ruby/object:Gem::Requirement
+  requirement: &70213937658000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70183955876500
+  version_requirements: *70213937658000
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &70213937651580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *70213937651580
 - !ruby/object:Gem::Dependency
   name: faye
-  requirement: &70183955851220 !ruby/object:Gem::Requirement
+  requirement: &70213937650380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70183955851220
+  version_requirements: *70213937650380
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70183955848320 !ruby/object:Gem::Requirement
+  requirement: &70213937649300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70183955848320
+  version_requirements: *70213937649300
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70183955832100 !ruby/object:Gem::Requirement
+  requirement: &70213937648440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,18 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70183955832100
+  version_requirements: *70213937648440
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &70213937647060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.11
+  type: :runtime
+  prerelease: false
+  version_requirements: *70213937647060
 description: See http://www.thecloudblocks.com for more info
 email: khash@thecloudblocks.com
 executables:
@@ -92,6 +114,7 @@ files:
 - lib/plugins/mysql.rb
 - lib/plugins/quartz_plugin.rb
 - lib/plugins/rake.rb
+- lib/plugins/redis.rb
 - lib/plugins/rotater.rb
 - lib/plugins/s3backup.rb
 - lib/plugins/shell.rb