appium-espresso-driver 2.17.0 → 2.18.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.18.1](https://github.com/appium/appium-espresso-driver/compare/v2.18.0...v2.18.1) (2023-03-22)
+
+
+### Bug Fixes
+
+* remove .js ext from build-espresso command ([d13b85d](https://github.com/appium/appium-espresso-driver/commit/d13b85da41973e321b54dbd91c7679e9ee97ba35))
+
+## [2.18.0](https://github.com/appium/appium-espresso-driver/compare/v2.17.0...v2.18.0) (2023-03-22)
+
+
+### Features
+
+* add building espresso server command via appium command ([#858](https://github.com/appium/appium-espresso-driver/issues/858)) ([cfaad9a](https://github.com/appium/appium-espresso-driver/commit/cfaad9a9cf82679df11cc4cbf57206d4f6d55b9c))
+
 ## [2.17.0](https://github.com/appium/appium-espresso-driver/compare/v2.16.1...v2.17.0) (2023-03-13)
 
 

package/README.md

@@ -42,7 +42,12 @@ On top of standard Appium requirements Espresso driver also expects the followin
 
 ## Scripts
 
-- `appium driver run print-espresso-path` prints the path to the Appium Espresso server root. You can modify the gradle file directly if [Espresso Build Config](#espresso-build-config) was not sufficient.
+- `appium driver run espresso print-espresso-path` prints the path to the Appium Espresso server root. You can modify the gradle file directly if [Espresso Build Config](#espresso-build-config) was not sufficient.
+- `appium driver run espresso build-espresso` builds the espresso server since driver version 2.18.0. It helps building the espresso server outside of the Appium process. Available environment variables are below:
+  - `SHOW_GRADLE_LOG` configures if the command shows the gradle task logs. `true` or `1`  sets it as enabled, but others set it as disabled. Defaults to disabled.
+  - `TEST_APP_PACKAGE` configures the target application to build the espresso server for.
+  - `ESPRESSO_BUILD_CONFIG` is an absolute path to the [Espresso Build Config](#espresso-build-config) as JSON format file.
+    - e.g. `SHOW_GRADLE_LOG=true TEST_APP_PACKAGE=your.test.pkg ESPRESSO_BUILD_CONFIG=/path/to/the/config.json appium driver run build-espresso`
 
 ## Capabilities
 
@@ -1259,4 +1264,3 @@ more details.
 * Espresso server unit tests are located at `io.appium.espressoserver.test` and can be run in Android Studio
 * NodeJS unit tests are run with `npm run test`
 * End-to-end tests are run with `npm run e2e-test` (remember to run `npm run build` before running this command so that it has up-to-date Espresso Server and NodeJS code)
-

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-espresso-driver",
-  "version": "2.17.0",
+  "version": "2.18.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-espresso-driver",
-      "version": "2.17.0",
+      "version": "2.18.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.4.3",
@@ -1124,7 +1124,7 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.15.1",
+      "version": "18.15.5",
       "license": "MIT"
     },
     "node_modules/@types/normalize-package-data": {
@@ -1445,7 +1445,7 @@
       "license": "ISC"
     },
     "node_modules/appium-chromedriver": {
-      "version": "5.3.0",
+      "version": "5.3.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2628,7 +2628,7 @@
       }
     },
     "node_modules/graceful-fs": {
-      "version": "4.2.10",
+      "version": "4.2.11",
       "license": "ISC"
     },
     "node_modules/handlebars": {
@@ -3141,7 +3141,7 @@
       "license": "ISC"
     },
     "node_modules/marked": {
-      "version": "4.2.12",
+      "version": "4.3.0",
       "extraneous": true,
       "license": "MIT",
       "bin": {
@@ -4043,7 +4043,7 @@
       "license": "MIT"
     },
     "node_modules/safe-stable-stringify": {
-      "version": "2.4.2",
+      "version": "2.4.3",
       "extraneous": true,
       "license": "MIT",
       "engines": {

package/package.json

@@ -7,7 +7,7 @@
     "automated testing",
     "android"
   ],
-  "version": "2.17.0",
+  "version": "2.18.1",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -39,7 +39,8 @@
     ],
     "mainClass": "EspressoDriver",
     "scripts": {
-      "print-espresso-path": "./scripts/print-espresso-path.js"
+      "print-espresso-path": "./scripts/print-espresso-path.js",
+      "build-espresso": "./scripts/build-espresso.js"
     }
   },
   "main": "./build/index.js",

package/scripts/build-espresso.js

@@ -0,0 +1,56 @@
+const _ = require('lodash');
+const path = require('path');
+const { logger, fs } = require('@appium/support');
+const { ServerBuilder } = require('../build/lib/server-builder.js');
+
+const LOG = new logger.getLogger('EspressoBuild');
+
+const ROOT_DIR = path.resolve(__dirname, '..');
+const ESPRESSO_SERVER_ROOT = path.join(ROOT_DIR, 'espresso-server');
+
+const ESPRESSO_SERVER_BUILD = path.join(ESPRESSO_SERVER_ROOT, 'app', 'build');
+
+async function buildEspressoServer () {
+
+  LOG.info(`Deleting the build directory ${ESPRESSO_SERVER_BUILD}`);
+
+  const opts = {
+    serverPath: ESPRESSO_SERVER_ROOT,
+    showGradleLog: !_.isEmpty(process.env.SHOW_GRADLE_LOG) && ['1', 'true'].includes(_.toLower(process.env.SHOW_GRADLE_LOG))
+  };
+
+  if (process.env.TEST_APP_PACKAGE) {
+    opts.testAppPackage = process.env.TEST_APP_PACKAGE;
+  }
+
+  if (process.env.ESPRESSO_BUILD_CONFIG) {
+    if (!(await fs.exists(process.env.ESPRESSO_BUILD_CONFIG))) {
+      throw new Error(`'${process.env.ESPRESSO_BUILD_CONFIG}' did not exist. Please set the path as an absolute path.`);
+    }
+    try {
+      const buildConfigurationStr = await fs.readFile(process.env.ESPRESSO_BUILD_CONFIG, 'utf8');
+      opts.buildConfiguration = JSON.parse(buildConfigurationStr);
+      LOG.info(`The espresso build config is ${JSON.stringify(opts.buildConfiguration)}`);
+    } catch (e) {
+      throw new Error(`Failed to parse the ${process.env.ESPRESSO_BUILD_CONFIG}. `
+        `Please make sure that the JSON is valid format. Error: ${e}`);
+    }
+  }
+
+  const builder = new ServerBuilder(LOG, opts);
+  try {
+    await builder.build();
+  } catch (e) {
+    throw new Error(`Failed to build the espresso server. `
+      `SHOW_GRADLE_LOG=true environment variable helps to check the gradle log. Error: ${e}`);
+  }
+
+  const dstPath = path.resolve(ESPRESSO_SERVER_ROOT, 'app', 'build', 'outputs', 'apk', 'androidTest', 'debug', 'app-debug-androidTest.apk');
+  if (await fs.exists(dstPath)) {
+    LOG.info(`Full path to the server APK: ${dstPath}`);
+  } else {
+    LOG.info(`Full path to the server build folder: ${ESPRESSO_SERVER_BUILD}`);
+  }
+}
+
+(async () => await buildEspressoServer())();