Add android commands

Author: RobbieTheWagner

README.md

@@ -1,7 +1,8 @@
 ember-cli-capacitor
 ==============================================================================
 
-This addon integrates Ember and Capacitor.
+This addon integrates Ember and [Capacitor](https://capacitorjs.com/).
+It supports building and live reload for iOS, Android, and Electron.
 
 
 Compatibility
@@ -23,8 +24,20 @@ ember install ember-cli-capacitor
 Usage
 ------------------------------------------------------------------------------
 
+### Blueprints
+
+The default `ember-cli-capacitor` blueprint will run when you first install
+the addon, but if you want to run it again, either to update to the latest
+blueprints or to add support for more platforms, you can run it with:
+
+```
+ember g ember-cli-capacitor
+```
+
 ### Commands
 
+#### iOS
+
 ```
 ember ios:serve
 ```
@@ -33,6 +46,16 @@ ember ios:serve
 ember ios:build
 ```
 
+#### Android
+
+```
+ember android:serve
+```
+
+```
+ember android:build
+```
+
 
 Contributing
 ------------------------------------------------------------------------------

index.js

@@ -5,12 +5,10 @@ module.exports = {
 
   includedCommands() {
     return {
+      'android:build': require('./lib/commands/android-build'),
+      'android:serve': require('./lib/commands/android-serve'),
       'ios:build': require('./lib/commands/ios-build'),
       'ios:serve': require('./lib/commands/ios-serve')
     };
-  },
-
-  isDevelopingAddon() {
-    return true;
   }
 };

lib/commands/android-build.js

@@ -0,0 +1,12 @@
+
+'use strict';
+
+const BaseCommand = require('./base');
+
+module.exports = BaseCommand.extend({
+  name: 'android:build',
+  description: 'Builds your app for Android',
+  async run(commandOptions) {
+    return await this.runTask('android:build', commandOptions);
+  }
+});

lib/commands/android-serve.js

@@ -0,0 +1,12 @@
+
+'use strict';
+
+const BaseCommand = require('./base');
+
+module.exports = BaseCommand.extend({
+  name: 'android:serve',
+  description: 'Builds your app and launches Android w/ live reload.',
+  async run(commandOptions) {
+    return await this.runTask('android:serve', commandOptions);
+  }
+});

lib/commands/base.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const Command = require('ember-cli/lib/models/command');
+const AndroidBuildTask = require('../tasks/android-build');
+const AndroidServeTask = require('../tasks/android-serve');
 const iOSBuildTask = require('../tasks/ios-build');
 const iOSServeTask = require('../tasks/ios-serve');
 
@@ -9,6 +11,8 @@ module.exports = Command.extend({
     this._super(...arguments);
 
     Object.assign(this.tasks, {
+      'android:build': AndroidBuildTask,
+      'android:serve': AndroidServeTask,
       'ios:build': iOSBuildTask,
       'ios:serve': iOSServeTask
     });

lib/tasks/android-build.js

@@ -0,0 +1,23 @@
+'use strict';
+
+const chalk = require('chalk');
+const Task = require('ember-cli/lib/models/task');
+// const Builder = require('ember-cli/lib/models/builder');
+const { execSync } = require('child_process');
+
+class AndroidBuildTask extends Task {
+  async run() {
+    let { ui } = this;
+
+    ui.writeLine(chalk.green('Android Build: Ember build'), chalk.green('.'));
+    execSync('ember build --environment=production');
+
+    ui.writeLine(chalk.green('Android Build: Sync'), chalk.green('.'));
+    execSync('npx cap sync android');
+
+    ui.writeLine(chalk.green('Android Build: Opening Android Studio'), chalk.green('.'));
+    execSync('npx cap open android');
+  }
+}
+
+module.exports = AndroidBuildTask;

lib/tasks/android-serve.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const chalk = require('chalk');
+const Task = require('ember-cli/lib/models/task');
+// const Builder = require('ember-cli/lib/models/builder');
+const { execSync } = require('child_process');
+
+class AndroidServeTask extends Task {
+  async run() {
+    let { ui } = this;
+
+    ui.startProgress(chalk.green('Android Serve: ember build'), chalk.green('.'));
+    execSync('ember build --environment=development');
+    ui.stopProgress();
+
+    ui.startProgress(chalk.green('Android Serve: npx cap sync android'), chalk.green('.'));
+    execSync('npx cap sync android');
+    ui.stopProgress();
+
+    ui.startProgress(chalk.green('Android Serve: npx cap open android'), chalk.green('.'));
+    execSync('npx cap open android');
+    ui.stopProgress();
+
+    ui.writeLine(chalk.green('Android Serve: Serving Ember app'));
+    execSync('ember serve');
+  }
+}
+
+module.exports = AndroidServeTask;

lib/tasks/ios-serve.js

@@ -6,7 +6,8 @@ const Task = require('ember-cli/lib/models/task');
 const { execSync } = require('child_process');
 
 class iOSServeTask extends Task {
-  async run() {
+  async run(options) {
+    console.log(options);
     let { ui } = this;
 
     ui.startProgress(chalk.green('iOS Serve: ember build'), chalk.green('.'));

package.json

@@ -1,9 +1,13 @@
 {
   "name": "ember-cli-capacitor",
   "version": "0.0.3",
-  "description": "Add capacitor to your Ember apps.",
+  "description": "Adds native iOS, Android, and Electron support to Ember with Capacitor.",
   "keywords": [
-    "ember-addon"
+    "ember-addon",
+    "capacitor",
+    "iOS",
+    "android",
+    "electron"
   ],
   "repository": {
     "type": "git",