deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make build fail when external_pipeline fails

Browse source
This commit is contained in:
Adam Heath 2016-02-18 12:41:48 +08:00
parent 476287452d
commit 351003b4fe
4 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
middleman-core/features/builder.feature
View file

@ -20,13 +20,13 @@ Feature: Builder
| layout | | layout |
| layouts/custom | | layouts/custom |
| layouts/content_for | | layouts/content_for |
And the file "index.html" should contain "Comment in layout" And the file "index.html" should contain "Comment in layout"
And the file "index.html" should contain "<h1>Welcome</h1>" And the file "index.html" should contain "<h1>Welcome</h1>"
And the file "static.html" should contain "Static, no code!" And the file "static.html" should contain "Static, no code!"
And the file "services/index.html" should contain "Services" And the file "services/index.html" should contain "Services"
And the file "stylesheets/static.css" should contain "body" And the file "stylesheets/static.css" should contain "body"
Scenario: Build glob Scenario: Build glob
Given a successfully built app at "glob-app" with flags "--glob '*.css'" Given a successfully built app at "glob-app" with flags "--glob '*.css'"
When I cd to "build" When I cd to "build"
@ -34,15 +34,19 @@ Feature: Builder
| index.html | | index.html |
Then the following files should exist: Then the following files should exist:
| stylesheets/site.css | | stylesheets/site.css |
Scenario: Build with errors Scenario: Build with errors
Given a built app at "build-with-errors-app" Given a built app at "build-with-errors-app"
Then the exit status should be 1 Then the exit status should be 1
Scenario: Build empty errors Scenario: Build empty errors
Given a built app at "empty-app" Given a built app at "empty-app"
Then the exit status should be 1 Then the exit status should be 1
Scenario: Build external_pipeline errors
Given a built app at "external-pipeline-error"
Then the exit status should be 1
Scenario: Build alias (b) Scenario: Build alias (b)
Given a fixture app "large-build-app" Given a fixture app "large-build-app"
When I run `middleman b` When I run `middleman b`

5
middleman-core/fixtures/external-pipeline-error/config.rb Normal file
View file

@ -0,0 +1,5 @@
activate :external_pipeline,
name: :failing,
command: "mv does-not-exist tmp/file.js",
source: "tmp",
latency: 2

0
middleman-core/fixtures/external-pipeline-error/source/javascripts/file.js Normal file
View file

5
middleman-core/lib/middleman-core/extensions/external_pipeline.rb
View file

@ -34,6 +34,11 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
end end
end end
unless $?.success?
logger.error '== External: Command failed with non-zero exit status'
exit(1)
end
@watcher.poll_once! @watcher.poll_once!
rescue ::Errno::ENOENT => e rescue ::Errno::ENOENT => e
logger.error "== External: Command failed with message: #{e.message}" logger.error "== External: Command failed with message: #{e.message}"