Adding MacOS and Linux (not tested)

This commit is contained in:
Ad5001 2016-11-19 11:16:20 +01:00
parent c86747ecd3
commit 50e722ad61
2 changed files with 228 additions and 18 deletions

View file

@ -20,21 +20,126 @@ use Ad5001\Gitable\Main;
class Dummy { class Linux extends GitClient {
/*
Exec's a git request with defined args
@param $args string
*/
public function gitExec(string $args) : string {
chdir($this->dir);
$process = proc_open(
"git " . $args,
array(
0 => array("pipe", "r"), //S TDIN
1 => array("pipe", "w"), //S TDOUT
2 => array("pipe", "w"), //S TDERR
),
$pipes
);
chdir(DEFAULT_GIT_DIR);
if ($process !== false) {
$stdout = stream_get_contents($pipes[1]);
$stderr = stream_get_contents($pipes[2]);
fclose($pipes[1]);
fclose($pipes[2]);
proc_close($process);
return $stdout . $stderr;
} else {
$stdout = stream_get_contents($pipes[1]);
$stderr = stream_get_contents($pipes[2]);
fclose($pipes[1]);
fclose($pipes[2]);
return "Error while executing command git " . $args . ": $stderr";
}
}
public function __construct(Main $main) { /*
Changes current directory
@param $path string
*/
public function cd(string $path): string {
if(is_dir($this->dir . $path)) {
$this->dir = $this->dir . $path;
$this->dir = realpath($this->dir);
if(substr($this->dir, strlen($this->dir) - 1) !== "/") {
$this->dir .= "/";
}
return "§aPath set to $this->dir";
} elseif(is_dir($path)) {
$this->dir = $path;
$this->dir = realpath($this->dir);
if(substr($this->dir, strlen($this->dir) - 1) !== "/") {
$this->dir .= "/";
}return"§aPath set to $path";
} else {
return "§4Directory $path not found !";
}
}
$this->main = $main; /*
Return all files and dirs from the current directory
*/
public function ls() : string {
chdir($this->dir);
$whereIsCommand = (PHP_OS == 'WINNT') ? 'dir' : 'ls';
$process = proc_open(
"$whereIsCommand",
array(
0 => array("pipe", "r"), //S TDIN
1 => array("pipe", "w"), //S TDOUT
2 => array("pipe", "w"), //S TDERR
),
$p
);
chdir(DEFAULT_GIT_DIR);
if ($process !== false) {
$stdout = stream_get_contents($p[1]);
$stderr = stream_get_contents($p[2]);
fclose($p[1]);
fclose($p[2]);
proc_close($process);
}
return $stdout;
}
$this->server = $main->getServer() /*
Checks if the executable exists.
*/
public function initcheck() {
$this->executable = $this->main->getConfig()->get("executable_path");
$process = proc_open(
"git --version",
array(
0 => array("pipe", "r"), //S TDIN
1 => array("pipe", "w"), //S TDOUT
2 => array("pipe", "w"), //S TDERR
),
$pipes
);
if ($process !== false) {
$stdout = stream_get_contents($pipes[1]);
$stderr = stream_get_contents($pipes[2]);
fclose($pipes[1]);
fclose($pipes[2]);
proc_close($process);
if($stdout == '') {
} $this->main->getLogger()->info("Git error: $stderr");
$this->main->getLogger()->critical("Git doesn't seems to be installed on your Linux computer ! Install it before uing this plugin.");
$this->main->setEnabled(false);
} else {
$this->main->getLogger()->info("Loaded git: $stdout");
}
}
}

View file

@ -20,21 +20,126 @@ use Ad5001\Gitable\Main;
class Dummy { class Mac extends GitClient {
/*
Exec's a git request with defined args
@param $args string
*/
public function gitExec(string $args) : string {
chdir($this->dir);
$process = proc_open(
"git " . $args,
array(
0 => array("pipe", "r"), //S TDIN
1 => array("pipe", "w"), //S TDOUT
2 => array("pipe", "w"), //S TDERR
),
$pipes
);
chdir(DEFAULT_GIT_DIR);
if ($process !== false) {
$stdout = stream_get_contents($pipes[1]);
$stderr = stream_get_contents($pipes[2]);
fclose($pipes[1]);
fclose($pipes[2]);
proc_close($process);
return $stdout . $stderr;
} else {
$stdout = stream_get_contents($pipes[1]);
$stderr = stream_get_contents($pipes[2]);
fclose($pipes[1]);
fclose($pipes[2]);
return "Error while executing command git " . $args . ": $stderr";
}
}
public function __construct(Main $main) { /*
Changes current directory
@param $path string
*/
public function cd(string $path): string {
if(is_dir($this->dir . $path)) {
$this->dir = $this->dir . $path;
$this->dir = realpath($this->dir);
if(substr($this->dir, strlen($this->dir) - 1) !== "/") {
$this->dir .= "/";
}
return "§aPath set to $this->dir";
} elseif(is_dir($path)) {
$this->dir = $path;
$this->dir = realpath($this->dir);
if(substr($this->dir, strlen($this->dir) - 1) !== "/") {
$this->dir .= "/";
}return"§aPath set to $path";
} else {
return "§4Directory $path not found !";
}
}
$this->main = $main; /*
Return all files and dirs from the current directory
*/
public function ls() : string {
chdir($this->dir);
$whereIsCommand = (PHP_OS == 'WINNT') ? 'dir' : 'ls';
$process = proc_open(
"$whereIsCommand",
array(
0 => array("pipe", "r"), //S TDIN
1 => array("pipe", "w"), //S TDOUT
2 => array("pipe", "w"), //S TDERR
),
$p
);
chdir(DEFAULT_GIT_DIR);
if ($process !== false) {
$stdout = stream_get_contents($p[1]);
$stderr = stream_get_contents($p[2]);
fclose($p[1]);
fclose($p[2]);
proc_close($process);
}
return $stdout;
}
$this->server = $main->getServer() /*
Checks if the executable exists.
*/
public function initcheck() {
$this->executable = $this->main->getConfig()->get("executable_path");
$process = proc_open(
"git --version",
array(
0 => array("pipe", "r"), //S TDIN
1 => array("pipe", "w"), //S TDOUT
2 => array("pipe", "w"), //S TDERR
),
$pipes
);
if ($process !== false) {
$stdout = stream_get_contents($pipes[1]);
$stderr = stream_get_contents($pipes[2]);
fclose($pipes[1]);
fclose($pipes[2]);
proc_close($process);
if($stdout == '') {
} $this->main->getLogger()->info("Git error: $stderr");
$this->main->getLogger()->critical("Git doesn't seems to be installed on your MacOS computer ! Install it before uing this plugin.");
$this->main->setEnabled(false);
} else {
$this->main->getLogger()->info("Loaded git: $stdout");
}
}
}