Add --output-style/-s option to build_sass command

dahlia · dahlia · commit 2674d3992856 · 2014-10-27T05:17:13.000+09:00
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -24,6 +24,10 @@ To be released.
   soon.
 - :func:`~sassutils.builder.build_directory()` function has a new optional
   parameter ``output_style``.
+- :meth:`~sassutils.builder.Build.build()` method has a new optional
+  parameter ``output_style``.
+- Added ``--output-style``/``-s`` option to
+  :class:`~sassutils.distutils.build_sass` command.
 
 __ https://github.com/sass/libsass/releases/tag/3.0
 .. _partial import: http://sass-lang.com/documentation/file.SASS_REFERENCE.html#partials
diff --git a/sasstests.py b/sasstests.py
@@ -519,6 +519,15 @@ def test_build_sass(self):
                 f.read()
             )
 
+    def test_output_style(self):
+        rv = self.build_sass('--output-style', 'compressed')
+        self.assertEqual(0, rv)
+        with open(self.css_path('a.scss.css')) as f:
+            self.assertEqual(
+                'p a{color:red}p b{color:blue}',
+                f.read()
+            )
+
 
 class SasscTestCase(unittest.TestCase):
 
diff --git a/sassutils/builder.py b/sassutils/builder.py
@@ -151,20 +151,30 @@ def resolve_filename(self, package_dir, filename):
         css_path = os.path.join(package_dir, self.css_path, css_filename)
         return sass_path, css_path
 
-    def build(self, package_dir):
+    def build(self, package_dir, output_style='nested'):
         """Builds the SASS/SCSS files in the specified :attr:`sass_path`.
         It finds :attr:`sass_path` and locates :attr:`css_path`
         as relative to the given ``package_dir``.
 
         :param package_dir: the path of package directory
         :type package_dir: :class:`str`, :class:`basestring`
+        :param output_style: an optional coding style of the compiled result.
+                             choose one of: ``'nested'`` (default),
+                             ``'expanded'``, ``'compact'``, ``'compressed'``
+        :type output_style: :class:`str`
         :returns: the set of compiled CSS filenames
         :rtype: :class:`collections.Set`
 
+        .. versionadded:: 0.6.0
+           The ``output_style`` parameter.
+
         """
         sass_path = os.path.join(package_dir, self.sass_path)
         css_path = os.path.join(package_dir, self.css_path)
-        css_files = build_directory(sass_path, css_path).values()
+        css_files = build_directory(
+            sass_path, css_path,
+            output_style=output_style
+        ).values()
         return frozenset(os.path.join(self.css_path, filename)
                          for filename in css_files)
 
diff --git a/sassutils/distutils.py b/sassutils/distutils.py
@@ -49,6 +49,9 @@
         'package.name': ('static/scss', 'static')
     }
 
+.. versionadded:: 0.6.0
+   Added ``--output-style``/``-s`` option to :class:`build_sass` command.
+
 """
 from __future__ import absolute_import
 
@@ -61,6 +64,7 @@
 from setuptools import Command
 from setuptools.command.sdist import sdist
 
+from sass import OUTPUT_STYLES
 from .builder import Manifest
 
 __all__ = 'build_sass', 'validate_manifests'
@@ -86,10 +90,17 @@ class build_sass(Command):
     """Builds SASS/SCSS files to CSS files."""
 
     descriptin = __doc__
-    user_options = []
+    user_options = [
+        (
+            'output-style=', 's',
+            'Coding style of the compiled result.  Choose one of ' +
+            ', '.join(OUTPUT_STYLES)
+        )
+    ]
 
     def initialize_options(self):
         self.package_dir = None
+        self.output_style = 'nested'
 
     def finalize_options(self):
         self.package_dir = {}
@@ -107,7 +118,10 @@ def run(self):
         for package_name, manifest in manifests.items():
             package_dir = self.get_package_dir(package_name)
             distutils.log.info("building '%s' sass", package_name)
-            css_files = manifest.build(package_dir)
+            css_files = manifest.build(
+                package_dir,
+                output_style=self.output_style
+            )
             map(distutils.log.info, css_files)
             package_data.setdefault(package_name, []).extend(css_files)
             data_files.extend((package_dir, f) for f in css_files)
