htmlcompressor: use new dsl

1 files changed, 7 insertions, 9 deletions

diff --git a/Library/Formula/htmlcompressor.rb b/Library/Formula/htmlcompressor.rb
index 5ebb7b4f4..f6fa44d98 100644
--- a/Library/Formula/htmlcompressor.rb
+++ b/Library/Formula/htmlcompressor.rb
@@ -1,25 +1,23 @@
 require 'formula'
 
 class Htmlcompressor < Formula
-  url 'http://htmlcompressor.googlecode.com/files/htmlcompressor-1.5.3.jar'
   homepage 'http://code.google.com/p/htmlcompressor/'
+  url 'http://htmlcompressor.googlecode.com/files/htmlcompressor-1.5.3.jar'
   sha1 '57db73b92499e018b2f2978f1c7aa7b1238c7a39'
 
-  def options
-    [
-      ['--yuicompressor', "Use YUICompressor for JS/CSS compression."],
-    ]
-  end
+  option 'yuicompressor', "Use YUICompressor for JS/CSS compression"
 
-  depends_on "yuicompressor" if ARGV.include? '--yuicompressor'
+  depends_on "yuicompressor" => :optional if build.include? 'yuicompressor'
 
   def install
     libexec.install "htmlcompressor-#{version}.jar"
+
     (bin+'htmlcompressor').write <<-EOS.undent
       #!/bin/sh
-      java -jar "#{libexec}/htmlcompressor-#{version}.jar" $@
+      java -jar "#{libexec}/htmlcompressor-#{version}.jar" "$@"
     EOS
-    if ARGV.include? '--yuicompressor'
+
+    if build.include? 'yuicompressor'
       yui = Formula.factory('yuicompressor')
       yui_jar = "yuicompressor-#{yui.version}.jar"
       ln_s "#{yui.libexec}/#{yui_jar}", "#{libexec}/#{yui_jar}"