Skip to content
This repository has been archived by the owner on Feb 27, 2024. It is now read-only.

Feature/ask GitHub api for commits #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/ask GitHub api for commits #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70d499a
[FEATURE] Ask github api for commits if we have no local .git directory.
Mar 16, 2017
c74ae01
[FEATURE] Add newline for more readable output
Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 45 additions & 12 deletions src/BaseCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ protected function packagePaths()
/**
* Return an array with lockFrom, lockTo, and rangeArg
*/
protected function getGitArguments(InputInterface $input, OutputInterface $output)
protected function getGitArguments(InputInterface $input, OutputInterface $output)
{
$from = $input->getArgument('sha-from');
$to = $input->getArgument('sha-to');
Expand Down Expand Up @@ -69,7 +69,7 @@ protected function getGitArguments(InputInterface $input, OutputInterface $outpu
$rangeArg = escapeshellarg("$from..$to");
} else {
$rangeArg = escapeshellarg("$from");
}
}

return array($lockFrom, $lockTo, $rangeArg);
}
Expand Down Expand Up @@ -105,6 +105,7 @@ protected function reposFromLockfile($lockContent)
protected function exec($argument, InputInterface $input, OutputInterface $output)
{
list($lockFrom, $lockTo, $rangeArg) = $this->getGitArguments($input, $output);

$output->writeln("<info>Project differences</info>");

$cmdProcess = new Process("git $argument $rangeArg");
Expand All @@ -126,15 +127,47 @@ protected function exec($argument, InputInterface $input, OutputInterface $outpu
$path = $packagePaths[$package];

$output->writeln("<info>$package in $path</info>");
if (!is_dir("$path/.git")) {
$output->writeln('<comment>Not a .git repo</comment>'.PHP_EOL);
continue;
}

$gitDirArg = escapeshellarg("--git-dir=$path/.git");
$shaArg = escapeshellarg($reposFrom[$package]['reference'] . '..' . $info['reference']);
$cmd = "git $gitDirArg $argument $shaArg";
$this->runCommand($cmd, $gitDirArg, $output);
if (!is_dir("$path/.git")) {
// check for github
if (preg_match('|https://github.com/([^/]+)/([^/]+).git|',$info['url'],$match)) {
// take commit message from the github api
$compareUrl = 'https://api.github.com/repos/'.$match[1].'/'.$match[2].'/compare/'.$reposFrom[$package]['reference'].'...'. $info['reference'];

$ch = curl_init();
curl_setopt($ch, CURLOPT_HTTPHEADER, array('Accept: application/vnd.github.v3+json','User-Agent: https://github.com/mtheunissen82/composer-diff'));
#curl_setopt($ch, CURLOPT_USERPWD, 'test:test' );
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_URL, $compareUrl );
$result = curl_exec($ch);

$compare = json_decode($result);
if (isset($compare->commits) && is_array($compare->commits)) {
foreach ($compare->commits as $commit) {
// take first line from commit message
$output->writeln(strtok($commit->commit->message,"\n"));
}
$output->writeln('');
} else {
$output->writeln("<error>Error reading commits from github " . $compareUrl . "</error>");
if ($compare && isset($compare->message)) {
// error message from github (authentication, rate limiting)
$output->writeln("<error>" . trim($compare->message) . "</error>" . PHP_EOL);
} else {
// general error
$output->writeln("<error>" . trim($result) . "</error>" . PHP_EOL);
}
}
} else {
// @TODO maybe ask packagist
$output->writeln('<comment>Not a .git repo</comment>'.PHP_EOL);
continue;
}
} else {
$gitDirArg = escapeshellarg("--git-dir=$path/.git");
$shaArg = escapeshellarg($reposFrom[$package]['reference'] . '..' . $info['reference']);
$cmd = "git $gitDirArg $argument $shaArg";
$this->runCommand($cmd, $gitDirArg, $output);
}
}
}
}
Expand Down Expand Up @@ -166,4 +199,4 @@ protected function runCommand($cmd, $gitDirArg, OutputInterface $output)
}
$output->writeln(trim($diff->getOutput()) . PHP_EOL);
}
}
}