Merge pull request #23 from artemeon/feat/improve-update

Feat/improve update
artemeon · Nov 30, 2022 · 00b6411 · 00b6411
2 parents d629335 + 586e111
commit 00b6411
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 54 deletions.
diff --git a/mantis2github b/mantis2github
@@ -1,6 +1,7 @@
 #!/usr/bin/env php
 <?php
 
+use Artemeon\M2G\Command\CheckUpdateCommand;
 use Artemeon\M2G\Command\ConfigurationCommand;
 use Artemeon\M2G\Command\CreateGithubIssueFromMantisIssue;
 use Artemeon\M2G\Command\ReadGithubIssueCommand;
@@ -29,6 +30,7 @@ use Symfony\Component\Console\Application;
         $app->add(new ReadMantisIssueCommand($mantisConnector));
         $app->add(new ReadGithubIssueCommand($githubConnector));
         $app->add(new CreateGithubIssueFromMantisIssue($mantisConnector, $githubConnector));
+        $app->add(new CheckUpdateCommand());
         $app->run();
     }
 

diff --git a/src/Command/CheckUpdateCommand.php b/src/Command/CheckUpdateCommand.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Artemeon\M2G\Command;
+
+use Artemeon\M2G\Helper\VersionHelper;
+
+use function Termwind\{render};
+
+class CheckUpdateCommand extends Command
+{
+    protected function configure()
+    {
+        $this->setName('check_update')
+            ->setDescription('Checks whether a new version is available');
+    }
+
+    protected function handle(): int
+    {
+        $currentVersion = VersionHelper::fetchVersion();
+        $latestVersion = VersionHelper::latestVersion();
+        $updateAvailable = VersionHelper::checkForUpdates();
+        $name = VersionHelper::getPackageName();
+
+        if ($updateAvailable) {
+            render(<<<HTML
+<table>
+    <thead>
+        <tr>
+            <th>Update available! $currentVersion -> $latestVersion</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td><br>Please run:<br><br><code class="font-bold">composer global update $name</code><br></td>
+        </tr>
+    </tbody>
+</table>
+HTML);
+        }
+
+        return 0;
+    }
+}
diff --git a/src/Command/Command.php b/src/Command/Command.php
@@ -3,7 +3,6 @@
 namespace Artemeon\M2G\Command;
 
 use Artemeon\M2G\Config\ConfigReader;
-use Artemeon\M2G\Helper\VersionHelper;
 use Exception;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
@@ -25,31 +24,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $this->input = $input;
         $this->output = $output;
 
-        $commandOutput = $this->handle();
-
-        $currentVersion = VersionHelper::fetchVersion();
-        $latestVersion = VersionHelper::latestVersion();
-        $updateAvailable = VersionHelper::checkForUpdates();
-        $name = VersionHelper::getPackageName();
-
-        if ($updateAvailable) {
-            render(<<<HTML
-<table>
-    <thead>
-        <tr>
-            <th>Update available! $currentVersion -> $latestVersion</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td><br>Please run:<br><br><code class="font-bold">composer global update $name</code><br></td>
-        </tr>
-    </tbody>
-</table>
-HTML);
-        }
-
-        return $commandOutput;
+        return $this->handle();
     }
 
     protected function arguments(): array

diff --git a/src/Helper/VersionHelper.php b/src/Helper/VersionHelper.php
@@ -5,6 +5,7 @@
 namespace Artemeon\M2G\Helper;
 
 use ahinkle\PackagistLatestVersion\PackagistLatestVersion;
+use Composer\InstalledVersions;
 use Exception;
 
 class VersionHelper
@@ -18,28 +19,7 @@ public static function getPackageName(): ?string
 
     public static function fetchVersion(): string
     {
-        $name = self::getPackageName();
-
-        $version = null;
-
-        foreach (
-            [
-                __DIR__ . '/../../../../composer/installed.php',
-                __DIR__ . '/../../../vendor/composer/installed.php',
-                __DIR__ . '/../../vendor/composer/installed.php'
-            ] as $file
-        ) {
-            if (file_exists($file)) {
-                $installed = require $file;
-                $version = $installed['versions'][$name]['pretty_version'] ?? null;
-
-                break;
-            }
-        }
-
-        unset($file, $installed);
-
-        return $version;
+        return InstalledVersions::getPrettyVersion('artemeon/mantis2github');
     }
 
     /**

diff --git a/src/Service/GithubConnector.php b/src/Service/GithubConnector.php
@@ -22,9 +22,7 @@ public function __construct(private ?ConfigValues $config)
                 'Accept' => 'application/vnd.github.v3+json',
                 'Authorization' => 'token ' . $this->config->getGithubToken(),
             ],
-            'defaults' => [
-                'verify' => false,
-            ],
+            'verify' => false,
             'base_uri' => 'https://api.github.com/repos/' . $config->getGithubRepo() . '/',
         ]);
     }

diff --git a/src/Service/MantisConnector.php b/src/Service/MantisConnector.php
@@ -22,9 +22,7 @@ public function __construct(private ?ConfigValues $config)
                 'Authorization' => $this->config->getMantisToken(),
                 'Content-Type' => 'application/json',
             ],
-            'defaults' => [
-                'verify' => false,
-            ],
+            'verify' => false,
             'base_uri' => rtrim($this->config->getMantisUrl(), '/') . '/api/rest/issues/',
         ]);
     }