Merge branch 'master' into stop-test

Author: atian25

History.md

@@ -1,4 +1,16 @@
 
+2.3.0 / 2017-11-29
+==================
+
+**features**
+  * [[`4c41319`](http://github.com/eggjs/egg-scripts/commit/4c41319f9e309402b2ccb5c7afd5a6d3cda2453f)] - feat: support stop --title (#16) (TZ | 天猪 <<[email protected]>>)
+
+2.2.0 / 2017-11-22
+==================
+
+**features**
+  * [[`ac58d00`](http://github.com/eggjs/egg-scripts/commit/ac58d00a974fdfff6b5c722743e4b32174963c52)] - feat: cwd maybe not baseDir (#15) (zhennann <<[email protected]>>)
+
 2.1.1 / 2017-11-14
 ==================
 

README.md

@@ -46,7 +46,7 @@ $ eggctl start [options] [baseDir]
   - `baseDir` - directory of application, default to `process.cwd()`.
 - **Options**
   - `port` - listening port, default to `process.env.PORT`, if unset, egg will use `7001` as default.
-  - `title` - process title description, use for kill grep, default to `egg-server-APPNAME`.
+  - `title` - process title description, use for kill grep, default to `egg-server-${APP_NAME}`.
   - `workers` - numbers of app workers, default to `process.env.EGG_WORKERS`, if unset, egg will use `os.cpus().length`  as default.
   - `daemon` - whether run at background daemon mode.
   - `framework` - specify framework that can be absolute path or npm package, default to auto detect.
@@ -61,9 +61,8 @@ Stop egg gracefull.
 
 ```bash
 # stop egg
-$ eggctl stop [baseDir]
-# eggctl stop ./server
+$ eggctl stop [--title=example]
 ```
 
-- **Arguments**
-  - `baseDir` - directory of application, default to `process.cwd()`.
+- **Options**
+  - `title` - process title description, use for kill grep.

lib/cmd/start.js

@@ -19,7 +19,7 @@ class StartCommand extends Command {
 
     this.options = {
       title: {
-        description: 'process title description, use for kill grep, default to `egg-server-APPNAME`',
+        description: 'process title description, use for kill grep, default to `egg-server-${APP_NAME}`',
         type: 'string',
       },
       workers: {
@@ -122,7 +122,6 @@ class StartCommand extends Command {
     argv.daemon = undefined;
 
     const options = {
-      cwd: baseDir,
       execArgv: context.execArgv,
       env,
       stdio: 'inherit',

lib/cmd/stop.js

@@ -8,8 +8,14 @@ class StopCommand extends Command {
 
   constructor(rawArgv) {
     super(rawArgv);
-    this.usage = 'Usage: egg-scripts stop [baseDir]';
+    this.usage = 'Usage: egg-scripts stop [--title=example]';
     this.serverBin = path.join(__dirname, '../start-cluster');
+    this.options = {
+      title: {
+        description: 'process title description, use for kill grep',
+        type: 'string',
+      },
+    };
   }
 
   get description() {
@@ -25,19 +31,14 @@ class StopCommand extends Command {
 
     const { argv } = context;
 
-    // egg-script stop
-    // egg-script stop ./server
-    // egg-script stop /opt/app
-    let baseDir = argv._[0] || context.cwd;
-    if (!path.isAbsolute(baseDir)) baseDir = path.join(context.cwd, baseDir);
-    argv.baseDir = baseDir;
-
-    this.logger.info(`stopping egg application at ${baseDir}`);
+    this.logger.info(`stopping egg application ${argv.title ? `with --title=${argv.title}` : ''}`);
 
     // node /Users/tz/Workspaces/eggjs/egg-scripts/lib/start-cluster {"title":"egg-server","workers":4,"port":7001,"baseDir":"/Users/tz/Workspaces/eggjs/test/showcase","framework":"/Users/tz/Workspaces/eggjs/test/showcase/node_modules/egg"}
     let processList = yield this.helper.findNodeProcess(item => {
       const cmd = item.cmd;
-      return cmd.includes('start-cluster');
+      return argv.title ?
+        cmd.includes('start-cluster') && cmd.includes(`"title":"${argv.title}"`) :
+        cmd.includes('start-cluster');
     });
     let pids = processList.map(x => x.pid);
 
@@ -55,7 +56,9 @@ class StopCommand extends Command {
     // node /Users/tz/Workspaces/eggjs/test/showcase/node_modules/[email protected]@egg-cluster/lib/app_worker.js {"framework":"/Users/tz/Workspaces/eggjs/test/showcase/node_modules/egg","baseDir":"/Users/tz/Workspaces/eggjs/test/showcase","port":7001,"workers":2,"plugins":null,"https":false,"key":"","cert":"","title":"egg-server","clusterPort":52406}
     processList = yield this.helper.findNodeProcess(item => {
       const cmd = item.cmd;
-      return cmd.includes('egg-cluster/lib/app_worker.js') || cmd.includes('egg-cluster/lib/agent_worker.js');
+      return argv.title ?
+        (cmd.includes('egg-cluster/lib/app_worker.js') || cmd.includes('egg-cluster/lib/agent_worker.js')) && cmd.includes(`"title":"${argv.title}"`) :
+        (cmd.includes('egg-cluster/lib/app_worker.js') || cmd.includes('egg-cluster/lib/agent_worker.js'));
     });
     pids = processList.map(x => x.pid);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "egg-scripts",
-  "version": "2.1.1",
+  "version": "2.3.0",
   "description": "deploy tool for egg project",
   "main": "index.js",
   "bin": {
@@ -9,24 +9,24 @@
   },
   "dependencies": {
     "common-bin": "^2.7.1",
-    "egg-utils": "^2.2.0",
-    "moment": "^2.19.1",
+    "egg-utils": "^2.3.0",
+    "moment": "^2.19.2",
     "mz": "^2.7.0",
     "mz-modules": "^2.0.0",
     "node-homedir": "^1.1.0",
     "runscript": "^1.3.0",
     "zlogger": "^1.1.0"
   },
   "devDependencies": {
-    "autod": "^2.10.1",
+    "autod": "^3.0.1",
     "coffee": "^4.1.0",
-    "egg": "^1.9.0",
+    "egg": "^1.11.0",
     "egg-bin": "^4.3.5",
     "egg-ci": "^1.8.0",
-    "eslint": "^4.8.0",
+    "eslint": "^4.11.0",
     "eslint-config-egg": "^5.1.1",
     "mm": "^2.2.0",
-    "urllib": "^2.25.0",
+    "urllib": "^2.25.1",
     "webstorm-disable-index": "^1.2.0"
   },
   "engines": {

test/fixtures/subdir-as-basedir/base-dir/app/router.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = app => {
+  app.get('/', function* () {
+    this.body = `hi, ${app.config.framework || 'egg'}`;
+  });
+
+  app.get('/env', function* () {
+    this.body = app.config.env + ', ' + app.config.pre;
+  });
+
+  app.get('/path', function* () {
+    this.body = process.env.PATH;
+  });
+};

test/fixtures/subdir-as-basedir/base-dir/config/config.default.js

@@ -0,0 +1,3 @@
+'use strict';
+
+exports.keys = '123456';

test/fixtures/subdir-as-basedir/base-dir/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "base-dir"
+}

test/fixtures/subdir-as-basedir/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "subdir-as-basedir"
+}

test/start.test.js

@@ -335,6 +335,34 @@ describe('test/start.test.js', () => {
         assert(result.data.toString() === 'hi, egg');
       });
     });
+
+    describe('subDir as baseDir', () => {
+      let app;
+      const rootDir = path.join(__dirname, '..');
+      const subDir = path.join(__dirname, 'fixtures/subdir-as-basedir/base-dir');
+
+      before(function* () {
+        yield utils.cleanup(rootDir);
+      });
+
+      after(function* () {
+        app.proc.kill('SIGTERM');
+        yield utils.cleanup(rootDir);
+      });
+
+      it('should start', function* () {
+        app = coffee.fork(eggBin, [ 'start', '--workers=2', subDir ], { cwd: rootDir });
+        // app.debug();
+        app.expect('code', 0);
+
+        yield sleep(waitTime);
+
+        assert(app.stderr === '');
+        assert(app.stdout.match(/egg started on http:\/\/127\.0\.0\.1:7001/));
+        const result = yield httpclient.request('http://127.0.0.1:7001');
+        assert(result.data.toString() === 'hi, egg');
+      });
+    });
   });
 
   describe('start with daemon', () => {