Merge branch 'master' of git@github.com:ezmobius/redis-rb

* 'master' of git@github.com:ezmobius/redis-rb: LPOPPUSH -> RPOPLPUSH Allow to install a specific commit from the Redis repo. Conflicts: spec/redis_spec.rb
redis · Nov 12, 2009 · d14c202 · d14c202
2 parents 1323f43 + 89bfc3d
commit d14c202
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/spec/redis_spec.rb b/spec/redis_spec.rb
@@ -275,7 +275,7 @@ def ==(other)
     @r.lrem('list', 1, 'hello').should == 1
     @r.lrange('list', 0, -1).should == ['goodbye']
   end
-  
+
   it "should be able to pop values from a list and push them onto a temp list(RPOPLPUSH)" do
     @r.rpush "list", 'one'
     @r.rpush "list", 'two'

diff --git a/tasks/redis.tasks.rb b/tasks/redis.tasks.rb
@@ -93,7 +93,11 @@ def self.stop
   task :download do
     sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}/.svn")
     sh 'git clone git://github.com/antirez/redis.git /tmp/redis' unless File.exists?(RedisRunner.redisdir)
-    sh "cd #{RedisRunner.redisdir} && git pull" if File.exists?("#{RedisRunner.redisdir}/.git")
+
+    if File.exists?("#{RedisRunner.redisdir}/.git")
+      arguments = ENV['COMMIT'].nil? ? "pull" : "reset --hard #{ENV['COMMIT']}"
+      sh "cd #{RedisRunner.redisdir} && git #{arguments}"
+    end
   end    
 
   desc "Open an IRb session"