@florianpat/lando-core 3.23.27-4florianPat.0 → 3.23.27-4florianPat.2

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
-## v3.23.27-4florianPat.0 - [March 4, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.27-4florianPat.0)
+## v3.23.27-4florianPat.2 - [March 13, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.27-4florianPat.2)
 
 ## v3.23.26 - [January 24, 2025](https://github.com/lando/core/releases/tag/v3.23.26)
 

package/app.js

@@ -131,7 +131,7 @@ module.exports = async (app, lando) => {
   app.events.on('ready', 1, async () => await require('./hooks/app-override-tooling-defaults')(app, lando));
 
   // set tooling compose cache
-  app.events.on('ready', async () => await require('./hooks/app-set-compose-cache')(app, lando));
+  app.events.on('ready-engine', async () => await require('./hooks/app-set-compose-cache')(app, lando));
 
   // v4 parts of the app are ready
   app.events.on('ready', 6, async () => await require('./hooks/app-v4-ready')(app, lando));
@@ -144,7 +144,7 @@ module.exports = async (app, lando) => {
 
   // Save a compose cache every time the app is ready, we have to duplicate this for v4 because we modify the
   // composeData after the v3 app.ready event
-  app.events.on('ready-v4', async () => await require('./hooks/app-set-v4-compose-cache')(app, lando));
+  app.events.on('ready-engine', async () => await require('./hooks/app-set-v4-compose-cache')(app, lando));
 
   // Otherwise set on rebuilds
   // NOTE: We set this pre-rebuild because post-rebuild runs after post-start because you would need to

package/lib/cli.js

@@ -317,6 +317,7 @@ module.exports = class Cli {
       .option('help', globalOptions.help)
       .option('verbose', globalOptions.verbose)
       .version(false)
+      .env('lando_cli_')
       .middleware([(argv => {
         argv._app = config;
         argv._yargs = yargs;

package/lib/daemon.js

@@ -40,7 +40,7 @@ const buildDockerCmd = (cmd, scriptsDir, dockerBin) => {
  */
 const getMacProp = prop => shell.sh(['defaults', 'read', `${MACOS_BASE}/Contents/Info.plist`, prop])
   .then(data => _.trim(data))
-  .catch(() => null);
+  .catch(() => 'skip');
 
 /*
  * Creates a new Daemon instance.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@florianpat/lando-core",
   "description": "The libraries that power all of Lando. Fork by flo for compose integration",
-  "version": "3.23.27-4florianPat.0",
+  "version": "3.23.27-4florianPat.2",
   "author": "Florian Patruck @florianPat",
   "license": "GPL-3.0",
   "repository": "florianPat/lando-core",
@@ -247,9 +247,9 @@
     "yargs-parser"
   ],
   "dist": {
-    "integrity": "sha512-/98U+xsnU1BnJCQAsZZlui8fGnMYfhATamRCi/wy9j29g76GPwXAR5/smdRmEq+Ibyt6SRSvxRVLp9cC7HvERw==",
-    "shasum": "4a4b0505a255aaf87c0a7e663f143a1c43de652d",
-    "filename": "florianpat-lando-core-3.23.27-4florianPat.0.tgz",
-    "unpackedSize": 60967690
+    "integrity": "sha512-md/dXWSDeZ/Yuv01a926LsoZUUFhVdhXKhuTsxueCV87DdsJ95SrVgwn8X7DiqD0sRb771j4oQ1wEYr01OId/g==",
+    "shasum": "48b0d84ff591b9cc816be0d7ac6a68c952270de0",
+    "filename": "florianpat-lando-core-3.23.27-4florianPat.2.tgz",
+    "unpackedSize": 60967667
   }
 }

package/tasks/exec.js

@@ -1,11 +1,11 @@
 'use strict';
 
 // Modules
-const fs = require('fs');
-const path = require('path');
 const _ = require('lodash');
 
 const {color} = require('listr2');
+const fs = require('fs');
+const path = require('path');
 
 // @TODO: when we have a file for recipes/compose we can set choices on service
 
@@ -14,7 +14,7 @@ module.exports = (lando, config = lando.appConfig) => ({
   describe: 'Runs command(s) on a service',
   usage: '$0 exec <service> [--user <user>] -- <command>',
   override: true,
-  level: 'engine',
+  level: 'app',
   examples: [
     '$0 exec appserver -- lash bash',
     '$0 exec nginx --user root -- whoami',
@@ -40,7 +40,8 @@ module.exports = (lando, config = lando.appConfig) => ({
 
     // if no app then we need to throw
     if (!fs.existsSync(minapp.composeCache)) {
-      throw new Error('Could not detect a built app. Rebuild or move into the correct location!');
+      const app = lando.getApp(options._app.root);
+      await app.init();
     }
 
     // Build a minimal app
@@ -59,7 +60,7 @@ module.exports = (lando, config = lando.appConfig) => ({
     }
 
     // nice things
-    const aservices = app?.config?.allServices ?? app?.allServices ?? [];
+    const aservices = app.allServices;
     const choices = `[${color.green('choices:')} ${aservices.map(service => `"${service}"`).join(', ')}]`;
 
     // gather our options
@@ -127,8 +128,8 @@ module.exports = (lando, config = lando.appConfig) => ({
     ropts.push(sconf?.overrides?.working_dir ?? sconf?.working_dir);
     // mix in mount if applicable
     ropts.push(app?.mounts[options.service]);
-    ropts.push(!options.deps ?? true);
-    ropts.push(options.autoRemove ?? false);
+    ropts.push(!options.deps ?? false);
+    ropts.push(options.autoRemove ?? true);
 
     // emit pre-exec
     await app.events.emit('pre-exec', config);