Minor changes

Author: jonatansalas

package.json

@@ -38,6 +38,7 @@
     "ink-progress-bar": "^2.0.0",
     "ink-spinner": "^1.0.0",
     "isomorphic-fetch": "^2.2.1",
+    "progress-stream": "^2.0.0",
     "prop-types": "^15.5.10",
     "react": "^15.6.1",
     "unzip": "^0.1.11"

src/cli/index.js

@@ -1,5 +1,5 @@
 import { h, Component, Text } from 'ink';
-import Progress from 'ink-progress-bar';
+//import Progress from 'ink-progress-bar';
 import PropTypes from 'prop-types';
 import Spinner from 'ink-spinner';
 import readLine from 'readline';
@@ -26,7 +26,8 @@ export default class Cli extends Component {
     state = {
         error: null,
         result: null,
-        projectName: null
+        projectName: null,
+        progress: false
     };
 
     async componentDidMount() {
@@ -42,9 +43,12 @@ export default class Cli extends Component {
 
         return (
             <Container>
-                <Conditional expression={!state.error && !state.result}>
+                <Conditional expression={!state.error && !state.result && !state.progress}>
                     <Spinner green /> Fetching base project from GitHub.
                 </Conditional>
+                <Conditional expression={state.progress}>
+                    <Spinner green /> Unzipping starter project to {props.projectName}
+                </Conditional>
                 <Conditional expression={state.error !== null}>
                     <Text red>
                         {state.error && state.error.message}
@@ -60,14 +64,19 @@ export default class Cli extends Component {
     }
 
     createScaffold = async path => {
+        const gitHubUrl = 'https://github.com/BlackBoxVision/typescript-hapi-starter/archive/master.zip';
         const gitHubFolderName = 'typescript-hapi-starter-master';
 
         try {
-            const stream = await ZipUtils.download(
-                'https://github.com/BlackBoxVision/typescript-hapi-starter/archive/master.zip'
-            );
+            const stream = await ZipUtils.download(gitHubUrl);
+
+            await ZipUtils.writeStream(stream, path, progress => {
+                //console.info('Progress', JSON.stringify(progress, null, 2));
 
-            await ZipUtils.writeStream(stream, path);
+                this.setState(state => ({
+                    progress: true
+                }));
+            });
 
             if (await FileUtils.exists(path)) {
                 await this.handleError(
@@ -82,7 +91,8 @@ export default class Cli extends Component {
 
                 this.setState(state => ({
                     projectName: path,
-                    result: 'ok'
+                    result: 'ok',
+                    progress: false
                 }));
 
                 this.exitWithDelay(Types.EXIT_WITH_SUCCESS);
@@ -96,7 +106,8 @@ export default class Cli extends Component {
         await FileUtils.remove(path);
 
         this.setState(state => ({
-            error: error
+            error: error,
+            progress: false
         }));
 
         this.exitWithDelay(Types.EXIT_WITH_ERROR);

src/cli/util/Zip.js

@@ -1,3 +1,4 @@
+import progress from 'progress-stream';
 import fetch from 'isomorphic-fetch';
 import unzip from 'unzip';
 import fs from 'fs';
@@ -14,9 +15,12 @@ export default class ZipUtils {
         return response.body;
     }
 
-    static async writeStream(stream, value) {
+    static async writeStream(stream, value, onProgress) {
+        const progressTracker = progress({ time: 100 }, onProgress);
+
         return new Promise((resolve, reject) => {
             stream
+                .pipe(progressTracker)
                 .pipe(fs.createWriteStream(`${value}.zip`))
                 .on('error', error => reject(error))
                 .on('close', () => resolve('file written'));

yarn.lock

@@ -1194,6 +1194,13 @@ process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
+progress-stream:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/progress-stream/-/progress-stream-2.0.0.tgz#fac63a0b3d11deacbb0969abcc93b214bce19ed5"
+  dependencies:
+    speedometer "~1.0.0"
+    through2 "~2.0.3"
+
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -1250,7 +1257,7 @@ react:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
-readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4:
+readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
   dependencies:
@@ -1399,6 +1406,10 @@ source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
+speedometer@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-1.0.0.tgz#cd671cb06752c22bca3370e2f334440be4fc62e2"
+
 sshpk@^1.7.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
@@ -1476,6 +1487,13 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
+through2@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  dependencies:
+    readable-stream "^2.1.5"
+    xtend "~4.0.1"
+
 to-fast-properties@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
@@ -1561,3 +1579,7 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
+xtend@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+