Commit Graph

20 Commits

Author SHA1 Message Date
Parker Moore
759b19908e Merge pull request #1124 from imathis/jekyll-1.0
Integrate Jekyll 1.0
2013-03-26 05:12:56 -07:00
Brandon Mathis
940064cac6 Ensure that Octopress.env can be set by ENV, _config/defaults/jekyll.yml and _config/site.yml 2013-03-18 02:00:30 -05: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
Grégory Karékinian
eda01faac3 Switched code style to a more usual Ruby style
* Two spaces indentation
* Got rid of two semicolons
* Added a blank line before the return value
2013-03-04 21:58:54 +01: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
Parker Moore
922b4cdaac Using master Gemfile and Rakefile cuz travis sucks. 2013-02-28 21:47:22 +01:00
Parker Moore
d022a05fe9 Being consistent with quote-type usage. 2013-02-28 21:30:39 +01:00
Parker Moore
57bfa12305 Moving to minitest v4.6. 2013-02-28 21:30:07 +01:00
Jon Frisby
ffa9118e9c Grand whitespace cleanup. 2013-02-21 21:53:04 -08:00
Parker Moore
b75234693f Testing now in lib/, added a supporting Gemfile and Rakefile 2013-02-17 02:51:07 +01:00
Parker Moore
153ce83527 Octopress::Configuration is now a class, rather than a module.
The previous system was very unforgiving about where the configuration directory
lay. This commit allows the configuration directory to be set through a config_directory
instance variable on the Octopress::Configuration class, in the event that this directory
ever needs to be changed (e.g. for testing).
2013-02-17 02:40:38 +01:00
Parker Moore
2db84f0db6 Ruby development console. 2013-02-17 02:36:19 +01:00
Grégory Karékinian
e18fba9456 Added initial test coverage 2013-02-12 12:08:29 +01:00
Greg Karékinian
fb9b6f8150 Fixed configuration overriding
The deep merge was made the wrong way around
2013-02-12 11:57:30 +01:00
Parker Moore
055d85e44e Returning an empty Hash if no config exists. Fixes #1005. 2013-02-11 21:07:50 +01:00
Parker Moore
9690617041 Changed Configuration back to a Module, for a Class 2013-01-20 23:44:45 -05:00
Parker Moore
7e68382f53 Declaring Octopress before declaring the child class Configuration 2013-01-20 23:43:47 -05:00
Parker Moore
fa2aa4913d Added Octopress.env 2013-01-20 23:43:22 -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