Merge pull request #36 from liferay/1.0

1.0.0

generators/app/__tests__/__snapshots__/app-generator.spec.js.snap

@@ -1,6 +1,41 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`app-generator allows a custom repository name 1`] = `
+Object {
+  "content": "root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+",
+  "filePath": "/.editorconfig",
+}
+`;
+
+exports[`app-generator allows a custom repository name 2`] = `
+Object {
+  "content": "build/
+node_modules/
+",
+  "filePath": "/.gitignore",
+}
+`;
+
+exports[`app-generator allows a custom repository name 3`] = `
+Object {
+  "content": "{}
+",
+  "filePath": "/.yo-rc.json",
+}
+`;
+
+exports[`app-generator allows a custom repository name 4`] = `
 Object {
   "content": "{
   \\"name\\": \\"my-nice-custom-project\\",
@@ -31,7 +66,7 @@ Object {
 }
 `;
 
-exports[`app-generator allows a custom repository name 2`] = `
+exports[`app-generator allows a custom repository name 5`] = `
 Object {
   "content": "# My Nice Custom Project
 
@@ -45,7 +80,56 @@ how to manage this project in the [generator documentation][2].
 }
 `;
 
+exports[`app-generator allows a custom repository name 6`] = `
+Object {
+  "content": "",
+  "filePath": "/src",
+}
+`;
+
+exports[`app-generator allows a custom repository name 7`] = `
+Object {
+  "content": "",
+  "filePath": "/src/.gitkeep",
+}
+`;
+
 exports[`app-generator allows adding sample content 1`] = `
+Object {
+  "content": "root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+",
+  "filePath": "/.editorconfig",
+}
+`;
+
+exports[`app-generator allows adding sample content 2`] = `
+Object {
+  "content": "build/
+node_modules/
+",
+  "filePath": "/.gitignore",
+}
+`;
+
+exports[`app-generator allows adding sample content 3`] = `
+Object {
+  "content": "{}
+",
+  "filePath": "/.yo-rc.json",
+}
+`;
+
+exports[`app-generator allows adding sample content 4`] = `
 Object {
   "content": "{
   \\"name\\": \\"sample-liferay-fragments\\",
@@ -76,7 +160,7 @@ Object {
 }
 `;
 
-exports[`app-generator allows adding sample content 2`] = `
+exports[`app-generator allows adding sample content 5`] = `
 Object {
   "content": "# Sample Liferay Fragments
 
@@ -90,7 +174,21 @@ how to manage this project in the [generator documentation][2].
 }
 `;
 
-exports[`app-generator allows adding sample content 3`] = `
+exports[`app-generator allows adding sample content 6`] = `
+Object {
+  "content": "",
+  "filePath": "/src",
+}
+`;
+
+exports[`app-generator allows adding sample content 7`] = `
+Object {
+  "content": "",
+  "filePath": "/src/.gitkeep",
+}
+`;
+
+exports[`app-generator allows adding sample content 8`] = `
 Object {
   "content": "{
   \\"cssPath\\": \\"styles.css\\",
@@ -104,7 +202,7 @@ Object {
 }
 `;
 
-exports[`app-generator allows adding sample content 4`] = `
+exports[`app-generator allows adding sample content 9`] = `
 Object {
   "content": "<div class=\\"sample-fragment\\">
   Sample fragment
@@ -114,7 +212,7 @@ Object {
 }
 `;
 
-exports[`app-generator allows adding sample content 5`] = `
+exports[`app-generator allows adding sample content 10`] = `
 Object {
   "content": ".sample-fragment {
   color: inherit;
@@ -124,7 +222,7 @@ Object {
 }
 `;
 
-exports[`app-generator allows adding sample content 6`] = `
+exports[`app-generator allows adding sample content 11`] = `
 Object {
   "content": "const content = fragmentElement.querySelector('.sample-fragment');
 ",
@@ -133,6 +231,41 @@ Object {
 `;
 
 exports[`app-generator generates a new project 1`] = `
+Object {
+  "content": "root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+",
+  "filePath": "/.editorconfig",
+}
+`;
+
+exports[`app-generator generates a new project 2`] = `
+Object {
+  "content": "build/
+node_modules/
+",
+  "filePath": "/.gitignore",
+}
+`;
+
+exports[`app-generator generates a new project 3`] = `
+Object {
+  "content": "{}
+",
+  "filePath": "/.yo-rc.json",
+}
+`;
+
+exports[`app-generator generates a new project 4`] = `
 Object {
   "content": "{
   \\"name\\": \\"sample-liferay-fragments\\",
@@ -163,7 +296,7 @@ Object {
 }
 `;
 
-exports[`app-generator generates a new project 2`] = `
+exports[`app-generator generates a new project 5`] = `
 Object {
   "content": "# Sample Liferay Fragments
 
@@ -176,3 +309,17 @@ how to manage this project in the [generator documentation][2].
   "filePath": "/README.md",
 }
 `;
+
+exports[`app-generator generates a new project 6`] = `
+Object {
+  "content": "",
+  "filePath": "/src",
+}
+`;
+
+exports[`app-generator generates a new project 7`] = `
+Object {
+  "content": "",
+  "filePath": "/src/.gitkeep",
+}
+`;

generators/app/__tests__/app-generator.spec.js

@@ -5,7 +5,12 @@ const YeomanTest = require('yeoman-test');
 
 function expectFile(base, _path) {
   const filePath = path.join(base, _path);
-  const content = fs.readFileSync(filePath, 'utf-8');
+  const stat = fs.lstatSync(filePath);
+  let content = '';
+
+  if (stat.isFile()) {
+    content = fs.readFileSync(filePath, 'utf-8');
+  }
 
   return expect({
     filePath: _path.split(path.sep).join('/'),
@@ -22,7 +27,7 @@ function expectProjectFiles(base) {
 
   return expectFiles(
     base,
-    glob.sync(`${templatesPath}/**/*`).map(templatePath =>
+    glob.sync(`${templatesPath}/**/*`, { dot: true }).map(templatePath =>
       path
         .resolve(templatePath)
         .replace(templatesPath, '')

generators/app/index.js

@@ -62,6 +62,8 @@ class AppGenerator extends CustomGenerator {
   writing() {
     logNewLine('Creating directory');
 
+    this.copyFiles(this.destinationRoot(), ['src/.gitkeep']);
+
     this.copyTemplates(this.destinationRoot(), [
       '.editorconfig',
       '.gitignore',

generators/fragment/index.js

@@ -96,7 +96,8 @@ module.exports = class extends CustomGenerator {
         name: FRAGMENT_TYPE_VAR,
         message: FRAGMENT_TYPE_MESSAGE,
         choices: FRAGMENT_TYPE_OPTIONS,
-        default: this.getValue(FRAGMENT_TYPE_VAR)
+        default: this.getValue(FRAGMENT_TYPE_DEFAULT),
+        when: !this.hasValue(FRAGMENT_TYPE_VAR)
       }
     ]);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-liferay-fragments",
-  "version": "0.2.0",
+  "version": "1.0.0",
   "description": "Yeoman generator for creating and maintaining Liferay Fragment projects",
   "homepage": "https://www.npmjs.com/package/generator-liferay-fragments",
   "author": {