Merge pull request #176 from iamstarkov/feat/compose-with-generator-t…

…ravis compose with generator-travis
yeoman · Oct 15, 2015 · 41642ee · 41642ee
2 parents d50f1a4 + c26bda8
commit 41642ee
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -104,7 +104,6 @@ Remember you can see the options of each sub generators by running `yo node:sub
 - `node:gulp`
 - `node:license`
 - `node:readme`
-- `node:travis`
 
 
 ## License

diff --git a/generators/app/index.js b/generators/app/index.js
@@ -195,8 +195,8 @@ module.exports = generators.Base.extend({
 
   default: function () {
     if (this.options.travis) {
-      this.composeWith('node:travis', {}, {
-        local: require.resolve('../travis')
+      this.composeWith('travis', {}, {
+        local: require.resolve('generator-travis/generators/app')
       });
     }
 

diff --git a/generators/travis/index.js b/generators/travis/index.js
diff --git a/generators/travis/templates/travis.yml b/generators/travis/templates/travis.yml
diff --git a/index.js b/index.js
@@ -7,6 +7,5 @@ module.exports = {
   eslint: require.resolve('./generators/eslint'),
   git: require.resolve('./generators/git'),
   gulp: require.resolve('./generators/gulp'),
-  readme: require.resolve('./generators/readme'),
-  travis: require.resolve('./generators/travis')
+  readme: require.resolve('./generators/readme')
 };
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "generator-license": "^2.0.0",
     "git-remote-origin-url": "^1.1.1",
     "github-username": "^2.0.0",
+    "generator-travis": "^1.1.3",
     "inquirer-npm-name": "^1.0.0",
     "lodash": "^3.7.0",
     "npm-name": "^1.0.2",

diff --git a/test/travis.js b/test/travis.js