RFC: User Config file integration

README.md

@@ -139,7 +139,7 @@ Here are some of the features and capabiliites of Greenwood.
 
 ### Configure
 
-Custom greenwood configurations can be added to a `greenwood.config.js` file in your root directory. For example, you may want to change the `src` folder to something else such as `www`.
+Custom greenwood configurations can be added to a `greenwood.config.js` file in your root directory. For example, you may want to change the `src` folder to something else such as `www`. By default, you can use a relative path. You can also use an absolute path.
 
 ```js
 module.exports = {

packages/cli/lib/config.js

@@ -23,7 +23,7 @@ module.exports = readAndMergeConfig = async() => {
     const userCfgFile = require(path.join(process.cwd(), 'greenwood.config.js'));
 
     // prepend paths with current directory
-    if (userCfgFile.source) {
+    if (userCfgFile.source && !path.isAbsolute(userCfgFile.source)) {
       userCfgFile.source = path.join(process.cwd(), userCfgFile.source);
     }
 

packages/cli/lib/init.js

@@ -1,31 +1,27 @@
 const fs = require('fs');
 const path = require('path');
-const greenwoodWorkspace = path.join(__dirname, '..');
-const defaultTemplateDir = path.join(greenwoodWorkspace, 'templates/');
+const defaultTemplatesDir = path.join(__dirname, '../templates/');
 const scratchDir = path.join(process.cwd(), './.greenwood/');
+const publicDir = path.join(process.cwd(), './public');
 
 module.exports = initContexts = async({ config }) => {
 
   return new Promise((resolve, reject) => {
 
     try {
-      const defaultSrc = config.source;
-
-      const userWorkspace = fs.existsSync(defaultSrc)
-        ? defaultSrc
-        : defaultTemplateDir;
-
-      const pagesDir = fs.existsSync(path.join(userWorkspace, 'pages'))
-        ? path.join(userWorkspace, 'pages/')
-        : defaultTemplateDir;
-
-      const templatesDir = fs.existsSync(path.join(userWorkspace, 'templates'))
-        ? path.join(userWorkspace, 'templates/')
-        : defaultTemplateDir;
-
-      const context = {
-        userWorkspace,
-        pagesDir,
+      const userWorkspace = path.join(config.source);
+      const userPagesDir = path.join(userWorkspace, 'pages/');
+      const userTemplatesDir = path.join(userWorkspace, 'templates/');
+      const userAppTemplate = path.join(userTemplatesDir, 'app-template.js');
+      const userPageTemplate = path.join(userTemplatesDir, 'page-template.js');
+
+      const userHasWorkspace = fs.existsSync(userWorkspace);
+      const userHasWorkspacePages = fs.existsSync(userPagesDir);
+      const userHasWorkspaceTemplates = fs.existsSync(userTemplatesDir);
+      const userHasWorkspacePageTemplate = fs.existsSync(userPageTemplate);
+      const userHasWorkspaceAppTemplate = fs.existsSync(userAppTemplate);
+
+      let context = {
         scratchDir,
         publicDir,
         pagesDir: userHasWorkspacePages ? userPagesDir : defaultTemplatesDir,
@@ -40,7 +36,7 @@ module.exports = initContexts = async({ config }) => {
         indexPageTemplate: 'index.html',
         notFoundPageTemplate: '404.html'
       };
-
+      
       if (!fs.existsSync(scratchDir)) {
         fs.mkdirSync(scratchDir);
       }

test/cli.spec.js

@@ -270,6 +270,7 @@ describe('building greenwood with user workspace that doesn\'t contain app templ
     await fs.remove(CONTEXT.scratchDir);
   });
 });
+
 describe('building greenwood with user workspace that doesn\'t contain page template', () => {
   before(async() => {
     setup = new TestSetup();
@@ -282,6 +283,85 @@ describe('building greenwood with user workspace that doesn\'t contain page temp
     blogPageHtmlPath = path.join(CONTEXT.publicDir, 'blog', '20190326', 'index.html'); 
   });
 
+  it('should create a public directory', () => {
+    expect(fs.existsSync(CONTEXT.publicDir)).to.be.true;
+  });
+
+  describe('public directory output', () => {  
+    it('should output a single index.html file (home page)', () => {
+      expect(fs.existsSync(path.join(CONTEXT.publicDir, './index.html'))).to.be.true;
+    });
+
+    it('should output one JS bundle', async() => {
+      expect(await glob.promise(path.join(CONTEXT.publicDir, './**/index.*.bundle.js'))).to.have.lengthOf(1);
+    });
+
+    it('should create a default hello page directory', () => {
+      expect(fs.existsSync(path.join(CONTEXT.publicDir, './hello'))).to.be.true;
+    });
+
+    describe('default generated hello page directory', () => {
+      const defaultHeading = 'Test App';
+      const defaultBody = 'This is a test app using a custom user template!';
+      let dom;
+
+      beforeEach(async() => {
+        dom = await JSDOM.fromFile(path.resolve(CONTEXT.publicDir, 'hello/index.html'));
+      });
+
+      it('should output an index.html file within the default hello page directory', () => {
+        expect(fs.existsSync(path.join(CONTEXT.publicDir, './hello', './index.html'))).to.be.true;
+      });
+
+      it('should have the expected heading text within the hello example page in the hello directory', async() => {
+        const heading = dom.window.document.querySelector('h3').textContent;
+
+        expect(heading).to.equal(defaultHeading);
+      });
+
+      it('should have the expected paragraph text within the hello example page in the hello directory', async() => {
+        let paragraph = dom.window.document.querySelector('p').textContent;
+
+        expect(paragraph).to.equal(defaultBody);
+      });
+    });
+  });
+
+  it('should contain a nested blog page directory', () => {
+    expect(fs.existsSync(path.join(CONTEXT.publicDir, 'blog', '20190326'))).to.be.true;
+  });
+
+  describe('nested generated blog page directory', () => {
+    const defaultHeading = 'Blog Page';
+    const defaultBody = 'This is the blog page built by Greenwood.';
+    let dom;
+
+    beforeEach(async() => {
+      dom = await JSDOM.fromFile(blogPageHtmlPath);
+    });
+
+    it('should contain a nested blog page with an index html file', () => {
+      expect(fs.existsSync(blogPageHtmlPath)).to.be.true;
+    });
+
+    it('should have the expected heading text within the blog page in the blog directory', async() => {
+      const heading = dom.window.document.querySelector('h3').textContent;
+
+      expect(heading).to.equal(defaultHeading);
+    });
+
+    it('should have the expected paragraph text within the blog page in the blog directory', async() => {
+      let paragraph = dom.window.document.querySelector('p').textContent;
+
+      expect(paragraph).to.equal(defaultBody);
+    });
+  });
+  after(async() => {
+    await fs.remove(CONTEXT.userSrc);
+    await fs.remove(CONTEXT.publicDir);
+    await fs.remove(CONTEXT.scratchDir);
+  });
+
 });
 
 describe('building greenwood with user provided config file', () => {

test/setup.js

@@ -11,7 +11,8 @@ module.exports = class Setup {
   init() {
     return new Promise(async(resolve, reject) => {
       try {
-        const ctx = await initContext({ config: {} });
+        const defaultSource = path.join(process.cwd(), 'src');
+        const ctx = await initContext({ config: { source: defaultSource } });
         const context = { 
           ...ctx,
           userSrc: path.join(__dirname, '..', 'src'), // static src