tasks/redis.rake in rhosync-2.1.1 vs tasks/redis.rake in rhosync-2.1.2

@@ -5,11 +5,11 @@
 def windows?
 	RUBY_PLATFORM =~ /(win|w)32$/
 end
 
 if windows?
-	$redis_ver = "redis-1.2.6-windows"
+	$redis_ver = "redis-2.2.2"
 	$redis_zip = "C:/#{$redis_ver}.zip"
 	$redis_dest = "C:/"
 end
 
 def redis_home
@@ -37,11 +37,11 @@
 
   def self.redisconfdir
     server_dir = File.dirname(`which redis-server`)
     conf_file = "#{RedisRunner.prefix}etc/redis.conf"
     unless File.exists? conf_file
-      conf_file = "#{RedisRunner.prefix}etc/redis.conf"
+      conf_file = "#{server_dir}/redis.conf"
     end
     conf_file
   end
 
   def self.dtach_socket
@@ -110,11 +110,11 @@
 	    ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "#{RedisRunner.prefix}bin"
 	    
 	    mk_bin_dir(bin_dir)
 	    
 	    %w(redis-benchmark redis-cli redis-server).each do |bin|
-	      sh "cp /tmp/redis/#{bin} #{bin_dir}"
+	      sh "cp /tmp/redis/src/#{bin} #{bin_dir}"
 	    end
 	
 	    puts "Installed redis-benchmark, redis-cli and redis-server to #{bin_dir}"
 	
 	    ENV['PREFIX'] and conf_dir = "#{ENV['PREFIX']}/etc" or conf_dir = "#{RedisRunner.prefix}etc"
@@ -134,34 +134,35 @@
   end
 
   desc "Download package"
   task :download do
   	if windows?
-	  	require 'net/http'
-	  	require 'zip/zip'
-	  	
-	  	puts "Installing redis to #{redis_home}."
-	
-	    Net::HTTP.start("servicestack.googlecode.com") do |http|
-	      resp = http.get("/files/#{$redis_ver}.zip")
+      require 'net/http'
+      require 'zip/zip'
+      puts "Installing redis to #{redis_home}."
+
+	    Net::HTTP.start("cloud.github.com") do |http|
+	      resp = http.get("/downloads/dmajkic/redis/#{$redis_ver}-win32-win64.zip")
 	      open($redis_zip, "wb") do |file|
 	        file.write(resp.body)
 	      end
 	    end
-	    
+
 	    Zip::ZipFile.open($redis_zip) do |zip_file|
 	    	zip_file.each do |f|
-	    		f_path = File.join($redis_dest, f.name)
+	    		f_path = File.join(redis_home, f.name)
           FileUtils.mkdir_p(File.dirname(f_path))
           zip_file.extract(f, f_path) { true }
     		end
     	end
-    	
+
+    	FileUtils.mv Dir.glob(File.join(redis_home,'32bit','*')), redis_home
+    	FileUtils.rm_rf File.join(redis_home, '64bit')
     	FileUtils.rm_f $redis_zip
     else
       sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}")
       sh 'git clone git://github.com/antirez/redis.git /tmp/redis -n'
-      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout v2.0.4-stable"
+      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout 2.2.2"
     end
   end
 
 end
 
\ No newline at end of file