Commit graph

327 commits

Author SHA1 Message Date
Jasper Van der Jeugt
3db3933b0b Revert "set internalRules last, so that it can be overrided by rules"
This reverts commit d406db44e3.
2014-03-26 12:05:38 +01:00
Jasper Van der Jeugt
969f2351ef Merge pull request #233 from rekahsoft/master
Fix unixFilter on Windows
2014-03-26 12:05:24 +01:00
chrisdotcode
5af08f807e Add flag to bind on selected host. 2014-03-24 04:50:17 -04:00
Collin J. Doering
da7ae99b12 Fix unixFilter on Windows
On windows, the 'unixFilter' function used window's 'createProcess'
function to create the external process that will filter some String
input. The problem with this is that it is unable to execute batch
stubs (eg. anything created using 'gem install ...') even if its in
$PATH. Anyways a solution to this issue is to execute the batch file
explicitly using 'cmd /c batchfile' but there is no rational way to know
where said batchfile is on the system. My solution is to detect windows
using the System.Info module and then instead of using 'proc' to create
the function, use 'shell' instead which will be able to execute
everything 'proc' can + batch files.

Inspired by: http://www.blaenkdenum.com/posts/the-switch-to-hakyll/#scss

Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
2014-03-23 17:30:29 -04:00
Jasper Van der Jeugt
63107a6f75 Merge pull request #190 from krsch/master
Implemented per-directory metadata support
2014-01-23 01:29:01 -08:00
Alexey Kreshchuk
dbabe0325b Unified code for global and external metadata
Didn't clean up unused code though
2014-01-22 00:11:51 +04:00
Alexey Kreshchuk
d406db44e3 set internalRules last, so that it can be overrided by rules 2014-01-21 23:15:08 +04:00
Jasper Van der Jeugt
b61877bdaa Fix issue with metadataRoute for composed routes 2014-01-03 16:40:15 +01:00
Jasper Van der Jeugt
98d03dfe48 Revert "Throw an error in case of duplicate compilers"
This reverts commit ffbce96607.
2013-12-05 12:27:45 +01:00
Jasper Van der Jeugt
ffbce96607 Throw an error in case of duplicate compilers 2013-11-22 13:56:17 +01:00
Jasper Van der Jeugt
f9a8443d68 Detect change if metadata file is deleted
Closes #191
2013-11-18 12:42:21 +01:00
Alexey Kreshchuk
46b6f78da8 Added test case for global metadata 2013-10-18 01:23:14 +04:00
Alexey Kreshchuk
712ffa39b5 Track metadata dependencies
I had to prepend some Rules to global Rules set. This might be possible
to replaced by a correct Store.set call.
I also had to prepend some Compile rules.
2013-10-16 01:39:04 +04:00
Alexey Kreshchuk
a6ae4eb99d Fix root directory in directory-wise metadata and beautify code 2013-10-15 03:59:16 +04:00
Alexey Kreshchuk
e71bbd90a8 Fix loadGlobalMetadata on Windows 2013-10-12 23:57:17 +04:00
Alexey Kreshchuk
e0f45b29b3 added gloabl metadata parsing 2013-10-11 02:41:27 +04:00
Jorge Israel Peña
999252ece1 add preview port Configuration field
Make it possible to specify the default port to listen on when the
preview server is run. This is useful if another service on the system
already runs on port 8000 (the default), since it's a hassle to keep
providing the port overriding option. For example: ./site preview vs.
./site preview -p 4000
2013-08-29 22:43:57 -07:00
Jasper Van der Jeugt
64569d7b72 Fix versions & metadata loading issue
Closes #171
2013-08-14 00:18:31 +02:00
uu1101
b5803bc7b6 Correct example code: parseGlob ==> fromGlob 2013-06-30 19:21:17 +02:00
Jasper Van der Jeugt
a3c4d06ff9 Merge pull request #162 from uu1101/seq-stderr
Deepseq stderr before closing the handle
2013-06-17 04:43:06 -07:00
Jasper Van der Jeugt
6814ff2e9b Only add teaser when <!--more--> is there 2013-06-17 12:01:22 +02:00
uu1101
a1e778d1e5 Set handle encoding as per locale 2013-06-14 01:02:14 +02:00
uu1101
cf501485b1 Deepseq stderr before closing the handle
Otherwise laziness allows for the handle to be closed withouth receiving the
input. This caused that no error messages were printed when `unixFilter`s
failed.
2013-06-14 00:32:45 +02:00
Jasper Van der Jeugt
e687662ba0 teaserContext -> teaserField 2013-06-06 10:21:18 +02:00
Simonas Kazlauskas
0a818d0725 Deploy should propagate error code
And return 1 if neither deployCommand and deploySite is set.
2013-05-22 15:24:26 +03:00
Jasper Van der Jeugt
d32307aa1c Add partials to template system 2013-05-07 09:28:09 +02:00
Jasper Van der Jeugt
cf138a415b Implement foreach structure 2013-05-06 23:32:25 +02:00
Ivan N. Veselov
946723dc9d Logged dependencies adding for debugging purposes. 2013-05-05 12:58:31 +03:00
Ivan N. Veselov
2651627189 Added "teasers" support to be used in posts index.
Just add "<!-- teaser_end -->" to separate the teaser and the rest of the article and use "$teaser$" key in the template!

Closes issue #35.
2013-05-04 17:26:22 +03:00
Jasper Van der Jeugt
ca80171caf Minor style changes 2013-05-04 15:18:26 +02:00
noxx
f4ee3e7fcb Created tests and fixed isMember function 2013-05-04 15:42:28 +03:00
noxx
0f779a8c53 Added isMember to load function 2013-05-04 13:05:47 +03:00
noxx
a3021bc703 Added isMember functions for Store 2013-05-04 12:51:58 +03:00
Jasper Van der Jeugt
4100083709 Style changes, move stuff to common parser module 2013-05-04 11:36:58 +02:00
Jasper Van der Jeugt
28bc3f1f3b Merge remote-tracking branch 'sphynx/master' 2013-05-04 11:14:35 +02:00
Ivan N. Veselov
617322ae8c Added MonadError's instance for Compiler. 2013-05-03 19:10:11 +03:00
Jasper Van der Jeugt
ec1f961c4e Close open cache files as soon as possible
See #124
2013-05-03 16:21:14 +02:00
Jasper Van der Jeugt
8f534400be More granular dependencies for routes
See #121
2013-05-03 11:03:49 +02:00
Jasper Van der Jeugt
cf98381508 Add event filtering based on pattern 2013-04-04 11:47:50 +02:00
Jasper Van der Jeugt
cbfc7c18e1 Debug info for Alternative instances
See #126
2013-04-04 00:26:05 +02:00
Jasper Van der Jeugt
c40cf286af Add getResourceFilePath
See #130
2013-04-03 12:07:03 +02:00
Jasper Van der Jeugt
5e4adaecb2 Account for absolute paths in shouldIgnoreFile 2013-04-03 12:02:06 +02:00
Jasper Van der Jeugt
bf496c2f55 We'll do it ourselves 2013-03-30 11:31:14 +01:00
Jasper Van der Jeugt
5d7e252d27 UnixFilter improvements
Closes #128
2013-03-30 10:58:02 +01:00
Samuel Tardieu
543cba90f6 Allow overriding the deploy command with Haskell code
By overriding `deploySite` with a `Configuration -> IO ()` code,
the user can execute Haskell code to deploy the site rather than
shell code.

The default behaviour honors the `deployCommand` configuration
field and is backward compatible.
2013-03-24 21:52:21 +01:00
Jasper Van der Jeugt
6c8fda2c00 Fix issue in Compiler Alternative instance 2013-03-24 19:21:33 +01:00
Jasper Van der Jeugt
d840363bf0 Merge remote-tracking branch 'piyush-kurur/master'
Conflicts:
	hakyll.cabal
2013-03-11 15:53:00 +01:00
Jasper Van der Jeugt
9b305229be Use resourceFilePath for copyFileCompiler
Closes #117
2013-03-07 18:48:11 +01:00
Piyush P Kurur
d6f6657c28 refactored the Default instance of Configuration 2013-03-07 18:04:21 +05:30
Piyush P Kurur
7fc2f677d9 fixing the coding style 2013-03-07 17:56:56 +05:30