cloudblocks 0.0.11 → 0.0.12a

data/bin/chief

@@ -26,7 +26,7 @@ config_dir = File.join(Dir.home, '.cloudblocks')
 config_full = File.join(config_dir, config_file)
 
 api_key = ''
-faye_url = 'https://socket.thecloudblocks.com:8443/'
+faye_url = 'http://sockets.cloudblocks.co/'
 
 if File.exists?(config_full)	
 	# config file present
@@ -35,7 +35,7 @@ if File.exists?(config_full)
 else
 	# no config file
 	puts 'CloudBlocks ConfigChief'
-	puts 'Please enter your API key. (you can find it at https://www.thecloudblocks.com/me):'
+	puts 'Please enter your API key. (you can find it at https://cloudblocks.co/me):'
 	api_key = gets
 	api_key = api_key.chomp
 	if api_key.length != 32
@@ -61,7 +61,7 @@ id = nil
 OptionParser.new do |opts|
 	opts.banner = 	<<-EOF
 ConfigChief. v#{str_version} (c) 2012 CloudBlocks
-For more information please visit http://www.thecloudblocks.com
+For more information please visit http://cloudblocks.co
 
 Usage: chief [options]
 
@@ -75,7 +75,7 @@ EOF
 	opts.on('-u', '--url URL', 'Server URL') do |v|
 		url = v
 	end
-	url = url || 'https://api.thecloudblocks.com'
+	url = url || 'https://api.cloudblocks.co'
 
 	opts.on('-k', '--key KEY', 'Config Key') do |v|
 		key = v

data/bin/quartz

@@ -25,7 +25,7 @@ def save_config
 	if !FileTest::directory?(@config_dir)
 		Dir.mkdir(@config_dir)
 	end
-	File.open(@config_full, 'w+') { |out| YAML::dump({ 'api_key' => @api_key, 'agent_id' => @agent_id }, out) }
+	File.open(@config_full, 'w+') { |out| YAML::dump({ 'api_key' => @api_key, 'agent_id' => @agent_id, 'secret_key' => @secret_key }, out) }
 end
 
 public
@@ -158,33 +158,37 @@ def plugin_meta_data
 end
 
 def get_job
-	result = @quartz.get_job
-	if result['ok']
-		if result['empty']
-			@log.debug 'No jobs to run'
-		else
-			message = JSON.parse(result['message'])
-			guid = message['plugin_uid']
-			name = message['template_name']
-			drt = message['desired_run_time']
-
-			@log.info "Going to run #{name} (uid:#{guid})"
-
-			# get the plugin
-			if @plugins.include?(guid)
-				plugin = @plugins[guid]
-				# run it
-				operation = proc { run_plugin(plugin, message) }
-				EM.defer(operation)
+	begin
+		result = @quartz.get_job
+		if result['ok']
+			if result['empty']
+				@log.debug 'No jobs to run'
 			else
-				@log.error "No plugin found with uid #{guid}"
-				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)
+				message = JSON.parse(result['message'])
+				guid = message['plugin_uid']
+				name = message['template_name']
+				drt = message['desired_run_time']
+
+				@log.info "Going to run #{name} (uid:#{guid})"
+
+				# get the plugin
+				if @plugins.include?(guid)
+					plugin = @plugins[guid]
+					# run it
+					operation = proc { run_plugin(plugin, message) }
+					EM.defer(operation)
+				else
+					@log.error "No plugin found with uid #{guid}"
+					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
+			@log.error "Failed to retrieve job due to #{result['error']}"
 		end
-	else
-		@log.error "Failed to retrieve job due to #{result['error']}"
+	rescue => exc
+		@log.error "Failed to retrieve job due to #{exc}"
 	end
 end
 
@@ -222,7 +226,7 @@ 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.thecloudblocks.com for more info' if latest > @version
+			@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
 		end
 	rescue => exc
 		warn "Cannot connect to the server"
@@ -235,6 +239,16 @@ def run
 	 	Signal.trap('INT') { stop }
 	    Signal.trap('TERM'){ stop }
 
+	    # pulse
+		EM.add_periodic_timer 60 do  # 1 minute
+			@log.debug "Pulseate"
+			begin
+				@quartz.pulse 
+			rescue => exc
+				@log.error "Failed to pulsate due to #{exc.message}"
+			end
+		end
+
 	    if @realtime
 	    	@log.info "Listening to realtime nofitifications from /quartz/agents/#{@agent_id} on #{@faye_url}" 
 	    	client = Faye::Client.new(@faye_url)
