Merge pull request #38 from wilau2/feat/add-android-clean-project

feat: add android clean project
pmadruga · Jul 17, 2020 · fd53ac8 · fd53ac8
2 parents 502313e + 101de49
commit fd53ac8
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -37,21 +37,22 @@ Or add it as a script to your `package.json`
 
 This is a combination of the commands suggested in the React Native documentation plus others.
 
-| State Type           | Command                       | In `clean-project-auto`? | Optional?  | Default? | Option Flag            |
-| -------------------- | ----------------------------- | ------------------------ | ---------- | -------- | ---------------------- |
-| React-native cache   | `rm -rf $TMPDIR/react-*`      | Yes                      | No         | true     |                        |
-| Metro bundler cache  | `rm -rf $TMPDIR/metro-*`      | Yes                      | No         | true     |                        |
-| Watchman cache       | `watchman watch-del-all`      | Yes                      | No         | true     |                        |
-| NPM modules          | `rm -rf node_modules`         | Yes                      | Yes        | true     | --keep-node_modules    |
-| Yarn cache           | `yarn cache clean`            | Yes                      | Yes        | true     | --keep-node-modules    |
-| Yarn packages        | `yarn install`                | No                       | Yes        | true     | --keep-node-modules    |
-| NPM cache            | `npm cache verify`            | Yes                      | Yes        | true     | --keep-node-modules    |
-| NPM Install          | `npm ci`                      | Yes                      | Yes        | true     | --keep-node-modules    |
-| iOS build folder     | `rm -rf ios/build`            | Yes                      | Yes        | false    | --remove-iOS-build     |
-| iOS pods folder      | `rm -rf ios/pods`             | Yes                      | Yes        | false    | --remove-iOS-pods      |
-| Android build folder | `rm -rf android/build`        | Yes                      | Yes        | false    | --remove-android-build |
-| Brew package         | `brew update && brew upgrade` | No                       | Yes        | true     | --keep-brew            |
-| Pod packages         | `pod update`                  | No                       | Yes        | true     | --keep-pods            |
+| State Type            | Command                          | In `clean-project-auto`? | Optional?  | Default? | Option Flag            |
+| --------------------- | -------------------------------- | ------------------------ | ---------- | -------- | ---------------------- |
+| React-native cache    | `rm -rf $TMPDIR/react-*`         | Yes                      | No         | true     |                        |
+| Metro bundler cache   | `rm -rf $TMPDIR/metro-*`         | Yes                      | No         | true     |                        |
+| Watchman cache        | `watchman watch-del-all`         | Yes                      | No         | true     |                        |
+| NPM modules           | `rm -rf node_modules`            | Yes                      | Yes        | true     | --keep-node_modules    |
+| Yarn cache            | `yarn cache clean`               | Yes                      | Yes        | true     | --keep-node-modules    |
+| Yarn packages         | `yarn install`                   | No                       | Yes        | true     | --keep-node-modules    |
+| NPM cache             | `npm cache verify`               | Yes                      | Yes        | true     | --keep-node-modules    |
+| NPM Install           | `npm ci`                         | Yes                      | Yes        | true     | --keep-node-modules    |
+| iOS build folder      | `rm -rf ios/build`               | Yes                      | Yes        | false    | --remove-iOS-build     |
+| iOS pods folder       | `rm -rf ios/pods`                | Yes                      | Yes        | false    | --remove-iOS-pods      |
+| Android build folder  | `rm -rf android/build`           | Yes                      | Yes        | false    | --remove-android-build |
+| Android clean project | `(cd android && ./gradlew clean)`| Yes                      | Yes        | false    | --clean-android-project|
+| Brew package          | `brew update && brew upgrade`    | No                       | Yes        | true     | --keep-brew            |
+| Pod packages          | `pod update`                     | No                       | Yes        | true     | --keep-pods            |
 
 Example: `./node_modules/.bin/react-native-clean-project --remove-iOS-build`
 

diff --git a/source/index.js b/source/index.js
@@ -8,6 +8,7 @@ options
   .then(options.askiOSPods)
   .then(options.askUpdatePods)
   .then(options.askAndroid)
+  .then(options.askAndroidCleanProject)
   .then(options.askNodeModules)
   .then(options.askBrew)
   .then(() => {
@@ -21,6 +22,9 @@ options
     if (options.getWipeAndroidBuild()) {
       executeTask(tasks.wipeAndroidBuildFolder);
     }
+    if (options.getCleanAndroidProject()) {
+      executeTask(tasks.cleanAndroidProject);
+    }
     executeTask(tasks.watchmanCacheClear);
     executeTask(tasks.wipeTempCaches);
     if (options.getUpdateBrew()) {

diff --git a/source/internals/options.js b/source/internals/options.js
@@ -8,13 +8,18 @@ const rlInterface = createInterface({
 // Possible arguments: --remove-iOS-build --remove-android-build --keep-node-modules
 const args = process.argv.slice(2);
 // Defaults
+
+let cleanAndroidProject = false;
 let wipeiOSBuild = false;
 let wipeiOSPods = false;
 let wipeAndroidBuild = false;
 let wipeNodeModules = true;
 let updateBrew = true;
 let updatePods = true;
 
+const getCleanAndroidProject = () => {
+  return cleanAndroidProject;
+}
 const getWipeiOSBuild = () => {
   return wipeiOSBuild;
 };
@@ -75,6 +80,17 @@ const askiOSPods = () =>
     });
   });
 
+const askAndroidCleanProject = () =>
+  new Promise(resolve => {
+    if (args.includes('--clean-android-project')) {
+      cleanAndroidProject = true;
+      return resolve();
+    }
+    return askQuestion('Clean Android project? (Y/n) ', answer => {
+      cleanAndroidProject = checkAnswer(answer, askAndroidCleanProject, resolve);
+    });
+  });
+
 const askAndroid = () =>
   new Promise(resolve => {
     if (args.includes('--remove-android-build')) {
@@ -120,6 +136,7 @@ const askUpdatePods = () =>
   });
 
 module.exports = {
+  getCleanAndroidProject,
   getWipeiOSBuild,
   getWipeiOSPods,
   getWipeAndroidBuild,
@@ -130,6 +147,7 @@ module.exports = {
   askiOSPods,
   askUpdatePods,
   askAndroid,
+  askAndroidCleanProject,
   askNodeModules,
   askBrew,
   rlInterface

diff --git a/source/internals/tasks.js b/source/internals/tasks.js
@@ -24,6 +24,11 @@ const tasks = {
     command: 'rm',
     args: ['-rf', 'android/build']
   },
+  cleanAndroidProject: {
+    name: 'clean android project',
+    command: '(cd android && ./gradlew clean)',
+    args: []
+  },
   watchmanCacheClear: {
     name: 'watchman cache clear (if watchman is installed)',
     command: 'watchman watch-del-all || true',

diff --git a/test/tasks.test.js b/test/tasks.test.js
@@ -12,9 +12,9 @@ const { tasks, autoTasks } = require('../source/internals/tasks');
 const plugin = require('../source/plugin');
 
 describe('Tasks List', () => {
-  it('should have twelve tasks in total', () => {
+  it('should have the correct number of tasks in total', () => {
     const input = Object.keys(tasks).length;
-    const expected = 13;
+    const expected = 14;
 
     expect(input).toEqual(expected);
   });