0d3ea5b710
Forgot to escape newlines.
2013-03-04 03:41:18 +01:00
2b9b613687
Normalize CLI options to match configuration expectations.
2013-03-03 18:23:02 -08:00
5af8e1f40c
Applying a more 'Ruby' style to post_url.rb
2013-03-04 03:20:59 +01:00
4caf613be8
Merge branch 'drafts' of https://github.com/scribu/jekyll into scribu-drafts
2013-03-03 12:57:55 -08:00
87f6f8c971
Fix invalid ordering of posts published on the same day and move post_url specific comparison of posts where it belongs: Into post_url
2013-03-03 15:36:16 +01:00
ce8e1afba6
Add support for Ruby < 1.9
2013-03-03 15:12:21 +01:00
cc83501489
Fix broken post_url with posts with a time in their YAML front matter.
2013-03-03 14:56:18 +01:00
1a351284ca
rename get_base() to containing_dir()
2013-03-03 12:56:12 +02:00
7258b10f88
We don't need YAML in the new command.
2013-02-28 22:19:38 +01:00
149b95d767
Typos in sample post.
2013-02-28 22:17:24 +01:00
441eddf1ca
Fix pretty url style paths.
...
Ignore the basename if the page is an index page, preserve it if it's just an
html page and use the full path in every other case.
2013-02-28 03:49:39 +02:00
bd9a112ff1
Merge pull request #785 from lenniboy/master
...
Improve debugability of error message for a malformed highlight tag
2013-02-26 16:58:36 -08:00
63d0eef646
Merge pull request #824 from sinamt/symlinked_folders
...
Allow symlinked folders in unsafe mode (with tests). Closes #796 , resolves #233 .
2013-02-26 16:54:52 -08:00
d58859570d
Fix up the whitespace.
...
Remove an extra blank line and fix another whitespace error pointed out
by git diff
2013-02-25 13:24:37 -06:00
5a9c20983d
Rename setup_plugins to plugins_path
2013-02-25 13:20:32 -06:00
d2c79a8841
Merge branch 'master' into issue-653
2013-02-25 13:08:23 -06:00
f8a90d711f
Using https protocol instead of http.
2013-02-24 01:54:13 +01:00
cdd3c0ef0c
Remove 'type' attribute from script tag in gist liquid tag.
2013-02-24 01:30:41 +01:00
7e7cee6e56
Strip space from the gist number, add test for gist tag
2013-02-24 00:58:13 +01:00
425f466842
'gist' liquid tag by @stereobooster. Fixes #463 .
2013-02-24 00:38:19 +01:00
7457cbae25
Fix issue with watching (auto-regeneration) continuously running if destination is not '_site'. #457 .
2013-02-22 00:59:44 +01:00
5d8e012899
Fixed merge with new log output in lib/jekyll.rb
2013-02-20 23:10:42 +01:00
9eb79ff135
Improved output for auto-regeneration.
2013-02-20 23:09:54 +01:00
bf79b0ac37
Fixed merge with new log output in lib/jekyll.rb
2013-02-20 23:09:34 +01:00
11eb1ecae1
Safe loading of files and YAML.
2013-02-10 19:07:38 +01:00
538c2086a5
whitespace fixes
2013-02-10 04:49:27 +02:00
3e164d6daf
don't check if draft is published or if its date is in the future
2013-02-09 23:48:38 +02:00
2588d681c9
fix draft filename processing
2013-02-09 23:38:13 +02:00
78831d94cd
don't mess with dir parameter
2013-02-09 23:19:35 +02:00
642349f797
implement and use Draft.valid?
2013-02-09 22:41:47 +02:00
1ac46b17c4
Don't require date in draft filenames.
2013-02-09 21:35:41 +02:00
4cd7c22ee7
Now uses the more semantically correct AND operator
2013-02-04 22:17:03 +01:00
7512e6bb66
Allow symlinked folders in unsafe mode
2013-02-04 17:16:01 +01:00
28a074ff7a
Remove Jekyll::Commands::Migrate
2013-01-31 00:18:22 +01:00
b70c59667c
Requiring jekyll-import gem. Printing error and exiting if it does not exist.
2013-01-30 23:43:26 +01:00
cff4ec72ea
Using .erb file for the new post
2013-01-30 21:05:52 +01:00
a7f0d04bda
Improve error message for malformed highlight tags
2013-01-29 12:16:33 +01:00
704307d7fe
Added very basic code snippet example to sample post
2013-01-27 23:30:32 +01:00
bf78fe9b75
Move post scaffold content to a separate method.
2013-01-27 23:23:53 +01:00
a68b67c65e
Added newline to New command for stylistic congruence.
2013-01-27 23:21:31 +01:00
ac691a1465
removed related posts segment of scaffold site.
2013-01-27 23:21:02 +01:00
a8671ed52b
Using modularized commands (Jekyll::Commands) as per @tombell's latest PR merge
2013-01-27 23:17:45 +01:00
272dd5ef35
Added the NewCommand class
2013-01-27 23:16:34 +01:00
ce7e307cba
Scaffold site, based on @mojombo's site (with permission).
2013-01-27 23:16:34 +01:00
b4bea4a586
Merge branch 'code-cleanup' of git://github.com/tombell/jekyll into code-cleanup
...
Module Cleanup
* 'code-cleanup' of git://github.com/tombell/jekyll:
Remove new lines between module and class
Update tag classes moving into a module
Update pagination classes moving into a module
Update converter classes moving into a module
Strip extra newlines
Update command classes moving into a module
Conflicts:
lib/jekyll/commands/serve.rb
2013-01-27 23:13:16 +01:00
b736676904
Merge pull request #775 from metamatt/issue773
...
Address issue 773 (bugs preventing tumblr.rb from running)
2013-01-27 14:06:41 -08:00
409eedafd8
Merge pull request #767 from mojombo/string-categories
...
Force Categories to be Strings
2013-01-26 13:32:26 -08:00
c95c5e3b7d
Use Dir.pwd instead of "." as the source argument to Post.new, since
...
this has historically supplied an absolute path in this call.
2013-01-25 15:57:45 -08:00
4041579b70
Merge pull request #777 from mastahyeti/safe_yaml
...
Safe YAML
2013-01-25 08:22:10 -08:00
4f7881ba40
Add SVG support to Jekyll/Webrick. Fixes #406 .
2013-01-25 06:20:07 +01:00
1528cfe1cd
adding safe_yaml to protect against object instantiation from yaml
2013-01-23 11:30:24 -06:00
fbc9d0c663
Fix truncation of overly long post names.
...
Delete the old truncate_post_name; it was called too late (if url rewriting
is enabled which it is by default), didn't run (it tried to use + to concat
a Fixnum onto a String), and even with those problems fixed, didn't actually
shorten the string enough to use as a pathname.
Instead, apply simple string truncation at the point we generate the slug,
which is used in the filename and is the part that could be unboundedly
long. I arbitrarily chose 200 as the maximum length; even shorter might be
better (really long slugs are just visually ugly); it might also be nicer
to truncate at a hyphen boundary.
This fixes the rest of issue #773 (subissue 4).
2013-01-22 10:25:07 -08:00
863643c7e8
Look for _posts directory relative to cwd, not relative to tumblr.rb.
...
That's where we put it earlier, so that's where we'll find it now.
This addresses part of issue #773 (subissue 3).
2013-01-22 10:24:33 -08:00
0ad623fb85
first pass at --drafts flag
2013-01-20 05:23:56 +02:00
517e6f81d3
Remove new lines between module and class
2013-01-20 00:00:49 +00:00
2c45150545
Update tag classes moving into a module
2013-01-19 23:50:44 +00:00
10d980b6e1
Update pagination classes moving into a module
2013-01-19 23:42:40 +00:00
663a1321d2
Update converter classes moving into a module
2013-01-19 23:07:38 +00:00
6514fe2d22
Strip extra newlines
2013-01-19 22:38:51 +00:00
e03f48085a
Update command classes moving into a module
2013-01-19 22:36:46 +00:00
f231ef7644
Merge pull request #684 from mattr-/issue-680.
2013-01-18 10:28:14 -05:00
2615291e6d
Printing error message in WP.com migrator. #671 .
2013-01-17 22:33:37 -05:00
3bca5c3297
Merge pull request #671 from fzero/master
...
Rescue from import errors on Wordpress.com plugin.
2013-01-17 19:30:51 -08:00
cd05f6be78
Ensures that categories are Strings before escaping. Fixes #759 .
2013-01-17 21:55:01 -05:00
f460a6cf71
Merge branch 'master' into issue-653
2013-01-16 21:52:32 -06:00
faf5e44c47
Merge pull request #664 from Jashank/faster_lsi
...
faster_lsi: Massively accelerate LSI performance.
2013-01-16 18:36:01 -08:00
2e76edd837
Merge pull request #496 from dunsmoreb/issue/481
...
Truncate post slugs when importing from Tumblr.
2013-01-16 18:34:21 -08:00
e383bfe65d
Merge pull request #743 from mccxj/master
...
add glob support to include, exclude option
2013-01-12 22:16:07 -08:00
5a3e05dbff
Ensuring that layout is only set to the default value if layout is not specified
2013-01-12 15:31:14 -08:00
e8c74fe7a8
Layouts default to page or post depending upon type.
2013-01-12 13:49:45 -08:00
a05b9159d9
Merge pull request #616 from hokaccha/fix_pygments_opt
...
fixed pygments linenos options for pygments.rb
2013-01-12 00:11:18 -08:00
7f072ed578
Merge branch 'master'
2013-01-12 01:18:41 +00:00
0fa55418e9
merge lastest from mojombo/jekyll master
2013-01-11 12:23:53 +01:00
68333cd221
Slight stylistic tweak to LSI initialisation.
...
Recommended-by: parkr
2013-01-11 20:02:31 +11:00
660e5e0e14
Merge remote-tracking branch 'jekyll/master'
2013-01-11 15:45:54 +08:00
3cf29eeee2
add Enumerable#glob_include?
2013-01-11 15:33:11 +08:00
6253f79de2
Added space between arguments in Convertible errors
2013-01-10 22:11:13 -08:00
151275d09e
Add TomDoc
2013-01-10 21:53:21 -06:00
92eb926bf8
Look for plugins under the source directory by default
2013-01-10 21:24:28 -06:00
f3f181484d
Merge remote-tracking branch 'upstream/master' into issue-653
2013-01-10 20:41:32 -06:00
e210a0603f
Revert "Remove migrators"
...
This reverts commit b9da30bc8f
2013-01-11 00:30:17 +00:00
ba48870ead
outputting full path when file does not parse
2013-01-10 12:29:04 -08:00
b3e27f2c5d
fixed a syntax error
2013-01-10 19:41:11 +08:00
c627cd3519
use any? instead
2013-01-10 09:16:09 +08:00
b70b57cb89
Merge branch 'master' into 'jekyll-command-redux'
2013-01-09 23:40:27 +00:00
1e892678bc
Update lib/jekyll/site.rb
2013-01-09 16:06:43 +08:00
6eed91871f
Changes based on @mojombo's feedback
2013-01-08 23:17:06 +01:00
44822a252e
add regexp support for option 'include','exclude'
2013-01-06 21:23:31 +08:00
dd0e208daa
Merge branch 'patch-1' of https://github.com/jlecour/jekyll into jlecour-patch-1
2013-01-03 22:26:09 -08:00
4c70c036e7
TomDoc lib/jekyll/post.rb.
2013-01-03 22:20:42 -08:00
9328a1a0dd
Merge branch 'docs' of https://github.com/icco/jekyll into icco-docs
2013-01-03 22:06:50 -08:00
72c8ceba4e
Merge pull request #651 from alagu/master
...
Posterous importer update
2012-12-31 18:24:43 -08:00
a5a6900948
fix error for case with broken encoding
2012-12-30 00:07:21 +02:00
2dbce8ca9f
fix error for case with wrong encoding or error in YAML
2012-12-29 23:32:34 +02:00
c23302f4fa
Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection
2012-12-26 14:02:41 -07:00
12a19eaf3a
Merge branch 'master' of git://github.com/mojombo/jekyll
2012-12-26 14:23:32 -05:00
d58a0c1088
Release 0.12.0
2012-12-22 16:46:30 -07:00
b9da30bc8f
Remove migrators
2012-12-22 17:49:33 +00:00
a151a16f09
Remove command options from default config
...
Removing command line options from the config is a path towards cleaning up the
configuration file and not including options which don't really belong there.
2012-12-19 18:23:34 +00:00
b7944c5274
Add initial MigrateCommand
...
Not all migrators can actually be calld from the comand line. Some require
options which are not passed in and have to be called by other means.
2012-12-19 17:50:21 +00:00
934495b272
Adds some random docs for stuff I saw while skimming the code.
2012-12-18 22:42:42 -08:00
dc139e2ac9
Update the sym->str key conversion
2012-12-18 22:13:17 +00:00
bd1c8fe760
Update Jekyll.configuration to convert symbol keys
...
Because Commander uses symbol keys in the options hash and I don't want to go
back backport every hash string key to symbols in Jekyll. ⭐
2012-12-18 21:55:00 +00:00
5b2e95b443
Add missing ] in self.watch string
2012-12-18 21:54:01 +00:00
d8f328b87c
Update loop position so trap handler is used
2012-12-18 21:41:18 +00:00
3b4feb41f0
Add initial serve command
...
The `ServeCommand` will let you serve your site locally for development. You
can specify `--port`, `--host` and `--baseurl` options if you wish to change the
defaults.
Additionally the `BuildCommand` will be called before the processing of the
serve command, this makes sure that the site is actually built. This means you
are able to pass the `--watch` option to auto-regenerate your site, even while
serving it locally.
2012-12-18 21:00:24 +00:00
14766497c8
Add bin/jekyll2 and initial BuildCommand
...
The `BuildCommand` class is responsible for handling the building of the site.
It can also optionally watch for changes to files and regenerate the site if
needed.
The `Command` class holds any methods which are used by any command
implementation.
2012-12-18 20:34:09 +00:00
3a8ebb4b71
Merge branch 'fix/front-matter-regexp' of https://github.com/zimbatm/jekyll into zimbatm-fix/front-matter-regexp
2012-12-15 22:09:41 -08:00
22f4b12836
Clean up default config spec.
2012-12-15 22:09:21 -08:00
583f9e0019
Merge branch 'master' of https://github.com/Neil-Smithline/jekyll into Neil-Smithline-master
2012-12-15 16:42:26 -08:00
26f8d60542
Merge branch 'master' of https://github.com/wbrady/jekyll into wbrady-master
2012-12-15 16:35:45 -08:00
4bae42a671
use Array.join instead of Array.inject, add .svn to defaults
2012-12-09 11:43:49 +01:00
8fb4e8fcca
Convert slashes in titles to dashes when migrating from WordPress
...
When a post has a title that contains a slash, such as 'This is my cool
blog post part 1/2', convert the slash to a dash so that the post
filename is created correctly.
Fixes issue #680
2012-12-04 20:45:20 -06:00
38ac55381b
Only pass first class to Pygments
...
This prevents an exception if something like the following is used:
~~~ {foo bar}
some code
~~~
2012-11-13 07:59:36 +00:00
20ac62d30e
Making sure errors don't halt the import.
...
Wrapped file operations in a begin/rescue block.
2012-11-11 23:28:10 -05:00
85f2dfffa6
faster_lsi: Massively accelerate LSI performance.
...
Currently, Classifier::LSI rebuilds the index every time an entry is
added. This runs into massive performance overheads on my website;
theoretically, disabling automatic index rebuilds, and explicitly
rebuilding the LSI index at the end of the LSI repopulation should
speed things up nicely.
As a side note, here, I use pandoc-ruby to provide a more featureful
Markdown transformer, so be mindful that the numbers I quote here have
artifically imposed I/O overheads.
With just the 76 posts I wrote this year (abysmal, I know), I come up
with the following figures:
Without faster_lsi:
jekyll --lsi 16.91s user 0.88s system 97% cpu 18.302 total
With faster_lsi:
jekyll --lsi 2.72s user 0.77s system 88% cpu 3.940 total
With 109 posts, we begin to see even better improvements:
Without faster_lsi:
jekyll --lsi 51.00s user 1.47s system 98% cpu 53.060 total
With faster_lsi:
jekyll --lsi 5.04s user 1.12s system 91% cpu 6.735 total
At this point, we begin to see I/O overheads being slower than LSI
when faster_lsi is active. I call that fairly conclusive. But wait,
there's more. I have 273 posts lying around... I wonder what happens
if I feed them all in. With faster_lsi, it was nice and clippy.
Without it, I simply gave up, and went and refilled my cup of tea.
And it was still going.
Without faster_lsi:
jekyll --lsi 1277.86s user 10.90s system 99% cpu 21:30.29 total
With faster_lsi:
jekyll --lsi 34.62s user 4.43s system 96% cpu 40.430 total
That is, in anyone's books, a major improvement. Note, however, that
I don't know just how well this will perform with `jekyll --auto`
because I don't know how it does the LSI rebuilds. I _think_ (but
please, don't commit me on this) that the LSI is rebuilt every time
Jekyll picks up a file change.
So, all up, the performance improvement is massive, and scales
depending on how many files you have. At the last point, the
improvement is just on 3200%.
A more optimal solution would be to cache the LSI index and/or content
data somehow. I'll leave that to when faster_lsi takes over ten
minutes to run.
2012-10-31 22:19:59 +11:00
bab29f64f7
Look for plugins under the source directory
...
When generating the site, Jekyll will now look for plugins under the
source directory by default. The plugin location can still be changed in
_config.yml
2012-10-12 22:43:20 -05:00
2726a5f27c
Merge branch 'master' of git://github.com/mojombo/jekyll
2012-10-03 19:33:21 -07:00
7c800d3b07
Added a configuration variable: keep_files (default: ['.git']), based on this pull request: https://github.com/mojombo/jekyll/pull/556
2012-08-23 12:07:30 +02:00
336ea66983
Better error reporting on Liquid exceptions
2012-08-14 17:35:41 -04:00
7f706f47fc
Update redcarpet support to version 2
2012-08-13 15:03:33 +01:00
3d2664d983
pygments options for pygments.rb
2012-08-09 00:34:44 +09:00
3904fd9257
make yaml parsing errors more informative
2012-06-29 12:08:57 -04:00
ee402dd18a
Merge branch 'switch-to-pygmentsrb' of https://github.com/tombell/jekyll into tombell-switch-to-pygmentsrb
2012-06-11 15:53:44 -07:00
202894c196
Merge branch 'custom-layout-directory' of https://github.com/tombell/jekyll into tombell-custom-layout-directory
...
Conflicts:
lib/jekyll/site.rb
2012-06-11 15:40:22 -07:00
47090ffd2a
Fix up a few TomDocs.
2012-06-06 11:59:49 -07:00
0e9e7fbc85
Simplify Site#read_layouts.
2012-06-06 11:59:49 -07:00
b2a1d61c04
Swap out albino for pygments.rb
2012-05-31 15:51:34 -04:00
df2ad2ac59
Allow a custom 'layouts' directory
...
* Add 'layouts' option to change the dir from '_layouts' to anything relative
to the source directory
* Add cucumber scenario for testing an alternative directory '_theme'
* Closes #563
2012-05-30 21:39:43 -04:00
da4e8f2ee1
Front-matter should be at start of file
...
It's the theme of the moment ; regexp checking.
Just in case we have two line start with --- in the file, we want to
make sure it's not interpreted as a front-matter.
2012-05-25 18:59:26 +01:00
7d88f72409
avoiding to call site_payload one time per each post and page. Speed site creation up of a 20%.
2012-04-29 00:27:11 -07:00
4533e60489
Merge branch 'master' of https://github.com/daneharrigan/jekyll into daneharrigan-master
...
Conflicts:
lib/jekyll.rb
2012-04-23 16:48:18 -07:00
8a0fbf02f5
Cleanup for RDiscount TOC support. Closes #333 .
2012-04-23 16:15:55 -07:00
f5b2acf8cd
Added support for inline TOCs with RDiscount
2012-04-23 15:56:28 -07:00
e29490c1c6
Allow setting of Kramdown smart_quotes. Fixes #482 .
2012-04-23 15:34:54 -07:00
4090500c5a
Added path in url.
...
Page#dir was returning the wrong dir ('/') for pages in directories.
2012-04-09 03:08:41 +03:00
604b60c9ba
Add checks to prevent accidental deletion of the source directory
2012-04-03 22:05:18 -05:00
8368485fa0
Remove deletion of dot files on cleanup.
...
This is a potentially very dangerous action that's impossible to test that it's correct.
If the '..' check line ever disappears, even running the tests will start deleting
everything accessible on the person's computer.
All dot-files that are generated are already known by Jekyll as either a static file or
a page (yaml front matter), only remove those files.
2012-04-03 21:33:35 -05:00
316cc8559c
moved paginate_path to default config
2012-02-26 20:58:14 -08:00
41f2805b7f
No need to have a variable assignment, especially if it has the same name as the method parameter.
2012-02-11 09:05:59 +01:00
5fb801474e
Truncate post slugs when importing from Tumblr.
...
Fixes #481 .
2012-02-01 06:44:01 -06:00
4499df8033
Shorten plugin loading code and update history.
2012-01-29 12:49:57 -08:00
02366ae5ff
Merge branch 'PluginsAsArray' of https://github.com/simensen/jekyll into simensen-PluginsAsArray
2012-01-29 12:32:59 -08:00
9d70088f01
Properly select dotfiles during directory scan.
...
Fixes #363 .
Fixes #431 .
Fixes #377 .
2012-01-23 00:21:08 -08:00
e6d89c6a0f
More testing, whitespace and comment cleanup.
2012-01-22 22:17:25 -08:00
dcf546275b
Tweaked plugin directory handling, tests.
2012-01-22 22:10:12 -08:00
0284b8b22f
Handle Posterous rate limiting
2012-01-22 20:58:56 -08:00
5d6e87bbf3
Merge remote-tracking branch 'origin/alagu-master' into alagu-posterous-importer-rebased
...
Conflict created due to #472 .
Conflicts:
lib/jekyll/migrators/posterous.rb
2012-01-22 19:35:25 -08:00
e27e2554d9
Merge pull request #472 from nfm/patch-1
...
Update Posterous migrator to take an api_token
2012-01-22 16:27:32 -08:00
16a4855200
Merge branch 'post_url' of https://github.com/thatguystone/jekyll into thatguystone-post_url
2012-01-22 16:03:10 -08:00
Parker Moore
Tom Preston-Werner
Daniel Hilgarth
scribu
Fotos Georgiadis
Matt Rogers
sterebooster
Alexander Ekdahl
Leonard Ehrenfried
Matt Ginzton
Jordon Bedwell
Ben Toews
Tom Bell
7rans
edeustace
Jashank Jeremy
mccxj
Eric Theise
Tom Preston-Werner
Fabio Neves
Nat Welch
Fabio Neves
Alagu
Will Brady
hokaccha
Neil-Smithline
Jonas Pfenniger
Luca Grulla
Michishige Kaito
Jason Roelofs
Dane Harrigan
Jérémy Lecour
dunsmoreb
Beau Simensen