Added an option to the haml and sass executables to check syntax.
git-svn-id: svn://hamptoncatlin.com/haml/trunk@691 7063305b-7217-0410-af8c-cdc13e5119b9
This commit is contained in:
parent
9a848a7eff
commit
b3ef623b3a
|
@ -144,6 +144,11 @@ END
|
||||||
exit
|
exit
|
||||||
end
|
end
|
||||||
|
|
||||||
|
opts.on('-c', '--check', "Just check syntax, don't evaluate.") do
|
||||||
|
@options[:check_syntax] = true
|
||||||
|
@options[:output] = StringIO.new
|
||||||
|
end
|
||||||
|
|
||||||
super
|
super
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -179,6 +184,9 @@ END
|
||||||
input.close() if input.is_a? File
|
input.close() if input.is_a? File
|
||||||
|
|
||||||
begin
|
begin
|
||||||
|
# We don't need to do any special handling of @options[:check_syntax] here,
|
||||||
|
# because the Sass syntax checking happens alongside evaluation
|
||||||
|
# and evaluation doesn't actually evaluate any code anyway.
|
||||||
result = ::Sass::Engine.new(template, @options[:for_engine]).render
|
result = ::Sass::Engine.new(template, @options[:for_engine]).render
|
||||||
rescue ::Sass::SyntaxError => e
|
rescue ::Sass::SyntaxError => e
|
||||||
raise e if @options[:trace]
|
raise e if @options[:trace]
|
||||||
|
@ -207,7 +215,12 @@ END
|
||||||
input.close() if input.is_a? File
|
input.close() if input.is_a? File
|
||||||
|
|
||||||
begin
|
begin
|
||||||
result = ::Haml::Engine.new(template, @options[:for_engine]).to_html
|
engine = ::Haml::Engine.new(template, @options[:for_engine])
|
||||||
|
if @options[:check_syntax]
|
||||||
|
puts "Syntax OK"
|
||||||
|
return
|
||||||
|
end
|
||||||
|
result = engine.to_html
|
||||||
rescue Exception => e
|
rescue Exception => e
|
||||||
raise e if @options[:trace]
|
raise e if @options[:trace]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue