Merge pull request #39 from Nikhil-Vats/master

Fixed bug - npm package not installing and released new version

Author: yochannah

DEV_DOCS.md

@@ -11,7 +11,7 @@ this.argument("projectDirectory", {
     });
 ```
 
-This defines the project directory argument which is entered when the generator is run. The string value stored in the `desc` above is shown when user runs the command `yo @biojs/biojs-webcomponents --help`.  Each argument should have a desc field so that yeoman can provide help when user asks.
+This defines the project directory argument which is entered when the generator is run. The string value stored in the `desc` above is shown when user runs the command `yo biojs-webcomponents --help`.  Each argument should have a desc field so that yeoman can provide help when user asks.
 
 The methods listed after the `constructor` are default methods provided by yeoman which are executed in the order they are written which is - 
 ### 1. initializing()
@@ -104,7 +104,7 @@ async function(props) {
             `Oops! We encountered an error. Please see below for the more details - \n${chalk.yellow(
               err
             )}\n.Try this - cd into that directory and run ${chalk.cyan(
-              "`yo @biojs/biojs-webcomponents .`"
+              "`yo biojs-webcomponents .`"
             )}.`
           );
         });

README.md

@@ -21,30 +21,30 @@ Step 1: Install [Yeoman](http://yeoman.io).
 npm install -g yo
 ```
 
-Step 2a: Install [generator-biojs-webcomponents](https://www.npmjs.com/package/@biojs/generator-biojs-webcomponents).
+Step 2a: Install [generator-biojs-webcomponents](https://www.npmjs.com/package/generator-biojs-webcomponents).
 
 ```
-npm install -g yo @biojs/biojs-webcomponents
+npm install -g yo generator-biojs-webcomponents
 ```
 
 Step 2b: Generate your new project.
 
 ```
-i) yo @biojs/biojs-webcomponents 
+i) yo biojs-webcomponents 
 ```
 This will make a **new directory** named `web-component` in the **current directory**. The `web-component` directory will be your **project directory**. If there is already a directory with the name `web-component`, the generator will not make a new one, rather **the existing one will be your project directory**.
 
    OR
 
 ```
-ii) yo @biojs/biojs-webcomponents .
+ii) yo biojs-webcomponents .
 ```
 This will run the generator in the **current directory**.
 
    OR 
 
 ```
-iii) yo @biojs/biojs-webcomponents /anyPath/yourNewProjectDir
+iii) yo biojs-webcomponents /anyPath/yourNewProjectDir
 ```
 This will run the generator in a new directory named `yourNewProjectDir` (you can choose any other name), the new directory will be created at the **path you specified**. If there is already a directory with the same name as you provided, the generator will not make a new one, rather **the existing one will be your project directory**.
 
@@ -106,7 +106,7 @@ If you face any issue, feel free to contact us at [Gitter](https://gitter.im/bio
 
 ## III. Workflow and Questions
 
-After running ```yo @biojs/biojs-webcomponents``` in your terminal, you will be asked -
+After running ```yo biojs-webcomponents``` in your terminal, you will be asked -
 
 ```
 ? Press Enter key to get going!

__tests__/app.js

@@ -158,8 +158,7 @@ describe("generator-biojs-webcomponents:app - Upgrade an existing component by i
 });
 
 describe("generator-biojs-webcomponents:app - Upgrade an existing component by installing component from npm package", () => {
-  it("installs the latest component from its npm package if user enters a valid version", async () => {
-    jest.setTimeout(10000); // Increases timeout for this test
+  it("throws an error if version entered does not exist", async () => {
     let res = await validators.checkVersionAndInstallComponent("latest", {
       packageNameToInstallComponent: "is-odd"
     });

generators/app/index.js

@@ -321,6 +321,7 @@ module.exports = class extends Generator {
             if (props.importFrom === upgradeComponentPrompts[0].choices[0]) {
               return this.prompt(installNpmPackagePrompts).then(props => {
                 // If user chooses to go back and choose source of importing file again
+                this.npmProps = props;
                 if (props.changeImportSourceFromNpmPackage) {
                   return recursivePromptExecution(
                     props.changeImportSourceFromNpmPackage
@@ -469,6 +470,21 @@ module.exports = class extends Generator {
     this.destinationRoot("./");
   }
 
+  installingNPMPackage() {
+    if (
+      this.npmProps &&
+      this.npmProps.packageNameToInstallComponent &&
+      this.npmProps.checkVersionAndInstallComponent
+    ) {
+      this.npmInstall(
+        this.npmProps.packageNameToInstallComponent +
+          "@" +
+          this.npmProps.checkVersionAndInstallComponent,
+        { "save-dev": true }
+      );
+    }
+  }
+
   install() {
     this.installDependencies({
       npm: true,

generators/app/validator.js

@@ -100,51 +100,13 @@ validators.version = async function(props, answers) {
 validators.checkVersionAndInstallComponent = async function(props, answers) {
   if (props) {
     if (props === "latest") {
-      let res = await executeCommand(
-        "cd " +
-          projectDirectory +
-          " && npm i " +
-          answers.packageNameToInstallComponent +
-          "@" +
-          props +
-          " --save-exact",
-        "checkVersionAndInstallComponent"
-      )
-        .then(() => true)
-        .catch(err => {
-          return chalk.red(
-            `Oops! We encountered an error. Please see below for the more details - \n${chalk.yellow(
-              err
-            )}`
-          );
-        });
-      return res;
+      return true;
     }
 
     let command =
       "npm view " + answers.packageNameToInstallComponent + "@" + props;
     let res = await executeCommand(command, "version")
-      .then(async () => {
-        let res = await executeCommand(
-          "cd " +
-            projectDirectory +
-            " && npm i " +
-            answers.packageNameToInstallComponent +
-            "@" +
-            props +
-            " --save-exact",
-          "checkVersionAndInstallComponent"
-        )
-          .then(() => true)
-          .catch(err => {
-            return chalk.red(
-              `Oops! We encountered an error. Please see below for the more details - \n${chalk.yellow(
-                err
-              )}`
-            );
-          });
-        return res;
-      })
+      .then(() => true)
       .catch(() =>
         chalk.red(
           "Sorry, the version - " +
@@ -305,10 +267,7 @@ function executeCommand(command, type) {
         // The command couldn't be executed
         spinner.stop();
         reject(err);
-      } else if (
-        type === "version" ||
-        type === "checkVersionAndInstallComponent"
-      ) {
+      } else if (type === "version") {
         // Command successfully executed
         if (stdout) {
           spinner.stop();

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-biojs-webcomponents",
-  "version": "1.0.1",
+  "version": "2.0.2",
   "description": "Generate the scaffold for a BioJS component automatically so you don't have to do it yourself",
   "homepage": "http://biojs.net",
   "author": {