Commit Graph

203 Commits

Author SHA1 Message Date
Parker Moore
5f40449500 Print stack trace from Jekyll in development mode. 2013-03-20 23:54:18 +01:00
Parker Moore
fcc512626a Render drafts if Octopress.env is not production. 2013-03-16 23:50:14 +01:00
Parker Moore
17311872d6 Initial changes to integrate Jekyll 1.0 2013-03-15 00:55:45 +01:00
Parker Moore
9087cf125e Merge pull request #1046 from MrJoy/remove_redundant_rake_task
This task is superfluous AND...
2013-03-05 16:32:13 -08:00
Parker Moore
c95867e61c Merge pull request #1037 from MrJoy/add_clobber_task
Add 'clobber' task for purging generated files.
2013-03-05 16:30:20 -08:00
Parker Moore
dfe703b11d Merge pull request #1081 from MrJoy/rsync_deployment_fixups
Various rsync deployment fixups:
2013-03-04 02:46:07 -08:00
Brandon Mathis
7bdab0e65c Added javascript asset management and improved Rakefiles and configuration for themes and plugins.
- Added Guard for file watching
- Configs can be automatically reloaded
- Static asset changes do not trigger Jekyll build
- CommonJS modular js support proved by stich-rb
- Javascript is concatenated and uglified
- Environment variables toggle uglify and fingerprinting
- New Jekyll plugin config_tag
- New Jekyll plugin javascript_assets_tag
- Added theme specific configurations
- Custome Jekyll Guard to the rescue
- Install, Generate, Watch, and Preview work with Guard now.
- Now configs are no longer tracked by Octopress, only theme defauts are.
- Console messages can be colorized.
- misc config reorganization and improvements
2013-03-04 01:12:10 -06:00
Jon Frisby
c20c2a7acd Eliminating ternary op. 2013-02-28 19:53:11 -08:00
Parker Moore
4972fb6c62 Pointing to the wrong spec folder. 2013-02-28 21:50:24 +01:00
Parker Moore
922b4cdaac Using master Gemfile and Rakefile cuz travis sucks. 2013-02-28 21:47:22 +01:00
Parker Moore
a181fc8798 Merge pull request #1048 from MrJoy/simplify_clean
Simplifying clean task.
2013-02-24 11:50:25 -08:00
Jon Frisby
ffa9118e9c Grand whitespace cleanup. 2013-02-21 21:53:04 -08:00
Parker Moore
d5a422fcde Merge pull request #1047 from MrJoy/remove_redundant_require
Remove redundant require statement from Rakefile.
2013-02-21 16:21:13 -08:00
Jon Frisby
27578e1498 Bring over a couple little things from master... 2013-02-21 12:28:51 -08:00
Jon Frisby
82f7d92ef0 Add 'clobber' task for purging generated files. 2013-02-20 11:56:54 -08:00
Jon Frisby
a7d112b38e Simplifying clean task.
* Make it less needlessly noisy (no need to enumerate all files when doing rm_rf).
* Explicitly nuking screen.css is superflous as `compass clean` will do this for us.
* Make task description more accurate about what's happening.
* Make task feedback less redundant (details of what was removed are right above it).
2013-02-20 11:54:20 -08:00
Jon Frisby
d6b6b0d80e Various rsync deployment fixups:
1) If ssh_key was absent, you'd get an error.
2) Had to specify full path to key ("/Users/jfrisby/.ssh/...") -- couldn't use "~/.ssh/...".  Since SSH demands it be there anyway, let's pre-populate for the user and make their lives easier.
3) Ensure uniform and consistent trailing slashes on source and dest paths to avoid accidentally mucking things up.
2013-02-20 11:38:10 -08:00
Jon Frisby
5da31a2ee1 This task is superfluous AND doesn't respect the presence/absence of "desc" making hidden/internal-use tasks show up. 2013-02-20 11:32:40 -08:00
Jon Frisby
8f5dd52157 Remove redundant require statement from Rakefile. 2013-02-20 11:25:37 -08:00
Parker Moore
4dfc4237d3 Updated Rakefile to handle Octopress::Configuration as a class. 2013-02-17 02:47:31 +01:00
Parker Moore
7265683c33 Merge pull request #1022 from gkarekinian/patch-2
Fixed configuration overriding
2013-02-16 17:12:00 -08:00
Parker Moore
28e25cacb0 Merge pull request #1021 from gkarekinian/patch-1
full_configuration in Rakefile was uninitialized
2013-02-16 16:22:59 -08:00
Grégory Karékinian
a6f2fdccd5 Fixed undefined variable timezone in Rakefile
It made it impossible to create a new page on 2.1
2013-02-14 17:44:39 +01:00
Grégory Karékinian
e18fba9456 Added initial test coverage 2013-02-12 12:08:29 +01:00
Greg Karékinian
cc97ac61fc full_configuration in Rakefile was uninitialized
Switched to a variable instead and reusing it in `integrate` task as well.
2013-02-11 12:42:47 +01:00
Franklin Chen
a5e7ed82db Update reference to timezone using new config system. 2013-01-28 23:39:51 -05:00
Parker Moore
c3479dca4a Merge 2.1 with new-configs 2013-01-20 23:20:45 -05:00
Parker Moore
6ce4d89bce Updated configuration structure and dependent code. Added Octopress module for easier sharing of helper methods. 2013-01-20 23:13:47 -05:00
Brandon Mathis
9659a45da3 Merge pull request #903 from mneorr/ssh_key
added ssh keys support (e.g. for Amazon ec2)
2013-01-13 21:06:42 -08:00
Brandon Mathis
5251313aa6 Improved timezone support
- Rake task list_drafts fixes
- Added link to timezone documentation
2013-01-13 22:54:47 -06:00
Chris Perelstein
4c0cf14344 Modified rake tasks to use iso8601 format dates and added configuration option to force a specfic timezone to be used 2013-01-13 22:01:57 -06:00
Brandon Mathis
5ba5b4760b Improvements to the regexes in setup_github_pages task 2013-01-13 10:00:43 -06:00
Brandon Mathis
38353f216c Improved draft management options
- rake list_drafts shows current drafts. Closes #645
- Rake generate, watch, and preview can compile future dated posts (defaults to false). Closes #837
2013-01-13 00:50:38 -06:00
Vaz Allen
ec07a5d7f8 setup_github_pages: allow for clones missing .git extension
Conflicts:
	Rakefile
