JPPM 0.2.6

jphp-group · May 9, 2018 · ec8720e · ec8720e
1 parent 84a2576
commit ec8720e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/packager/example/simple/package.php.yml b/packager/example/simple/package.php.yml
@@ -7,14 +7,18 @@ deps:
 plugins:
 - Doc
 - Hub
+- App
+
 app:
   disable-launcher: '1'
   bootstrap: index.php
   encoding: UTF-8
   metrics: ''
   trace: ''
+
 sources:
 - src
+
 doc:
   langs:
     en: English

diff --git a/packager/package.php.yml b/packager/package.php.yml
@@ -1,5 +1,5 @@
 name: jppm
-version: 0.2.5
+version: 0.2.6
 
 plugins: [GitHub, Hub, Doc]
 
@@ -14,8 +14,7 @@ github:
     > JPHP Package Manager v%version%
 
     **What's new**
-    + Add Plugin API and plugin example.
-    + Add test task.
+    + Improve error handlers.
 
     **Downloads**
     + For Windows: [JPPM Windows Installer](%github.address%/releases/download/jppm-%version%/jppm-setup-%version%.exe)

diff --git a/packager/src-php/packager/Repository.php b/packager/src-php/packager/Repository.php
@@ -330,7 +330,12 @@ public function findPackage(string $name, string $versionPattern, ?PackageLock $
                     $newInfo = $cached ? $this->getVersionInfoFromExternal($repo, $name, $versionPattern) : null;
 
                     if (!$newInfo) {
-                        $newInfo = $repo->getVersions($name)[$versionPattern];
+                        try {
+                            $newInfo = $repo->getVersions($name)[$versionPattern];
+                        } catch (\Throwable $e) {
+                            Console::warn($e->getMessage());
+                            continue;
+                        }
                     }
 
                     if ($oldInfo['hash'] !== $newInfo['hash']) {
@@ -390,12 +395,17 @@ public function findPackage(string $name, string $versionPattern, ?PackageLock $
                 $dirFile = "$this->dir/$name/$foundVersion";
                 fs::ensureParent($archFile);
 
-                if ($foundVersionSource->downloadTo($name, $foundVersion, $archFile)) {
-                    $this->installFromArchive($archFile);
-                    fs::delete($archFile);
-                    fs::format($indexFile, $foundVersionInfo, JsonProcessor::SERIALIZE_PRETTY_PRINT);
-                } else if ($foundVersionSource->downloadToDirectory($name, $foundVersion, $dirFile)) {
-                    fs::format($indexFile, $foundVersionInfo, JsonProcessor::SERIALIZE_PRETTY_PRINT);
+                try {
+                    if ($foundVersionSource->downloadTo($name, $foundVersion, $archFile)) {
+                        $this->installFromArchive($archFile);
+                        fs::delete($archFile);
+                        fs::format($indexFile, $foundVersionInfo, JsonProcessor::SERIALIZE_PRETTY_PRINT);
+                    } else if ($foundVersionSource->downloadToDirectory($name, $foundVersion, $dirFile)) {
+                        fs::format($indexFile, $foundVersionInfo, JsonProcessor::SERIALIZE_PRETTY_PRINT);
+                    }
+                } catch (\Throwable $e) {
+                    Console::error($e->getMessage());
+                    return null;
                 }
             }
 

diff --git a/packager/src-php/packager/repository/GitRepository.php b/packager/src-php/packager/repository/GitRepository.php
@@ -4,6 +4,7 @@
 use compress\GzipOutputStream;
 use compress\TarArchive;
 use git\Git;
+use git\GitAPIException;
 use packager\cli\Console;
 use packager\Ignore;
 use packager\Package;
@@ -180,7 +181,12 @@ protected function fetchGit()
         }
 
         $git->clean(['force' => true, 'cleanDirectories' => true]);
-        $git->fetch(['removeDeletedRefs' => true, 'remote' => 'origin', 'tagOpt' => 'FETCH_TAGS']);
+
+        try {
+            $git->fetch(['removeDeletedRefs' => true, 'remote' => 'origin', 'tagOpt' => 'FETCH_TAGS']);
+        } catch (GitAPIException $e) {
+            throw new IOException("Failed to fetch from git '{$e->getMessage()}'");
+        }
 
         //