rnbuilder 0.5.12 → 0.5.14

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g rnbuilder
 $ rnbuilder COMMAND
 running command...
 $ rnbuilder (-v|--version|version)
-rnbuilder/0.5.12 darwin-arm64 node-v18.4.0
+rnbuilder/0.5.14 darwin-arm64 node-v18.11.0
 $ rnbuilder --help [COMMAND]
 USAGE
   $ rnbuilder COMMAND
@@ -58,7 +58,7 @@ EXAMPLE
   hello world from ./src/build.ts!
 ```
 
-_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.12/src/commands/build.ts)_
+_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.14/src/commands/build.ts)_
 
 ## `rnbuilder codepush [BUILD]`
 
@@ -77,7 +77,7 @@ EXAMPLE
        Push changes to existing apps ./src/firebase-sync-udids.ts!
 ```
 
-_See code: [src/commands/codepush.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.12/src/commands/codepush.ts)_
+_See code: [src/commands/codepush.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.14/src/commands/codepush.ts)_
 
 ## `rnbuilder help [COMMAND]`
 
@@ -109,7 +109,7 @@ EXAMPLE
   initialize environment for first run from ./src/initialize.ts!
 ```
 
-_See code: [src/commands/initialize.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.12/src/commands/initialize.ts)_
+_See code: [src/commands/initialize.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.14/src/commands/initialize.ts)_
 
 ## `rnbuilder match-nuke [BUILD]`
 
@@ -128,7 +128,7 @@ EXAMPLE
        Nuke certificates ./src/match-nuke.ts!
 ```
 
-_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.12/src/commands/match-nuke.ts)_
+_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.14/src/commands/match-nuke.ts)_
 
 ## `rnbuilder sync-udids [BUILD]`
 