2013-01-12 21:28:21 -06:00
Marin Usalj
7c9c4bad48 added ssh keys support (e.g. for Amazon ec2) 2012-12-29 09:58:34 -08:00
Parker Moore
087461a06c Removed dependencies upon :copydot from other tasks 2012-12-28 02:57:56 -05:00
Parker Moore
536f760d5a Remove copydot task in favor of Jekyll's include config (Fixes #894) 2012-12-28 02:19:19 -05:00
Johan Svensson
a6b8efe4a2 Rakefile option for any additional rsync arguments
Added variable `rsync_args`
2012-12-20 00:13:28 -06:00
Brandon Mathis
1d210675b7 Merge pull request #874 from imathis/catch_deploy_failures
Catch deploy failures
2012-12-19 21:51:59 -08:00
Parker Moore
d089889772 Printing the repo_url when failing. #866 2012-12-20 00:47:38 -05:00
Parker Moore
51fb2bcc5a #866 - using 'raise' instead of 'puts' for the error 2012-12-20 00:43:54 -05:00
Parker Moore
80fad2180e Checking to see if 'git push' worked in deploy. #866. 2012-12-20 00:43:53 -05:00
Parker Moore
569ed588e3 Updated URL parser for setup_github_pages. Fixes #868 2012-12-20 00:37:48 -05:00
Parker Moore
31db12fc49 DRY'd up that user regex. 2012-12-20 00:02:36 -05:00
Parker Moore
1e300fbb03 Catching malformed repo URLs #689 2012-12-19 23:46:33 -05:00
Parker Moore
3c92c5b407 Added support for https:// repo URLs. #867. 2012-12-19 23:45:34 -05:00
Parker Moore
dbb1487ba0 Slightly different syntax for setting server_host/_port. #780 2012-12-17 14:14:25 -05:00
Parker Moore
bb8f531d54 Using OCTOPRESS_-prefixed ENV vars. Modification to #780. 2012-12-17 14:06:45 -05:00
Parker Moore
6827f314b1 Printing HOST and PORT on rake preview 2012-12-17 13:59:35 -05:00
Max Lincoln
329d2c5bda Grab IP and PORT env vars and bind rack to both 2012-12-17 13:58:09 -05:00