gma / nesta

File Based CMS and Static Site Generator
http://nestacms.com
MIT License
902 stars 120 forks source link

Selective env #160

Closed glenngillen closed 9 years ago

glenngillen commented 9 years ago

This pull request allows YAML and environment variable configs to co-exist with each other. This also means a user can specify an environment variable of NESTA* without causing nesta to completely change where it reads it's config from.

I also had to change the way fallback to YAML happens as falsy values defined in ENV would be ignored.

gma commented 9 years ago

Did you update your master branch before you forked it? It's not applying cleanly…

glenngillen commented 9 years ago

Yeah, but I did a selective patch to exclude a bunch of white space changes and I see now the PR says there are conflicts. Let me take another look later this evening.

On Mon, Jan 19, 2015 at 6:16 PM, Graham Ashton notifications@github.com wrote:

Did you update your master branch before you forked it? It's not applying cleanly…

Reply to this email directly or view it on GitHub: https://github.com/gma/nesta/pull/160#issuecomment-70454148

glenngillen commented 9 years ago

Fixed, must've had an old fork and didn't realize it.

What do you think?

gma commented 9 years ago

Sorted. I wrote up a big explanatory comment in the merge commit.

glenngillen commented 9 years ago

Woo! Thanks.

If/when you get a chance could I get a version bump so I can lock this change as a dependency on a few things?

gma commented 9 years ago

Will do. I'd like to review a PR that fixes plugin generation and get that into the same release. Are you waiting on it to get other work done?

glenngillen commented 9 years ago

Nothing pressing, I've got Gemfiles pulling things via git in the interim.

On Fri, Jan 23, 2015 at 5:46 PM, Graham Ashton notifications@github.com wrote:

Will do. I'd like to review a PR that fixes plugin generation and get that into the same release. Are you waiting on it to get other work done?

Reply to this email directly or view it on GitHub: https://github.com/gma/nesta/pull/160#issuecomment-71154126

gma commented 9 years ago

Okay. I'll see if I get any spare time on Sunday. If it's not done within the week, feel free to remind me.