Issue/327 versioning (#345)
* Switch to semver format * Rewrite new version check to use Github Releases and cron * Styling * Remove v from in front of version * New version check test fix * Uncomment test case
This commit is contained in:
parent
092b9fc9dc
commit
e12188b7d3
@ -3,6 +3,7 @@
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Console\Command;
|
||||
use App\Services\VersionService;
|
||||
use Symfony\Component\Yaml\Yaml;
|
||||
|
||||
/**
|
||||
@ -12,23 +13,12 @@ class Version extends Command
|
||||
{
|
||||
protected $signature = 'phpvms:version {--write} {--base-only}';
|
||||
|
||||
/**
|
||||
* Create the version number that gets written out
|
||||
*
|
||||
* @param mixed $cfg
|
||||
*
|
||||
* @return bool|string
|
||||
*/
|
||||
protected function createVersionNumber($cfg)
|
||||
private $versionSvc;
|
||||
|
||||
public function __construct(VersionService $versionSvc)
|
||||
{
|
||||
exec($cfg['git']['git-local'], $version);
|
||||
$version = substr($version[0], 0, $cfg['build']['length']);
|
||||
|
||||
// prefix with the date in YYMMDD format
|
||||
$date = date('ymd');
|
||||
$version = $date.'-'.$version;
|
||||
|
||||
return $version;
|
||||
parent::__construct();
|
||||
$this->versionSvc = $versionSvc;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -38,27 +28,17 @@ class Version extends Command
|
||||
*/
|
||||
public function handle()
|
||||
{
|
||||
$version_file = config_path('version.yml');
|
||||
$cfg = Yaml::parse(file_get_contents($version_file));
|
||||
|
||||
// Get the current build id
|
||||
$build_number = $this->createVersionNumber($cfg);
|
||||
$cfg['build']['number'] = $build_number;
|
||||
|
||||
$c = $cfg['current'];
|
||||
$version = "v{$c['major']}.{$c['minor']}.{$c['patch']}-{$build_number}";
|
||||
|
||||
// Write the updated build number out to the file
|
||||
if ($this->option('write')) {
|
||||
$version_file = config_path('version.yml');
|
||||
$cfg = Yaml::parse(file_get_contents($version_file));
|
||||
$build_number = $this->versionSvc->getBuildId($cfg);
|
||||
$cfg['build']['number'] = $build_number;
|
||||
|
||||
file_put_contents($version_file, Yaml::dump($cfg, 4, 2));
|
||||
}
|
||||
|
||||
// Only show the major.minor.patch version
|
||||
if ($this->option('base-only')) {
|
||||
$version = 'v'.$cfg['current']['major'].'.'
|
||||
.$cfg['current']['minor'].'.'
|
||||
.$cfg['current']['patch'];
|
||||
}
|
||||
|
||||
$version = $this->versionSvc->getCurrentVersion(!$this->option('base-only'));
|
||||
echo $version."\n";
|
||||
}
|
||||
}
|
||||
|
33
app/Cron/Nightly/NewVersionCheck.php
Normal file
33
app/Cron/Nightly/NewVersionCheck.php
Normal file
@ -0,0 +1,33 @@
|
||||
<?php
|
||||
|
||||
namespace App\Cron\Nightly;
|
||||
|
||||
use App\Contracts\Listener;
|
||||
use App\Events\CronNightly;
|
||||
use App\Services\VersionService;
|
||||
|
||||
/**
|
||||
* Determine if any pilots should be set to ON LEAVE status
|
||||
*/
|
||||
class NewVersionCheck extends Listener
|
||||
{
|
||||
private $versionSvc;
|
||||
|
||||
/**
|
||||
* @param VersionService $versionSvc
|
||||
*/
|
||||
public function __construct(VersionService $versionSvc)
|
||||
{
|
||||
$this->versionSvc = $versionSvc;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set any users to being on leave after X days
|
||||
*
|
||||
* @param CronNightly $event
|
||||
*/
|
||||
public function handle(CronNightly $event): void
|
||||
{
|
||||
$this->versionSvc->isNewVersionAvailable();
|
||||
}
|
||||
}
|
@ -12,6 +12,13 @@
|
||||
options: ''
|
||||
type: text
|
||||
description: 'Email where notices, etc are sent'
|
||||
- key: general.check_prerelease_version
|
||||
name: 'Pre-release versions in version check'
|
||||
group: general
|
||||
value: false
|
||||
options: ''
|
||||
type: boolean
|
||||
description: 'Include beta and other pre-release versions when checking for a new version'
|
||||
- key: units.distance
|
||||
name: 'Distance Units'
|
||||
group: units
|
||||
|
@ -3,7 +3,7 @@
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Contracts\Controller;
|
||||
use App\Facades\Utils;
|
||||
use App\Repositories\KvpRepository;
|
||||
use App\Repositories\NewsRepository;
|
||||
use App\Repositories\PirepRepository;
|
||||
use App\Repositories\UserRepository;
|
||||
@ -16,6 +16,7 @@ use vierbergenlars\SemVer\version as semver;
|
||||
|
||||
class DashboardController extends Controller
|
||||
{
|
||||
private $kvpRepo;
|
||||
private $newsRepo;
|
||||
private $pirepRepo;
|
||||
private $userRepo;
|
||||
@ -23,15 +24,18 @@ class DashboardController extends Controller
|
||||
/**
|
||||
* DashboardController constructor.
|
||||
*
|
||||
* @param KvpRepository $kvpRepo
|
||||
* @param NewsRepository $newsRepo
|
||||
* @param PirepRepository $pirepRepo
|
||||
* @param UserRepository $userRepo
|
||||
*/
|
||||
public function __construct(
|
||||
KvpRepository $kvpRepo,
|
||||
NewsRepository $newsRepo,
|
||||
PirepRepository $pirepRepo,
|
||||
UserRepository $userRepo
|
||||
) {
|
||||
$this->kvpRepo = $kvpRepo;
|
||||
$this->newsRepo = $newsRepo;
|
||||
$this->pirepRepo = $pirepRepo;
|
||||
$this->userRepo = $userRepo;
|
||||
@ -47,10 +51,8 @@ class DashboardController extends Controller
|
||||
protected function checkNewVersion()
|
||||
{
|
||||
try {
|
||||
$current_version = new semver(Version::compact());
|
||||
$latest_version = new semver(Utils::downloadUrl(config('phpvms.version_file')));
|
||||
|
||||
if (semver::gt($latest_version, $current_version)) {
|
||||
if ($this->kvpRepo->get('new_version_available', false) === true) {
|
||||
$latest_version = $this->kvpRepo->get('latest_version_tag');
|
||||
Flash::warning('New version '.$latest_version.' is available!');
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
|
@ -2,7 +2,10 @@
|
||||
|
||||
namespace App\Providers;
|
||||
|
||||
use App\Cron\Hourly\RemoveExpiredBids;
|
||||
use App\Cron\Hourly\RemoveExpiredLiveFlights;
|
||||
use App\Cron\Nightly\ApplyExpenses;
|
||||
use App\Cron\Nightly\NewVersionCheck;
|
||||
use App\Cron\Nightly\PilotLeave;
|
||||
use App\Cron\Nightly\RecalculateBalances;
|
||||
use App\Cron\Nightly\RecalculateStats;
|
||||
@ -25,6 +28,7 @@ class CronServiceProvider extends ServiceProvider
|
||||
PilotLeave::class,
|
||||
SetActiveFlights::class,
|
||||
RecalculateStats::class,
|
||||
NewVersionCheck::class,
|
||||
],
|
||||
|
||||
CronWeekly::class => [
|
||||
@ -35,8 +39,8 @@ class CronServiceProvider extends ServiceProvider
|
||||
],
|
||||
|
||||
CronHourly::class => [
|
||||
\App\Cron\Hourly\RemoveExpiredBids::class,
|
||||
\App\Cron\Hourly\RemoveExpiredLiveFlights::class,
|
||||
RemoveExpiredBids::class,
|
||||
RemoveExpiredLiveFlights::class,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
69
app/Repositories/KvpRepository.php
Normal file
69
app/Repositories/KvpRepository.php
Normal file
@ -0,0 +1,69 @@
|
||||
<?php
|
||||
|
||||
namespace App\Repositories;
|
||||
|
||||
use Spatie\Valuestore\Valuestore;
|
||||
|
||||
class KvpRepository
|
||||
{
|
||||
private $valueStore;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->valueStore = Valuestore::make(config('phpvms.kvp_storage_path'));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $key
|
||||
* @param null $default
|
||||
*
|
||||
* @return array|string|null
|
||||
*/
|
||||
public function retrieve($key, $default = null)
|
||||
{
|
||||
return $this->get($key, $default);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a value from the KVP store
|
||||
*
|
||||
* @param string $key
|
||||
* @param mixed $default default value to return
|
||||
*
|
||||
* @return array|string|null
|
||||
*/
|
||||
public function get($key, $default = null)
|
||||
{
|
||||
if (!$this->valueStore->has($key)) {
|
||||
return $default;
|
||||
}
|
||||
|
||||
return $this->valueStore->get($key);
|
||||
}
|
||||
|
||||
/**
|
||||
* @alias store($key,$value)
|
||||
*
|
||||
* @param string $key
|
||||
* @param mixed $value
|
||||
*
|
||||
* @return null
|
||||
*/
|
||||
public function save($key, $value)
|
||||
{
|
||||
return $this->store($key, $value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Save a value to the KVP store
|
||||
*
|
||||
* @param $key
|
||||
* @param $value
|
||||
*
|
||||
* @return null
|
||||
*/
|
||||
public function store($key, $value)
|
||||
{
|
||||
return $this->valueStore->put($key, $value);
|
||||
}
|
||||
}
|
194
app/Services/VersionService.php
Normal file
194
app/Services/VersionService.php
Normal file
@ -0,0 +1,194 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services;
|
||||
|
||||
use App\Contracts\Service;
|
||||
use App\Repositories\KvpRepository;
|
||||
use App\Support\HttpClient;
|
||||
use GuzzleHttp\Exception\GuzzleException;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use SemVer\SemVer\Version;
|
||||
use Symfony\Component\Yaml\Yaml;
|
||||
|
||||
class VersionService extends Service
|
||||
{
|
||||
private $httpClient;
|
||||
private $kvpRepo;
|
||||
|
||||
public function __construct(
|
||||
HttpClient $httpClient,
|
||||
KvpRepository $kvpRepo
|
||||
) {
|
||||
$this->httpClient = $httpClient;
|
||||
$this->kvpRepo = $kvpRepo;
|
||||
}
|
||||
|
||||
/**
|
||||
* Clean the version string (e.,g strip the v in front)
|
||||
*
|
||||
* @param string $version
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
private function cleanVersionString($version): string
|
||||
{
|
||||
if ($version[0] === 'v') {
|
||||
$version = substr($version, 1);
|
||||
}
|
||||
|
||||
return $version;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the latest release version/tag into the KVP repo and return the tag
|
||||
*
|
||||
* @param $version_tag
|
||||
* @param $download_url
|
||||
*
|
||||
* @return string The version string
|
||||
*/
|
||||
private function setLatestRelease($version_tag, $download_url): string
|
||||
{
|
||||
$version_tag = $this->cleanVersionString($version_tag);
|
||||
|
||||
$this->kvpRepo->save('latest_version_tag', $version_tag);
|
||||
$this->kvpRepo->save('latest_version_url', $download_url);
|
||||
|
||||
return $version_tag;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find and return the Github asset line
|
||||
*
|
||||
* @param $release
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
private function getGithubAsset($release): string
|
||||
{
|
||||
foreach ($release['assets'] as $asset) {
|
||||
if ($asset['content_type'] === 'application/gzip') {
|
||||
return $asset['browser_download_url'];
|
||||
}
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
|
||||
/**
|
||||
* Download the latest version from github
|
||||
*/
|
||||
private function getLatestVersionGithub()
|
||||
{
|
||||
$releases = [];
|
||||
|
||||
try {
|
||||
$releases = $this->httpClient->get(config('phpvms.version_file'), [
|
||||
'headers' => [
|
||||
'Accept' => 'application/json',
|
||||
],
|
||||
]);
|
||||
} catch (GuzzleException $e) {
|
||||
Log::error('Error retrieving new version: '.$e->getMessage());
|
||||
}
|
||||
|
||||
$include_prerelease = setting('general.check_prerelease_version', false);
|
||||
foreach ($releases as $release) {
|
||||
if ($release['prerelease'] === true) {
|
||||
if ($include_prerelease) {
|
||||
return $this->setLatestRelease(
|
||||
$release['tag_name'],
|
||||
$this->getGithubAsset($release)
|
||||
);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
return $this->setLatestRelease(
|
||||
$release['tag_name'],
|
||||
$this->getGithubAsset($release)
|
||||
);
|
||||
}
|
||||
|
||||
return $releases;
|
||||
}
|
||||
|
||||
/**
|
||||
* Downloads the latest version and saves it into the KVP store
|
||||
*/
|
||||
public function getLatestVersion()
|
||||
{
|
||||
$latest_version = $this->getLatestVersionGithub();
|
||||
return $latest_version;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the build ID, which is the date and the git log version
|
||||
*
|
||||
* @param array $cfg
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getBuildId($cfg)
|
||||
{
|
||||
exec($cfg['git']['git-local'], $version);
|
||||
$version = substr($version[0], 0, $cfg['build']['length']);
|
||||
|
||||
// prefix with the date in YYMMDD format
|
||||
$date = date('ymd');
|
||||
return $date.'.'.$version;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the current version
|
||||
*
|
||||
* @param bool $include_build True will include the build ID
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getCurrentVersion($include_build = true)
|
||||
{
|
||||
$version_file = config_path('version.yml');
|
||||
$cfg = Yaml::parse(file_get_contents($version_file));
|
||||
|
||||
$c = $cfg['current'];
|
||||
$version = "{$c['major']}.{$c['minor']}.{$c['patch']}";
|
||||
|
||||
if ($include_build) {
|
||||
// Get the current build id
|
||||
$build_number = $this->getBuildId($cfg);
|
||||
$cfg['build']['number'] = $build_number;
|
||||
$version = $version.'+'.$build_number;
|
||||
}
|
||||
|
||||
return $version;
|
||||
}
|
||||
|
||||
/**
|
||||
* See if a new version is available. Saves a flag into the KVP store if there is
|
||||
*
|
||||
* @param null [$current_version]
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isNewVersionAvailable($current_version = null)
|
||||
{
|
||||
if (!$current_version) {
|
||||
$current_version = $this->getCurrentVersion(false);
|
||||
} else {
|
||||
$current_version = $this->cleanVersionString($current_version);
|
||||
}
|
||||
|
||||
$current_version = Version::fromString($current_version);
|
||||
$latest_version = Version::fromString($this->getLatestVersion());
|
||||
|
||||
// Convert to semver
|
||||
if ($latest_version->isGreaterThan($current_version)) {
|
||||
$this->kvpRepo->save('new_version_available', true);
|
||||
return true;
|
||||
}
|
||||
|
||||
$this->kvpRepo->save('new_version_available', false);
|
||||
return false;
|
||||
}
|
||||
}
|
@ -20,7 +20,7 @@ class Http
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function get($uri, array $opts)
|
||||
public static function get($uri, array $opts = [])
|
||||
{
|
||||
$opts = array_merge([
|
||||
'connect_timeout' => 2, // wait two seconds by default
|
||||
|
47
app/Support/HttpClient.php
Normal file
47
app/Support/HttpClient.php
Normal file
@ -0,0 +1,47 @@
|
||||
<?php
|
||||
|
||||
namespace App\Support;
|
||||
|
||||
use GuzzleHttp\Client;
|
||||
|
||||
/**
|
||||
* Helper for HTTP stuff
|
||||
*/
|
||||
class HttpClient
|
||||
{
|
||||
private $httpClient;
|
||||
|
||||
public function __construct(
|
||||
Client $httpClient
|
||||
) {
|
||||
$this->httpClient = $httpClient;
|
||||
}
|
||||
|
||||
/**
|
||||
* Download a URI. If a file is given, it will save the downloaded
|
||||
* content into that file
|
||||
*
|
||||
* @param $uri
|
||||
* @param array $opts
|
||||
*
|
||||
* @throws \GuzzleHttp\Exception\GuzzleException
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function get($uri, array $opts = [])
|
||||
{
|
||||
$opts = array_merge([
|
||||
'connect_timeout' => 2, // wait two seconds by default
|
||||
], $opts);
|
||||
|
||||
$response = $this->httpClient->request('GET', $uri, $opts);
|
||||
|
||||
$body = $response->getBody()->getContents();
|
||||
$content_type = $response->getHeaderLine('content-type');
|
||||
if (strpos($content_type, 'application/json') !== false) {
|
||||
$body = \GuzzleHttp\json_decode($body, true);
|
||||
}
|
||||
|
||||
return $body;
|
||||
}
|
||||
}
|
@ -13,7 +13,6 @@
|
||||
"ext-mbstring": "*",
|
||||
"ext-pdo": "*",
|
||||
"composer/composer": "1.8.*",
|
||||
"composer/semver": "1.4.*",
|
||||
"laravel/framework": "5.8.*",
|
||||
"akaunting/money": "1.0.*",
|
||||
"anhskohbo/no-captcha": "3.0.*",
|
||||
@ -46,12 +45,13 @@
|
||||
"prettus/l5-repository": "2.6.*",
|
||||
"santigarcor/laratrust": "5.2.*",
|
||||
"sebastiaanluca/laravel-helpers": "3.*",
|
||||
"semver/semver": "^1.1",
|
||||
"spatie/laravel-pjax": "1.3.*",
|
||||
"spatie/valuestore": "^1.2",
|
||||
"symfony/polyfill-iconv": "^1.11",
|
||||
"theiconic/php-ga-measurement-protocol": "2.7.*",
|
||||
"tivie/php-os-detector": "1.1.*",
|
||||
"toin0u/geotools-laravel": "1.0.*",
|
||||
"vierbergenlars/php-semver": "3.0.*",
|
||||
"waavi/sanitizer": "1.0.*",
|
||||
"webpatser/laravel-uuid": "3.*"
|
||||
},
|
||||
|
565
composer.lock
generated
565
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@ -57,7 +57,12 @@ return [
|
||||
/*
|
||||
* URL to the latest version file
|
||||
*/
|
||||
'version_file' => 'http://downloads.phpvms.net/VERSION',
|
||||
'version_file' => 'https://api.github.com/repos/nabeelio/phpvms/releases',
|
||||
|
||||
/*
|
||||
* Where the KVP file is stored
|
||||
*/
|
||||
'kvp_storage_path' => storage_path('app/kvp.json'),
|
||||
|
||||
/*
|
||||
* DO NOT CHANGE THESE! It will result in messed up data
|
||||
|
@ -27,4 +27,4 @@ format:
|
||||
build: '{$build}'
|
||||
version: '{$major}.{$minor}.{$patch} (build {$build})'
|
||||
full: 'version {{''format.version''}}'
|
||||
compact: 'v{$major}.{$minor}.{$patch}-{$build}'
|
||||
compact: 'v{$major}.{$minor}.{$patch}+{$build}'
|
||||
|
@ -1,6 +1,11 @@
|
||||
<?php
|
||||
|
||||
use App\Repositories\SettingRepository;
|
||||
use App\Services\DatabaseService;
|
||||
use GuzzleHttp\Client;
|
||||
use GuzzleHttp\Handler\MockHandler;
|
||||
use GuzzleHttp\HandlerStack;
|
||||
use GuzzleHttp\Psr7\Response;
|
||||
use Tests\TestData;
|
||||
|
||||
/**
|
||||
@ -103,6 +108,60 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Read a file from the data directory
|
||||
*
|
||||
* @param $filename
|
||||
*
|
||||
* @return false|string
|
||||
*/
|
||||
public function readDataFile($filename)
|
||||
{
|
||||
$paths = [
|
||||
'data/'.$filename,
|
||||
'tests/data/'.$filename,
|
||||
];
|
||||
|
||||
foreach ($paths as $p) {
|
||||
if (file_exists($p)) {
|
||||
return file_get_contents($p);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a mock Guzzle Client with a response loaded from $mockFile
|
||||
*
|
||||
* @param $mockFile
|
||||
*/
|
||||
public function mockGuzzleClient($mockFile): void
|
||||
{
|
||||
$mock = new MockHandler([
|
||||
new Response(200,
|
||||
[
|
||||
'Content-Type' => 'application/json; charset=utf-8',
|
||||
],
|
||||
$this->readDataFile($mockFile)
|
||||
),
|
||||
]);
|
||||
|
||||
$handler = HandlerStack::create($mock);
|
||||
$guzzleClient = new Client(['handler' => $handler]);
|
||||
app()->instance(Client::class, $guzzleClient);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update a setting
|
||||
*
|
||||
* @param $key
|
||||
* @param $value
|
||||
*/
|
||||
public function updateSetting($key, $value)
|
||||
{
|
||||
$settingsRepo = app(SettingRepository::class);
|
||||
$settingsRepo->store($key, $value);
|
||||
}
|
||||
|
||||
/**
|
||||
* So we can test private/protected methods
|
||||
* http://bit.ly/1mr5hMq
|
||||
|
78
tests/VersionTest.php
Normal file
78
tests/VersionTest.php
Normal file
@ -0,0 +1,78 @@
|
||||
<?php
|
||||
|
||||
use App\Repositories\KvpRepository;
|
||||
use App\Services\VersionService;
|
||||
|
||||
class VersionTest extends TestCase
|
||||
{
|
||||
private $kvpRepo;
|
||||
|
||||
public function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
$this->kvpRepo = app(KvpRepository::class);
|
||||
}
|
||||
|
||||
public function testGetLatestVersion()
|
||||
{
|
||||
setting('general.check_prerelease_version', false);
|
||||
|
||||
$this->mockGuzzleClient('releases.json');
|
||||
$versionSvc = app(VersionService::class);
|
||||
|
||||
$str = $versionSvc->getLatestVersion();
|
||||
|
||||
$this->assertEquals('7.0.0-alpha2', $str);
|
||||
$this->assertEquals('7.0.0-alpha2', $this->kvpRepo->get('latest_version_tag'));
|
||||
}
|
||||
|
||||
public function testGetLatestPrereleaseVersion()
|
||||
{
|
||||
$this->updateSetting('general.check_prerelease_version', true);
|
||||
|
||||
$this->mockGuzzleClient('releases.json');
|
||||
$versionSvc = app(VersionService::class);
|
||||
|
||||
$str = $versionSvc->getLatestVersion();
|
||||
|
||||
$this->assertEquals('7.0.0-beta', $str);
|
||||
$this->assertEquals('7.0.0-beta', $this->kvpRepo->get('latest_version_tag'));
|
||||
}
|
||||
|
||||
public function testNewVersionNotAvailable()
|
||||
{
|
||||
$this->updateSetting('general.check_prerelease_version', false);
|
||||
|
||||
$versions = [
|
||||
'v7.0.0',
|
||||
'7.0.0',
|
||||
'8.0.0',
|
||||
'7.0.0-beta',
|
||||
'7.0.0+buildid',
|
||||
];
|
||||
|
||||
foreach ($versions as $v) {
|
||||
$this->mockGuzzleClient('releases.json');
|
||||
$versionSvc = app(VersionService::class);
|
||||
$this->assertFalse($versionSvc->isNewVersionAvailable($v));
|
||||
}
|
||||
}
|
||||
|
||||
public function testNewVersionIsAvailable()
|
||||
{
|
||||
$this->updateSetting('general.check_prerelease_version', true);
|
||||
|
||||
$versions = [
|
||||
'v6.0.1',
|
||||
'6.0.0',
|
||||
'7.0.0-alpha',
|
||||
];
|
||||
|
||||
foreach ($versions as $v) {
|
||||
$this->mockGuzzleClient('releases.json');
|
||||
$versionSvc = app(VersionService::class);
|
||||
$this->assertTrue($versionSvc->isNewVersionAvailable($v));
|
||||
}
|
||||
}
|
||||
}
|
360
tests/data/releases.json
Normal file
360
tests/data/releases.json
Normal file
@ -0,0 +1,360 @@
|
||||
[
|
||||
{
|
||||
"url": "https://api.github.com/repos/nabeelio/phpvms/releases/13667336",
|
||||
"assets_url": "https://api.github.com/repos/nabeelio/phpvms/releases/13667336/assets",
|
||||
"upload_url": "https://uploads.github.com/repos/nabeelio/phpvms/releases/13667336/assets{?name,label}",
|
||||
"html_url": "https://github.com/nabeelio/phpvms/releases/tag/v7.0.0-beta",
|
||||
"id": 13667336,
|
||||
"node_id": "MDc6UmVsZWFzZTEzNjY3MzM2",
|
||||
"tag_name": "v7.0.0-beta",
|
||||
"target_commitish": "master",
|
||||
"name": "",
|
||||
"draft": false,
|
||||
"author": {
|
||||
"login": "nabeelio",
|
||||
"id": 99736,
|
||||
"node_id": "MDQ6VXNlcjk5NzM2",
|
||||
"avatar_url": "https://avatars2.githubusercontent.com/u/99736?v=4",
|
||||
"gravatar_id": "",
|
||||
"url": "https://api.github.com/users/nabeelio",
|
||||
"html_url": "https://github.com/nabeelio",
|
||||
"followers_url": "https://api.github.com/users/nabeelio/followers",
|
||||
"following_url": "https://api.github.com/users/nabeelio/following{/other_user}",
|
||||
"gists_url": "https://api.github.com/users/nabeelio/gists{/gist_id}",
|
||||
"starred_url": "https://api.github.com/users/nabeelio/starred{/owner}{/repo}",
|
||||
"subscriptions_url": "https://api.github.com/users/nabeelio/subscriptions",
|
||||
"organizations_url": "https://api.github.com/users/nabeelio/orgs",
|
||||
"repos_url": "https://api.github.com/users/nabeelio/repos",
|
||||
"events_url": "https://api.github.com/users/nabeelio/events{/privacy}",
|
||||
"received_events_url": "https://api.github.com/users/nabeelio/received_events",
|
||||
"type": "User",
|
||||
"site_admin": false
|
||||
},
|
||||
"prerelease": true,
|
||||
"created_at": "2018-10-25T23:12:08Z",
|
||||
"published_at": "2018-10-25T23:21:26Z",
|
||||
"assets": [
|
||||
{
|
||||
"url": "https://api.github.com/repos/nabeelio/phpvms/releases/assets/9415556",
|
||||
"id": 9415556,
|
||||
"node_id": "MDEyOlJlbGVhc2VBc3NldDk0MTU1NTY=",
|
||||
"name": "phpvms-v7.0.0-beta.tar.gz",
|
||||
"label": "",
|
||||
"uploader": {
|
||||
"login": "nabeelio",
|
||||
"id": 99736,
|
||||
"node_id": "MDQ6VXNlcjk5NzM2",
|
||||
"avatar_url": "https://avatars2.githubusercontent.com/u/99736?v=4",
|
||||
"gravatar_id": "",
|
||||
"url": "https://api.github.com/users/nabeelio",
|
||||
"html_url": "https://github.com/nabeelio",
|
||||
"followers_url": "https://api.github.com/users/nabeelio/followers",
|
||||
"following_url": "https://api.github.com/users/nabeelio/following{/other_user}",
|
||||
"gists_url": "https://api.github.com/users/nabeelio/gists{/gist_id}",
|
||||
"starred_url": "https://api.github.com/users/nabeelio/starred{/owner}{/repo}",
|
||||
"subscriptions_url": "https://api.github.com/users/nabeelio/subscriptions",
|
||||
"organizations_url": "https://api.github.com/users/nabeelio/orgs",
|
||||
"repos_url": "https://api.github.com/users/nabeelio/repos",
|
||||
"events_url": "https://api.github.com/users/nabeelio/events{/privacy}",
|
||||
"received_events_url": "https://api.github.com/users/nabeelio/received_events",
|
||||
"type": "User",
|
||||
"site_admin": false
|
||||
},
|
||||
"content_type": "application/gzip",
|
||||
"state": "uploaded",
|
||||
"size": 15567950,
|
||||
"download_count": 1503,
|
||||
"created_at": "2018-10-25T23:21:25Z",
|
||||
"updated_at": "2018-10-25T23:21:26Z",
|
||||
"browser_download_url": "https://github.com/nabeelio/phpvms/releases/download/v7.0.0-beta/phpvms-v7.0.0-beta.tar.gz"
|
||||
},
|
||||
{
|
||||
"url": "https://api.github.com/repos/nabeelio/phpvms/releases/assets/9415555",
|
||||
"id": 9415555,
|
||||
"node_id": "MDEyOlJlbGVhc2VBc3NldDk0MTU1NTU=",
|
||||
"name": "phpvms-v7.0.0-beta.tar.gz.sha256",
|
||||
"label": "",
|
||||
"uploader": {
|
||||
"login": "nabeelio",
|
||||
"id": 99736,
|
||||
"node_id": "MDQ6VXNlcjk5NzM2",
|
||||
"avatar_url": "https://avatars2.githubusercontent.com/u/99736?v=4",
|
||||
"gravatar_id": "",
|
||||
"url": "https://api.github.com/users/nabeelio",
|
||||
"html_url": "https://github.com/nabeelio",
|
||||
"followers_url": "https://api.github.com/users/nabeelio/followers",
|
||||
"following_url": "https://api.github.com/users/nabeelio/following{/other_user}",
|
||||
"gists_url": "https://api.github.com/users/nabeelio/gists{/gist_id}",
|
||||
"starred_url": "https://api.github.com/users/nabeelio/starred{/owner}{/repo}",
|
||||
"subscriptions_url": "https://api.github.com/users/nabeelio/subscriptions",
|
||||
"organizations_url": "https://api.github.com/users/nabeelio/orgs",
|
||||
"repos_url": "https://api.github.com/users/nabeelio/repos",
|
||||
"events_url": "https://api.github.com/users/nabeelio/events{/privacy}",
|
||||
"received_events_url": "https://api.github.com/users/nabeelio/received_events",
|
||||
"type": "User",
|
||||
"site_admin": false
|
||||
},
|
||||
"content_type": "application/octet-stream",
|
||||
"state": "uploaded",
|
||||
"size": 92,
|
||||
"download_count": 174,
|
||||
"created_at": "2018-10-25T23:21:24Z",
|
||||
"updated_at": "2018-10-25T23:21:24Z",
|
||||
"browser_download_url": "https://github.com/nabeelio/phpvms/releases/download/v7.0.0-beta/phpvms-v7.0.0-beta.tar.gz.sha256"
|
||||
},
|
||||
{
|
||||
"url": "https://api.github.com/repos/nabeelio/phpvms/releases/assets/9415554",
|
||||
"id": 9415554,
|
||||
"node_id": "MDEyOlJlbGVhc2VBc3NldDk0MTU1NTQ=",
|
||||
"name": "release_version",
|
||||
"label": "",
|
||||
"uploader": {
|
||||
"login": "nabeelio",
|
||||
"id": 99736,
|
||||
"node_id": "MDQ6VXNlcjk5NzM2",
|
||||
"avatar_url": "https://avatars2.githubusercontent.com/u/99736?v=4",
|
||||
"gravatar_id": "",
|
||||
"url": "https://api.github.com/users/nabeelio",
|
||||
"html_url": "https://github.com/nabeelio",
|
||||
"followers_url": "https://api.github.com/users/nabeelio/followers",
|
||||
"following_url": "https://api.github.com/users/nabeelio/following{/other_user}",
|
||||
"gists_url": "https://api.github.com/users/nabeelio/gists{/gist_id}",
|
||||
"starred_url": "https://api.github.com/users/nabeelio/starred{/owner}{/repo}",
|
||||
"subscriptions_url": "https://api.github.com/users/nabeelio/subscriptions",
|
||||
"organizations_url": "https://api.github.com/users/nabeelio/orgs",
|
||||
"repos_url": "https://api.github.com/users/nabeelio/repos",
|
||||
"events_url": "https://api.github.com/users/nabeelio/events{/privacy}",
|
||||
"received_events_url": "https://api.github.com/users/nabeelio/received_events",
|
||||
"type": "User",
|
||||
"site_admin": false
|
||||
},
|
||||
"content_type": "application/octet-stream",
|
||||
"state": "uploaded",
|
||||
"size": 21,
|
||||
"download_count": 630,
|
||||
"created_at": "2018-10-25T23:21:23Z",
|
||||
"updated_at": "2018-10-25T23:21:23Z",
|
||||
"browser_download_url": "https://github.com/nabeelio/phpvms/releases/download/v7.0.0-beta/release_version"
|
||||
}
|
||||
],
|
||||
"tarball_url": "https://api.github.com/repos/nabeelio/phpvms/tarball/v7.0.0-beta",
|
||||
"zipball_url": "https://api.github.com/repos/nabeelio/phpvms/zipball/v7.0.0-beta",
|
||||
"body": ""
|
||||
},
|
||||
{
|
||||
"url": "https://api.github.com/repos/nabeelio/phpvms/releases/9810818",
|
||||
"assets_url": "https://api.github.com/repos/nabeelio/phpvms/releases/9810818/assets",
|
||||
"upload_url": "https://uploads.github.com/repos/nabeelio/phpvms/releases/9810818/assets{?name,label}",
|
||||
"html_url": "https://github.com/nabeelio/phpvms/releases/tag/v7.0.0-alpha2",
|
||||
"id": 9810818,
|
||||
"node_id": "MDc6UmVsZWFzZTk4MTA4MTg=",
|
||||
"tag_name": "v7.0.0-alpha2",
|
||||
"target_commitish": "master",
|
||||
"name": null,
|
||||
"draft": false,
|
||||
"author": {
|
||||
"login": "nabeelio",
|
||||
"id": 99736,
|
||||
"node_id": "MDQ6VXNlcjk5NzM2",
|
||||
"avatar_url": "https://avatars2.githubusercontent.com/u/99736?v=4",
|
||||
"gravatar_id": "",
|
||||
"url": "https://api.github.com/users/nabeelio",
|
||||
"html_url": "https://github.com/nabeelio",
|
||||
"followers_url": "https://api.github.com/users/nabeelio/followers",
|
||||
"following_url": "https://api.github.com/users/nabeelio/following{/other_user}",
|
||||
"gists_url": "https://api.github.com/users/nabeelio/gists{/gist_id}",
|
||||
"starred_url": "https://api.github.com/users/nabeelio/starred{/owner}{/repo}",
|
||||
"subscriptions_url": "https://api.github.com/users/nabeelio/subscriptions",
|
||||
"organizations_url": "https://api.github.com/users/nabeelio/orgs",
|
||||
"repos_url": "https://api.github.com/users/nabeelio/repos",
|
||||
"events_url": "https://api.github.com/users/nabeelio/events{/privacy}",
|
||||
"received_events_url": "https://api.github.com/users/nabeelio/received_events",
|
||||
"type": "User",
|
||||
"site_admin": false
|
||||
},
|
||||
"prerelease": false,
|
||||
"created_at": "2018-02-23T17:48:28Z",
|
||||
"published_at": "2018-02-23T17:57:13Z",
|
||||
"assets": [
|
||||
{
|
||||
"url": "https://api.github.com/repos/nabeelio/phpvms/releases/assets/6307893",
|
||||
"id": 6307893,
|
||||
"node_id": "MDEyOlJlbGVhc2VBc3NldDYzMDc4OTM=",
|
||||
"name": "phpvms-v7.0.0-alpha2.tar.gz",
|
||||
"label": "",
|
||||
"uploader": {
|
||||
"login": "nabeelio",
|
||||
"id": 99736,
|
||||
"node_id": "MDQ6VXNlcjk5NzM2",
|
||||
"avatar_url": "https://avatars2.githubusercontent.com/u/99736?v=4",
|
||||
"gravatar_id": "",
|
||||
"url": "https://api.github.com/users/nabeelio",
|
||||
"html_url": "https://github.com/nabeelio",
|
||||
"followers_url": "https://api.github.com/users/nabeelio/followers",
|
||||
"following_url": "https://api.github.com/users/nabeelio/following{/other_user}",
|
||||
"gists_url": "https://api.github.com/users/nabeelio/gists{/gist_id}",
|
||||
"starred_url": "https://api.github.com/users/nabeelio/starred{/owner}{/repo}",
|
||||
"subscriptions_url": "https://api.github.com/users/nabeelio/subscriptions",
|
||||
"organizations_url": "https://api.github.com/users/nabeelio/orgs",
|
||||
"repos_url": "https://api.github.com/users/nabeelio/repos",
|
||||
"events_url": "https://api.github.com/users/nabeelio/events{/privacy}",
|
||||
"received_events_url": "https://api.github.com/users/nabeelio/received_events",
|
||||
"type": "User",
|
||||
"site_admin": false
|
||||
},
|
||||
"content_type": "application/gzip",
|
||||
"state": "uploaded",
|
||||
"size": 13122744,
|
||||
"download_count": 1522,
|
||||
"created_at": "2018-02-23T17:57:12Z",
|
||||
"updated_at": "2018-02-23T17:57:13Z",
|
||||
"browser_download_url": "https://github.com/nabeelio/phpvms/releases/download/v7.0.0-alpha2/phpvms-v7.0.0-alpha2.tar.gz"
|
||||
},
|
||||
{
|
||||
"url": "https://api.github.com/repos/nabeelio/phpvms/releases/assets/6307896",
|
||||
"id": 6307896,
|
||||
"node_id": "MDEyOlJlbGVhc2VBc3NldDYzMDc4OTY=",
|
||||
"name": "phpvms-v7.0.0-alpha2.tar.gz.sha256",
|
||||
"label": "",
|
||||
"uploader": {
|
||||
"login": "nabeelio",
|
||||
"id": 99736,
|
||||
"node_id": "MDQ6VXNlcjk5NzM2",
|
||||
"avatar_url": "https://avatars2.githubusercontent.com/u/99736?v=4",
|
||||
"gravatar_id": "",
|
||||
"url": "https://api.github.com/users/nabeelio",
|
||||
"html_url": "https://github.com/nabeelio",
|
||||
"followers_url": "https://api.github.com/users/nabeelio/followers",
|
||||
"following_url": "https://api.github.com/users/nabeelio/following{/other_user}",
|
||||
"gists_url": "https://api.github.com/users/nabeelio/gists{/gist_id}",
|
||||
"starred_url": "https://api.github.com/users/nabeelio/starred{/owner}{/repo}",
|
||||
"subscriptions_url": "https://api.github.com/users/nabeelio/subscriptions",
|
||||
"organizations_url": "https://api.github.com/users/nabeelio/orgs",
|
||||
"repos_url": "https://api.github.com/users/nabeelio/repos",
|
||||
"events_url": "https://api.github.com/users/nabeelio/events{/privacy}",
|
||||
"received_events_url": "https://api.github.com/users/nabeelio/received_events",
|
||||
"type": "User",
|
||||
"site_admin": false
|
||||
},
|
||||
"content_type": "application/octet-stream",
|
||||
"state": "uploaded",
|
||||
"size": 94,
|
||||
"download_count": 209,
|
||||
"created_at": "2018-02-23T17:57:13Z",
|
||||
"updated_at": "2018-02-23T17:57:13Z",
|
||||
"browser_download_url": "https://github.com/nabeelio/phpvms/releases/download/v7.0.0-alpha2/phpvms-v7.0.0-alpha2.tar.gz.sha256"
|
||||
}
|
||||
],
|
||||
"tarball_url": "https://api.github.com/repos/nabeelio/phpvms/tarball/v7.0.0-alpha2",
|
||||
"zipball_url": "https://api.github.com/repos/nabeelio/phpvms/zipball/v7.0.0-alpha2",
|
||||
"body": null
|
||||
},
|
||||
{
|
||||
"url": "https://api.github.com/repos/nabeelio/phpvms/releases/9526184",
|
||||
"assets_url": "https://api.github.com/repos/nabeelio/phpvms/releases/9526184/assets",
|
||||
"upload_url": "https://uploads.github.com/repos/nabeelio/phpvms/releases/9526184/assets{?name,label}",
|
||||
"html_url": "https://github.com/nabeelio/phpvms/releases/tag/v7.0.0-alpha1",
|
||||
"id": 9526184,
|
||||
"node_id": "MDc6UmVsZWFzZTk1MjYxODQ=",
|
||||
"tag_name": "v7.0.0-alpha1",
|
||||
"target_commitish": "master",
|
||||
"name": null,
|
||||
"draft": false,
|
||||
"author": {
|
||||
"login": "nabeelio",
|
||||
"id": 99736,
|
||||
"node_id": "MDQ6VXNlcjk5NzM2",
|
||||
"avatar_url": "https://avatars2.githubusercontent.com/u/99736?v=4",
|
||||
"gravatar_id": "",
|
||||
"url": "https://api.github.com/users/nabeelio",
|
||||
"html_url": "https://github.com/nabeelio",
|
||||
"followers_url": "https://api.github.com/users/nabeelio/followers",
|
||||
"following_url": "https://api.github.com/users/nabeelio/following{/other_user}",
|
||||
"gists_url": "https://api.github.com/users/nabeelio/gists{/gist_id}",
|
||||
"starred_url": "https://api.github.com/users/nabeelio/starred{/owner}{/repo}",
|
||||
"subscriptions_url": "https://api.github.com/users/nabeelio/subscriptions",
|
||||
"organizations_url": "https://api.github.com/users/nabeelio/orgs",
|
||||
"repos_url": "https://api.github.com/users/nabeelio/repos",
|
||||
"events_url": "https://api.github.com/users/nabeelio/events{/privacy}",
|
||||
"received_events_url": "https://api.github.com/users/nabeelio/received_events",
|
||||
"type": "User",
|
||||
"site_admin": false
|
||||
},
|
||||
"prerelease": false,
|
||||
"created_at": "2018-02-04T18:49:50Z",
|
||||
"published_at": "2018-02-04T18:55:52Z",
|
||||
"assets": [
|
||||
{
|
||||
"url": "https://api.github.com/repos/nabeelio/phpvms/releases/assets/6096096",
|
||||
"id": 6096096,
|
||||
"node_id": "MDEyOlJlbGVhc2VBc3NldDYwOTYwOTY=",
|
||||
"name": "phpvms-v7.0.0-alpha1.tar.gz",
|
||||
"label": "",
|
||||
"uploader": {
|
||||
"login": "nabeelio",
|
||||
"id": 99736,
|
||||
"node_id": "MDQ6VXNlcjk5NzM2",
|
||||
"avatar_url": "https://avatars2.githubusercontent.com/u/99736?v=4",
|
||||
"gravatar_id": "",
|
||||
"url": "https://api.github.com/users/nabeelio",
|
||||
"html_url": "https://github.com/nabeelio",
|
||||
"followers_url": "https://api.github.com/users/nabeelio/followers",
|
||||
"following_url": "https://api.github.com/users/nabeelio/following{/other_user}",
|
||||
"gists_url": "https://api.github.com/users/nabeelio/gists{/gist_id}",
|
||||
"starred_url": "https://api.github.com/users/nabeelio/starred{/owner}{/repo}",
|
||||
"subscriptions_url": "https://api.github.com/users/nabeelio/subscriptions",
|
||||
"organizations_url": "https://api.github.com/users/nabeelio/orgs",
|
||||
"repos_url": "https://api.github.com/users/nabeelio/repos",
|
||||
"events_url": "https://api.github.com/users/nabeelio/events{/privacy}",
|
||||
"received_events_url": "https://api.github.com/users/nabeelio/received_events",
|
||||
"type": "User",
|
||||
"site_admin": false
|
||||
},
|
||||
"content_type": "application/gzip",
|
||||
"state": "uploaded",
|
||||
"size": 13926978,
|
||||
"download_count": 289,
|
||||
"created_at": "2018-02-04T18:55:50Z",
|
||||
"updated_at": "2018-02-04T18:55:51Z",
|
||||
"browser_download_url": "https://github.com/nabeelio/phpvms/releases/download/v7.0.0-alpha1/phpvms-v7.0.0-alpha1.tar.gz"
|
||||
},
|
||||
{
|
||||
"url": "https://api.github.com/repos/nabeelio/phpvms/releases/assets/6096097",
|
||||
"id": 6096097,
|
||||
"node_id": "MDEyOlJlbGVhc2VBc3NldDYwOTYwOTc=",
|
||||
"name": "phpvms-v7.0.0-alpha1.tar.gz.sha256",
|
||||
"label": "",
|
||||
"uploader": {
|
||||
"login": "nabeelio",
|
||||
"id": 99736,
|
||||
"node_id": "MDQ6VXNlcjk5NzM2",
|
||||
"avatar_url": "https://avatars2.githubusercontent.com/u/99736?v=4",
|
||||
"gravatar_id": "",
|
||||
"url": "https://api.github.com/users/nabeelio",
|
||||
"html_url": "https://github.com/nabeelio",
|
||||
"followers_url": "https://api.github.com/users/nabeelio/followers",
|
||||
"following_url": "https://api.github.com/users/nabeelio/following{/other_user}",
|
||||
"gists_url": "https://api.github.com/users/nabeelio/gists{/gist_id}",
|
||||
"starred_url": "https://api.github.com/users/nabeelio/starred{/owner}{/repo}",
|
||||
"subscriptions_url": "https://api.github.com/users/nabeelio/subscriptions",
|
||||
"organizations_url": "https://api.github.com/users/nabeelio/orgs",
|
||||
"repos_url": "https://api.github.com/users/nabeelio/repos",
|
||||
"events_url": "https://api.github.com/users/nabeelio/events{/privacy}",
|
||||
"received_events_url": "https://api.github.com/users/nabeelio/received_events",
|
||||
"type": "User",
|
||||
"site_admin": false
|
||||
},
|
||||
"content_type": "application/octet-stream",
|
||||
"state": "uploaded",
|
||||
"size": 94,
|
||||
"download_count": 44,
|
||||
"created_at": "2018-02-04T18:55:52Z",
|
||||
"updated_at": "2018-02-04T18:55:52Z",
|
||||
"browser_download_url": "https://github.com/nabeelio/phpvms/releases/download/v7.0.0-alpha1/phpvms-v7.0.0-alpha1.tar.gz.sha256"
|
||||
}
|
||||
],
|
||||
"tarball_url": "https://api.github.com/repos/nabeelio/phpvms/tarball/v7.0.0-alpha1",
|
||||
"zipball_url": "https://api.github.com/repos/nabeelio/phpvms/zipball/v7.0.0-alpha1",
|
||||
"body": null
|
||||
}
|
||||
]
|
Loading…
Reference in New Issue
Block a user