chriseppstein-compass 0.6.5 → 0.6.6

data/CHANGELOG.markdown

@@ -1,6 +1,20 @@
 COMPASS CHANGELOG
 =================
 
+0.6.6
+-----
+
+The Haml project now releases a gem called haml-edge that is built from the haml master branch instead of stable. Compass now depends on this gem and will continue to do so until haml 2.2 is released. This should reduce the number of installation problems that have been encountered by new users.
+
+### Command Line
+
+* Fixed a bug that had broken the --write-configuration (-c) option.
+* The --force option will now force recompilation. Useful when the stylesheets don't appear to need a recompile according to the file timestamps.
+
+### Unit tests
+
+* Some unit tests were cleaned up for clarity and to better take advantage of the compass project management facilities.
+
 0.6.5
 -----
 

data/Manifest

@@ -1,6 +1,8 @@
 bin/compass
 CHANGELOG.markdown
 compass.gemspec
+examples/blueprint_default/config.rb
+examples/blueprint_default/images/grid.png
 examples/blueprint_default/index.html
 examples/blueprint_default/parts/elements.html
 examples/blueprint_default/parts/forms.html
@@ -9,13 +11,13 @@ examples/blueprint_default/parts/test-small.jpg
 examples/blueprint_default/parts/test.jpg
 examples/blueprint_default/parts/valid.png
 examples/blueprint_default/src/ie.sass
-examples/blueprint_default/src/images/grid.png
 examples/blueprint_default/src/print.sass
 examples/blueprint_default/src/screen.sass
 examples/blueprint_plugins/config.rb
 examples/blueprint_plugins/images/buttons/cross.png
 examples/blueprint_plugins/images/buttons/key.png
 examples/blueprint_plugins/images/buttons/tick.png
+examples/blueprint_plugins/images/grid.png
 examples/blueprint_plugins/images/link_icons/doc.png
 examples/blueprint_plugins/images/link_icons/email.png
 examples/blueprint_plugins/images/link_icons/external.png
@@ -34,7 +36,6 @@ examples/blueprint_plugins/plugins/link_icons.html
 examples/blueprint_plugins/plugins/rtl.html
 examples/blueprint_plugins/src/buttons.sass
 examples/blueprint_plugins/src/ie.sass
-examples/blueprint_plugins/src/images/grid.png
 examples/blueprint_plugins/src/link_icons.sass
 examples/blueprint_plugins/src/print.sass
 examples/blueprint_plugins/src/rtl_screen.sass
@@ -45,6 +46,8 @@ examples/blueprint_scoped/src/screen.sass
 examples/blueprint_scoped_form/src/ie.sass
 examples/blueprint_scoped_form/src/print.sass
 examples/blueprint_scoped_form/src/screen.sass
+examples/blueprint_semantic/config.rb
+examples/blueprint_semantic/images/grid.png
 examples/blueprint_semantic/index.html
 examples/blueprint_semantic/parts/fancy_type.html
 examples/blueprint_semantic/parts/liquid.html
@@ -52,13 +55,13 @@ examples/blueprint_semantic/parts/test-small.jpg
 examples/blueprint_semantic/parts/test.jpg
 examples/blueprint_semantic/parts/valid.png
 examples/blueprint_semantic/src/ie.sass
-examples/blueprint_semantic/src/images/grid.png
 examples/blueprint_semantic/src/liquid.sass
 examples/blueprint_semantic/src/print.sass
 examples/blueprint_semantic/src/screen.sass
 examples/compass/compass.html
+examples/compass/config.rb
+examples/compass/images/blue_arrow.gif
 examples/compass/src/compass.sass
-examples/compass/src/images/blue_arrow.gif
 examples/compass/src/sticky_footer.sass
 examples/compass/src/utilities.sass
 examples/compass/sticky_footer.html.haml
@@ -172,6 +175,7 @@ lib/compass/commands/write_configuration.rb
 lib/compass/compiler.rb
 lib/compass/configuration.rb
 lib/compass/core_ext.rb
+lib/compass/dependencies.rb
 lib/compass/errors.rb
 lib/compass/exec.rb
 lib/compass/frameworks.rb
@@ -202,11 +206,13 @@ README.markdown
 test/command_line_test.rb
 test/compass_test.rb
 test/configuration_test.rb
+test/fixtures/stylesheets/blueprint/config.rb
 test/fixtures/stylesheets/blueprint/css/typography.css
 test/fixtures/stylesheets/blueprint/sass/ie.sass
 test/fixtures/stylesheets/blueprint/sass/print.sass
 test/fixtures/stylesheets/blueprint/sass/screen.sass
 test/fixtures/stylesheets/blueprint/sass/typography.sass
+test/fixtures/stylesheets/compass/config.rb
 test/fixtures/stylesheets/compass/css/layout.css
 test/fixtures/stylesheets/compass/css/print.css
 test/fixtures/stylesheets/compass/css/reset.css
@@ -215,6 +221,7 @@ test/fixtures/stylesheets/compass/sass/layout.sass
 test/fixtures/stylesheets/compass/sass/print.sass
 test/fixtures/stylesheets/compass/sass/reset.sass
 test/fixtures/stylesheets/compass/sass/utilities.sass
+test/fixtures/stylesheets/yui/config.rb
 test/fixtures/stylesheets/yui/css/mixins.css
 test/fixtures/stylesheets/yui/sass/base.sass
 test/fixtures/stylesheets/yui/sass/fonts.sass

data/Rakefile

@@ -44,7 +44,7 @@ begin
     p.url = "http://github.com/chriseppstein/compass"
     p.author = ['Chris Eppstein']
     p.email = "chris@eppsteins.net"
-    p.dependencies = ["haml"]
+    p.dependencies = ["haml-edge"]
     p.has_rdoc = false
   end
  
@@ -78,7 +78,7 @@ task :examples do
       output.close
     end
     Dir.chdir example do
-      Compass::Exec::Compass.new([]).run!
+      Compass::Exec::Compass.new(["--force"]).run!
     end
   end
 end

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.6.6

data/compass.gemspec

@@ -1,37 +1,39 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{compass}
-  s.version = "0.6.5"
+  s.version = "0.6.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Eppstein"]
-  s.date = %q{2009-04-29}
+  s.date = %q{2009-05-08}
   s.default_executable = %q{compass}
   s.description = %q{Sass-Based CSS Meta-Framework. Semantic, Maintainable CSS.}
   s.email = %q{chris@eppsteins.net}
   s.executables = ["compass"]
