Commit Graph

146 Commits

Author SHA1 Message Date
Parker Moore aa7a234c18 Merge master into jekyll-new 2013-03-17 15:45:37 +01:00
Parker Moore 7a57451962 Add --config switch to build and serve commands. 2013-03-16 14:54:44 +01:00
Tom Preston-Werner 2b9b613687 Normalize CLI options to match configuration expectations. 2013-03-03 18:23:02 -08:00
Tom Preston-Werner 4caf613be8 Merge branch 'drafts' of https://github.com/scribu/jekyll into scribu-drafts 2013-03-03 12:57:55 -08:00
Tom Preston-Werner 197f52b0e6 Fix jekyll-import LoadError message. 2013-03-03 12:51:25 -08:00
Parker Moore c042a77496 Merge pull request #788 from mojombo/add-opts
Add 2 opts back into bin/jekyll
2013-02-20 13:13:42 -08:00
Brett Hardin 03e2e8d063 Changing help message to reflect what actually happens when running build and serve 2013-02-20 09:37:19 -08:00
Parker Moore f002ee4f9f Merge pull request #792 from mojombo/alias-serve-to-server
Aliased jekyll server to jekyll serve
2013-02-03 09:55:14 -08:00
Parker Moore f5137850e4 Using abort instead of puts & exit when jekyll-import gem isn't available. 2013-02-03 01:24:38 +01:00
Parker Moore 82f29bb627 The jekyll-import gem provides Jekyll::Commands::Import, not Jekyll::Commands::Migrate. 2013-01-31 00:18:54 +01:00
Parker Moore b70c59667c Requiring jekyll-import gem. Printing error and exiting if it does not exist. 2013-01-30 23:43:26 +01:00
Parker Moore 221c2f4c0e Aliased jekyll server to jekyll serve 2013-01-30 23:30:04 +01:00
Parker Moore 6e8202f9a6 Added in --limit-posts 2013-01-30 22:04:56 +01:00
Parker Moore 7023a5e622 Added the --future switch back to the CLI 2013-01-30 21:56:54 +01:00
Parker Moore a8671ed52b Using modularized commands (Jekyll::Commands) as per @tombell's latest PR merge 2013-01-27 23:17:45 +01:00
Parker Moore f3856a444a Added command to primary binary. 2013-01-27 23:16:34 +01:00
scribu c48de6b320 add drafts.feature 2013-01-20 05:23:56 +02:00
scribu 0ad623fb85 first pass at --drafts flag 2013-01-20 05:23:56 +02:00
Tom Bell e03f48085a Update command classes moving into a module 2013-01-19 22:36:46 +00:00
Tom Bell 9c517c6d7d Rename migrate command to import 2013-01-11 00:32:39 +00:00
Tom Bell e3bd250e69 Remove old jekyll command 2013-01-09 23:42:57 +00:00
Tom Bell b70b57cb89 Merge branch 'master' into 'jekyll-command-redux' 2013-01-09 23:40:27 +00:00
Tom Preston-Werner b36c9788ac Merge branch 'master' of https://github.com/enure/jekyll into enure-master 2012-12-31 14:22:24 -08:00
Tom Bell 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
Tom Bell 9c65ceb22d Remove comments 2012-12-19 16:56:08 +00:00
Tom Bell d298e2bd57 Add LSI option for build and serve commands 2012-12-19 16:44:03 +00:00
Tom Bell 4578c15a24 Add TODOs for current switches 2012-12-19 16:34:03 +00:00
Tom Bell 053c2eb0a7 Rename Args to Options in command docs 2012-12-19 14:13:32 +00:00
Tom Bell be20a03bb9 Update to make the help command default 2012-12-19 14:09:02 +00:00
Tom Bell dc139e2ac9 Update the sym->str key conversion 2012-12-18 22:13:17 +00:00
Tom Bell 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
Tom Bell 72f99eb8a7 Update global options and command descriptions 2012-12-18 21:18:05 +00:00
Tom Bell 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
Tom Bell 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
Tom Preston-Werner 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
Charles Stuart cb336dbb71 fix issue 457: Custom destination in _config.yml causes jekyll server to auto-regenerate continuously 2012-03-20 13:58:32 -06:00
Tom Preston-Werner ac41b459fc Merge pull request #446 from ossxp-com/patch-1
Invalid migrator for WordPress because of a typo.
2012-01-22 15:02:09 -08:00
Tom Preston-Werner 8d48992f22 Merge pull request #447 from mking/master
Fix comment typo
2012-01-21 19:46:27 -08:00
Tom Preston-Werner 4fe5e6ba99 Update history and fix up style. 2012-01-14 20:17:35 -08:00
Tom Preston-Werner 1f44e1ad64 Merge branch 'master' of https://github.com/RJ/jekyll into RJ-master 2012-01-14 20:15:31 -08:00
Matthew King 14d51bfd25 Fix typo "destintation" => "destination" 2011-12-03 22:36:18 -05:00
OpenSourceXpress b18bdee6f1 Invalid migrator for WordPress because of a typo.
WordPress importer name should be WordPress not Wordpress.
2011-12-01 09:42:12 +08:00
Dane Harrigan 58d8fef7ec added command-line option --paginate_path 2011-06-05 15:11:35 -04:00
Tom Preston-Werner 2ad0fbc8ff Merge remote-tracking branch 'MattHall/redcarpet' 2011-05-29 21:38:34 -07:00
Tom Preston-Werner f808c98232 Clean up Enki importer and update History. 2011-05-09 00:59:40 -07:00
Tom Preston-Werner b86bc97c5f Clean up Tumblr importer and update History. 2011-05-09 00:54:26 -07:00
MattHall cf779b2760 Added Redcarpet for MD conversion 2011-04-20 10:04:42 +01:00
Tom Preston-Werner dce4ccc5a4 Better error message for invalid post date. 2011-03-11 17:52:25 -08:00
Tom Preston-Werner 68eaadd13a Merge remote-tracking branch 'MattHall/cli' into test 2011-03-10 23:01:18 -08:00
Richard Jones 2f9d4f5be6 Allow setting default mimetype for --server. Useful if permalinks don't end in .html 2011-02-05 12:25:32 +00:00
Matt Hall 84c1a72443 Updating CLI for importing 2010-12-19 17:38:14 +00:00
Tom Preston-Werner 86397cbf00 Add --no-server option. 2010-12-16 16:27:41 -08:00
Tom Preston-Werner 65622cb1e0 Use OptionParser's [no-] functionality for better boolean parsing. 2010-12-13 21:07:35 -08:00
Jason Graham ac7a0cc95f Add Kramdown support and tests 2010-11-20 17:40:27 -08:00
Tom Preston-Werner 38ed81e0ce Update history for --base-url option. 2010-11-18 00:11:04 -06:00
Arnar Birgisson 4a8fc1fa6e Adding baseurl option. Fixes #51 2010-11-17 22:50:40 +01:00
cblunt f688c9df81 Added limit-posts option to site configuration.
* Added unit tests for limit-posts.
  * Added feature for limit-posts.
  * Added --limit_posts option to bin/jekyll options parser
