Commit graph

1133 commits

Author SHA1 Message Date
Ben Hollis d51056cb26 Fix CLI tests now that we generate a Gemfile by default 2012-03-24 20:37:15 -07:00
Thomas Reynolds 53db5689c7 Merge pull request #318 from bhollis/bundler
Add bundler as a dependency and default to generating a Gemfile
2012-03-20 10:49:38 -07:00
Ben Hollis a07df582c3 Add bundler as a dependency and default to generating a Gemfile. 2012-03-19 16:50:51 -06:00
Thomas Reynolds 276e6562dd Merge pull request #316 from bhollis/templates
Include middleman-core's template path in the list of source_paths
2012-03-19 08:37:16 -07:00
Thomas Reynolds 40380aaeeb Merge pull request #317 from bhollis/master
Fix watcher to be more selective about what it ignores
2012-03-19 08:36:51 -07:00
Ben Hollis 0d80678e48 Include middleman-core's template path in the list of source_paths so that inherited templates in other gems can still use the Gemfile and config.ru from the main middleman gem. 2012-03-18 18:58:15 -06:00
Ben Hollis 1b0fe80873 Fix watcher to be more selective about what it ignores 2012-03-18 18:55:02 -06:00
Ben Hollis bacffeea02 Tell Thor to return the right exit code on failure 2012-03-18 17:30:35 -06:00
Thomas Reynolds 85d2ace5ce Merge pull request #315 from bhollis/master
Expose errors to users during build
2012-03-18 12:34:43 -07:00
Ben Hollis 6f4e863091 Expose errors to users during build rather than burying them in output files. 2012-03-18 13:01:04 -06:00
Thomas Reynolds d36077f47b Merge pull request #313 from bhollis/sitemap_globs
Sitemap/frontmatter/globbing fixes
2012-03-15 11:32:03 -07:00
Ben Hollis 4a5fededf7 Make with_layout work with globs/regexes 2012-03-15 00:31:50 -07:00
Ben Hollis 5db1a9453a Make directory_indexes use provides_metadata_for_path instead of its own list of ignored paths, allowing it to support regexes/globs 2012-03-15 00:29:50 -07:00
Ben Hollis 73350d6d05 Don't let people (or messed up code) accidentally create sitemap pages through the page method 2012-03-15 00:28:51 -07:00
Ben Hollis 111d021630 Fix frontmatter ignore to not create phantom pages and to generally be simpler. 2012-03-15 00:27:59 -07:00
Thomas Reynolds 07828d8aa0 derp only allow compass 0.12 2012-03-14 20:05:49 -07:00
Thomas Reynolds a13db4f16e derp only allow compass 0.12 2012-03-14 20:04:29 -07:00
Thomas Reynolds 7d2821a472 travis update 2012-03-14 20:02:49 -07:00
Thomas Reynolds f76883b53a bump compass 2012-03-14 10:54:59 -07:00
Thomas Reynolds 1a25582d6f Merge pull request #310 from bhollis/master
Load extension gems even when only using middleman-core
2012-03-14 10:46:09 -07:00
Ben Hollis f1051d8c59 Load extensions even when only using middleman-core. Also, use Bundler.require when available rather than scanning gems for extensions. 2012-03-13 23:00:02 -07:00
Ben Hollis baa7d42d74 Forgot to rename gzip extension in one place 2012-03-13 22:42:18 -07:00
Thomas Reynolds 892d2e7800 loosen sass dep 2012-03-13 09:18:49 -07:00
Thomas Reynolds af6145f2f7 compass is out 2012-03-13 09:18:49 -07:00
Thomas Reynolds 40a5c619a4 Merge pull request #309 from bhollis/gzip
Rename gzip_assets to just gzip since it does HTML too
2012-03-13 08:52:47 -07:00
Ben Hollis 317dfb318a Rename gzip_assets to just gzip since it does HTML too 2012-03-12 21:31:05 -07:00
Thomas Reynolds bba2584c81 Merge pull request #308 from bhollis/master
Test showing variables not getting passed to templates during build
2012-03-12 10:14:00 -07:00
Ben Hollis 780daa7053 Fix test instructions 2012-03-11 23:41:49 -07:00
Ben Hollis de92015085 Fix usage of a 1.9-only method in Sitemap::Page 2012-03-11 23:41:48 -07:00
Ben Hollis c6c3021593 Fix issue #302 2012-03-11 23:33:46 -07:00
Ben Hollis 6edefe3c68 Further tweaks that expose another bug - ignore with proxies leads to Not Found errors. Same issue as #302. 2012-03-11 23:09:43 -07:00
Ben Hollis 9555266ac1 Variables not passed to proxies when they are built. Possibly related to issue #302. 2012-03-11 22:49:21 -07:00
Ben Hollis 54b5304264 Ignore pidfiles 2012-03-11 22:40:54 -07:00
Ben Hollis 3fde255610 Change gzip_assets output to print size difference in human terms 2012-03-11 11:06:48 -07:00
Thomas Reynolds 89bd4f1eaf correct a relative_assets issue 2012-03-10 19:51:47 -08:00
Thomas Reynolds 7d7f9a20ef i18n not ready for primetime yet 2012-03-10 19:40:04 -08:00
Thomas Reynolds 08f5e64858 bump listen dep 2012-03-10 18:57:47 -08:00
Thomas Reynolds d9a82beb8a merge i18n extension 2012-03-10 18:57:00 -08:00
Thomas Reynolds 8d22fee8d8 Merge pull request #298 from bhollis/i18n-helpers
Fix Padrino helpers that require an i18n locale to be present
2012-03-09 10:19:15 -08:00
Ben Hollis e7df250c4d Include "i18n" gem in middleman-core gemspec 2012-03-08 23:05:59 -08:00
Thomas Reynolds dc5bbe8522 Merge pull request #305 from bhollis/sitemap
Fix current_page helper
2012-03-08 09:12:00 -08:00
Ben Hollis 4830f51664 Fix current_page 2012-03-07 22:08:41 -08:00
Ben Hollis efe1d45af7 Rewrite sitemap_traversal tests to better reflect what should actually happen, and to expose a bug in current_page. 2012-03-07 22:08:41 -08:00
Ben Hollis 739a8633ae Rename sitemap_traversal.features to sitemap_traversal.feature so it will actually be run. Also rename ignore_already_minified.features for the same reason. 2012-03-07 22:08:16 -08:00
Thomas Reynolds 38d1059be2 Merge pull request #300 from bhollis/url
A url helper that strips directory indexes
2012-03-05 08:36:14 -08:00
Ben Hollis 0470fa3083 Remove nonsense comment 2012-03-04 23:37:16 -08:00
Ben Hollis 627b6c1462 A url helper that strips directory indexes 2012-03-04 23:26:30 -08:00
Thomas Reynolds b093bb9f51 fix asset_hash tests from what I assume are random hash key ordering issues across rubies 2012-03-04 23:03:21 -08:00
Thomas Reynolds b9475bbccc Merge asset_hash extension 2012-03-04 22:53:43 -08:00
Thomas Reynolds 49ae07bab8 Merge pull request #299 from bhollis/decruft
Three small cleanups
2012-03-04 22:49:41 -08:00