Merge branch 'master' of github.com:chriseppstein/compass

lib/compass/configuration/defaults.rb

@@ -30,7 +30,7 @@ module Compass
         if top_level.environment == :development
           :expanded
         else
-          :compact
+          :compressed
         end
       end
 

lib/compass/configuration/serialization.rb

@@ -50,6 +50,7 @@ module Compass
             $stderr.puts "WARNING: #{prop} is code and cannot be written to a file. You'll need to copy it yourself."
           end
           if respond_to?("comment_for_#{prop}")
+            contents << "\n"
             contents << send("comment_for_#{prop}")
           end
           if block_given? && (to_emit = yield(prop, value))

lib/compass/exec/project_options_parser.rb

@@ -37,14 +37,14 @@ module Compass::Exec::ProjectOptionsParser
     end
 
     opts.on('-e ENV', '--environment ENV', [:development, :production], 'Use sensible defaults for your current environment.',
-            '  One of: development, production (default)') do |env|
+            '  One of: development (default), production') do |env|
       self.options[:environment] = env
-            end
+    end
 
     opts.on('-s STYLE', '--output-style STYLE', [:nested, :expanded, :compact, :compressed], 'Select a CSS output mode.',
             '  One of: nested, expanded, compact, compressed') do |style|
       self.options[:output_style] = style
-            end
+    end
 
     opts.on('--relative-assets', :NONE, 'Make compass asset helpers generate relative urls to assets.') do
       self.options[:relative_assets] = true