@@ -277,7 +291,7 @@ config_file = 'cloudblocks.yaml'
 @log_full = File.join('/tmp', @log_file)
 
 @api_key = ''
-@faye_url = 'https://socket.thecloudblocks.com:8443/push/'
+@faye_url = 'http://sockets.cloudblocks.co/push/'
 commands = %w[register unregister start stop]
 
 @plugins = {}
@@ -290,7 +304,7 @@ command = nil
 OptionParser.new do |opts|
 	opts.banner = 	<<-EOF
 CloudQuartz Agent. v#{str_version} (c) 2012 CloudBlocks
-For more information please visit http://www.thecloudblocks.com
+For more information please visit http://cloudblocks.co
 
 Usage: quartz [register|unregister|start|stop] [options]
 
@@ -300,7 +314,7 @@ EOF
 	opts.on('--url URL', 'Server URL') do |server_url|
 		@url = server_url
 	end
-	@url = @url || 'https://api.thecloudblocks.com'
+	@url = @url || 'https://api.cloudblocks.co'
 
 	opts.on('--agent-id AGENTID', 'Agent id') do |v|
 		@agent_id = v
@@ -331,6 +345,10 @@ EOF
 		@api_key = v
 	end
 
+	opts.on('--secret-key SECRETKET', 'Secret Key') do |v|
+		@secret_key = v
+	end
+
 	opts.on('-n', '--no-realtime', 'Disable realtime notifications') do |v|
 		@realtime = false
 	end
@@ -365,17 +383,24 @@ if (@api_key.empty? || @agent_id.empty?) && File.exists?(@config_full)
 	config = YAML::load(File.open(@config_full))
 	@api_key = config['api_key']
 	@agent_id = config['agent_id']
+	@secret_key = config['secret_key']
 end
 
 # still no api key, we need to get it
 if @api_key.empty?
 	puts 'CloudBlocks CloudQuartz'
-	@api_key = ask('Please enter your API key. (you can find it at https://www.thecloudblocks.com/me): ')
+	@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'
 		exit -1
 	end
 
+	@secret_key = ask('Please enter your Secret Key (you can find it at https://cloudblocks.co/me): ')
+	if @secret_key.length != 32
+		puts 'Invalid Secret key'
+		exit -1
+	end
+
 	save_config
 	puts 'Configuration Saved'
 end
@@ -384,12 +409,12 @@ end
 if @agent_id.empty?
 	q = ask("Register the agent? ") { |q| q.default = "Y" }
 	if q.chomp.downcase != 'n'
-		@quartz = CloudQuartz.new(:api_key => @api_key, :url => @url)
+		@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" }
 		if q.chomp.downcase != 'n'
-			@quartz = CloudQuartz.new(:api_key => @api_key, :url => @url, :agent_id => @agent_id)
+			@quartz = CloudQuartz.new(:api_key => @api_key, :url => @url, :agent_id => @agent_id, :secret_key => @secret_key)
 			start
 		else
 			exit 0
@@ -409,11 +434,11 @@ unless commands.include?(command)
 	exit -1
 end
 
-if (@agent_id.nil? || @agent_id.empty? || @agent_id.empty?) && command != 'register'
+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'
 	exit -1
 end
 
-@quartz = CloudQuartz.new(:api_key => @api_key, :url => @url, :agent_id => @agent_id)
+@quartz = CloudQuartz.new(:api_key => @api_key, :url => @url, :agent_id => @agent_id, :secret_key => @secret_key)
 
 send(command)

data/lib/cloud-quartz.rb

@@ -9,7 +9,8 @@ class CloudQuartz
 	def initialize(options = {})
 		@api_key = options[:api_key]
 		@agent_id = options[:agent_id]
-		self.class.base_uri options[:url] || 'https://api.thecloudblocks.com'
+		@secret_key = options[:secret_key]
+		self.class.base_uri options[:url] || 'https://api.cloudblocks.co'
 	end
 
 	def get_job
@@ -32,6 +33,10 @@ class CloudQuartz
 		process(self.class.post("/job/#{job_id}/complete.json", { :headers => http_headers.merge({'Content-Type' => 'application/json'}), :body => data.to_json } ))
 	end
 
+	def pulse
+		process(self.class.get("/agent/#{@agent_id}/pulse.json", { :headers => http_headers } ))
+	end
+
 	def status(stat, version, plugins)
 		data = { :status => stat, :version => version, :plugins => plugins }
 		process(self.class.post("/agent/#{@agent_id}/status.json", { :headers => http_headers.merge({'Content-Type' => 'application/json'}), :body => data.to_json }))
