0
@@ -8,7 +8,6 @@ Features:
0
   Sass should throw generic errors for undefined constants, not syntax errors
0
   Sass::Plugin should log errors
0
   There should be a way to represent options in-document
0
-  Haml and Sass executables should return meaningful exit codes
0
   There should be a way to make Haml tags not insert whitespace
0
   "%li, %a"?
0
   Sass::Engine load_paths option should be set by executable

0
@@ -16,12 +16,23 @@ module Haml
0
       end
0
 
0
       def parse!
0
-        @opts = OptionParser.new(&(method(:set_opts).to_proc))
0
-        @opts.parse!(@args)
0
-
0
-        process_result
0
+        begin
0
+          @opts = OptionParser.new(&(method(:set_opts).to_proc))
0
+          @opts.parse!(@args)
0
+
0
+          process_result
0
+          
0
+          @options
0
+        rescue Exception => e
0
+          if @options[:trace]
0
+            puts e
0
+          else
0
+            puts "Error: #{e.message}\nUse --trace to see traceback"
0
+          end
0
 
0
-        @options
0
+          exit 1
0
+        end
0
+        exit 0
0
       end
0
 
0
       def to_s
0
@@ -39,6 +50,15 @@ module Haml
0
           @options[:output] = $stdout
0
         end
0
 
0
+        opts.on('-s', '--stdio', 'Read input from standard input and print output to standard output') do
0
+          @options[:input] = $stdin
0
+          @options[:output] = $stdout
0
+        end
0
+
0
+        opts.on('--trace', :NONE, 'Show a full traceback on error') do
0
+          @options[:trace] = true
0
+        end
0
+
0
         opts.on_tail("-?", "-h", "--help", "Show this message") do
0
           puts opts
0
           exit
0
@@ -102,7 +122,7 @@ Description:
0
 Options:
0
 END
0
        
0
-        opts.on('--rails RAILS_DIR', "Install Haml from the Gem to a Rails project.") do |dir|
0
+        opts.on('--rails RAILS_DIR', "Install Haml from the Gem to a Rails project") do |dir|
0
           original_dir = dir
0
 
0
           dir = File.join(dir, 'vendor', 'plugins')