2010-09-13 00:31:52 +01:00
Tom Preston-Werner 0ce13c943d Merge remote branch 'darwin/site_url_from_cmdline' 2010-06-22 15:33:06 -07:00
Tom Preston-Werner de8bd48154 Maruku is now the only processor dependency installed by default. Closes #57.
Other processors will be lazy-loaded when necessary (and prompt the
user to install them when necessary).
2010-06-22 15:17:39 -07:00
Antonin Hildebrand 23d26c5525 allow setting --url <custom_site_url> from commandline (issue #15, closes #143)
Sometimes you may be forced to use absolute urls. For example I had problem with FeedBurner's blog post preview page. Image links specified as relative urls were not resolved correctly. I can imagine some poor RSS readers may behave similar way.

I wanted site.url to be configurable, because I didn't want to hard-code final url there. I still want to be able to have working link when doing local web site development and testing. I have small bash script which runs jekyll -serve --auto with this parameter set for local development. My setup is more complicated, because I use several jekylls behind reverse proxy to simulate setup on http://binaryage.com which uses gh-pages from many repos together with layouts linked as git modules.
2010-06-22 09:11:42 +02:00
Tom Preston-Werner cb77a5287b load plugins under safe mode 2010-06-18 17:55:17 -07:00
Tom Preston-Werner 03cb12aeb3 convert to use rakegem 2010-04-21 13:55:01 -07:00
Kris Brown 98fa570c86 added support for consistent site.time in payload, generating the site at a specific time and limiting future posts
squish
2010-02-26 20:52:41 +00:00
Kris Brown 6b74454a07 resetting to upstream 2010-01-10 10:11:44 +00:00
Kris Brown 2a7b1cbd98 merged 'mojombo/master' at 'v0.5.6' 2010-01-09 09:03:59 +00:00
Tom Preston-Werner 602a252364 add javascript mime type for webrick. fixes #98 2010-01-08 18:59:35 -08:00
Jamie Macey fab5a715c5 safely allow loading jekyll customizations from inside a site 2009-11-29 13:25:00 -05:00
Nick Quaranto e1dbda47ed Merging in calavera's pagination branch 2009-05-09 11:44:34 -04:00
Nick Quaranto 563933f114 Update the help message and comments to use config.yml 2009-04-23 18:24:52 -04:00
David Calavera 2e00c5957b pagination executable option 2009-04-04 14:46:44 +02:00
Tom Preston-Werner 73d42b24ad Huge refactor to move all config into Jekyll::Site
This commit makes Jekyll threadsafe (or at least makes it possible to be so).
It also makes it a ton easier to use Jekyll as a library for scripted site
transformation. I did, however, break all the tests. =(
2009-03-12 19:05:43 -07:00
mreid 9f3244e884 Fixed bug which meant config file did not override default source and destination 2009-03-12 20:51:12 +11:00
Mark 6edfae8c26 Refactored configuration and command-line option code 2009-03-12 20:51:11 +11:00
Mark 6fec047631 Added ability to set Jekyll parameters via _config.yaml file 2009-03-12 20:46:33 +11:00
Tom Preston-Werner bb4d1ee119 add --version 2009-02-03 18:43:53 -08:00
mreid 0b78c32771 Added option to not put file date in permalink URL 2009-01-19 19:58:53 +11:00
Tom Preston-Werner a99e142163 report success from a normal jekyll run 2008-12-23 00:47:24 -08:00
Tom Preston-Werner 8ed84a7590 start server after jekyll processing so webrick has something to serve 2008-12-21 23:27:09 -08:00
Tom Preston-Werner 47a894cebf allow optional port argument to --server 2008-12-21 21:48:04 -08:00
John Reilly 9ecbfb2253 Added --server option to start a simple WEBrick server on destination directory 2008-12-19 17:50:56 -06:00
Tom Preston-Werner 59080271ed allow use of rdiscount if --rdiscount is set and gem is installed 2008-12-15 12:27:57 -08:00
PJ Hyett bf9dda6c9a don't require directory_watcher unless it's needed 2008-12-14 18:40:45 -08:00
Tom Preston-Werner b1bf818c6d disable true LSI by default, enable with --lsi 2008-12-12 21:03:16 -08:00
Tom Preston-Werner f00272ea52 use pygments for code highlighting if --pygments is specified 2008-12-12 20:01:40 -08:00
Tom Preston-Werner 8dff479a13 do not use DATA, rubygems freaks out 2008-12-08 15:46:27 -08:00
Tom Preston-Werner f257974b5b auto-regen 2008-12-06 16:09:52 -08:00
Tom Preston-Werner 07a8203e50 redo refactor 2008-12-06 16:09:52 -08:00
Tom Preston-Werner 702e538e96 refactor processing calls 2008-12-06 16:09:52 -08:00
Tom Preston-Werner 3f8b9a08fa add --auto option 2008-12-06 16:09:52 -08:00
Tom Preston-Werner c742fb7701 implement a real related posts feature. up to 0.1.2 2008-11-22 12:36:32 -08:00
Tom Preston-Werner 351877d6fd better cli calling methods 2008-11-22 00:55:29 -08:00
Jack Danger Canty bcf91bda22 updating the binary with an extremely basic USAGE note 2008-11-19 21:52:49 -08:00
Tom Preston-Werner bffdeee637 rename to Jekyll 2008-11-17 11:07:54 -08:00
Tom Preston-Werner 551ca08296 rename to conveyer 2008-11-16 21:29:15 -08:00
Tom Preston-Werner ac3e24ac59 add binary 2008-10-19 22:18:28 -07:00
Tom Preston-Werner d189e05d23 first commit 2008-10-19 19:07:26 -07:00