@@ -40,7 +45,12 @@ class CloudQuartz
 	private
 
 	def http_headers
-		{ 'api_key' => @api_key }
+		time = Time.now.utc.to_i
+		{ 'api_key' => @api_key, 'hash' => signature(time), 'time' => time.to_s }
+	end
+
+	def signature(time)
+		Digest::SHA1.hexdigest("#{@api_key}#{@secret_key}#{time}").downcase
 	end
 
 	def process(response)

data/lib/config-chief.rb

@@ -11,7 +11,7 @@ class ConfigChief
   def initialize(options = {})
     @api_key = options[:api_key]
     @workspace = options[:workspace]
-    self.class.base_uri options[:url] || 'https://api.thecloudblocks.com'
+    self.class.base_uri options[:url] || 'https://api.cloudblocks.co'
   end
   
   def get_by_key(key, options = {}, params = {})

data/lib/plugins/broken.rb

@@ -1,8 +1,13 @@
 require File.join(File.dirname(__FILE__), 'quartz_plugin')
 
 class Broken < QuartzPlugin
+
+	@@version_major = 0
+	@@version_minor = 0
+	@@version_revision = 1
+	
 	def info
-		{ :uid => "04165a45fde840a9a17b41f019b3dca3", :name => "Broken", :version => "0.0.0" }
+		{ :uid => "04165a45fde840a9a17b41f019b3dca3", :name => "Broken", :version => get_version }
 	end
 
 	def run(message)

data/lib/plugins/logrotate.rb

@@ -3,17 +3,21 @@ require 'fileutils'
 
 class Logrotate < QuartzPlugin
 
+	@@version_major = 0
+	@@version_minor = 0
+	@@version_revision = 1
+
 	def info
-		{ :uid => "8f4286bfd946c8b08b234833673b8860", :name => "Log Rotate", :version => "0.0.0" }
+		{ :uid => "8f4286bfd946c8b08b234833673b8860", :name => "Log Rotate", :version => get_version }
 	end
 
 	def run(message)
 		pl = payload(message)
 
-		@source_pattern 	= pl['source pattern']
+		@source_pattern 	= pl['source_pattern']
 		@dest_folder 		= pl['destination']
 		@keep 				= pl['keep'].empty? ? 0 : pl['keep'].to_i
-		@post_run_step 		= pl['post rotate']
+		@post_run_step 		= pl['post_rotate']
 
         ext = Time.now.utc.strftime('%Y%m%d%H%M%S')
 

data/lib/plugins/mysql.rb

@@ -3,8 +3,12 @@ require 'fileutils'
 
 class Mysql < QuartzPlugin
 
+	@@version_major = 0
+	@@version_minor = 0
+	@@version_revision = 1
+
 	def info
-		{ :uid => "67deb35a555344c8a7651c656e6c8e2e", :name => "MySQL Backup", :version => "0.0.0" }
+		{ :uid => "67deb35a555344c8a7651c656e6c8e2e", :name => "MySQL Backup", :version => get_version }
 	end
 
 	def run(message)
