Permalink
Browse files

merge lastest from mojombo/jekyll master

  • Loading branch information...
2 parents 6eed918 + 6253f79 commit 0fa55418e9f5e1982f00cd801d35f7f2177095ef @edeustace committed Jan 11, 2013
Showing with 4,539 additions and 95 deletions.
  1. +2 −0 .gitignore
  2. +1 −0 .ruby-version
  3. +45 −0 CONTRIBUTING.md
  4. +14 −0 History.txt
  5. +7 −6 README.textile
  6. +66 −0 Rakefile
  7. +3 −3 bin/jekyll
  8. +13 −5 jekyll.gemspec
  9. +25 −21 lib/jekyll.rb
  10. +22 −5 lib/jekyll/converters/markdown.rb
  11. +16 −6 lib/jekyll/convertible.rb
  12. +11 −0 lib/jekyll/filters.rb
  13. +27 −7 lib/jekyll/migrators/posterous.rb
  14. +47 −34 lib/jekyll/post.rb
  15. +7 −2 lib/jekyll/site.rb
  16. +4 −0 site/.gitignore
  17. +1 −0 site/CNAME
  18. +1 −0 site/README
  19. +5 −0 site/_config.yml
  20. +32 −0 site/_includes/analytics.html
  21. +79 −0 site/_includes/docs_contents.html
  22. +15 −0 site/_includes/footer.html
  23. +26 −0 site/_includes/header.html
  24. +22 −0 site/_includes/section_nav.html
  25. +14 −0 site/_includes/top.html
  26. +12 −0 site/_layouts/default.html
  27. +21 −0 site/_layouts/docs.html
  28. +250 −0 site/_posts/2012-07-01-configuration.md
  29. +66 −0 site/_posts/2012-07-01-contributing.md
  30. +108 −0 site/_posts/2012-07-01-deployment-methods.md
  31. +103 −0 site/_posts/2012-07-01-extras.md
  32. +120 −0 site/_posts/2012-07-01-frontmatter.md
  33. +34 −0 site/_posts/2012-07-01-github-pages.md
  34. +8 −0 site/_posts/2012-07-01-heroku.md
  35. +47 −0 site/_posts/2012-07-01-home.md
  36. +43 −0 site/_posts/2012-07-01-installation.md
  37. +180 −0 site/_posts/2012-07-01-migrations.md
  38. +62 −0 site/_posts/2012-07-01-pages.md
  39. +116 −0 site/_posts/2012-07-01-pagination.md
  40. +163 −0 site/_posts/2012-07-01-permalinks.md
  41. +384 −0 site/_posts/2012-07-01-plugins.md
  42. +106 −0 site/_posts/2012-07-01-posts.md
  43. +49 −0 site/_posts/2012-07-01-resources.md
  44. +95 −0 site/_posts/2012-07-01-structure.md
  45. +217 −0 site/_posts/2012-07-01-templates.md
  46. +108 −0 site/_posts/2012-07-01-troubleshooting.md
  47. +35 −0 site/_posts/2012-07-01-usage.md
  48. +166 −0 site/_posts/2012-07-01-variables.md
  49. +62 −0 site/css/grid.css
  50. +504 −0 site/css/normalize.css
  51. +70 −0 site/css/pygments.css
  52. +697 −0 site/css/style.css
  53. +11 −0 site/docs/index.html
  54. BIN site/favicon.png
  55. BIN site/img/article-footer.png
  56. BIN site/img/footer-arrow.png
  57. BIN site/img/footer-logo.png
  58. BIN site/img/logo-2x.png
  59. BIN site/img/octojekyll.png
  60. BIN site/img/tube.png
  61. BIN site/img/tube1x.png
  62. +77 −0 site/index.html
  63. +4 −0 site/js/modernizr-2.5.3.min.js
  64. +5 −0 test/fixtures/broken_front_matter1.erb
  65. +4 −0 test/fixtures/broken_front_matter2.erb
  66. +7 −0 test/fixtures/broken_front_matter3.erb
  67. +4 −0 test/fixtures/front_matter.erb
  68. +10 −0 test/helper.rb
  69. +44 −0 test/test_convertible.rb
  70. +20 −2 test/test_redcarpet.rb
  71. +22 −4 test/test_site.rb
