Subpackages now install into packages grid and can be updated

Author: Shaun McCormick

_build/build.transport.php

@@ -37,8 +37,8 @@
 /* version info */
 define('PKG_NAME','packman');
 define('PKG_NAME_LOWER','packman');
-define('PKG_VERSION','1.1.0');
-define('PKG_RELEASE','pl');
+define('PKG_VERSION','1.2.0');
+define('PKG_RELEASE','rc1');
 
 /* set sources */
 $root = dirname(dirname(__FILE__)).'/';

core/components/packman/docs/changelog.txt

@@ -1,5 +1,9 @@
 Changelog for PackMan
 
+PackMan 1.2.0
+====================================
+- Subpackages now install into packages grid and can be updated
+
 PackMan 1.1.0
 ====================================
 - Added French, German translations

core/components/packman/includes/resolve.subpackage.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Add package to packages grid
+ * 
+ * @package packman
+ */
+$success= true;
+if ($transport && $transport->xpdo) {
+    $signature = '{signature}';
+    $provider = '{provider}';
+    $modx =& $transport->xpdo;
+    $modx->addPackage('modx.transport',$modx->getOption('core_path').'model/');
+    
+    switch ($options[xPDOTransport::PACKAGE_ACTION]) {
+        case xPDOTransport::ACTION_INSTALL:
+        case xPDOTransport::ACTION_UPGRADE:
+            /* define version */
+            $attributes = $modx->fromJSON('{attributes}');
+            $metadata = $modx->fromJSON('{metadata}');
+            $sig = explode('-',$signature);
+            $versionSignature = explode('.',$sig[1]);
+
+            /* add in the package as an object so it can be upgraded */
+            $package = $modx->newObject('transport.modTransportPackage');
+            $package->set('signature',$signature);
+            $package->fromArray(array(
+                'created' => date('Y-m-d h:i:s'),
+                'updated' => date('Y-m-d h:i:s'),
+                'installed' => strftime('%Y-%m-%d %H:%M:%S'),
+                'state' => 1,
+                'workspace' => 1,
+                'provider' => $provider,
+                'disabled' => false,
+                'source' => $signature.'.transport.zip',
+                'manifest' => null,
+                'attributes' => $attributes,
+                'package_name' => $sig[0],
+                'metadata' => $metadata,
+                'version_major' => $versionSignature[0],
+                'version_minor' => !empty($versionSignature[1]) ? $versionSignature[1] : 0,
+                'version_patch' => !empty($versionSignature[2]) ? $versionSignature[2] : 0,
+            ));
+            if (!empty($sig[2])) {
+                $r = preg_split('/([0-9]+)/',$sig[2],-1,PREG_SPLIT_DELIM_CAPTURE);
+                if (is_array($r) && !empty($r)) {
+                    $package->set('release',$r[0]);
+                    $package->set('release_index',(isset($r[1]) ? $r[1] : '0'));
+                } else {
+                    $package->set('release',$sig[2]);
+                }
+            }
+            $success = $package->save();
+            $modx->logManagerAction('package_install','transport.modTransportPackage',$package->get('id'));
+        break;
+        
+        case xPDOTransport::ACTION_UNINSTALL:
+            /* remove the package on uninstall */
+            $package = $modx->getObject('transport.modTransportPackage',array('signature' => $signature));
+            if ($package) {
+                if ($package->uninstall()) {
+                    $cacheManager= $modx->getCacheManager();
+                    $cacheManager->clearCache();
+                    $modx->logManagerAction('package_uninstall','transport.modTransportPackage',$package->get('id'));
+                }
+            }
+        break;
+    }
+}
+
+return $success;

core/components/packman/processors/build.php

@@ -333,21 +333,37 @@
 /* add category vehicle to build */
 $builder->putVehicle($vehicle);
 
+
+
 /* add in packages */
 $packageList = $modx->fromJSON($_POST['packages']);
 if (!empty($packageList)) {
+    $modx->addPackage('modx.transport',$modx->getOption('core_path').'model/');
+
     $packageDir = $modx->getOption('core_path',null,MODX_CORE_PATH).'packages/';
     $spAttr = array('vehicle_class' => 'xPDOTransportVehicle');
     $spReplaces = array(
         '{version}',
         '{version_major}',
         '{name}',
     );
+    $resolverReplaces = array(
+        '{signature}',
+        '{provider}',
+        '{attributes}',
+        '{metadata}',
+    );
 
     foreach ($packageList as $packageData) {
         $file = $packageDir.$packageData['signature'].'.transport.zip';
         if (!file_exists($file)) continue;
 
+        $package = $modx->getObject('transport.modTransportPackage',array('signature' => $packageData['signature']));
+        if (!$package) {
+            $modx->log(modX::LOG_LEVEL_ERROR,'[PackMan] Package could not be found with signature: '.$packageData['signature']);
+            continue;
+        }
+
         /* create package as subpackage */
         $vehicle = $builder->createVehicle(array(
             'source' => $file,
@@ -373,6 +389,22 @@
             'source' => $cachePath.$cacheKey,
         ));
 
+        /* add resolver to subpackage to add to packages grid */
+        $cacheKey = 'packman/resolvers/'.$packageData['signature'].'.php';
+        $resolver = file_get_contents($modx->tp->config['includesPath'].'resolve.subpackage.php');
+        $resolver = str_replace($resolverReplaces,array(
+            $packageData['signature'],
+            $package->get('provider'),
+            str_replace("'","\'",$modx->toJSON($package->get('attributes'))),
+            str_replace("'","\'",$modx->toJSON($package->get('metadata'))),
+        ),$resolver);
+        $modx->cacheManager->writeFile($cachePath.$cacheKey,$resolver);
+
+        /* add resolver to vehicle */
+        $vehicle->resolve('php',array(
+            'source' => $cachePath.$cacheKey,
+        ));
+
         /* add subpackage to build */
         $builder->putVehicle($vehicle);
     }