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

Keep files feature #685

Merged
merged 5 commits into from Jan 11, 2013

Conversation

Projects
None yet
5 participants
@edeustace
Contributor

edeustace commented Dec 8, 2012

As requested - a version of pull request #630 except its now on a feature branch on the fork.

@parkr

This comment has been minimized.

parkr commented on jekyll.gemspec in 7c800d3 Dec 8, 2012

Nicely alphabetized.

@parkr

This comment has been minimized.

parkr commented on lib/jekyll.rb in 7c800d3 Dec 8, 2012

Maybe we should add '.svn'?

This comment has been minimized.

mattr- replied Dec 19, 2012

I'd say 'yes', at least for the corporate environments (like mine) where svn is the standard and the use of git is nonexistant (sadly).

@parkr

This comment has been minimized.

parkr commented on lib/jekyll/site.rb in 7c800d3 Dec 8, 2012

Thoughts on using or_list = self.keep_files.join("|")?

In this case, it produces the exact same output.

This comment has been minimized.

mattr- replied Dec 19, 2012

👍 to this. More understandable that way too. The current line just makes my head hurt.

@parkr

This comment has been minimized.

Member

parkr commented Dec 8, 2012

Lastly, are these from the latest master?

@edeustace

This comment has been minimized.

Contributor

edeustace commented Dec 9, 2012

Hi @parkr, I just rebased from mojombo/jekyll but was already at latest. I've made those changes you suggested.

@parkr

This comment has been minimized.

Member

parkr commented Dec 9, 2012

Great! +1 for this change, @mojombo!

@parkr

This comment has been minimized.

Member

parkr commented Dec 10, 2012

And thanks, @edeustace :)

lib/jekyll/migrators/marley.rb
lib/jekyll/migrators/mephisto.rb
lib/jekyll/migrators/mt.rb
lib/jekyll/migrators/posterous.rb
lib/jekyll/migrators/rss.rb

This comment has been minimized.

@parkr

parkr Dec 18, 2012

Member

Were these migrators forgotten?

@mattr-

This comment has been minimized.

mattr- commented on test/test_site.rb in 7c800d3 Dec 19, 2012

I think I would rename this to something like:

should 'recursively keeps files as specified in the config' do

or something like that, just to make the test case description more - heh - descriptive, but I'm not really bothered by the current description either.

@mattr-

This comment has been minimized.

Member

mattr- commented Dec 19, 2012

Sorry, I'm late to the commenting party for this pull. You can ignore my comment about the use of .join since it was already done.

@mojombo

This comment has been minimized.

Contributor

mojombo commented Jan 1, 2013

Can you rebase this without the gemspec changes? It won't merge cleanly with those in there.

@@ -217,7 +219,11 @@ def cleanup
# all files and directories in destination, including hidden ones
dest_files = Set.new
Dir.glob(File.join(self.dest, "**", "*"), File::FNM_DOTMATCH) do |file|
dest_files << file unless file =~ /\/\.{1,2}$/
if self.keep_files.length > 0
dest_files << file unless file =~ /\/\.{1,2}$/ or file =~ keep_file_regex

This comment has been minimized.

@mojombo

mojombo Jan 1, 2013

Contributor

I'd prefer to see || here instead of or.

@@ -242,6 +248,14 @@ def cleanup
FileUtils.rm_rf(obsolete_files.to_a)
end
# create a regex from the keep_files array
# ['.git','.svn'] => /\/(\.git|\/.svn)/

This comment has been minimized.

@mojombo

mojombo Jan 1, 2013

Contributor

I'm trying to convert all the docs to TomDoc. I'd love to see these done in that style.

end
should 'remove orphaned files in destination - keep_files .svn' do

This comment has been minimized.

@mojombo

mojombo Jan 1, 2013

Contributor

Extraneous whitespace.

@edeustace

This comment has been minimized.

Contributor

edeustace commented Jan 2, 2013

Been away, will have a look later.

@parkr

This comment has been minimized.

Member

parkr commented Jan 11, 2013

@edeustace You may need to rebase on the current master again, sorry!

@edeustace

This comment has been minimized.

Contributor

edeustace commented Jan 11, 2013

@parkr hows this commit?

parkr added a commit that referenced this pull request Jan 11, 2013

@parkr parkr merged commit 418ef41 into jekyll:master Jan 11, 2013

1 check passed

default The Travis build passed
Details
@parkr

This comment has been minimized.

Member

parkr commented Jan 11, 2013

It's great, thanks!

@edeustace edeustace deleted the edeustace:keep_files_feature branch Jan 14, 2013

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