View
@@ -8,3 +8,5 @@ _site/
.bundle/
.DS_Store
bbin/
+gh-pages/
+site/_site/
View
@@ -0,0 +1 @@
+1.9.3-p362
View
@@ -0,0 +1,45 @@
+Contribute
+==========
+
+So you've got an awesome idea to throw into Jekyll. Great! Please keep the following in mind:
+
+* **Contributions will not be accepted without tests.**
+* If you're creating a small fix or patch to an existing feature, just a simple test will do. Please stay in the confines of the current test suite and use [Shoulda](http://github.com/thoughtbot/shoulda/tree/master) and [RR](http://github.com/btakita/rr/tree/master).
+* If it's a brand new feature, make sure to create a new [Cucumber](https://github.com/cucumber/cucumber/) feature and reuse steps where appropriate. Also, whipping up some documentation in your fork's wiki would be appreciated, and once merged it will be transferred over to the main wiki.
+
+Test Dependencies
+-----------------
+
+To run the test suite and build the gem you'll need to install Jekyll's dependencies. Jekyll uses Bundler, so a quick run of the bundle command and you're all set!
+
+ $ bundle
+
+Before you start, run the tests and make sure that they pass (to confirm your environment is configured properly):
+
+ $ rake test
+ $ rake features
+
+Workflow
+--------
+
+Here's the most direct way to get your work merged into the project:
+* Fork the project
+* Clone down your fork ( `git clone git://github.com/<username>/jekyll.git` )
+* Create a topic branch to contain your change ( `git checkout -b my_awesome_feature` )
+* Hack away, add tests. Not necessarily in that order.
+* Make sure everything still passes by running `rake`
+* If necessary, rebase your commits into logical chunks, without errors
+* Push the branch up ( `git push origin my_awesome_feature` )
+* Create an issue with a description and link to your branch
+
+Gotchas
+-------
+
+* If you want to bump the gem version, please put that in a separate commit. This way, the maintainers can control when the gem gets released.
+* Try to keep your patch(es) based from the latest commit on mojombo/jekyll. The easier it is to apply your work, the less work the maintainers have to do, which is always a good thing.
+* Please don't tag your GitHub issue with [fix], [feature], etc. The maintainers actively read the issues and will label it once they come across it.
+
+Finally...
+----------
+
+Thanks! Hacking on Jekyll should be fun, and if for some reason it's a pain to do let us know so we can fix it.
View
@@ -1,4 +1,14 @@
== HEAD
+ * Minor Enhancements
+ * Add source and destination directory protection (#535)
+ * Better YAML error message (#718)
+ * Bug Fixes
+ * Prevent custom destination from causing continuous regen (#528)
+ * Site Enhancements
+ * Bring site into master branch with better preview/deploy (#709)
+ * Redesigned site (#583)
+
+== 0.12.0 / 2012-12-22
* Minor Enhancements
* Add ability to explicitly specify included files (#261)
* Add --default-mimetype option (#279)
@@ -7,12 +17,16 @@
* Allow multiple plugin dirs to be specified (#438)
* Inline TOC token support for RDiscount (#333)
* Add the option to specify the paginated url format (#342)
+ * Swap out albino for pygments.rb (#569)
+ * Support Redcarpet 2 and fenced code blocks (#619)
+ * Better reporting of Liquid errors (#624)
* Bug Fixes
* Allow some special characters in highlight names
* URL escape category names in URL generation (#360)
* Fix error with limit_posts (#442)
* Properly select dotfile during directory scan (#363, #431, #377)
* Allow setting of Kramdown smart_quotes (#482)
+ * Ensure front-matter is at start of file (#562)
== 0.11.2 / 2011-12-27
* Bug Fixes
View
@@ -22,19 +22,20 @@ h2. Diving In
h2. Runtime Dependencies
-* RedCloth: Textile support (Ruby)
-* Liquid: Templating system (Ruby)
* Classifier: Generating related posts (Ruby)
-* Maruku: Default markdown engine (Ruby)
* Directory Watcher: Auto-regeneration of sites (Ruby)
+* Kramdown: Markdown-superset converter (Ruby)
+* Liquid: Templating system (Ruby)
+* Maruku: Default markdown engine (Ruby)
* Pygments: Syntax highlighting (Python)
h2. Developer Dependencies
-* Shoulda: Test framework (Ruby)
-* RR: Mocking (Ruby)
-* RedGreen: Nicer test output (Ruby)
* RDiscount: Discount Markdown Processor (Ruby)
+* RedCloth: Textile support (Ruby)
+* RedGreen: Nicer test output (Ruby)
+* RR: Mocking (Ruby)
+* Shoulda: Test framework (Ruby)
h2. License
View
@@ -109,6 +109,72 @@ rescue LoadError
end
end
+#############################################################################
+#
+# Site tasks - http://jekyllrb.com
+#
+#############################################################################
+
+namespace :site do
+ desc "Generate and view the site locally"
+ task :preview do
+ require "launchy"
+
+ # Yep, it's a hack! Wait a few seconds for the Jekyll site to generate and
+ # then open it in a browser. Someday we can do better than this, I hope.
+ Thread.new do
+ sleep 4
+ puts "Opening in browser..."
+ Launchy.open("http://localhost:4000")
+ end
+
+ # Generate the site in server mode.
+ puts "Running Jekyll..."
+ Dir.chdir("site") do
+ sh "#{File.expand_path('bin/jekyll', File.dirname(__FILE__))} --server"
+ end
+ end
+
+ desc "Commit the local site to the gh-pages branch and publish to GitHub Pages"
+ task :publish do
+ # Failsafe. Remove this once it has been done.
+ puts "Make sure to merge #583 into gh-pages before deploying."
+ exit(1)
+
+ # Ensure the gh-pages dir exists so we can generate into it.
+ puts "Checking for gh-pages dir..."
+ unless File.exist?("./gh-pages")
+ puts "No gh-pages directory found. Run the following commands first:"
+ puts " `git clone git@github.com:mojombo/jekyll gh-pages"
+ puts " `cd gh-pages"
+ puts " `git checkout gh-pages`"
+ exit(1)
+ end
+
+ # Ensure gh-pages branch is up to date.
+ Dir.chdir('gh-pages') do
+ sh "git pull origin gh-pages"
+ end
+
+ # Copy to gh-pages dir.
+ puts "Copying site to gh-pages branch..."
+ Dir.glob("site/*") do |path|
+ next if path == "_site"
+ sh "cp -R #{path} gh-pages/"
+ end
+
+ # Commit and push.
+ puts "Committing and pushing to GitHub Pages..."
+ sha = `git log`.match(/[a-z0-9]{40}/)[0]
+ Dir.chdir('gh-pages') do
+ sh "git add ."
+ sh "git commit -m 'Updating to #{sha}.'"
+ sh "git push origin gh-pages"
+ end
+ puts 'Done.'
+ end
+end
+
#############################################################################
#
# Packaging tasks
View
@@ -229,10 +229,10 @@ source = options['source']
destination = options['destination']
# Files to watch
-def globs(source)
+def globs(source, destination)
Dir.chdir(source) do
dirs = Dir['*'].select { |x| File.directory?(x) }
- dirs -= ['_site']
+ dirs -= [destination]
dirs = dirs.map { |x| "#{x}/**/*" }
dirs += ['*']
end
@@ -249,7 +249,7 @@ if options['auto']
dw = DirectoryWatcher.new(source)
dw.interval = 1
- dw.glob = globs(source)
+ dw.glob = globs(source, destination)
dw.add_observer do |*args|
t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
View
@@ -4,8 +4,9 @@ Gem::Specification.new do |s|
s.rubygems_version = '1.3.5'
s.name = 'jekyll'
- s.version = '0.11.2'
- s.date = '2011-12-27'
+ s.version = '0.12.0'
+ s.license = 'MIT'
+ s.date = '2012-12-22'
s.rubyforge_project = 'jekyll'
s.summary = "A simple, blog aware, static site generator."
@@ -27,7 +28,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency('directory_watcher', "~> 1.1")
s.add_runtime_dependency('maruku', "~> 0.5")
s.add_runtime_dependency('kramdown', "~> 0.13.4")
- s.add_runtime_dependency('pygments.rb', "~> 0.2.12")
+ s.add_runtime_dependency('pygments.rb', "~> 0.3.2")
s.add_development_dependency('rake', "~> 0.9")
s.add_development_dependency('rdoc', "~> 3.11")
@@ -37,7 +38,8 @@ Gem::Specification.new do |s|
s.add_development_dependency('cucumber', "1.1")
s.add_development_dependency('RedCloth', "~> 4.2")
s.add_development_dependency('rdiscount', "~> 1.6")
- s.add_development_dependency('redcarpet', "~> 1.9")
+ s.add_development_dependency('redcarpet', "~> 2.1.1")
+ s.add_development_dependency('launchy', "~> 2.1.2")
# = MANIFEST =
s.files = %w[
@@ -74,10 +76,12 @@ Gem::Specification.new do |s|
lib/jekyll/migrators/csv.rb
lib/jekyll/migrators/drupal.rb
lib/jekyll/migrators/enki.rb
+ lib/jekyll/migrators/joomla.rb
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
lib/jekyll/migrators/textpattern.rb
lib/jekyll/migrators/tumblr.rb
lib/jekyll/migrators/typo.rb
@@ -90,6 +94,9 @@ Gem::Specification.new do |s|
lib/jekyll/static_file.rb
lib/jekyll/tags/highlight.rb
lib/jekyll/tags/include.rb
+ lib/jekyll/tags/post_url.rb
+ test/fixtures/broken_front_matter1.erb
+ test/fixtures/front_matter.erb
test/helper.rb
test/source/.htaccess
test/source/_includes/sig.markdown
@@ -132,6 +139,7 @@ Gem::Specification.new do |s|
test/source/z_category/_posts/2008-9-23-categories.textile
test/suite.rb
test/test_configuration.rb
+ test/test_convertible.rb
test/test_core_ext.rb
test/test_filters.rb
test/test_generated_site.rb
@@ -141,9 +149,9 @@ Gem::Specification.new do |s|
test/test_post.rb
test/test_rdiscount.rb
test/test_redcarpet.rb
+ test/test_redcloth.rb
test/test_site.rb
test/test_tags.rb
- test/test_redcloth.rb
]
# = MANIFEST =
View
@@ -46,47 +46,50 @@ def require_all(path)
require_all 'jekyll/tags'
module Jekyll
- VERSION = '0.11.2'
+ VERSION = '0.12.0'
# Default options. Overriden by values in _config.yml or command-line opts.
- # (Strings rather symbols used for compatability with YAML).
+ # Strings rather than symbols are used for compatability with YAML.
DEFAULTS = {
'safe' => false,
'auto' => false,
'server' => false,
'server_port' => 4000,
- 'source' => Dir.pwd,
- 'destination' => File.join(Dir.pwd, '_site'),
- 'plugins' => File.join(Dir.pwd, '_plugins'),
+ 'source' => Dir.pwd,
+ 'destination' => File.join(Dir.pwd, '_site'),
+ 'plugins' => File.join(Dir.pwd, '_plugins'),
+ 'layouts' => '_layouts',
'keep_files' => ['.git','.svn'],
- 'layouts' => '_layouts',
-
- 'future' => true,
- 'lsi' => false,
- 'pygments' => false,
- 'markdown' => 'maruku',
- 'permalink' => 'date',
- 'include' => ['.htaccess'],
+
+ 'future' => true,
+ 'lsi' => false,
+ 'pygments' => false,
+ 'markdown' => 'maruku',
+ 'permalink' => 'date',
+ 'include' => ['.htaccess'],
'paginate_path' => 'page:num',
- 'markdown_ext' => 'markdown,mkd,mkdn,md',
- 'textile_ext' => 'textile',
+ 'markdown_ext' => 'markdown,mkd,mkdn,md',
+ 'textile_ext' => 'textile',
- 'maruku' => {
+ 'maruku' => {
'use_tex' => false,
'use_divs' => false,
'png_engine' => 'blahtex',
'png_dir' => 'images/latex',
'png_url' => '/images/latex'
},
- 'rdiscount' => {
+
+ 'rdiscount' => {
'extensions' => []
},
- 'redcarpet' => {
+
+ 'redcarpet' => {
'extensions' => []
},
- 'kramdown' => {
+
+ 'kramdown' => {
'auto_ids' => true,
'footnote_nr' => 1,
'entity_output' => 'as_char',
@@ -103,8 +106,9 @@ module Jekyll
'coderay_css' => 'style'
}
},
- 'redcloth' => {
- 'hard_breaks' => true
+
+ 'redcloth' => {
+ 'hard_breaks' => true
}
}
Oops, something went wrong.

0 comments on commit 0fa5541

Please sign in to comment.