Selective env #160
Selective env #160
Conversation
|
Did you update your master branch before you forked it? It's not applying cleanly… |
|
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
|
glenngillen
force-pushed
the
selective-env
branch
2 times, most recently
from
97f1162
to
eefcf48
Compare
|
Fixed, must've had an old fork and didn't realize it. What do you think? |
| @@ -91,7 +91,7 @@ def self.yaml_exists? | |||
| private_class_method :yaml_exists? | |||
|
|
|||
| def self.can_use_yaml? | |||
| ENV.keys.grep(/^NESTA/).empty? && yaml_exists? | |||
| yaml_exists? | |||
There was a problem hiding this comment.
We no longer need both yaml_exists? and can_use_yaml?; they're identical. I'll take a look at nailing one of them.
|
Sorted. I wrote up a big explanatory comment in the merge commit. |
|
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? |
|
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? |
|
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
|
|
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. |
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.