New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore directories and files on auto-generation (watch) #2459

Merged
merged 3 commits into from Jun 7, 2014

Conversation

Projects
None yet
4 participants
@ivantsepp
Contributor

ivantsepp commented May 28, 2014

Related Issues: #1184, #1870, #2450, #2302

Summary:

  • When you specify inconsistent values for source and destination, that is switching between absolute and relative, the watch option doesn't properly ignore the destination directory.
  • Editing the config file outputs Regenerating: 1 files at... though this is confusing since these changes do not take effect.

Fixes:

  • Use realpath to get absolute paths
  • Add the config files to the list of files/directories to ignore
  • Remove Command#globs since it's not used anymore (it was used when Jekyll used directory_watcher gem.)

Ivan Tse added some commits May 28, 2014

Ivan Tse
Remove `Command.globs` method
It is no longer being used.
Ivan Tse
Get relative paths of directories to ignore
Use `Pathname#realpath` to get absolute paths so that
`Pathname#relative_path_from` will not raise an exception. Also add the
config files to this list.
@parkr

This comment has been minimized.

Member

parkr commented May 28, 2014

This is looking pretty good! Let's separate out this logic into a separate method (maybe on Jekyll::Command?) and write tests for it. Then I'm 👍.

@parkr parkr added this to the 2.1 milestone May 28, 2014

@parkr parkr added the Fix label May 28, 2014

@ivantsepp

This comment has been minimized.

Contributor

ivantsepp commented May 28, 2014

I moved the logic to Jekyll::Command and added tests. I switched from using Pathname#realpath to Pathname#expand_path since realpath will raise an exception if the file/directory doesn't exist.

source,
:ignore => ignored,
options['source'],
:ignore => self.ignore_paths(options),

This comment has been minimized.

@parkr

parkr Jun 4, 2014

Member

Don't need the self. here.

@parkr

This comment has been minimized.

Member

parkr commented Jun 4, 2014

This is looking good to me. @mattr-?

@mattr-

This comment has been minimized.

Member

mattr- commented Jun 7, 2014

LGTM. :shipit:

@parkr parkr merged commit ccf97a6 into jekyll:master Jun 7, 2014

1 check passed

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

parkr added a commit that referenced this pull request Jun 7, 2014

@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.