feat(generators): Change name: new->new:angular and entity->entity:angular

Author: EndyKaufman

README.md

@@ -33,16 +33,16 @@ $ npm install -g @rucken/cli
 <!-- installstop -->
 # Generators
 <!-- generators -->
-* [`rucken entity [FOLDER]`](#rucken-entity-folder)
-* [`rucken new [FOLDER]`](#rucken-new-folder)
+* [`rucken entity:angular [FOLDER]`](#rucken-entity-angular-folder)
+* [`rucken new:angular [FOLDER]`](#rucken-new-angular-folder)
 
-## `rucken entity [FOLDER]`
+## `rucken entity:angular [FOLDER]`
 
-generate model, service, grid, lookup input, modal for edit row in grid, modal for select items from grid with items
+generate frontend model, service, grid, lookup input, modal for edit row in grid, modal for select items from grid with items for Angular 6+ application based on Rucken template
 
 ```
 USAGE
-  $ rucken entity [FOLDER]
+  $ rucken entity:angular [FOLDER]
 
 OPTIONS
   -a, --app=app            application name in angular.json
@@ -55,15 +55,15 @@ OPTIONS
   -w, --web=web            web library name in angular.json
 ```
 
-_See code: [src\commands\entity.ts](https://github.com/rucken/cli/blob/develop/src/commands/entity.ts)_
+_See code: [src\commands\entity.ts](https://github.com/rucken/cli/blob/develop/src/commands/angular-entity.ts)_
 
-## `rucken new [FOLDER]`
+## `rucken new:angular [FOLDER]`
 
-generate empty application based on rucken template
+generate frontend web empty Angular 6+ application based on Rucken template
 
 ```
 USAGE
-  $ rucken new [FOLDER]
+  $ rucken new:angular [FOLDER]
 
 OPTIONS
   -e, --email=email        email
@@ -72,7 +72,7 @@ OPTIONS
   -u, --username=username  username
 ```
 
-_See code: [src\commands\new.ts](https://github.com/rucken/cli/blob/develop/src/commands/new.ts)_
+_See code: [src\commands\new.ts](https://github.com/rucken/cli/blob/develop/src/commands/angular-new.ts)_
 <!-- generatorsstop -->
 
 # Commands

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@rucken/cli",
-  "description": "Console tools for create and build Angular5+ application based on rucken",
+  "description": "Console tools for create and build Angular6+ and NestJS application based on Rucken template",
   "version": "3.0.2",
   "author": {
     "name": "endy",
@@ -15,7 +15,7 @@
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "@oclif/plugin-help": "^2",
-    "@rucken/schematics": "^3.0.8",
+    "@rucken/schematics": "^3.1.0",
     "@types/recursive-readdir": "^2.2.0",
     "@types/replace-ext": "0.0.27",
     "npm-run": "^5.0.1",
@@ -37,9 +37,9 @@
     "@types/node": "~8.9.4",
     "@types/yargs": "^11.1.1",
     "chai": "^4",
-    "conventional-changelog-cli": "^2.0.1",
+    "conventional-changelog-cli": "^2.0.5",
     "conventional-commits-detector": "^0.1.1",
-    "conventional-recommended-bump": "^4.0.0",
+    "conventional-recommended-bump": "^4.0.1",
     "globby": "^8",
     "mocha": "^5",
     "nyc": "^12",
@@ -97,8 +97,8 @@
     "run-version-updater": "node ./bin/run version-updater test/fixtures/version-updater/folder1 -r test/fixtures/version-updater",
     "run-config": "node ./bin/run config test/fixtures/config/dev -m dev",
     "run-prepare": "node ./bin/run prepare test/fixtures/prepare -m dev",
-    "run-new": "node ./bin/run new test/fixtures/new -n demo -u demo -e demo@demo.demo",
-    "run-entity": "node ./bin/run entity test/fixtures/entity -n demo -u demo -e demo@demo.demo -f [name,title]"
+    "run-new:angular": "node ./bin/run new test/fixtures/angular-new -n demo -u demo -e demo@demo.demo",
+    "run-entity:angular": "node ./bin/run entity test/fixtures/angular-entity -n demo -u demo -e demo@demo.demo -f [name,title]"
   },
   "greenkeeper": {
     "ignore": [

package.json

@@ -2,8 +2,9 @@ import { flags, Command } from '@oclif/command';
 import { sep } from 'path';
 const npmRun = require('npm-run');
 
-export class Entity extends Command {
-  static description = 'generate model, service, grid, lookup input, modal for edit row in grid, modal for select items from grid with items';
+export class AngularEntity extends Command {
+  static aliases = ['entity:angular', 'angular-entity'];
+  static description = 'generate frontend model, service, grid, lookup input, modal for edit row in grid, modal for select items from grid with items for Angular 6+ application based on Rucken template';
   static flags = {
     help: flags.help({ char: 'h' }),
     name: flags.string({ char: 'n', description: 'entity singular name on ke-bab case', required: true }),
@@ -16,7 +17,7 @@ export class Entity extends Command {
   };
   static args = [{ name: 'folder' }];
   async run() {
-    const { args, flags } = this.parse(Entity);
+    const { args, flags } = this.parse(AngularEntity);
     const folder = args.folder;
     const name = flags.name;
     const fields = flags.fields;
@@ -64,7 +65,7 @@ export class Entity extends Command {
     return new Promise((resolve, reject) => {
       const inputFolder = folder ? folder.replace(new RegExp('\\' + sep, 'g'), '/').split(sep).join('/') : undefined;
       const command =
-        'schematics @rucken/schematics:entity ' +
+        'schematics @rucken/schematics:angular-entity ' +
         (inputFolder ? ('--root=' + inputFolder + ' ') : ' ') +
         (name ? ('--name=' + name + ' ') : ' ') +
         (fields ? ('--fields=' + fields + ' ') : ' ') +

src/commands/entity.ts src/commands/angular-entity.tssrc/commands/entity.ts renamed to src/commands/angular-entity.ts

@@ -2,8 +2,9 @@ import { flags, Command } from '@oclif/command';
 import { sep } from 'path';
 const npmRun = require('npm-run');
 
-export class New extends Command {
-  static description = 'generate empty application based on rucken template';
+export class AngularNew extends Command {
+  static aliases = ['new:angular', 'angular-new'];
+  static description = 'generate frontend web empty Angular 6+ application based on Rucken template';
   static flags = {
     help: flags.help({ char: 'h' }),
     name: flags.string({ char: 'n', description: 'application name on ke-bab case', required: true }),
@@ -12,7 +13,7 @@ export class New extends Command {
   };
   static args = [{ name: 'folder' }];
   async run() {
-    const { args, flags } = this.parse(New);
+    const { args, flags } = this.parse(AngularNew);
     const folder = args.folder;
     const name = flags.name;
     const username = flags.username;
@@ -44,7 +45,7 @@ export class New extends Command {
     return new Promise((resolve, reject) => {
       const inputFolder = folder ? folder.replace(new RegExp('\\' + sep, 'g'), '/').split(sep).join('/') : undefined;
       const command =
-        'schematics @rucken/schematics:new ' +
+        'schematics @rucken/schematics:angular-new ' +
         (inputFolder ? ('--root=' + inputFolder + ' ') : ' ') +
         (name ? ('--name=' + name + ' ') : ' ') +
         (username ? ('--username=' + username + ' ') : ' ') +

src/commands/new.ts src/commands/angular-new.tssrc/commands/new.ts renamed to src/commands/angular-new.ts

@@ -3,39 +3,39 @@ import { readFileSync } from 'fs';
 import { resolve } from 'path';
 const rimraf = require('rimraf');
 
-describe('entity', () => {
+describe('entity:angular', () => {
   beforeEach(done =>
-    rimraf(resolve('test/fixtures/entity'), {}, () =>
+    rimraf(resolve('test/fixtures/angular-entity'), {}, () =>
       setTimeout(
         () =>
           done(), 1000
       )
     )
   );
   afterEach(done =>
-    rimraf(resolve('test/fixtures/entity'), {}, () =>
+    rimraf(resolve('test/fixtures/angular-entity'), {}, () =>
       setTimeout(
         () =>
           done(), 1000
       )
     )
   );
   test
-    .command(['entity', 'test/fixtures/entity', '-n', 'demo', '-u', 'demo', '-e', 'demo@demo.demo', '-f', '[name,title]'])
+    .command(['entity:angular', 'test/fixtures/angular-entity', '-n', 'demo', '-u', 'demo', '-e', 'demo@demo.demo', '-f', '[name,title]'])
     .it('run entity generator', _ctx => {
       let angularConfig;
       let modelContent;
       try {
         angularConfig = JSON.parse(readFileSync(
-          'test/fixtures/entity/angular.json'
+          'test/fixtures/angular-entity/angular.json'
         ).toString());
       } catch (error) {
         angularConfig = {};
         console.error(error);
       }
       try {
         modelContent = readFileSync(
-          'test/fixtures/entity/libs/demo/core/src/lib/shared/models/demo.ts'
+          'test/fixtures/angular-entity/libs/demo/core/src/lib/shared/models/demo.ts'
         ).toString();
       } catch (error) {
         modelContent = '';

test/commands/entity.test.ts test/commands/angular-entity.test.tstest/commands/entity.test.ts renamed to test/commands/angular-entity.test.ts

@@ -3,30 +3,30 @@ import { readFileSync } from 'fs';
 import { resolve } from 'path';
 const rimraf = require('rimraf');
 
-describe('new', () => {
+describe('new:angular', () => {
   beforeEach(done =>
-    rimraf(resolve('test/fixtures/new'), {}, () =>
+    rimraf(resolve('test/fixtures/angular-new'), {}, () =>
       setTimeout(
         () =>
           done(), 1000
       )
     )
   );
   afterEach(done =>
-    rimraf(resolve('test/fixtures/new'), {}, () =>
+    rimraf(resolve('test/fixtures/angular-new'), {}, () =>
       setTimeout(
         () =>
           done(), 1000
       )
     )
   );
   test
-    .command(['new', 'test/fixtures/new', '-n', 'demo', '-u', 'demo', '-e', 'demo@demo.demo'])
+    .command(['new:angular', 'test/fixtures/angular-new', '-n', 'demo', '-u', 'demo', '-e', 'demo@demo.demo'])
     .it('run new generator', _ctx => {
       let angularConfig;
       try {
         angularConfig = JSON.parse(readFileSync(
-          'test/fixtures/new/angular.json'
+          'test/fixtures/angular-new/angular.json'
         ).toString());
       } catch (error) {
         angularConfig = {};