Adam Luikart
d4d1391bbb
Don't hang on to the first Logger instance you see
...
If the main app instance hangs on to the logger that ::Middleman::Logger.singleton returns, then subsequent calls to re-init the logger won't have any effect (for instance, when setting up the preview server's logger based on CLI params).
Redefining logger to be a pass-through to ::Middleman::Logger.singleton instead of an ivar seems more in keeping with the sprit of a singleton, anyways.
This fixes an issue where running `middleman server --verbose` doesn't output any debug info.
2014-04-07 17:34:26 -05:00
Thomas Reynolds
fac4928d50
Update haml and sass deps
...
Conflicts:
Gemfile
middleman/middleman.gemspec
2014-04-03 10:01:18 -07:00
Thomas Reynolds
6d2f8cd50c
Add options hash to asset methods to allow special options to be passed through from extensions
2014-03-31 14:15:46 -07:00
Thomas Reynolds
1c37cc6a34
Merge pull request #1238 from bhollis/asciidoc
...
Remove Asciidoc support in favor of a middleman-asciidoc extension
2014-03-30 10:52:40 -07:00
Ben Hollis
5ce8549f03
Remove Asciidoc support in favor of a middleman-asciidoc extension.
2014-03-29 19:24:51 -07:00
Ben Hollis
c1f7299cfd
Fix some references to extensions[:frontmatter]
2014-03-29 17:21:49 -07:00
Ben Hollis
abeee38126
Remove yet another way to register extensions and register/activate FrontMatter like a normal extension.
2014-03-29 17:17:00 -07:00
Ben Hollis
a6c37f3dd3
Clean up extensions a bit. Removes newest form of registering extensions, more consistently sets and uses an extension's ext_name, and makes a lot of things errors instead of just log messages in hopes that people can't get too far with a messed-up config.
2014-03-29 14:29:42 -07:00
Ben Hollis
10eca91311
Fix docs for HashWithIndifferentAccess
2014-03-25 22:43:43 -07:00
Ben Hollis
60f712e6ba
Merge branch 'v3-stable'
...
Conflicts:
.travis.yml
Gemfile
middleman-cli/lib/middleman-cli/build.rb
middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
middleman-core/lib/middleman-core/templates.rb
middleman-core/lib/middleman-core/util.rb
middleman-core/middleman-core.gemspec
2014-03-25 22:35:19 -07:00
Thomas Reynolds
91675c4588
move sprockets init
2014-03-25 17:00:17 -07:00
Thomas Reynolds
8bc2fddb9d
Remove static serving of non-Middleman folders
2014-03-25 16:57:57 -07:00
Thomas Reynolds
1b6af9a4c1
Expose asset_path on the main Application object (Sprockets needed it)
2014-03-25 11:01:35 -07:00
Thomas Reynolds
37a8caf3fa
Bring back extension block register syntax. Closes #1192
2014-03-25 11:00:43 -07:00
Karl Freeman
6c84ed4674
whitespace [ci skip]
2014-03-25 13:13:36 +00:00
Karl Freeman
ce83e502f6
more consistency across all gems
...
- rubocop'd for cosmetics
2014-03-25 08:50:28 +00:00
Ben Hollis
bb5b4054ff
Don't bother processing asset hash on ignored resources. On a large project with a lot of Sprockets dependencies that were mostly ignored, this brought the build down from 30 minutes to 1 minute
2014-03-23 23:35:12 -07:00
Ben Hollis
0a6c80d223
Don't attempt to load local templates if HOME is not set
2014-03-23 16:49:22 -07:00
Thomas Reynolds
ce7636ad18
remove Implied Extensions feature. Closes #1211
2014-03-20 17:12:41 -07:00
Thomas Reynolds
1721dff4c7
add node_modules to filewatcher ignore
2014-03-20 10:03:44 -07:00
Thomas Reynolds
fde93ffed4
add node_modules to filewatcher ignore
2014-03-20 10:02:18 -07:00
Thomas Reynolds
ae1edd482f
upgrade to newest activesupport
2014-03-20 09:53:01 -07:00
Thomas Reynolds
515c91e826
Merge pull request #1219 from bhollis/windows
...
Add tzinfo-data for Windows users
2014-03-19 15:40:33 -07:00
Ben Hollis
f71a0951ef
Add tzinfo-data for Windows users
2014-03-18 22:42:31 -07:00
Ben Hollis
67689e60d2
Prevent the file watcher from recursively enumerating into paths that it should ignore. This should fix the issue in #1197 as well as provide a performance boost when starting 'middleman server'.
2014-03-18 21:17:50 -07:00
Karl Freeman
87acf687d5
friendlier localhost print
2014-03-14 06:46:10 +00:00
Ben Hollis
a88f12a262
Apply fix from 32716f3729 - avoid loading middleman-core unless needed. Fixes #1203
2014-03-13 20:32:25 -07:00
Thomas Reynolds
250c87ef61
move livereload init into dev block
2014-03-09 17:50:34 -07:00
Thomas Reynolds
8b20b39b31
Merge pull request #1194 from bhollis/gemfile
...
Require Bundler (a Gemfile) for all set up Middleman projects
2014-03-08 16:05:34 -08:00
Ben Hollis
10f8715bde
Whoops, properly implement findup
2014-03-04 22:43:10 -08:00
Ben Hollis
220d1e8948
Require Bundler (a Gemfile) for all set up Middleman projects. We still do extension auto-discovery for "init". Gemfile may now be in any parent directory of 'config.rb', in case the Middleman project is in a subdirectory of a larger project.
2014-03-03 23:47:24 -08:00
Ben Hollis
5de4e337c1
Merge middleman-more back into middleman-core
2014-03-03 22:32:12 -08:00
Ben Hollis
c9a640a3e2
Merge remote-tracking branch 'origin/v3-stable'
...
Conflicts:
middleman-core/lib/middleman-core/extension.rb
2014-03-03 22:10:50 -08:00
Ben Hollis
0533bc4209
Be quiet about missing extras when middleman-core is used alone
2014-02-25 22:28:06 -08:00
Ben Hollis
0f9b199bfa
Move some requires around
2014-02-22 22:44:28 -08:00
Ben Hollis
e662b6433f
Reapply changes from 477f87e98a to TemplateRenderer/TemplateContext
2014-02-22 22:44:25 -08:00
Ben Hollis
c5b0ba17ea
Fix Padrino integration after merge
2014-02-22 20:11:54 -08:00
Ben Hollis
4e545eef27
Break Middleman::Extension into its own file, mirroring the change on master
2014-02-22 18:43:47 -08:00
Ben Hollis
7b46fd6524
Merge remote-tracking branch 'origin/v3-stable'
...
Conflicts:
CHANGELOG.md
middleman-core/lib/middleman-core/core_extensions/rendering.rb
middleman-core/lib/middleman-core/extensions.rb
middleman-core/lib/middleman-core/version.rb
middleman-core/lib/middleman-more/core_extensions/compass.rb
middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
middleman-core/middleman-core.gemspec
2014-02-22 18:11:37 -08:00
Ben Hollis
477f87e98a
Prefer loading layouts from layouts_dir over layouts with the same name in the source root. This also includes a bunch of refactoring/cleanup of rendering.rb. Fixes #1176 .
2014-02-20 08:50:07 -08:00
Ben Hollis
ca50f21fac
"middleman init" will create a project in the current directory. Fixes #1181 .
2014-02-19 23:13:59 -08:00
Thomas Reynolds
3995ad850c
update padrino.
2014-02-18 18:30:29 -08:00
Jonathan Soeder
8d346e74a5
Adding before build hook
2014-02-04 23:03:24 -06:00
Nico Hagenburger
0c3000c799
as there are no more local changes in the hooks’ source, it can be unvendored and used as gem
2014-02-03 23:39:23 +01:00
Nico Hagenburger
e5d95944c4
use instance hooks provided by hooks instead of changing the gem’s source
...
Conflicts:
middleman-core/lib/middleman-core/core_extensions/extensions.rb
2014-02-03 23:37:55 +01:00
Nico Hagenburger
732532b72e
upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0
...
Conflicts:
middleman-core/lib/middleman-core/application.rb
2014-02-03 23:34:31 +01:00
Nico Hagenburger
d6f9e8c640
as there are no more local changes in the hooks’ source, it can be unvendored and used as gem
2014-02-02 11:18:25 +01:00
Nico Hagenburger
2ad91339bb
use instance hooks provided by hooks instead of changing the gem’s source
2014-02-02 11:12:57 +01:00
Nico Hagenburger
247a152d39
upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0
2014-02-01 23:45:46 +01:00
Jeremy Green
b056f4f1d1
Update the console to the new logger syntax.
2014-01-30 23:26:17 -06:00
