Merge branch 'rsync_and_run_local'

Author: tamagokun

lib/Pomander.php

@@ -80,7 +80,7 @@ function run()
 	$cmd = implode(" && ",$cmd);
 	$app = builder()->get_application();
 
-	list($status, $output) = !isset($app->env)? exec_cmd($cmd) : $app->env->exec($cmd);
+	list($status, $output) = !isset($app->env)? run_local($cmd) : $app->env->exec($cmd);
 	if(!$silent && count($output)) puts(implode("\n", $output));
 
 	if($status > 0)
@@ -98,23 +98,29 @@ function run()
 	return $output;
 }
 
-function exec_cmd($cmd)
+function run_local($cmd)
 {
 	$cmd = is_array($cmd)? implode(" && ",$cmd) : $cmd;
 	exec($cmd, $output, $status);
-	return array($status, $output);	
+	return array($status, $output);
+}
+
+// Deprecated: use run_local()
+function exec_cmd($cmd)
+{
+	return run_local($cmd);
 }
 
 function put($what,$where)
 {
 	if(!isset(builder()->get_application()->env))
-		return exec_cmd("cp -R $what $where");
+		return run_local("cp -R $what $where");
 	builder()->get_application()->env->put($what,$where);
 }
 
 function get($what,$where)
 {
 	if(!isset(builder()->get_application()->env))
-		return exec_cmd("cp -R $what $where");
+		return run_local("cp -R $what $where");
 	builder()->get_application()->env->get($what,$where);
 }

lib/Pomander/Environment.php

@@ -115,7 +115,7 @@ public function multi_role_support($role,$app)
 
 	public function exec($cmd)
 	{
-		if(!$this->target) return exec_cmd($cmd);
+		if(!$this->target) return run_local($cmd);
 		if(!$this->shell)
 		{
 			$keypass = $this->key_password;
@@ -129,19 +129,19 @@ public function exec($cmd)
 	public function put($what,$where)
 	{
 		if($this->target)
-			$cmd = "{$this->rsync_cmd} {$this->rsync_flags} $what {$this->user}@{$this->target}:$where";
+			$cmd = "{$this->rsync_cmd} -e \"ssh -i {$this->key_path}\" {$this->rsync_flags} $what {$this->user}@{$this->target}:$where";
 		else
 			$cmd = "cp -r $what $where";
-		return exec_cmd($cmd);
+		return run_local($cmd);
 	}
 
 	public function get($what,$where)
 	{
 		if($this->target)
-			$cmd = "{$this->rsync_cmd} {$this->rsync_flags} {$this->user}@{$this->target}:$what $where";
+			$cmd = "{$this->rsync_cmd} -e \"ssh -i {$this->key_path}\" {$this->rsync_flags} {$this->user}@{$this->target}:$what $where";
 		else
 			$cmd = "cp -r $what $where";
-		return exec_cmd($cmd);
+		return run_local($cmd);
 	}
 
 	private function defaults()

lib/tasks/default.php

@@ -218,7 +218,7 @@
 desc("Set it up");
 task('init', function($app) {
 	info("init","Creating deploy directory");
-	exec_cmd("mkdir -p ./deploy");
+	run_local("mkdir -p ./deploy");
 	info("init","Creating development configuration");
 	$app->invoke("config");
 	info("init","Done!");