Make includes dir configurable and rename dirs for consistency #3782

Merged
merged 2 commits into from Aug 16, 2015

Conversation

Projects
None yet
4 participants
@fniephaus
Contributor

fniephaus commented Jun 11, 2015

This addresses #2684 and makes the _includes directory configurable.

@parkr

View changes

lib/jekyll/configuration.rb
@@ -11,7 +11,8 @@ class Configuration < Hash
'destination' => File.join(Dir.pwd, '_site'),
'plugins' => '_plugins',
'layouts' => '_layouts',
- 'data_source' => '_data',
+ 'data_source' => '_data',
+ 'includes_dir' => '_includes',

This comment has been minimized.

@parkr

parkr Aug 4, 2015

Member

Perhaps just includes to match plugins and layouts?

@parkr

parkr Aug 4, 2015

Member

Perhaps just includes to match plugins and layouts?

This comment has been minimized.

@fniephaus

fniephaus Aug 4, 2015

Contributor

I just wanted to avoid confusions, because there already is an include.
What would you prefer?

@fniephaus

fniephaus Aug 4, 2015

Contributor

I just wanted to avoid confusions, because there already is an include.
What would you prefer?

This comment has been minimized.

@parkr

parkr Aug 4, 2015

Member

Ah, yes, that might be confusing. For consistency, it would be nice to have plugins_dir, layouts_dir, and so forth as well. But We'd need the backwards-compatibility layer (in Jekyll::Configuration so should be easy). Want to do that? Would be great to have :)

@parkr

parkr Aug 4, 2015

Member

Ah, yes, that might be confusing. For consistency, it would be nice to have plugins_dir, layouts_dir, and so forth as well. But We'd need the backwards-compatibility layer (in Jekyll::Configuration so should be easy). Want to do that? Would be great to have :)

This comment has been minimized.

@fniephaus

fniephaus Aug 4, 2015

Contributor

Sure, I could do that. So you want all directory configuration options to have a _dir suffix and a backwards-compatibility layer that maps old names to new names?

@fniephaus

fniephaus Aug 4, 2015

Contributor

Sure, I could do that. So you want all directory configuration options to have a _dir suffix and a backwards-compatibility layer that maps old names to new names?

This comment has been minimized.

@parkr

parkr Aug 4, 2015

Member

Yeppers! Examples of backwards-compatibility are in Jekyll::Configuration. Just add whatever is needed to that method. :)

@parkr

parkr Aug 4, 2015

Member

Yeppers! Examples of backwards-compatibility are in Jekyll::Configuration. Just add whatever is needed to that method. :)

This comment has been minimized.

@fniephaus

fniephaus Aug 4, 2015

Contributor

No worries. I'll update this pull request next weekend if that's ok!

@fniephaus

fniephaus Aug 4, 2015

Contributor

No worries. I'll update this pull request next weekend if that's ok!

This comment has been minimized.

@parkr

parkr Aug 4, 2015

Member

Sure. We're going to release 3.0 soonish, but this can be 3.1.

@parkr

parkr Aug 4, 2015

Member

Sure. We're going to release 3.0 soonish, but this can be 3.1.

This comment has been minimized.

@fniephaus

fniephaus Aug 4, 2015

Contributor

Ok, so maybe I can finish this on Thursday if that helps

@fniephaus

fniephaus Aug 4, 2015

Contributor

Ok, so maybe I can finish this on Thursday if that helps

This comment has been minimized.

@fniephaus

fniephaus Aug 7, 2015

Contributor

@parkr turns out I'd also need to update jekyll-sass-converter if we rename source to source_dir. Is that still something you would want?

@fniephaus

fniephaus Aug 7, 2015

Contributor

@parkr turns out I'd also need to update jekyll-sass-converter if we rename source to source_dir. Is that still something you would want?

This comment has been minimized.

@parkr

parkr Aug 8, 2015

Member

Keep source and dest/destination as-is.

@parkr

parkr Aug 8, 2015

Member

Keep source and dest/destination as-is.

@fniephaus

This comment has been minimized.

Show comment
Hide comment
@fniephaus

fniephaus Aug 8, 2015

Contributor

@parkr this should be it. let me know if you want me to change anything else. 😃

Contributor

fniephaus commented Aug 8, 2015

@parkr this should be it. let me know if you want me to change anything else. 😃

@fniephaus fniephaus changed the title from Make _includes directory configurable to Make includes dir configurable and rename dirs for consistency Aug 8, 2015

@envygeeks

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks Aug 8, 2015

Contributor

@fniephaus can you please squash those commits. Thanks.

Contributor

envygeeks commented Aug 8, 2015

@fniephaus can you please squash those commits. Thanks.

fniephaus added some commits Jun 11, 2015

Make _includes directory configurable; closes #2684
and rename `plugins`, `layouts` and `data_source` directories for consistency
@fniephaus

This comment has been minimized.

Show comment
Hide comment
@fniephaus

fniephaus Aug 9, 2015

Contributor

@envygeeks Done!

Contributor

fniephaus commented Aug 9, 2015

@envygeeks Done!

@parkr parkr merged commit 2812341 into jekyll:master Aug 16, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

parkr added a commit that referenced this pull request Aug 16, 2015

Merge branch 'fniephaus-_includes' into 'master'
* fniephaus-_includes:
  Unify renaming of configuration options to a single method. /cc #3782.
  Make _includes directory configurable; closes #2684

parkr added a commit that referenced this pull request Aug 16, 2015

@jekyll jekyll locked and limited conversation to collaborators Feb 27, 2017

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.