@@ -14,17 +18,20 @@ class Mysql < QuartzPlugin
 		@log.debug "Pruned payload #{pl}"
 
 		@job_name 			= pl['job_name'].gsub(/[^\w\s_-]+/, '').gsub(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2').gsub(/\s/, '_')
-		@mysqldump_utility 	= pl['dump utility'] || '/usr/bin/mysqldump'
-		@name 				= pl['db name'] || :all
+		@mysqldump_utility 	= pl['dump_utility'] || '/usr/bin/mysqldump'
+		@name 				= pl['db_name'] || :all
 		@username 			= pl['username']
 		@password 			= pl['password']
 		@socket 			= pl['socket']
 		@host 				= pl['host']
 		@port 				= pl['port']
-		@skip_tables 		= pl['skip tables']
-		@only_tables 		= pl['only tables']
-		@additional_options = pl['additional options'] || ['--single-transaction', '--quick']
-		@path 				= pl['backup folder']
+		@skip_tables 		= pl['skip_tables']
+		@only_tables 		= pl['only_tables']
+		@additional_options = pl['additional_options'] || ['--single-transaction', '--quick']
+		@path 				= pl['backup_folder']
+
+		@only_tables = @only_tables.split(',') unless @only_tables.nil?
+		@skip_tables = @skip_tables.split(',') unless @skip_tables.nil?
 
         dump_cmd = "#{mysqldump} | gzip > '#{ File.join(@path, @job_name.downcase) }.sql.gz'"
         @log.debug "Running #{dump_cmd}"

data/lib/plugins/quartz_plugin.rb

@@ -22,13 +22,7 @@ class QuartzPlugin
 		parsed_payload = JSON.parse(raw_payload) unless raw_payload.nil?
 		@log.debug "Parsed payload #{parsed_payload}"
 
-		v = {}
-		unless parsed_payload.nil?
-			parsed_payload.each do |p|
-				v = v.merge({ p['name'] => p['value']})
-			end
-		end
-
+		v = parsed_payload
 		v = v.merge({'job_name' => message['job_name']})
 
 		@log.debug "Payload #{v}"
@@ -46,4 +40,12 @@ class QuartzPlugin
 			{ :ok => false, :message => stderr.read.strip}
 		end
 	end
+
+	@@version_major = 0
+	@@version_minor = 0
+	@@version_revision = 0
+
+	def get_version
+		"#{@@version_major}.#{@@version_minor}.#{@@version_revision}"
+	end
 end

data/lib/plugins/rake.rb

@@ -1,8 +1,13 @@
 require File.join(File.dirname(__FILE__), 'quartz_plugin')
 
 class Rake < QuartzPlugin
+
+	@@version_major = 0
+	@@version_minor = 0
+	@@version_revision = 1
+
 	def info
-		{ :uid => "62e3583abfc24f209916c4ff97661fa0", :name => "Rake", :version => "0.0.0" }
+		{ :uid => "62e3583abfc24f209916c4ff97661fa0", :name => "Rake", :version => get_version }
 	end
 
 	def run(message)

data/lib/plugins/redis.rb

@@ -3,23 +3,27 @@ require 'fileutils'
 
 class Redis < QuartzPlugin
 
+	@@version_major = 0
+	@@version_minor = 0
+	@@version_revision = 1
+
 	def info
-		{ :uid => "6342c1ef0d8bb2a47ab1362a6b02c058", :name => "Redis Backup", :version => "0.0.0" }
+		{ :uid => "6342c1ef0d8bb2a47ab1362a6b02c058", :name => "Redis Backup", :version => get_version }
 	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'
+		@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']
+		@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?

data/lib/plugins/rotater.rb

@@ -3,17 +3,21 @@ require 'fileutils'
 
 class Rotater < QuartzPlugin
 
+        @@version_major = 0
+        @@version_minor = 0
+        @@version_revision = 1
+
 	def info
-		{ :uid => "02f7d8237bcc438e8f0659babfef2911", :name => "File Rotater", :version => "0.0.0" }
+		{ :uid => "02f7d8237bcc438e8f0659babfef2911", :name => "File Rotater", :version => get_version }
 	end
 
 	def run(message)
 		pl = payload(message)
 
-		source_pattern = pl['source pattern']
+		source_pattern = pl['source_pattern']
 		dest_folder = pl['location']
 		keep = pl['keep'].nil? ? 5 : pl['keep'].to_i
-		post_rotate = pl['post rotate']
+		post_rotate = pl['post_rotate']
 
 		archive = File.join(dest_folder, '/archive')
 

data/lib/plugins/s3backup.rb

@@ -4,8 +4,12 @@ require 'fog'
 
 class S3backup < QuartzPlugin
 
+	@@version_major = 0
+	@@version_minor = 0
+	@@version_revision = 1
+
 	def info
-		{ :uid => "d3533989f9d542f393566511e8eb2090", :name => "S3 Backup", :version => "0.0.0" }
+		{ :uid => "d3533989f9d542f393566511e8eb2090", :name => "S3 Backup", :version => get_version }
 	end
 
 	def run(message)
@@ -13,12 +17,12 @@ class S3backup < QuartzPlugin
 
 		@log.debug "Pruned payload #{pl}"
 
-		@access_key_id 			= pl['access key']
-		@secret_access_key 		= pl['secret key']
+		@access_key_id 			= pl['access_key']
+		@secret_access_key 		= pl['secret_key']
 		@bucket 				= pl['bucket']
-		@remote_path 			= pl['remote path']
+		@remote_path 			= pl['remote_path']
 		@region 				= pl['region']
-		@local_pattern 			= pl['local pattern']
+		@local_pattern 			= pl['local_pattern']
 		@keep 					= pl['keep'].empty? ? 0 : pl['keep'].to_i
 
 		@testing				= pl['testing']
@@ -52,20 +56,25 @@ class S3backup < QuartzPlugin
 
 			count = 0
 			# get local files
+			directory = connection.directories.get(@bucket)
+			all_rotated = directory.files.reject { |m| File.dirname(m.key) != @remote_path }
+
 			Dir.glob(@local_pattern).each do |f|
-				remote_file = File.join(@remote_path, File.basename(f))
-				next if File.directory?(f)
-				@log.debug "Copying #{f} to #{remote_file}"
-				count += 1
-				File.open(f, 'r') do |file|
-					connection.put_object(@bucket, File.join(remote_path, File.basename(f)), file)
+				base_file = File.basename(f)
+				remote_files = all_rotated.map {|m| File.basename(m.key)}
+				unless remote_files.include? base_file
+					remote_file = File.join(@remote_path, base_file)
+					next if File.directory?(f)
+					@log.debug "Copying #{f} to #{remote_file}"
+					count += 1
+					File.open(f, 'r') do |file|
+						connection.put_object(@bucket, File.join(remote_path, base_file), file)
+					end
 				end
 			end
 
 			return run_result(true, "Files copied to S3 bucket successfully with no rotation") if @keep == 0
 
-			directory = connection.directories.get(@bucket)
-			all_rotated = directory.files.reject { |m| File.dirname(m.key) != @remote_path }
 			@log.debug "Found #{all_rotated.count} in the remote bucket"
 			if all_rotated.count > @keep
 				remove_count = all_rotated.count - @keep

data/lib/plugins/shell.rb

@@ -1,19 +1,23 @@
 require File.join(File.dirname(__FILE__), 'quartz_plugin')
 
 class Shell < QuartzPlugin
+	
+	@@version_major = 0
+	@@version_minor = 0
+	@@version_revision = 1
+
 	def info
-		{ :uid => "20e07c656e2f477d969e9561e13229fb", :name => "Shell", :version => "0.0.0" }
+		{ :uid => "20e07c656e2f477d969e9561e13229fb", :name => "Shell", :version => get_version }
 	end
 
 	def run(message)
 		@log.debug "Running with #{message}"
 		payload = payload(message)
 		command = payload['command']
-		params = payload['params']
-		@log.info "Shell command '#{command}' with '#{params}'"
+		@log.info "Shell command '#{command}"
 
 		begin
-			result = run_shell("#{command} #{params}")
+			result = run_shell("#{command}")
 			run_result(result[:ok], result[:message])
 		rescue => ex
 			run_result(false, "Failed to run shell command due to #{ex}")

data/lib/plugins/tester.rb

@@ -1,8 +1,13 @@
 require File.join(File.dirname(__FILE__), 'quartz_plugin')
 
 class Tester < QuartzPlugin
+	
+	@@version_major = 1
+	@@version_minor = 0
+	@@version_revision = 0
+
 	def info
-		{ :uid => "c0bb6ed7950b489f9abba8071ff0e0ab", :name => "Tester", :version => "0.0.0" }
+		{ :uid => "c0bb6ed7950b489f9abba8071ff0e0ab", :name => "Tester", :version => get_version }
 	end
 
 	def run(message)

data/lib/plugins/webget.rb

@@ -2,8 +2,13 @@ require File.join(File.dirname(__FILE__), 'quartz_plugin')
 require 'httparty'
 
 class Webget < QuartzPlugin
+
+	@@version_major = 0
+	@@version_minor = 0
+	@@version_revision = 1
+
 	def info
-		{ :uid => "6b5f722d214f4d71a5be237d44094721", :name => "WebGet", :version => "0.0.0" }
+		{ :uid => "6b5f722d214f4d71a5be237d44094721", :name => "WebGet", :version => get_version }
 	end
 
 	def run(message)

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: cloudblocks
 version: !ruby/object:Gem::Version
-  version: 0.0.11
-  prerelease: 
+  version: 0.0.12a
+  prerelease: 6
 platform: ruby
 authors:
-- Khash Sajadi
+- CloudBlocks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70213937662760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70213937662760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70213937659840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70213937659840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70213937658000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70213937658000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.10
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70213937651580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70213937651580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.4
 - !ruby/object:Gem::Dependency
   name: faye
-  requirement: &70213937650380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70213937650380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70213937649300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70213937649300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70213937648440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70213937648440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70213937647060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,9 +133,14 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70213937647060
-description: See http://www.thecloudblocks.com for more info
-email: khash@thecloudblocks.com
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.11
+description: See http://cloudblocks.co for more info
+email: hello@cloudblocks.co
 executables:
 - chief
 - quartz
@@ -122,7 +162,7 @@ files:
 - lib/plugins/webget.rb
 - bin/chief
 - bin/quartz
-homepage: http://www.thecloudblocks.com
+homepage: http://cloudblocks.co
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -137,12 +177,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: CloudBlocks Gem and Agent