Merge pull request #28 from creative-commoners/pulls/1.0/semver

 API Remove Packagist API and use Composer to determine recommended andd latest updates

.travis.yml

@@ -14,7 +14,7 @@ matrix:
       env: DB=PGSQL CORE_RELEASE=3.6
     - php: 7.1
       env: DB=PGSQL CORE_RELEASE=3.6
-    - php: 7.2
+    - php: 7.1
       env: DB=MYSQL CORE_RELEASE=3
 
 before_script:

_config/extensions.yml

@@ -4,3 +4,7 @@ Name: updatecheckerextensions
 Package:
   extensions:
     - BringYourOwnIdeas\UpdateChecker\Extensions\ComposerUpdateExtension
+
+BringYourOwnIdeas\Maintenance\Util\ComposerLoader:
+  extensions:
+    - BringYourOwnIdeas\UpdateChecker\Extensions\ComposerLoaderExtension

composer.json

@@ -31,11 +31,11 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.6.0",
-        "silverstripe/framework": "^3.1",
+        "php": "^5.6 || ~7.0.0 || ~7.1.0",
+        "composer/composer": "^1",
+        "silverstripe/framework": "^3.2",
         "symbiote/silverstripe-queuedjobs": "^2.8",
-        "knplabs/packagist-api": "^1.1",
-        "friendsofsilverstripe/silverstripe-maintenance": "^0.3"
+        "bringyourownideas/silverstripe-maintenance": "^1@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",

src/Extensions/ComposerLoaderExtension.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace BringYourOwnIdeas\UpdateChecker\Extensions;
+
+use Composer\Composer;
+use Composer\Factory;
+use Composer\IO\NullIO;
+use Extension;
+
+class ComposerLoaderExtension extends Extension
+{
+    /**
+     * @var Composer
+     */
+    protected $composer;
+
+    /**
+     * @param Composer $composer
+     * @return $this
+     */
+    public function setComposer(Composer $composer)
+    {
+        $this->composer = $composer;
+        return $this;
+    }
+
+    /**
+     * @return Composer
+     */
+    public function getComposer()
+    {
+        return $this->composer;
+    }
+
+    /**
+     * Builds an instance of Composer
+     */
+    public function onAfterBuild()
+    {
+        $originalDir = getcwd();
+        chdir(BASE_PATH);
+        /** @var Composer $composer */
+        $composer = Factory::create(new NullIO());
+        $this->setComposer($composer);
+        chdir($originalDir);
+    }
+}

src/Extensions/ComposerUpdateExtension.php

@@ -2,7 +2,6 @@
 
 namespace BringYourOwnIdeas\UpdateChecker\Extensions;
 
-use CheckComposerUpdatesJob;
 use DataExtension;
 use Injector;
 use QueuedJobService;
@@ -21,21 +20,39 @@ class ComposerUpdateExtension extends DataExtension
 
     private static $db = [
         'VersionHash' => 'Varchar',
-        'LatestVersion' => 'Varchar',
+        'VersionConstraint' => 'Varchar(50)',
+        'AvailableVersion' => 'Varchar(50)',
+        'AvailableHash' => 'Varchar(50)',
+        'LatestVersion' => 'Varchar(50)',
+        'LatestHash' => 'Varchar(50)',
     ];
 
     private static $summary_fields = [
-        'LatestVersion',
+        'AvailableVersion' => 'Available',
+        'LatestVersion' => 'Latest',
     ];
 
     /**
      * Automatically schedule a self update job on dev/build
      */
     public function requireDefaultRecords()
     {
-        Injector::inst()
-            ->get(QueuedJobService::class)
-            ->queueJob(new CheckComposerUpdatesJob());
+        $job = Injector::inst()->create($this->getJobName());
+        Injector::inst()->get(QueuedJobService::class)->queueJob($job);
+    }
+
+    /**
+     * If the available version is the same as the current version then return nothing, otherwise show the latest
+     * available version
+     *
+     * @return string
+     */
+    public function getAvailableVersion()
+    {
+        if ($this->owner->getField('Version') === $this->owner->getField('AvailableVersion')) {
+            return '';
+        }
+        return $this->owner->getField('AvailableVersion');
     }
 
     /**