Skip to content

Commit f3bc309

Browse files
committed
JPPM 0.6.1
1 parent ced56c9 commit f3bc309

File tree

4 files changed

+27
-30
lines changed

4 files changed

+27
-30
lines changed

packager/buildSrc/DefaultPlugin.php

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -548,40 +548,37 @@ function server(Event $event)
548548
*/
549549
function update(Event $event)
550550
{
551-
$library = null;
551+
$libraries = [];
552552
foreach ($event->args() as $arg) {
553-
$library = $arg;
553+
$libraries[] = $arg;
554554
break;
555555
}
556556

557-
if ($library) {
557+
if ($libraries) {
558558
$vendor = new Vendor($event->package()->getAny('config.vendor-dir', './vendor'));
559+
$event->packager()->getRepo()->cleanCache();
560+
$event->packager()->loadPackageLock("./");
559561

560-
$dep = $event->package()->getDeps()[$library];
561-
if (!$dep) {
562-
$dep = $event->package()->getDevDeps()[$library];
563-
}
564-
565-
$pkg = $dep == null ? null : $vendor->getPackage($library);
562+
foreach ($libraries as $library) {
563+
$pkg = $vendor->getPackage($library);
566564

567-
if (!$dep || !$pkg) {
568-
Console::error("-> failed to update {0}, the package doesn't exist in deps or devDeps", $library);
569-
exit(-1);
570-
} else {
571-
$event->packager()->loadPackageLock("./");
572-
if (!$event->packager()->removeDepFromPackageLock($library)) {
573-
Console::warn("package-lock.php.yml hasn't '{0}' dep", Colors::withColor($library, 'yellow'));
574-
}
565+
if (!$pkg) {
566+
Console::error("-> failed to update {0}, the package doesn't exist in deps or devDeps", $library);
567+
exit(-1);
568+
} else {
569+
if (!$event->packager()->removeDepFromPackageLock($library)) {
570+
Console::warn("package-lock.php.yml hasn't '{0}' dep", Colors::withColor($library, 'yellow'));
571+
}
575572

576-
Console::info(
577-
"updating {0}@{1} (pattern = {2})",
578-
Colors::withColor($library, 'yellow'),
579-
$pkg->getVersion(),
580-
$dep
581-
);
573+
Console::info(
574+
"updating {0}@{1} (pattern = {2})",
575+
Colors::withColor($library, 'yellow'),
576+
$pkg->getVersion(),
577+
$pkg->getName()
578+
);
582579

583-
$event->packager()->getRepo()->cleanCache();
584-
$event->packager()->install($event->package(), $vendor, false, false);
580+
$event->packager()->install($event->package(), $vendor, false);
581+
}
585582
}
586583

587584
$event->packager()->loadPackageLock("./");

packager/example/hello-world/package.php.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 1.0.0
44
plugins: [App]
55

66
deps:
7-
jphp-core: ~1.1.1
7+
jphp-core: ^1.1.1
88
jphp-zend-ext: '*'
99

1010
app:

packager/package.php.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: jppm
2-
version: 0.6.0
2+
version: 0.6.1
33

44
plugins: [GitHub, Hub, Doc]
55

@@ -17,8 +17,8 @@ github:
1717
> JPHP Package Manager v%version%
1818
1919
**What's new**
20-
+ Fix ignorng package-lock file when install.
21-
+ Add `jppm update <package>` command to update version in package-lock for one package.
20+
+ New JPHP engine version (1.2+)
21+
+ Improve `jppm update` command.
2222
2323
**Downloads**
2424
+ For Windows: [JPPM Windows Installer](%github.address%/releases/download/jppm-%version%/jppm-setup-%version%.exe)

packager/src-php/packager/Vendor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function getRelativeFile(Package $package, string $path): string
5555
* @param string $name
5656
* @return Package
5757
*/
58-
public function getPackage(string $name): Package
58+
public function getPackage(string $name): ?Package
5959
{
6060
$file = new File("$this->dir/{$name}/", Package::FILENAME);
6161

0 commit comments

Comments
 (0)