@@ -147,5 +147,5 @@ EXAMPLE
        Sync device UDIDs from firebase from ./src/firebase-sync-udids.ts!
 ```
 
-_See code: [src/commands/sync-udids.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.12/src/commands/sync-udids.ts)_
+_See code: [src/commands/sync-udids.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.14/src/commands/sync-udids.ts)_
 <!-- commandsstop -->

package/lib/commands/build.js

@@ -75,10 +75,10 @@ class Build extends command_1.Command {
                     },
                 });
                 const answers = await inquirer.prompt(questions);
-                result = Object.assign(Object.assign({}, result), answers);
+                result = Object.assign(Object.assign(Object.assign({}, result), answers), { firebase: answers.distribute === 'firebase' });
             }
             const postQuestions = [];
-            if (result.env !== 'prod' || result.distribute === 'firebase') {
+            if (result.env !== 'prod') {
                 postQuestions.push({
                     type: 'confirm',
                     name: 'firebase',
@@ -171,7 +171,6 @@ class Build extends command_1.Command {
         fs.writeFileSync(process.cwd() + `/${fileName}.json`, json);
     }
     runPlatforms(target, parameters, otherParams) {
-        shell.cd('fastlane');
         target.forEach((t) => {
             shell.exec(`bundle exec fastlane ${t} build ${parameters.join(' ')} --env ${otherParams.env}`);
         });
@@ -181,25 +180,28 @@ class Build extends command_1.Command {
         const params = await this.askForMissingFields(flags);
         const { client, target } = params, otherParams = tslib_1.__rest(params, ["client", "target"]);
         const parameters = utils_1.buildKeyValuePairs(otherParams);
-        shell.exec(`git checkout ${params.branch}`);
+        shell.exec(`git reset --hard && git checkout ${params.branch} && git pull`);
         shell.cd('fastlane');
         shell.exec('bundle update --bundler');
         shell.exec('bundle install');
         shell.exec('bundle update fastlane');
         shell.exec('bundle update cocoapods');
-        shell.cd('..');
+        shell.cd('../');
         if (client) {
             client.forEach((c) => {
                 this.updateAppVersion(target, otherParams.env, c, otherParams.version_number);
-                shell.exec(`git add . && git commit -m "bump version ${process.env.CLIENT} - ${params.env}"`);
-                shell.exec('git pull && git push');
-                shell.cd(`clients/${c}`);
+                shell.exec(`git add . && git commit -m "bump version ${c} - ${otherParams.env}"`);
+                shell.exec('git pull --rebase && git push');
+                shell.cd(`fastlane/clients/${c}`);
                 this.runPlatforms(target, parameters, otherParams);
                 shell.cd('../..');
             });
         }
         else {
             this.updateAppVersion(target, otherParams.env, undefined, otherParams.version_number);
+            shell.exec(`git add . && git commit -m "bump version - ${otherParams.env}"`);
+            shell.exec('git pull --rebase && git push');
+            shell.cd('fastlane');
             this.runPlatforms(target, parameters, otherParams);
         }
     }

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.5.12","commands":{"build":{"id":"build","description":"Build react native apps","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder build\nhello world from ./src/build.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Set client that you want to build app"},"target":{"name":"target","type":"option","char":"t","description":"Set the build target: android, ios or both","options":["android","ios"]},"env":{"name":"env","type":"option","char":"e","description":"Set the environment: prod, adhoc, staging","options":["staging","adhoc","prod"]},"branch":{"name":"branch","type":"option","char":"b","description":"Set the source branch used to build the app"},"version":{"name":"version","type":"option","char":"v","description":"Set the version number for this build"},"installr":{"name":"installr","type":"option","char":"i","description":"If enabled, the build will be uploaded to installR"}},"args":[{"name":"build"}]},"codepush":{"id":"codepush","description":"Push changes to existing apps","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder codepush\n    Push changes to existing apps ./src/firebase-sync-udids.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to push update"}},"args":[{"name":"build"}]},"initialize":{"id":"initialize","description":"Initialize the environment for first run","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder initialize\ninitialize environment for first run from ./src/initialize.ts!\n"],"flags":{},"args":[]},"match-nuke":{"id":"match-nuke","description":"Nuke certificates","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder match-nuke\n    Nuke certificates ./src/match-nuke.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to sync udids"}},"args":[{"name":"build"}]},"sync-udids":{"id":"sync-udids","description":"Sync device UDIDs from firebase","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder sync-udids\n    Sync device UDIDs from firebase from ./src/firebase-sync-udids.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to sync udids"}},"args":[{"name":"build"}]}}}
+{"version":"0.5.14","commands":{"build":{"id":"build","description":"Build react native apps","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder build\nhello world from ./src/build.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Set client that you want to build app"},"target":{"name":"target","type":"option","char":"t","description":"Set the build target: android, ios or both","options":["android","ios"]},"env":{"name":"env","type":"option","char":"e","description":"Set the environment: prod, adhoc, staging","options":["staging","adhoc","prod"]},"branch":{"name":"branch","type":"option","char":"b","description":"Set the source branch used to build the app"},"version":{"name":"version","type":"option","char":"v","description":"Set the version number for this build"},"installr":{"name":"installr","type":"option","char":"i","description":"If enabled, the build will be uploaded to installR"}},"args":[{"name":"build"}]},"codepush":{"id":"codepush","description":"Push changes to existing apps","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder codepush\n    Push changes to existing apps ./src/firebase-sync-udids.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to push update"}},"args":[{"name":"build"}]},"initialize":{"id":"initialize","description":"Initialize the environment for first run","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder initialize\ninitialize environment for first run from ./src/initialize.ts!\n"],"flags":{},"args":[]},"match-nuke":{"id":"match-nuke","description":"Nuke certificates","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder match-nuke\n    Nuke certificates ./src/match-nuke.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to sync udids"}},"args":[{"name":"build"}]},"sync-udids":{"id":"sync-udids","description":"Sync device UDIDs from firebase","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder sync-udids\n    Sync device UDIDs from firebase from ./src/firebase-sync-udids.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to sync udids"}},"args":[{"name":"build"}]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rnbuilder",
   "description": "React Native builder tool",
-  "version": "0.5.12",
+  "version": "0.5.14",
   "author": "Tuan Luong @r0b0t3d",
   "bin": {
     "rnbuilder": "./bin/run"