[WIP] feat: add egg-ons plugin

.autod.conf.js

@@ -3,6 +3,7 @@
 module.exports = {
   write: true,
   prefix: '^',
+  plugin: 'autod-egg',
   test: [
     'test',
     'benchmark',
@@ -17,10 +18,9 @@ module.exports = {
   devdep: [
     'egg-bin',
     'autod',
+    'autod-egg',
     'eslint',
     'eslint-config-egg',
-    'supertest',
-    'ali-oss',
   ],
   exclude: [
     './test/fixtures',

.eslintrc

@@ -1,6 +1,3 @@
 {
-  "extends": "eslint-config-egg",
-  "rules": {
-    "no-unused-vars": "off"
-  }
-}
+  "extends": "eslint-config-egg"
+}

.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: node_js
 node_js:
 - '6'
-- '7'
+- '8'
 install:
 - npm i npminstall && npminstall
 script:

config/plugin.js

@@ -13,7 +13,10 @@ module.exports = {
     enable: true,
     package: 'egg-mysql',
   },
-
+  ons: {
+    enable: true,
+    package: 'egg-ons',
+  },
   nunjucks: {
     enable: true,
     package: 'egg-view-nunjucks',

package.json

@@ -3,7 +3,9 @@
   "version": "1.0.0",
   "description": "egg framework for aliyun",
   "keywords": [
-    "egg", "egg-framework", "aliyun"
+    "egg",
+    "egg-framework",
+    "aliyun"
   ],
   "files": [
     "index.js",
@@ -13,40 +15,41 @@
     "config"
   ],
   "dependencies": {
-    "egg": "^1.0.0-rc.3",
-    "egg-alinode": "^1.1.0",
-    "egg-mysql": "^2.0.0",
-    "egg-oss": "^1.0.1",
-    "egg-view-nunjucks": "^2.0.0"
+    "egg": "^1.9.0",
+    "egg-alinode": "^1.1.1",
+    "egg-mysql": "^3.0.0",
+    "egg-ons": "^1.0.0",
+    "egg-oss": "^1.1.0",
+    "egg-view-nunjucks": "^2.1.4"
   },
   "devDependencies": {
-    "ali-oss": "^4.8.0",
-    "autod": "^2.7.1",
-    "egg-bin": "^2.4.0",
-    "egg-mock": "^3.2.0",
-    "eslint": "^3.17.1",
-    "eslint-config-egg": "^3.2.0",
-    "rimraf": "^2.6.1",
-    "supertest": "^3.0.0"
+    "autod": "^2.10.1",
+    "autod-egg": "^1.0.0",
+    "egg-bin": "^4.3.5",
+    "egg-mock": "^3.13.1",
+    "eslint": "^4.9.0",
+    "eslint-config-egg": "^5.1.1",
+    "rimraf": "^2.6.2"
   },
   "engines": {
     "node": ">=6.0.0"
   },
   "scripts": {
+    "autod": "autod",
+    "pkgfiles": "egg-bin pkgfiles --check",
     "test": "npm run lint -- --fix && npm run test-local",
     "test-local": "egg-bin test ",
     "cov": "egg-bin cov",
-    "lint": "eslint .",
-    "ci": "npm run lint && npm run cov",
-    "autod": "autod"
+    "lint": "eslint . --fix",
+    "ci": "npm run autod -- --check && npm run pkgfiles && npm run lint && npm run cov"
   },
   "ci": {
-    "version": "6, 7"
+    "version": "6, 8"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/eggjs/aliyun-egg"
   },
   "author": "jtyjty99999 <[email protected]> (http://github.com/jtyjty99999)",
   "license": "MIT"
-}
+}

test/aliyun-egg.test.js

@@ -1,9 +1,6 @@
 'use strict';
 
-const request = require('supertest');
 const mm = require('egg-mock');
-const oss = require('ali-oss');
-const config = require('./fixtures/apps/oss/config/config.default').oss.client;
 const assert = require('assert');
 const env = process.env;
 const region = env.ALI_SDK_OSS_REGION || 'oss-cn-hangzhou';
@@ -16,15 +13,17 @@ describe('test/aliyun-egg.test.js', () => {
       app = utils.createApp('apps/web');
       return app.ready();
     });
+    afterEach(mm.restore);
+    after(() => app.close());
 
     it('should render', () => {
-      return request(app.callback())
+      return app.httpRequest()
         .get('/home')
         .expect('world')
         .expect(200);
     });
     it('should render by default template nunjucks', () => {
-      return request(app.callback())
+      return app.httpRequest()
         .get('/home2')
         .expect('world2')
         .expect(200);
@@ -34,34 +33,22 @@ describe('test/aliyun-egg.test.js', () => {
   describe('oss plugin test', () => {
     let app;
     let lastUploadFileName;
-    let url;
+    const bucket = 'ali-oss-test-bucket-test99';
+    const url = 'http://' + bucket + '.' + region + '.aliyuncs.com';
     before(function* () {
-      const ossConfig = {
-        accessKeyId: config.accessKeyId,
-        accessKeySecret: config.accessKeySecret,
-        endpoint: config.endpoint,
-        region,
-        callbackServer: 'http://d.rockuw.com:4567',
-      };
-      const store = oss(ossConfig);
-      const bucket = 'ali-oss-test-bucket-test99';
-      url = 'http://' + bucket + '.' + region + '.aliyuncs.com';
-      const result = yield store.putBucket(bucket, region);
-      assert(result.bucket === bucket);
-      assert(result.res.status === 200);
       app = utils.createApp('apps/oss');
       return app.ready();
     });
-
+    afterEach(mm.restore);
     after(function* () {
       if (lastUploadFileName) {
         yield app.oss.delete(lastUploadFileName);
       }
-      app.close();
+      yield app.close();
     });
 
     it('should upload file stream to oss', function* () {
-      const result = yield request(app.callback()).get('/uploadtest').expect(200);
+      const result = yield app.httpRequest().get('/uploadtest').expect(200);
       lastUploadFileName = result.body.name;
       const reg = new RegExp('^' + url);
       assert(typeof result.body.name === 'string');
@@ -76,9 +63,11 @@ describe('test/aliyun-egg.test.js', () => {
       app = utils.createApp('apps/mysqlapp-new');
       return app.ready();
     });
+    afterEach(mm.restore);
+    after(() => app.close());
 
     it('should query', () => {
-      return request(app.callback())
+      return app.httpRequest()
         .get('/')
         .expect(200);
     });