Merge pull request #699 from embark-framework/3_1_0_templates-gitignore-2

3_1_0 template .gitignore — round 2

.npmignore

@@ -1 +0,0 @@
-!templates/**/.gitignore

lib/cmds/template_generator.js

@@ -14,6 +14,9 @@ class TemplateGenerator {
     fs.copySync(templatePath, fspath);
     utils.cd(fspath);
     utils.sed('package.json', '%APP_NAME%', name);
+    if (fs.existsSync('dot.gitignore')) {
+      fs.moveSync('dot.gitignore', '.gitignore');
+    }
 
     if (name === 'embark_demo') {
       console.log(__('Installing packages...').green);

lib/core/fs.js

@@ -23,6 +23,10 @@ function move(){
   return fs.move.apply(fs.move, arguments);
 }
 
+function moveSync() {
+  return fs.moveSync.apply(fs.moveSync, arguments);
+}
+
 function appendFileSync() {
   return fs.appendFileSync.apply(fs.writeFileSync, arguments);
 }
@@ -92,6 +96,7 @@ module.exports = {
   copy,
   copySync,
   move,
+  moveSync,
   readFile,
   readFileSync,
   appendFileSync,