-  s.extra_rdoc_files = ["bin/compass", "CHANGELOG.markdown", "lib/compass/actions.rb", "lib/compass/commands/base.rb", "lib/compass/commands/create_project.rb", "lib/compass/commands/generate_grid_background.rb", "lib/compass/commands/installer_command.rb", "lib/compass/commands/list_frameworks.rb", "lib/compass/commands/print_version.rb", "lib/compass/commands/project_base.rb", "lib/compass/commands/stamp_pattern.rb", "lib/compass/commands/update_project.rb", "lib/compass/commands/validate_project.rb", "lib/compass/commands/watch_project.rb", "lib/compass/commands/write_configuration.rb", "lib/compass/compiler.rb", "lib/compass/configuration.rb", "lib/compass/core_ext.rb", "lib/compass/errors.rb", "lib/compass/exec.rb", "lib/compass/frameworks.rb", "lib/compass/grid_builder.rb", "lib/compass/installers/base.rb", "lib/compass/installers/manifest.rb", "lib/compass/installers/rails.rb", "lib/compass/installers/stand_alone.rb", "lib/compass/installers.rb", "lib/compass/logger.rb", "lib/compass/merb.rb", "lib/compass/test_case.rb", "lib/compass/validate/COPYRIGHT.html", "lib/compass/validate/css-validator-javadoc.jar", "lib/compass/validate/css-validator.jar", "lib/compass/validate/jigsaw.jar", "lib/compass/validate/JIGSAW_COPYRIGHT", "lib/compass/validate/README.html", "lib/compass/validate/xerces.jar", "lib/compass/validate/XERCES_COPYING.txt", "lib/compass/validator.rb", "lib/compass/version.rb", "lib/compass.rb", "lib/sass_extensions.rb", "README.markdown"]
-  s.files = ["bin/compass", "CHANGELOG.markdown", "compass.gemspec", "examples/blueprint_default/index.html", "examples/blueprint_default/parts/elements.html", "examples/blueprint_default/parts/forms.html", "examples/blueprint_default/parts/grid.html", "examples/blueprint_default/parts/test-small.jpg", "examples/blueprint_default/parts/test.jpg", "examples/blueprint_default/parts/valid.png", "examples/blueprint_default/src/ie.sass", "examples/blueprint_default/src/images/grid.png", "examples/blueprint_default/src/print.sass", "examples/blueprint_default/src/screen.sass", "examples/blueprint_plugins/config.rb", "examples/blueprint_plugins/images/buttons/cross.png", "examples/blueprint_plugins/images/buttons/key.png", "examples/blueprint_plugins/images/buttons/tick.png", "examples/blueprint_plugins/images/link_icons/doc.png", "examples/blueprint_plugins/images/link_icons/email.png", "examples/blueprint_plugins/images/link_icons/external.png", "examples/blueprint_plugins/images/link_icons/feed.png", "examples/blueprint_plugins/images/link_icons/im.png", "examples/blueprint_plugins/images/link_icons/pdf.png", "examples/blueprint_plugins/images/link_icons/visited.png", "examples/blueprint_plugins/images/link_icons/xls.png", "examples/blueprint_plugins/images/test-small.jpg", "examples/blueprint_plugins/images/test.jpg", "examples/blueprint_plugins/images/valid.png", "examples/blueprint_plugins/index.html", "examples/blueprint_plugins/plugins/buttons.html", "examples/blueprint_plugins/plugins/fancy_type.html", "examples/blueprint_plugins/plugins/link_icons.html", "examples/blueprint_plugins/plugins/rtl.html", "examples/blueprint_plugins/src/buttons.sass", "examples/blueprint_plugins/src/ie.sass", "examples/blueprint_plugins/src/images/grid.png", "examples/blueprint_plugins/src/link_icons.sass", "examples/blueprint_plugins/src/print.sass", "examples/blueprint_plugins/src/rtl_screen.sass", "examples/blueprint_plugins/src/screen.sass", "examples/blueprint_scoped/src/ie.sass", "examples/blueprint_scoped/src/print.sass", "examples/blueprint_scoped/src/screen.sass", "examples/blueprint_scoped_form/src/ie.sass", "examples/blueprint_scoped_form/src/print.sass", "examples/blueprint_scoped_form/src/screen.sass", "examples/blueprint_semantic/index.html", "examples/blueprint_semantic/parts/fancy_type.html", "examples/blueprint_semantic/parts/liquid.html", "examples/blueprint_semantic/parts/test-small.jpg", "examples/blueprint_semantic/parts/test.jpg", "examples/blueprint_semantic/parts/valid.png", "examples/blueprint_semantic/src/ie.sass", "examples/blueprint_semantic/src/images/grid.png", "examples/blueprint_semantic/src/liquid.sass", "examples/blueprint_semantic/src/print.sass", "examples/blueprint_semantic/src/screen.sass", "examples/compass/compass.html", "examples/compass/src/compass.sass", "examples/compass/src/images/blue_arrow.gif", "examples/compass/src/sticky_footer.sass", "examples/compass/src/utilities.sass", "examples/compass/sticky_footer.html.haml", "examples/compass/utilities.html.haml", "examples/logo/logo.html", "examples/logo/src/ie.sass", "examples/logo/src/print.sass", "examples/logo/src/screen.sass", "examples/yui/divisions.html.haml", "examples/yui/index.html.haml", "examples/yui/src/screen.sass", "examples/yui/sub_divisions.html.haml", "examples/yui/templates.html.haml", "examples/yui/test.jpg", "examples/yui/typography.html.haml", "frameworks/blueprint/stylesheets/_blueprint.sass", "frameworks/blueprint/stylesheets/blueprint/_ie.sass", "frameworks/blueprint/stylesheets/blueprint/_print.sass", "frameworks/blueprint/stylesheets/blueprint/_screen.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_form.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass", "frameworks/blueprint/templates/buttons/buttons/cross.png", "frameworks/blueprint/templates/buttons/buttons/key.png", "frameworks/blueprint/templates/buttons/buttons/tick.png", "frameworks/blueprint/templates/buttons/buttons.sass", "frameworks/blueprint/templates/buttons/manifest.rb", "frameworks/blueprint/templates/link_icons/link_icons/doc.png", "frameworks/blueprint/templates/link_icons/link_icons/email.png", "frameworks/blueprint/templates/link_icons/link_icons/external.png", "frameworks/blueprint/templates/link_icons/link_icons/feed.png", "frameworks/blueprint/templates/link_icons/link_icons/im.png", "frameworks/blueprint/templates/link_icons/link_icons/pdf.png", "frameworks/blueprint/templates/link_icons/link_icons/visited.png", "frameworks/blueprint/templates/link_icons/link_icons/xls.png", "frameworks/blueprint/templates/link_icons/link_icons.sass", "frameworks/blueprint/templates/link_icons/manifest.rb", "frameworks/blueprint/templates/project/grid.png", "frameworks/blueprint/templates/project/ie.sass", "frameworks/blueprint/templates/project/manifest.rb", "frameworks/blueprint/templates/project/print.sass", "frameworks/blueprint/templates/project/screen.sass", "frameworks/blueprint.rb", "frameworks/compass/stylesheets/_compass.sass", "frameworks/compass/stylesheets/compass/_layout.sass", "frameworks/compass/stylesheets/compass/_misc.sass", "frameworks/compass/stylesheets/compass/_reset.sass", "frameworks/compass/stylesheets/compass/_utilities.sass", "frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass", "frameworks/compass/stylesheets/compass/utilities/_general.sass", "frameworks/compass/stylesheets/compass/utilities/_links.sass", "frameworks/compass/stylesheets/compass/utilities/_lists.sass", "frameworks/compass/stylesheets/compass/utilities/_print.sass", "frameworks/compass/stylesheets/compass/utilities/_tables.sass", "frameworks/compass/stylesheets/compass/utilities/_text.sass", "frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass", "frameworks/compass/stylesheets/compass/utilities/general/_float.sass", "frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass", "frameworks/compass/stylesheets/compass/utilities/general/_inline_block.sass", "frameworks/compass/stylesheets/compass/utilities/general/_reset.sass", "frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass", "frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass", "frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass", "frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass", "frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass", "frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass", "frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass", "frameworks/compass/templates/project/ie.sass", "frameworks/compass/templates/project/manifest.rb", "frameworks/compass/templates/project/print.sass", "frameworks/compass/templates/project/screen.sass", "frameworks/compass.rb", "frameworks/yui/COPYRIGHT", "frameworks/yui/stylesheets/_yui.sass", "frameworks/yui/stylesheets/yui/modules/_base.sass", "frameworks/yui/stylesheets/yui/modules/_fonts.sass", "frameworks/yui/stylesheets/yui/modules/_grids.sass", "frameworks/yui/stylesheets/yui/modules/_reset.sass", "frameworks/yui/templates/project/manifest.rb", "frameworks/yui/templates/project/screen.sass", "frameworks/yui.rb", "lib/compass/actions.rb", "lib/compass/commands/base.rb", "lib/compass/commands/create_project.rb", "lib/compass/commands/generate_grid_background.rb", "lib/compass/commands/installer_command.rb", "lib/compass/commands/list_frameworks.rb", "lib/compass/commands/print_version.rb", "lib/compass/commands/project_base.rb", "lib/compass/commands/stamp_pattern.rb", "lib/compass/commands/update_project.rb", "lib/compass/commands/validate_project.rb", "lib/compass/commands/watch_project.rb", "lib/compass/commands/write_configuration.rb", "lib/compass/compiler.rb", "lib/compass/configuration.rb", "lib/compass/core_ext.rb", "lib/compass/errors.rb", "lib/compass/exec.rb", "lib/compass/frameworks.rb", "lib/compass/grid_builder.rb", "lib/compass/installers/base.rb", "lib/compass/installers/manifest.rb", "lib/compass/installers/rails.rb", "lib/compass/installers/stand_alone.rb", "lib/compass/installers.rb", "lib/compass/logger.rb", "lib/compass/merb.rb", "lib/compass/test_case.rb", "lib/compass/validate/COPYRIGHT.html", "lib/compass/validate/css-validator-javadoc.jar", "lib/compass/validate/css-validator.jar", "lib/compass/validate/jigsaw.jar", "lib/compass/validate/JIGSAW_COPYRIGHT", "lib/compass/validate/README.html", "lib/compass/validate/xerces.jar", "lib/compass/validate/XERCES_COPYING.txt", "lib/compass/validator.rb", "lib/compass/version.rb", "lib/compass.rb", "lib/sass_extensions.rb", "Manifest", "Rakefile", "README.markdown", "test/command_line_test.rb", "test/compass_test.rb", "test/configuration_test.rb", "test/fixtures/stylesheets/blueprint/css/typography.css", "test/fixtures/stylesheets/blueprint/sass/ie.sass", "test/fixtures/stylesheets/blueprint/sass/print.sass", "test/fixtures/stylesheets/blueprint/sass/screen.sass", "test/fixtures/stylesheets/blueprint/sass/typography.sass", "test/fixtures/stylesheets/compass/css/layout.css", "test/fixtures/stylesheets/compass/css/print.css", "test/fixtures/stylesheets/compass/css/reset.css", "test/fixtures/stylesheets/compass/css/utilities.css", "test/fixtures/stylesheets/compass/sass/layout.sass", "test/fixtures/stylesheets/compass/sass/print.sass", "test/fixtures/stylesheets/compass/sass/reset.sass", "test/fixtures/stylesheets/compass/sass/utilities.sass", "test/fixtures/stylesheets/yui/css/mixins.css", "test/fixtures/stylesheets/yui/sass/base.sass", "test/fixtures/stylesheets/yui/sass/fonts.sass", "test/fixtures/stylesheets/yui/sass/grids.sass", "test/fixtures/stylesheets/yui/sass/mixins.sass", "test/sass_extensions_test.rb", "test/test_helper.rb", "VERSION"]
+  s.extra_rdoc_files = ["bin/compass", "CHANGELOG.markdown", "lib/compass/actions.rb", "lib/compass/commands/base.rb", "lib/compass/commands/create_project.rb", "lib/compass/commands/generate_grid_background.rb", "lib/compass/commands/installer_command.rb", "lib/compass/commands/list_frameworks.rb", "lib/compass/commands/print_version.rb", "lib/compass/commands/project_base.rb", "lib/compass/commands/stamp_pattern.rb", "lib/compass/commands/update_project.rb", "lib/compass/commands/validate_project.rb", "lib/compass/commands/watch_project.rb", "lib/compass/commands/write_configuration.rb", "lib/compass/compiler.rb", "lib/compass/configuration.rb", "lib/compass/core_ext.rb", "lib/compass/dependencies.rb", "lib/compass/errors.rb", "lib/compass/exec.rb", "lib/compass/frameworks.rb", "lib/compass/grid_builder.rb", "lib/compass/installers/base.rb", "lib/compass/installers/manifest.rb", "lib/compass/installers/rails.rb", "lib/compass/installers/stand_alone.rb", "lib/compass/installers.rb", "lib/compass/logger.rb", "lib/compass/merb.rb", "lib/compass/test_case.rb", "lib/compass/validate/COPYRIGHT.html", "lib/compass/validate/css-validator-javadoc.jar", "lib/compass/validate/css-validator.jar", "lib/compass/validate/jigsaw.jar", "lib/compass/validate/JIGSAW_COPYRIGHT", "lib/compass/validate/README.html", "lib/compass/validate/xerces.jar", "lib/compass/validate/XERCES_COPYING.txt", "lib/compass/validator.rb", "lib/compass/version.rb", "lib/compass.rb", "lib/sass_extensions.rb", "README.markdown"]
+  s.files = ["bin/compass", "CHANGELOG.markdown", "compass.gemspec", "examples/blueprint_default/config.rb", "examples/blueprint_default/images/grid.png", "examples/blueprint_default/index.html", "examples/blueprint_default/parts/elements.html", "examples/blueprint_default/parts/forms.html", "examples/blueprint_default/parts/grid.html", "examples/blueprint_default/parts/test-small.jpg", "examples/blueprint_default/parts/test.jpg", "examples/blueprint_default/parts/valid.png", "examples/blueprint_default/src/ie.sass", "examples/blueprint_default/src/print.sass", "examples/blueprint_default/src/screen.sass", "examples/blueprint_plugins/config.rb", "examples/blueprint_plugins/images/buttons/cross.png", "examples/blueprint_plugins/images/buttons/key.png", "examples/blueprint_plugins/images/buttons/tick.png", "examples/blueprint_plugins/images/grid.png", "examples/blueprint_plugins/images/link_icons/doc.png", "examples/blueprint_plugins/images/link_icons/email.png", "examples/blueprint_plugins/images/link_icons/external.png", "examples/blueprint_plugins/images/link_icons/feed.png", "examples/blueprint_plugins/images/link_icons/im.png", "examples/blueprint_plugins/images/link_icons/pdf.png", "examples/blueprint_plugins/images/link_icons/visited.png", "examples/blueprint_plugins/images/link_icons/xls.png", "examples/blueprint_plugins/images/test-small.jpg", "examples/blueprint_plugins/images/test.jpg", "examples/blueprint_plugins/images/valid.png", "examples/blueprint_plugins/index.html", "examples/blueprint_plugins/plugins/buttons.html", "examples/blueprint_plugins/plugins/fancy_type.html", "examples/blueprint_plugins/plugins/link_icons.html", "examples/blueprint_plugins/plugins/rtl.html", "examples/blueprint_plugins/src/buttons.sass", "examples/blueprint_plugins/src/ie.sass", "examples/blueprint_plugins/src/link_icons.sass", "examples/blueprint_plugins/src/print.sass", "examples/blueprint_plugins/src/rtl_screen.sass", "examples/blueprint_plugins/src/screen.sass", "examples/blueprint_scoped/src/ie.sass", "examples/blueprint_scoped/src/print.sass", "examples/blueprint_scoped/src/screen.sass", "examples/blueprint_scoped_form/src/ie.sass", "examples/blueprint_scoped_form/src/print.sass", "examples/blueprint_scoped_form/src/screen.sass", "examples/blueprint_semantic/config.rb", "examples/blueprint_semantic/images/grid.png", "examples/blueprint_semantic/index.html", "examples/blueprint_semantic/parts/fancy_type.html", "examples/blueprint_semantic/parts/liquid.html", "examples/blueprint_semantic/parts/test-small.jpg", "examples/blueprint_semantic/parts/test.jpg", "examples/blueprint_semantic/parts/valid.png", "examples/blueprint_semantic/src/ie.sass", "examples/blueprint_semantic/src/liquid.sass", "examples/blueprint_semantic/src/print.sass", "examples/blueprint_semantic/src/screen.sass", "examples/compass/compass.html", "examples/compass/config.rb", "examples/compass/images/blue_arrow.gif", "examples/compass/src/compass.sass", "examples/compass/src/sticky_footer.sass", "examples/compass/src/utilities.sass", "examples/compass/sticky_footer.html.haml", "examples/compass/utilities.html.haml", "examples/logo/logo.html", "examples/logo/src/ie.sass", "examples/logo/src/print.sass", "examples/logo/src/screen.sass", "examples/yui/divisions.html.haml", "examples/yui/index.html.haml", "examples/yui/src/screen.sass", "examples/yui/sub_divisions.html.haml", "examples/yui/templates.html.haml", "examples/yui/test.jpg", "examples/yui/typography.html.haml", "frameworks/blueprint/stylesheets/_blueprint.sass", "frameworks/blueprint/stylesheets/blueprint/_ie.sass", "frameworks/blueprint/stylesheets/blueprint/_print.sass", "frameworks/blueprint/stylesheets/blueprint/_screen.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_form.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass", "frameworks/blueprint/templates/buttons/buttons/cross.png", "frameworks/blueprint/templates/buttons/buttons/key.png", "frameworks/blueprint/templates/buttons/buttons/tick.png", "frameworks/blueprint/templates/buttons/buttons.sass", "frameworks/blueprint/templates/buttons/manifest.rb", "frameworks/blueprint/templates/link_icons/link_icons/doc.png", "frameworks/blueprint/templates/link_icons/link_icons/email.png", "frameworks/blueprint/templates/link_icons/link_icons/external.png", "frameworks/blueprint/templates/link_icons/link_icons/feed.png", "frameworks/blueprint/templates/link_icons/link_icons/im.png", "frameworks/blueprint/templates/link_icons/link_icons/pdf.png", "frameworks/blueprint/templates/link_icons/link_icons/visited.png", "frameworks/blueprint/templates/link_icons/link_icons/xls.png", "frameworks/blueprint/templates/link_icons/link_icons.sass", "frameworks/blueprint/templates/link_icons/manifest.rb", "frameworks/blueprint/templates/project/grid.png", "frameworks/blueprint/templates/project/ie.sass", "frameworks/blueprint/templates/project/manifest.rb", "frameworks/blueprint/templates/project/print.sass", "frameworks/blueprint/templates/project/screen.sass", "frameworks/blueprint.rb", "frameworks/compass/stylesheets/_compass.sass", "frameworks/compass/stylesheets/compass/_layout.sass", "frameworks/compass/stylesheets/compass/_misc.sass", "frameworks/compass/stylesheets/compass/_reset.sass", "frameworks/compass/stylesheets/compass/_utilities.sass", "frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass", "frameworks/compass/stylesheets/compass/utilities/_general.sass", "frameworks/compass/stylesheets/compass/utilities/_links.sass", "frameworks/compass/stylesheets/compass/utilities/_lists.sass", "frameworks/compass/stylesheets/compass/utilities/_print.sass", "frameworks/compass/stylesheets/compass/utilities/_tables.sass", "frameworks/compass/stylesheets/compass/utilities/_text.sass", "frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass", "frameworks/compass/stylesheets/compass/utilities/general/_float.sass", "frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass", "frameworks/compass/stylesheets/compass/utilities/general/_inline_block.sass", "frameworks/compass/stylesheets/compass/utilities/general/_reset.sass", "frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass", "frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass", "frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass", "frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass", "frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass", "frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass", "frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass", "frameworks/compass/templates/project/ie.sass", "frameworks/compass/templates/project/manifest.rb", "frameworks/compass/templates/project/print.sass", "frameworks/compass/templates/project/screen.sass", "frameworks/compass.rb", "frameworks/yui/COPYRIGHT", "frameworks/yui/stylesheets/_yui.sass", "frameworks/yui/stylesheets/yui/modules/_base.sass", "frameworks/yui/stylesheets/yui/modules/_fonts.sass", "frameworks/yui/stylesheets/yui/modules/_grids.sass", "frameworks/yui/stylesheets/yui/modules/_reset.sass", "frameworks/yui/templates/project/manifest.rb", "frameworks/yui/templates/project/screen.sass", "frameworks/yui.rb", "lib/compass/actions.rb", "lib/compass/commands/base.rb", "lib/compass/commands/create_project.rb", "lib/compass/commands/generate_grid_background.rb", "lib/compass/commands/installer_command.rb", "lib/compass/commands/list_frameworks.rb", "lib/compass/commands/print_version.rb", "lib/compass/commands/project_base.rb", "lib/compass/commands/stamp_pattern.rb", "lib/compass/commands/update_project.rb", "lib/compass/commands/validate_project.rb", "lib/compass/commands/watch_project.rb", "lib/compass/commands/write_configuration.rb", "lib/compass/compiler.rb", "lib/compass/configuration.rb", "lib/compass/core_ext.rb", "lib/compass/dependencies.rb", "lib/compass/errors.rb", "lib/compass/exec.rb", "lib/compass/frameworks.rb", "lib/compass/grid_builder.rb", "lib/compass/installers/base.rb", "lib/compass/installers/manifest.rb", "lib/compass/installers/rails.rb", "lib/compass/installers/stand_alone.rb", "lib/compass/installers.rb", "lib/compass/logger.rb", "lib/compass/merb.rb", "lib/compass/test_case.rb", "lib/compass/validate/COPYRIGHT.html", "lib/compass/validate/css-validator-javadoc.jar", "lib/compass/validate/css-validator.jar", "lib/compass/validate/jigsaw.jar", "lib/compass/validate/JIGSAW_COPYRIGHT", "lib/compass/validate/README.html", "lib/compass/validate/xerces.jar", "lib/compass/validate/XERCES_COPYING.txt", "lib/compass/validator.rb", "lib/compass/version.rb", "lib/compass.rb", "lib/sass_extensions.rb", "Manifest", "Rakefile", "README.markdown", "test/command_line_test.rb", "test/compass_test.rb", "test/configuration_test.rb", "test/fixtures/stylesheets/blueprint/config.rb", "test/fixtures/stylesheets/blueprint/css/typography.css", "test/fixtures/stylesheets/blueprint/sass/ie.sass", "test/fixtures/stylesheets/blueprint/sass/print.sass", "test/fixtures/stylesheets/blueprint/sass/screen.sass", "test/fixtures/stylesheets/blueprint/sass/typography.sass", "test/fixtures/stylesheets/compass/config.rb", "test/fixtures/stylesheets/compass/css/layout.css", "test/fixtures/stylesheets/compass/css/print.css", "test/fixtures/stylesheets/compass/css/reset.css", "test/fixtures/stylesheets/compass/css/utilities.css", "test/fixtures/stylesheets/compass/sass/layout.sass", "test/fixtures/stylesheets/compass/sass/print.sass", "test/fixtures/stylesheets/compass/sass/reset.sass", "test/fixtures/stylesheets/compass/sass/utilities.sass", "test/fixtures/stylesheets/yui/config.rb", "test/fixtures/stylesheets/yui/css/mixins.css", "test/fixtures/stylesheets/yui/sass/base.sass", "test/fixtures/stylesheets/yui/sass/fonts.sass", "test/fixtures/stylesheets/yui/sass/grids.sass", "test/fixtures/stylesheets/yui/sass/mixins.sass", "test/sass_extensions_test.rb", "test/test_helper.rb", "VERSION"]
   s.homepage = %q{http://github.com/chriseppstein/compass}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Compass", "--main", "README.markdown"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{compass}
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = %q{1.3.3}
   s.summary = %q{Sass-Based CSS Meta-Framework.}
   s.test_files = ["test/command_line_test.rb", "test/compass_test.rb", "test/configuration_test.rb", "test/sass_extensions_test.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
-    if current_version >= 3 then
-      s.add_runtime_dependency(%q<haml>, [">= 0"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<haml-edge>, [">= 0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<haml-edge>, [">= 0"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<haml-edge>, [">= 0"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/examples/blueprint_default/config.rb

@@ -0,0 +1,8 @@
+# Require any additional compass plugins here.
+project_type = :stand_alone
+css_dir = "stylesheets"
+sass_dir = "src"
+images_dir = "images"
+output_style = :compact
+# To enable relative image paths using the images_url() function:
+http_images_path = :relative

data/examples/blueprint_semantic/config.rb

@@ -0,0 +1,8 @@
+# Require any additional compass plugins here.
+project_type = :stand_alone
+css_dir = "stylesheets"
+sass_dir = "src"
+images_dir = "images"
+output_style = :compact
+# To enable relative image paths using the images_url() function:
+http_images_path = :relative

data/examples/blueprint_semantic/src/screen.sass

@@ -9,6 +9,8 @@ body.blueprint
   +blueprint-scaffolding-body
   .container
     +container
+  .showgrid
+    +showgrid
   hr
     +colruler
   hr.space

data/examples/compass/config.rb

@@ -0,0 +1,8 @@
+# Require any additional compass plugins here.
+project_type = :stand_alone
+css_dir = "stylesheets"
+sass_dir = "src"
+images_dir = "images"
+output_style = :compact
+# To enable relative image paths using the images_url() function:
+http_images_path = :relative

data/examples/compass/src/utilities.sass

@@ -56,7 +56,7 @@ h2
   ul.comma-delimited
     +comma-delimited-list
   ol.pretty
-    +pretty-bullets("images/blue_arrow.gif", 5px, 7px, 24px)
+    +pretty-bullets("blue_arrow.gif", 5px, 7px, 18px)
 
 #tables
   +column(16)

data/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass

@@ -12,7 +12,7 @@
 //  * Christian Metts   [mintchaos.com]
 //  * Khoi Vinh         [subtraction.com]
 //  Read more about using a grid here:
-//  * subtraction.com/archives/2007/0318_oh_yeeaahh.php
+//  * http://www.subtraction.com/2007/03/18/oh-yeeaahh
 //  --------------------------------------------------------------
 
 @import compass/utilities/general/float.sass

data/lib/compass.rb

@@ -1,5 +1,4 @@
-require 'rubygems'
-require 'sass'
+require File.join(File.dirname(__FILE__), 'compass', 'dependencies')
 
 def assert_sass_version(obj)
   unless obj.respond_to?(:version) && obj.version[:major] == 2 && obj.version[:minor] >= 1

data/lib/compass/actions.rb

@@ -57,7 +57,7 @@ module Compass
 
     # Compile one Sass file
     def compile(sass_filename, css_filename, options)
-      if Sass::Plugin.exact_stylesheet_needs_update?(css_filename, sass_filename)
+      if options[:force] || Sass::Plugin.exact_stylesheet_needs_update?(css_filename, sass_filename)
         logger.record :compile, basename(sass_filename) unless options[:quiet]
         engine = ::Sass::Engine.new(open(sass_filename).read,
                                     :filename => sass_filename,

data/lib/compass/commands/project_base.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'sass'
 require 'fileutils'
 require 'pathname'
 require File.join(File.dirname(__FILE__), 'base')

data/lib/compass/commands/update_project.rb

@@ -11,10 +11,12 @@ module Compass
       end
 
       def perform
-        Compass::Compiler.new(working_path,
-                              projectize(Compass.configuration.sass_dir),
-                              projectize(Compass.configuration.css_dir),
-                              Compass.sass_engine_options.merge(:quiet => options[:quiet])).run
+        compiler = Compass::Compiler.new(working_path,
+          projectize(Compass.configuration.sass_dir),
+          projectize(Compass.configuration.css_dir),
+          Compass.sass_engine_options.merge(:quiet => options[:quiet],
+                                            :force => options[:force]))
+        compiler.run
       end
 
     end

data/lib/compass/commands/watch_project.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'sass'
 require 'fileutils'
 require 'pathname'
 require File.join(File.dirname(__FILE__), 'base')

data/lib/compass/commands/write_configuration.rb

@@ -15,6 +15,10 @@ module Compass
         installer.write_configuration_files
       end
 
+      def installer_args
+        [nil, project_directory, options]
+      end
+
     end
   end
 end

data/lib/compass/configuration.rb

@@ -105,6 +105,18 @@ module Compass
       environment == :development
     end
 
+    def sass_path
+      if project_path && sass_dir
+        File.join(project_path, sass_dir)
+      end
+    end
+
+    def css_path
+      if project_path && css_dir
+        File.join(project_path, css_dir)
+      end
+    end
+
     def serialize
       contents = ""
       required_libraries.each do |lib|
@@ -130,16 +142,15 @@ module Compass
       %Q(#{prop} = #{value.inspect}\n)
     end
 
+    def to_compiler_arguments(additional_options)
+      [project_path, sass_path, css_path, to_sass_engine_options.merge(additional_options)]
+    end
+
     def to_sass_plugin_options
-      if project_path && sass_dir && css_dir
-        proj_sass_path = File.join(project_path, sass_dir)
-        proj_css_path = File.join(project_path, css_dir)
-        locations = {proj_sass_path => proj_css_path}
-      else
-        locations = {}
-      end
+      locations = {}
+      locations[sass_path] = css_path if sass_path && css_path
       Compass::Frameworks::ALL.each do |framework|
-        locations[framework.stylesheets_directory] = proj_css_path || css_dir || "."
+        locations[framework.stylesheets_directory] = css_path || css_dir || "."
       end
       plugin_opts = {:template_location => locations}
       plugin_opts[:style] = output_style if output_style
@@ -156,9 +167,7 @@ module Compass
 
     def sass_load_paths
       load_paths = []
-      if project_path && sass_dir
-        load_paths << File.join(project_path, sass_dir)
-      end
+      load_paths << sass_path if sass_path
       Compass::Frameworks::ALL.each do |framework|
         load_paths << framework.stylesheets_directory
       end

data/lib/compass/dependencies.rb

@@ -0,0 +1,9 @@
+unless defined?(Sass)
+  require 'rubygems'
+  begin
+    gem 'haml-edge','>= 2.1'
+  rescue Exception
+    $stderr.puts "WARNING: haml-edge gem not found. Trying to find haml on the load path."
+  end
+  require 'sass'
+end

data/lib/compass/exec.rb

@@ -1,6 +1,5 @@
+require File.join(Compass.lib_directory, 'compass', 'dependencies')
 require 'optparse'
-require 'rubygems'
-require 'haml'
 require File.join(Compass.lib_directory, 'compass', 'logger')
 require File.join(Compass.lib_directory, 'compass', 'errors')
 require File.join(Compass.lib_directory, 'compass', 'actions')
@@ -22,10 +21,6 @@ module Compass
     end
 
     def get_line(exception)
-      # SyntaxErrors have weird line reporting
-      # when there's trailing whitespace,
-      # which there is for Haml documents.
-      return exception.message.scan(/:(\d+)/)[0] if exception.is_a?(::Haml::SyntaxError)
       exception.backtrace[0].scan(/:(\d+)/)[0]
     end
     module_function :report_error, :get_file, :get_line

data/lib/compass/installers/base.rb

@@ -14,7 +14,7 @@ module Compass
         @target_path = target_path
         @working_path = Dir.getwd
         @options = options
-        @manifest = Manifest.new(manifest_file)
+        @manifest = Manifest.new(manifest_file) if template_path
         self.logger = options[:logger]
       end
 

data/lib/compass/logger.rb

@@ -31,4 +31,12 @@ module Compass
       @max_action_length ||= actions.inject(0){|memo, a| [memo, a.to_s.length].max}
     end
   end
+
+  class NullLogger
+    def record(*args)
+    end
+
+    def log(msg)
+    end
+  end
 end

data/lib/compass/test_case.rb

@@ -24,8 +24,7 @@ module Compass
       input =  open(stylesheet)
       template = input.read()
       input.close()
-      @last_compile = ::Sass::Engine.new(template,
-        ::Sass::Plugin.engine_options(:style => :compact, :filename => stylesheet)).render
+      @last_compile = ::Sass::Engine.new(template, ::Sass::Plugin.engine_options(:filename => stylesheet)).render
       yield @last_compile if block_given?
     end
 

data/lib/sass_extensions.rb

@@ -1,4 +1,3 @@
-require 'sass'
 require 'sass/plugin'
 
 module Sass::Script::Functions

data/test/command_line_test.rb

@@ -55,7 +55,11 @@ FRAMEWORKS
     within_tmp_directory do
       compass "basic"
       Dir.chdir "basic" do
+        # basic update with timestamp caching
         compass
+        assert_action_performed :unchanged, "src/screen.sass"
+        # basic update with force option set
+        compass "--force"
         assert_action_performed :compile, "src/screen.sass"
         assert_action_performed :identical, "stylesheets/screen.css"
       end
@@ -126,11 +130,16 @@ FRAMEWORKS
   end
 
   def assert_action_performed(action, path)
+    actions_found = []
     @last_result.split("\n").each do |line|
       line = line.split
       return if line.first == action.to_s && line.last == path
+      actions_found << line.first if line.last == path
     end
-    fail "Action #{action.inspect} was not performed on: #{path}"
+    message = "Action #{action.inspect} was not performed on: #{path}."
+    message += "The following actions were performed: #{actions_found.join(", ")}" if actions_found.any?
+    puts @last_result
+    fail message
   end
 
   def within_tmp_directory(dir = "tmp")

data/test/compass_test.rb

@@ -5,71 +5,67 @@ require 'compass'
 class CompassTest < Test::Unit::TestCase
   include Compass::TestCaseHelper
   def setup
-    setup_fixtures :blueprint, :yui, :empty
-    @original_options = Sass::Plugin.options
-  end
-  
-  def setup_fixtures(*folders)
-    folders.each do |folder|
-      FileUtils.mkdir_p stylesheet_fixtures(folder)
-      mkdir_clean tempfile_loc(folder)
-    end
+    Compass.configuration.reset!
   end
 
   def teardown
-    teardown_fixtures :blueprint, :yui, :empty
-    Sass::Plugin.options = @original_options
+    teardown_fixtures :blueprint, :yui, :empty, :compass
   end
 
-  def teardown_fixtures(*folders)
-    folders.each do |folder|
-      FileUtils.rm_rf tempfile_loc(folder)
+  def teardown_fixtures(*project_names)
+    project_names.each do |project_name|
+      FileUtils.rm_rf tempfile_path(project_name)
     end
   end
 
   def test_blueprint_generates_no_files
-    with_templates(:empty) do
-      Dir.new(tempfile_loc(:empty)).each do |f|
+    within_project(:empty) do |proj|
+      return unless File.exists?(proj.css_path)
+      Dir.new(proj.css_path).each do |f|
         fail "This file should not have been generated: #{f}" unless f == "." || f == ".."
       end
     end
   end
 
   def test_blueprint
-    with_templates(:blueprint) do
-      each_css_file(tempfile_loc(:blueprint)) do |css_file|
+    within_project(:blueprint) do |proj|
+      each_css_file(proj.css_path) do |css_file|
         assert_no_errors css_file, :blueprint
       end
       assert_renders_correctly :typography
     end
   end
+
   def test_yui
-    with_templates('yui') do
-      each_css_file(tempfile_loc('yui')) do |css_file|
+    within_project('yui') do |proj|
+      each_css_file(proj.css_path) do |css_file|
         assert_no_errors css_file, 'yui'
       end
       assert_renders_correctly :mixins
     end
   end
+
   def test_compass
-    with_templates('compass') do
-      each_css_file(tempfile_loc('compass')) do |css_file|
+    within_project('compass') do |proj|
+      each_css_file(proj.css_path) do |css_file|
         assert_no_errors css_file, 'compass'
       end
       assert_renders_correctly :reset, :layout, :utilities
     end
   end
-  private
-  def assert_no_errors(css_file, folder)
-    file = css_file[(tempfile_loc(folder).size+1)..-1]
-    msg = "Syntax Error found in #{file}. Results saved into #{save_loc(folder)}/#{file}"
+
+private
+  def assert_no_errors(css_file, project_name)
+    file = css_file[(tempfile_path(project_name).size+1)..-1]
+    msg = "Syntax Error found in #{file}. Results saved into #{save_path(project_name)}/#{file}"
     assert_equal 0, open(css_file).readlines.grep(/Sass::SyntaxError/).size, msg
   end
+
   def assert_renders_correctly(*arguments)
     options = arguments.last.is_a?(Hash) ? arguments.pop : {}
     for name in arguments
-      actual_result_file = "#{tempfile_loc(@current_template_folder)}/#{name}.css"
-      expected_result_file = "#{result_loc(@current_template_folder)}/#{name}.css"
+      actual_result_file = "#{tempfile_path(@current_project)}/#{name}.css"
+      expected_result_file = "#{result_path(@current_project)}/#{name}.css"
       actual_lines = File.read(actual_result_file).split("\n")
       expected_lines = File.read(expected_result_file).split("\n")
       expected_lines.zip(actual_lines).each_with_index do |pair, line|
@@ -81,27 +77,17 @@ class CompassTest < Test::Unit::TestCase
       end
     end
   end
-  def with_templates(folder)
-    old_template_loc = Sass::Plugin.options[:template_location]
-    Sass::Plugin.options[:template_location] = if old_template_loc.is_a?(Hash)
-      old_template_loc.dup
-    else
-      Hash.new
-    end
-    @current_template_folder = folder
-    begin
-      Sass::Plugin.options[:template_location][template_loc(folder)] = tempfile_loc(folder)
-      Compass::Frameworks::ALL.each do |framework|
-        Sass::Plugin.options[:template_location][framework.stylesheets_directory] = tempfile_loc(folder)
-      end
-      Sass::Plugin.update_stylesheets
-      yield
-    ensure
-      @current_template_folder = nil
-      Sass::Plugin.options[:template_location] = old_template_loc
-    end
+
+  def within_project(project_name)
+    @current_project = project_name
+    Compass.configuration.parse(configuration_file(project_name))
+    Compass.configuration.project_path = project_path(project_name)
+    args = Compass.configuration.to_compiler_arguments(:logger => Compass::NullLogger.new)
+    compiler = Compass::Compiler.new *args
+    compiler.run
+    yield Compass.configuration
   rescue
-    save_output(folder)    
+    save_output(project_name)    
     raise
   end
   
@@ -112,37 +98,32 @@ class CompassTest < Test::Unit::TestCase
   end
 
   def save_output(dir)
-    FileUtils.rm_rf(save_loc(dir))
-    FileUtils.cp_r(tempfile_loc(dir), save_loc(dir))
+    FileUtils.rm_rf(save_path(dir))
+    FileUtils.cp_r(tempfile_path(dir), save_path(dir)) if File.exists?(tempfile_path(dir))
   end
 
-  def mkdir_clean(dir)
-    begin
-      FileUtils.mkdir dir
-    rescue Errno::EEXIST
-      FileUtils.rm_r dir
-      FileUtils.mkdir dir
-    end
+  def project_path(project_name)
+    absolutize("fixtures/stylesheets/#{project_name}")
   end
 
-  def stylesheet_fixtures(folder)
-    absolutize("fixtures/stylesheets/#{folder}")
+  def configuration_file(project_name)
+    File.join(project_path(project_name), "config.rb")
   end
 
-  def tempfile_loc(folder)
-    "#{stylesheet_fixtures(folder)}/tmp"
+  def tempfile_path(project_name)
+    File.join(project_path(project_name), "tmp")
   end
   
-  def template_loc(folder)
-    "#{stylesheet_fixtures(folder)}/sass"
+  def template_path(project_name)
+    File.join(project_path(project_name), "sass")
   end
   
-  def result_loc(folder)
-    "#{stylesheet_fixtures(folder)}/css"
+  def result_path(project_name)
+    File.join(project_path(project_name), "css")
   end
   
-  def save_loc(folder)
-    "#{stylesheet_fixtures(folder)}/saved"
+  def save_path(project_name)
+    File.join(project_path(project_name), "saved")
   end
 
 end

data/test/configuration_test.rb

@@ -2,18 +2,25 @@ require  File.dirname(__FILE__)+'/test_helper'
 require 'compass'
 
 class ConfigurationTest < Test::Unit::TestCase
+
+  def setup
+    Compass.configuration.reset!
+  end
+
   def test_parse_and_serialize
     contents = <<-CONFIG
       require 'compass'
-      require 'sass'
       # Require any additional compass plugins here.
 
+      project_type = :stand_alone
       css_dir = "css"
       sass_dir = "sass"
       images_dir = "img"
       javascripts_dir = "js"
+      output_style = :nested
       # To enable relative image paths using the images_url() function:
       # http_images_path = :relative
+      http_images_path = "/images"
     CONFIG
 
     Compass.configuration.parse_string(contents, "test_parse")

data/test/fixtures/stylesheets/blueprint/config.rb

@@ -0,0 +1,9 @@
+# Require any additional compass plugins here.
+project_type = :stand_alone
+css_dir = "tmp"
+sass_dir = "sass"
+images_dir = "images"
+output_style = :nested
+# To enable relative image paths using the images_url() function:
+# http_images_path = :relative
+http_images_path = "/images"

data/test/fixtures/stylesheets/compass/config.rb

@@ -0,0 +1,9 @@
+# Require any additional compass plugins here.
+project_type = :stand_alone
+css_dir = "tmp"
+sass_dir = "sass"
+images_dir = "images"
+output_style = :nested
+# To enable relative image paths using the images_url() function:
+# http_images_path = :relative
+http_images_path = "/images"

data/test/fixtures/stylesheets/yui/config.rb

@@ -0,0 +1,9 @@
+# Require any additional compass plugins here.
+project_type = :stand_alone
+css_dir = "tmp"
+sass_dir = "sass"
+images_dir = "images"
+output_style = :nested
+# To enable relative image paths using the images_url() function:
+# http_images_path = :relative
+http_images_path = "/images"

data/test/sass_extensions_test.rb

@@ -20,7 +20,13 @@ class SassExtensionsTest < Test::Unit::TestCase
   def test_third_argument_expansion
     assert_equal "a b e, a b f, a c e, a c f, a d e, a d f", nest("a", "b, c, d", "e, f")
   end
+
+protected
+  def evaluation_content(options)
+    Sass::Script::Functions::EvaluationContext.new(options)
+  end
   def nest(*arguments)
-    Sass::Script::Functions.nest(*arguments.map{|a| Sass::Script::String.new(a)}).to_s
+    options = arguments.last.is_a?(Hash) ? arguments.pop : Hash.new
+    evaluation_content(options).nest(*arguments.map{|a| Sass::Script::String.new(a)}).to_s
   end
 end

data/test/test_helper.rb

@@ -17,6 +17,7 @@ linked_haml = File.dirname(__FILE__) + '/haml'
 if File.exists?(linked_haml) && !$:.include?(linked_haml + '/lib')
   puts "[ using linked Haml ]"
   $:.unshift linked_haml + '/lib'
+  require 'sass'
 else
   need_gems = true
 end
@@ -25,9 +26,6 @@ require 'rubygems' if need_gems
 
 require 'action_controller'
 require 'action_view'
-require 'haml'
-require 'sass'
-require 'sass/plugin'
 
 
 require 'test/unit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chriseppstein-compass
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-29 00:00:00 -07:00
+date: 2009-05-08 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: haml-edge
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -24,7 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -57,6 +57,7 @@ extra_rdoc_files:
 - lib/compass/compiler.rb
 - lib/compass/configuration.rb
 - lib/compass/core_ext.rb
+- lib/compass/dependencies.rb
 - lib/compass/errors.rb
 - lib/compass/exec.rb
 - lib/compass/frameworks.rb
@@ -86,6 +87,8 @@ files:
 - bin/compass
 - CHANGELOG.markdown
 - compass.gemspec
+- examples/blueprint_default/config.rb
+- examples/blueprint_default/images/grid.png
 - examples/blueprint_default/index.html
 - examples/blueprint_default/parts/elements.html
 - examples/blueprint_default/parts/forms.html
@@ -94,13 +97,13 @@ files:
 - examples/blueprint_default/parts/test.jpg
 - examples/blueprint_default/parts/valid.png
 - examples/blueprint_default/src/ie.sass
-- examples/blueprint_default/src/images/grid.png
 - examples/blueprint_default/src/print.sass
 - examples/blueprint_default/src/screen.sass
 - examples/blueprint_plugins/config.rb
 - examples/blueprint_plugins/images/buttons/cross.png
 - examples/blueprint_plugins/images/buttons/key.png
 - examples/blueprint_plugins/images/buttons/tick.png
+- examples/blueprint_plugins/images/grid.png
 - examples/blueprint_plugins/images/link_icons/doc.png
 - examples/blueprint_plugins/images/link_icons/email.png
 - examples/blueprint_plugins/images/link_icons/external.png
@@ -119,7 +122,6 @@ files:
 - examples/blueprint_plugins/plugins/rtl.html
 - examples/blueprint_plugins/src/buttons.sass
 - examples/blueprint_plugins/src/ie.sass
-- examples/blueprint_plugins/src/images/grid.png
 - examples/blueprint_plugins/src/link_icons.sass
 - examples/blueprint_plugins/src/print.sass
 - examples/blueprint_plugins/src/rtl_screen.sass
@@ -130,6 +132,8 @@ files:
 - examples/blueprint_scoped_form/src/ie.sass
 - examples/blueprint_scoped_form/src/print.sass
 - examples/blueprint_scoped_form/src/screen.sass
+- examples/blueprint_semantic/config.rb
+- examples/blueprint_semantic/images/grid.png
 - examples/blueprint_semantic/index.html
 - examples/blueprint_semantic/parts/fancy_type.html
 - examples/blueprint_semantic/parts/liquid.html
@@ -137,13 +141,13 @@ files:
 - examples/blueprint_semantic/parts/test.jpg
 - examples/blueprint_semantic/parts/valid.png
 - examples/blueprint_semantic/src/ie.sass
-- examples/blueprint_semantic/src/images/grid.png
 - examples/blueprint_semantic/src/liquid.sass
 - examples/blueprint_semantic/src/print.sass
 - examples/blueprint_semantic/src/screen.sass
 - examples/compass/compass.html
+- examples/compass/config.rb
+- examples/compass/images/blue_arrow.gif
 - examples/compass/src/compass.sass
-- examples/compass/src/images/blue_arrow.gif
 - examples/compass/src/sticky_footer.sass
 - examples/compass/src/utilities.sass
 - examples/compass/sticky_footer.html.haml
@@ -257,6 +261,7 @@ files:
 - lib/compass/compiler.rb
 - lib/compass/configuration.rb
 - lib/compass/core_ext.rb
+- lib/compass/dependencies.rb
 - lib/compass/errors.rb
 - lib/compass/exec.rb
 - lib/compass/frameworks.rb
@@ -287,11 +292,13 @@ files:
 - test/command_line_test.rb
 - test/compass_test.rb
 - test/configuration_test.rb
+- test/fixtures/stylesheets/blueprint/config.rb
 - test/fixtures/stylesheets/blueprint/css/typography.css
 - test/fixtures/stylesheets/blueprint/sass/ie.sass
 - test/fixtures/stylesheets/blueprint/sass/print.sass
 - test/fixtures/stylesheets/blueprint/sass/screen.sass
 - test/fixtures/stylesheets/blueprint/sass/typography.sass
+- test/fixtures/stylesheets/compass/config.rb
 - test/fixtures/stylesheets/compass/css/layout.css
 - test/fixtures/stylesheets/compass/css/print.css
 - test/fixtures/stylesheets/compass/css/reset.css
@@ -300,6 +307,7 @@ files:
 - test/fixtures/stylesheets/compass/sass/print.sass
 - test/fixtures/stylesheets/compass/sass/reset.sass
 - test/fixtures/stylesheets/compass/sass/utilities.sass
+- test/fixtures/stylesheets/yui/config.rb
 - test/fixtures/stylesheets/yui/css/mixins.css
 - test/fixtures/stylesheets/yui/sass/base.sass
 - test/fixtures/stylesheets/yui/sass/fonts.sass
@@ -337,7 +345,7 @@ requirements: []
 rubyforge_project: compass
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Sass-Based CSS Meta-Framework.
 test_files: 
 - test/command_line_test.rb