Eval and Evalsha is now supported

Conflicts:

	src/main/java/redis/clients/jedis/Client.java
	src/main/java/redis/clients/jedis/Jedis.java

src/test/java/redis/clients/jedis/tests/commands/EvalCommandsTest.java

@@ -0,0 +1,76 @@
+package redis.clients.jedis.tests.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+import redis.clients.jedis.exceptions.JedisDataException;
+import redis.clients.jedis.exceptions.JedisException;
+
+public class EvalCommandsTest extends JedisCommandTestBase {
+    
+    @SuppressWarnings("unchecked")
+	@Test
+    public void evalMultiBulk() {
+    	String script = "return {KEYS[1],KEYS[2],ARGV[1],ARGV[2]}";
+    	List<String> keys = new ArrayList<String>();
+    	keys.add("key1");
+    	keys.add("key2");
+    	
+        List<String> response = (List<String>)jedis.eval(script, keys, "first", "second" );
+        
+        assertEquals(4, response.size());
+        assertEquals("key1", response.get(0));
+        assertEquals("key2", response.get(1));
+        assertEquals("first", response.get(2));
+        assertEquals("second", response.get(3));
+    }
+    
+	@Test
+    public void evalBulk() {
+    	String script = "return KEYS[1]";
+    	List<String> keys = new ArrayList<String>();
+    	keys.add("key1");
+    	
+        String response = (String)jedis.eval(script, keys);
+        
+        assertEquals("key1", response);        
+    }
+	
+	@Test
+    public void evalInt() {
+    	String script = "return 2";
+    	List<String> keys = new ArrayList<String>();
+    	keys.add("key1");
+    	
+    	Long response = (Long)jedis.eval(script, keys);
+        
+        assertEquals(new Long(2), response);
+    }
+	
+	@Test
+    public void evalNoArgs() {
+    	String script = "return KEYS[1]";
+    	
+    	String response = (String)jedis.eval(script, "key1");
+        
+        assertEquals("key1", response);
+    }
+	
+	@SuppressWarnings("unchecked")
+	@Test
+    public void evalsha() {
+		jedis.set("foo", "bar");
+		jedis.eval("return redis.call('get','foo')");
+		String result = (String)jedis.evalsha("6b1bf486c81ceb7edf3c093f4c48582e38c0e791");
+		
+		assertEquals("bar", result);
+    }
+	
+	@SuppressWarnings("unchecked")
+	@Test(expected=JedisDataException.class)
+    public void evalshaShaNotFound() {
+		Exception result = (Exception)jedis.evalsha("ffffffffffffffffffffffffffffffffffffffff");
+    }
+}