compass 0.12.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e629fb68564c2f3f09db502f41a0ac463ba5217
-  data.tar.gz: 5f6a437927a49110ed073dc97fb1b1c22e54303f
+  metadata.gz: 6f19f7c2a57d2c658147057464a21ad02f0557e7
+  data.tar.gz: 25bd3b3007302b40c502707a48d043c0621767eb
 SHA512:
-  metadata.gz: 6b64b38208a67c2ab42237d68f296237ea9a78260dc1a19fd12af7c6d729fa1496e90eb0a2f631c1564b6723be848eb19192cd54b4e653b5a462b77daaca7f8f
-  data.tar.gz: 9fdf0f13a58e9eb942fe5e9a8e3f58fb62e868097f61f82eef04e7e19a90d542a806ffd1da2b4e6ccb4e5041a076e6f9e7b55b98e13b6823d18b39192109d126
+  metadata.gz: efcf36f5fad054c294f99aed0146f62c66b91e62381ed34e843585a579c1e6b3e1bba6347d79cb6e8b839b1f609f3ca926b570eb74ea862d68f1855e9e291ca0
+  data.tar.gz: dcebe774aaf801b6e062a1e479f285d12aaa3ea243cb06e040242fdfc886bee57d0c638547004884b7289917fb0ec031f894949cadee55329c32590a2d2b43bc

data/LICENSE.markdown

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Christopher M. Eppstein
+Copyright (c) 2009-2014 Christopher M. Eppstein
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,32 +1,37 @@
+sh "git checkout lib/compass/generated_version.rb"
 require 'rubygems'
+require 'rubygems/package_task'
+require 'rake/testtask'
+require 'fileutils'
+
+
 if ENV["PKG"]
   $: << File.expand_path(File.dirname(__FILE__))+"/lib"
 else
-  require 'bundler'
-  Bundler.setup 
+  require 'bundler/setup'
+end
+
+unless ENV['CI']
+  require 'colorize'
+  require 'fileutils'
 end
 
 begin
   require 'rake/dsl_definition'
 rescue LoadError
-  #pass
+  # pass
 end
-require 'compass'
 
 # ----- Default: Testing ------
-
 task :default => [:test, :features]
 
-require 'rake/testtask'
-require 'fileutils'
-
 begin
-require 'cucumber'
-require 'cucumber/rake/task'
+  require 'cucumber'
+  require 'cucumber/rake/task'
 
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "features --format progress"
-end
+  Cucumber::Rake::Task.new(:features) do |t|
+    #t.cucumber_opts = %w{--format progress}
+  end
 rescue LoadError
   $stderr.puts "cannot load cucumber"
 end
@@ -39,10 +44,6 @@ Rake::TestTask.new :test do |t|
   t.test_files = test_files
   t.verbose = true
 end
-Rake::Task[:test].send(:add_comment, <<END)
-To run with an alternate version of Rails, make test/rails a symlink to that version.
-To run with an alternate version of Haml & Sass, make test/haml a symlink to that version.
-END
 
 Rake::TestTask.new :units do |t|
   t.libs << 'lib'
@@ -53,51 +54,15 @@ Rake::TestTask.new :units do |t|
   t.verbose = true
 end
 
-
-desc "Compile Examples into HTML and CSS"
-task :examples do
-  linked_haml = "tests/haml"
-  if File.exists?(linked_haml) && !$:.include?(linked_haml + '/lib')
-    puts "[ using linked Haml ]"
-    $:.unshift linked_haml + '/lib'
-  end
-  require 'haml'
-  require 'sass'
-  require 'pathname'
-  require 'compass'
-  require 'compass/exec'
-  FileList['examples/*'].each do |example|
-    next unless File.directory?(example)
-    puts "\nCompiling #{example}"
-    puts "=" * "Compiling #{example}".length
-    Dir.chdir example do
-      load "bootstrap.rb" if File.exists?("bootstrap.rb")
-      Compass::Exec::SubCommandUI.new(%w(compile --force)).run!
-    end
-    # compile any haml templates to html
-    FileList["#{example}/**/*.haml"].each do |haml_file|
-      basename = haml_file[0..-6]
-      engine = Haml::Engine.new(open(haml_file).read, :filename => haml_file)
-      puts "     haml #{File.basename(basename)}"
-      output = open(basename,'w')
-      output.write(engine.render)
-      output.close
-    end
-  end
-end
-
-namespace :examples do
-  desc "clean up the example directories"
-  task :clean do
-    puts "Cleaning Examples"
-    Dir.glob('examples/*/clean.rb').each do |cleaner|
-      load cleaner
-    end
-  end
+Rake::TestTask.new :integrations do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  test_files = FileList['test/integrations/**/*_test.rb']
+  test_files.exclude('test/rails/*', 'test/haml/*')
+  t.test_files = test_files
+  t.verbose = true
 end
 
-task "gemspec:generate" => "examples:clean"
-
 namespace :git do
   task :clean do
     sh "git", "clean", "-fdx"
@@ -109,12 +74,12 @@ begin
   require 'cucumber/rake/task'
   require 'rcov/rcovtask'
   namespace :rcov do
-    Cucumber::Rake::Task.new(:cucumber) do |t|    
+    Cucumber::Rake::Task.new(:cucumber) do |t|
       t.rcov = true
       t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/,features\/ --aggregate coverage.data}
       t.rcov_opts << %[-o "coverage"]
     end
-    
+
     Rcov::RcovTask.new(:units) do |rcov|
       rcov.libs << 'lib'
       test_files = FileList['test/**/*_test.rb']
@@ -125,8 +90,8 @@ begin
       rcov.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/,features\/ --aggregate coverage.data}
       rcov.rcov_opts << %[-o "coverage" --sort coverage]
     end
-    
-    
+
+
     desc "Run both specs and features to generate aggregated coverage"
     task :all do |t|
       rm "coverage.data" if File.exist?("coverage.data")
@@ -138,20 +103,135 @@ rescue LoadError => e
   puts "WARNING: #{e}"
 end
 
-begin
-  require 'packager/rake_task'
-  require 'compass/version'
-  # Building a package:
-  # 1. Get packager installed and make sure your system is setup correctly according to their docs.
-  # 2. Make sure you are actually using a universal binary that has been nametooled.
-  # 3. PKG=1 OFFICIAL=1 rake packager:pkg
-  Packager::RakeTask.new(:pkg) do |t|
-    t.package_name = "Compass"
-    t.version = Compass::VERSION
-    t.domain = "compass-style.org"
-    t.bin_files = ["compass"]
-    t.resource_files = FileList["frameworks/**/*"] + ["VERSION.yml", "LICENSE.markdown"]
+namespace :test do
+  debug = false
+  desc "update test expectations if needed"
+  task :update do
+    Rake::Task['test:update:fixtures'].invoke
   end
-rescue LoadError => e
-  puts "WARNING: #{e}"
+  task :debug do
+    debug = true
+    Rake::Task['test:update:fixtures'].invoke
+  end
+  namespace :update do
+    EXPECTED = 'css'
+    TMP = 'tmp'
+    #desc "update fixture expectations for test cases if needed"
+    task :fixtures do
+      fixtures = File.join('test/fixtures/stylesheets/compass'.split('/'))
+      # remove any existing temporary files
+      FileUtils.rm_rf(File.join(File.dirname(__FILE__), fixtures, TMP, '.'))
+      # compile the fixtures
+      puts "checking test cases..."
+      CHECKMARK = "\u2713 "
+      filter = debug ? '--trace' : "| grep 'error.*#{fixtures}'"
+      errors = %x[compass compile #{fixtures} #{filter}]
+      # check for compilation errors
+      if not errors.empty?
+        puts "Please fix the following errors before proceeding:".colorize(:red) if not debug
+        puts errors
+      else
+        # check to see what's changed
+        diff = %x[diff -r #{File.join(fixtures, EXPECTED, '')} #{File.join(fixtures, TMP, '')}]
+        # ignore non-CSS files in css/
+        diff.gsub!(/^Only in .*\/css\/(.*)\:.*[^.]/, '')
+        if diff.empty?
+          puts "#{CHECKMARK}Cool! Looks like all the tests are up to date".colorize(:green)
+        else
+          puts "The following changes were found:"
+          puts "===================================="
+          # check for new or removed expectations
+          diff.scan(/^Only in .*\/(#{EXPECTED}|#{TMP})\/(.*)\: (.*).css/).each do |match|
+            config = (match[0] == TMP) ? [:green, '>', 'NEW TEST'] : [:red, '<', 'DELETED']
+            puts "[#{File.join(match[1], match[2])}]  #{config[2].colorize(config[0])}".colorize(:cyan)
+            new_file = File.join(File.dirname(__FILE__), fixtures, match[0], match[1], match[2]) + '.css'
+            puts File.read(new_file).gsub(/^(.*)/, config[1] + ' \1').colorize(config[0])
+          end
+          diff = diff.gsub(/^diff\s\-r\s.*\/tmp\/(.*).css/, '[\1]'.colorize(:cyan))
+          diff = diff.gsub(/^Only in .*\n?/, '')
+          diff = diff.gsub(/^(\<.*)/, '\1'.colorize(:red))
+          diff = diff.gsub(/^(\>.*)/, '\1'.colorize(:green))
+          diff = diff.gsub(/^(\d+.*)/, '\1'.colorize(:cyan))
+          puts diff
+          puts "===================================="
+          puts "Are all of these changes expected? [y/n]".colorize(:yellow)
+          if (($stdin.gets.chomp)[0] == 'y')
+            FileUtils.rm_rf(File.join(File.dirname(__FILE__), fixtures, EXPECTED, '.'))
+            FileUtils.cp_r(File.join(File.dirname(__FILE__), fixtures, TMP, '.'), File.join(File.dirname(__FILE__), fixtures, EXPECTED))
+            puts "#{CHECKMARK}Thanks! The test expectations have been updated".colorize(:green)
+          else
+            puts "Please manually update the test cases and expectations".colorize(:red)
+          end
+        end
+      end
+    end
+  end
+end
+
+# Release tasks
+gemspec_file = FileList['compass.gemspec'].first
+spec = eval(File.read(gemspec_file), binding, gemspec_file)
+spec.files.delete("VERSION")
+spec.files.delete("VERSION_NAME")
+
+def spec.bump!
+  segments = version.to_s.split(".")
+  segments[-1] = segments.last.succ
+  self.version = Gem::Version.new(segments.join("."))
+end
+
+# Set SAME_VERSION when moving to a new major version and you want to specify the new version
+# explicitly instead of bumping the current version.
+# E.g. rake build SAME_VERSION=true
+spec.bump! unless ENV["SAME_VERSION"]
+
+desc "Run tests and build compass-#{spec.version}.gem"
+task :build => [:default, :gem]
+
+task :gem => :release_version
+
+task :release_version do
+  open("lib/compass/generated_version.rb", "w") do |f|
+    f.write(<<VERSION_EOF)
+module Compass
+  VERSION = "#{spec.version}"
+  VERSION_NAME = "#{File.read('VERSION_NAME').strip}"
 end
+VERSION_EOF
+  end
+end
+
+desc "Make the prebuilt gem compass-#{spec.version}.gem public."
+task :publish => [:record_version, :push_gem, :tag]
+
+desc "Build & Publish version #{spec.version}" 
+task :release => [:build, :publish]
+
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar = true
+end
+
+desc "Record the new version in version control for posterity"
+task :record_version do
+  unless ENV["SAME_VERSION"]
+    open(FileList["VERSION"].first, "w") do |f|
+      f.write(spec.version.to_s)
+    end
+    sh "git add VERSION"
+    sh "git checkout lib/compass/generated_version.rb"
+    sh %Q{git commit -m "Bump version to #{spec.version}."}
+  end
+end
+
+desc "Tag the repo as #{spec.version} and push the code and tag."
+task :tag do
+  sh "git tag -a -m 'Version #{spec.version}' #{spec.version}"
+  sh "git push --tags origin #{`git rev-parse --abbrev-ref HEAD`}"
+end
+
+desc "Push compass-#{spec.version}.gem to the rubygems server"
+task :push_gem do
+  sh "gem push pkg/compass-#{spec.version}.gem"
+end
+

data/features/command_line.feature

@@ -17,41 +17,13 @@ Feature: Command Line
     And I am told how to link to /stylesheets/print.css for media "print"
     And I am told how to conditionally link "IE" to /stylesheets/ie.css for media "screen, projection"
 
-  Scenario: Install a project with blueprint
-    When I create a project using: compass create bp_project --using blueprint
-    Then a directory bp_project/ is created
-    And a configuration file bp_project/config.rb is created
-    And a sass file bp_project/sass/screen.scss is created
-    And a sass file bp_project/sass/print.scss is created
-    And a sass file bp_project/sass/ie.scss is created
-    And a css file bp_project/stylesheets/screen.css is created
-    And a css file bp_project/stylesheets/print.css is created
-    And a css file bp_project/stylesheets/ie.css is created
-    And an image file bp_project/images/grid.png is created
-    And I am told how to link to /stylesheets/screen.css for media "screen, projection"
-    And I am told how to link to /stylesheets/print.css for media "print"
-    And I am told how to conditionally link "lt IE 8" to /stylesheets/ie.css for media "screen, projection"
-
   Scenario: Install a project with specific directories
-    When I create a project using: compass create custom_project --using blueprint --sass-dir sass --css-dir css --images-dir assets/imgs
+    When I create a project using: compass create custom_project --using compass --sass-dir sass --css-dir css --images-dir assets/imgs
     Then a directory custom_project/ is created
     And a directory custom_project/sass/ is created
     And a directory custom_project/css/ is created
-    And a directory custom_project/assets/imgs/ is created
     And a sass file custom_project/sass/screen.scss is created
     And a css file custom_project/css/screen.css is created
-    And an image file custom_project/assets/imgs/grid.png is created
-
-  Scenario: Perform a dry run of creating a project
-    When I create a project using: compass create my_project --dry-run
-    Then a directory my_project/ is not created
-    But a configuration file my_project/config.rb is reported created
-    And a sass file my_project/sass/screen.scss is reported created
-    And a sass file my_project/sass/print.scss is reported created
-    And a sass file my_project/sass/ie.scss is reported created
-    And I am told how to link to /stylesheets/screen.css for media "screen, projection"
-    And I am told how to link to /stylesheets/print.css for media "print"
-    And I am told how to conditionally link "IE" to /stylesheets/ie.css for media "screen, projection"
 
   Scenario: Creating a bare project
     When I create a project using: compass create bare_project --bare
@@ -64,7 +36,7 @@ Feature: Command Line
     And I am told how to compile my sass stylesheets
 
   Scenario: Compiling a project with errors
-    Given I am using the existing project in test/fixtures/stylesheets/compass
+    Given I am using the existing project in test/fixtures/stylesheets/valid
     And the project has a file named "sass/error.scss" containing:
       """
         .broken {
@@ -78,68 +50,37 @@ Feature: Command Line
     And the command exits with a non-zero error code
 
   Scenario: Compiling an existing project.
-    Given I am using the existing project in test/fixtures/stylesheets/compass
+    Given I am using the existing project in test/fixtures/stylesheets/valid
     When I run: compass compile
     Then a directory tmp/ is created
-    And a css file tmp/layout.css is created
-    And a css file tmp/print.css is created
-    And a css file tmp/reset.css is created
-    And a css file tmp/utilities.css is created
+    And a css file tmp/simple.css is created
 
   Scenario: Compiling an existing project with a specified project
-    Given I am using the existing project in test/fixtures/stylesheets/compass
+    Given I am using the existing project in test/fixtures/stylesheets/valid
     And I am in the parent directory
-    When I run: compass compile tmp_compass
-    Then a directory tmp_compass/tmp/ is created
-    And a css file tmp_compass/tmp/layout.css is created
-    And a css file tmp_compass/tmp/print.css is created
-    And a css file tmp_compass/tmp/reset.css is created
-    And a css file tmp_compass/tmp/utilities.css is created
-
-  Scenario: Dry Run of Compiling an existing project.
-    Given I am using the existing project in test/fixtures/stylesheets/compass
-    When I run: compass compile --dry-run
-    Then a directory tmp/ is not created
-    And a css file tmp/layout.css is not created
-    And a css file tmp/print.css is not created
-    And a css file tmp/reset.css is not created
-    And a css file tmp/utilities.css is not created
-    And a css file tmp/layout.css is reported created
-    And a css file tmp/print.css is reported created
-    And a css file tmp/reset.css is reported created
-    And a css file tmp/utilities.css is reported created
+    When I run: compass compile tmp_valid
+    Then a directory tmp_valid/tmp/ is created
+    And a css file tmp_valid/tmp/simple.css is created
 
   Scenario: Recompiling a project with no changes
-    Given I am using the existing project in test/fixtures/stylesheets/compass
+    Given I am using the existing project in test/fixtures/stylesheets/valid
     When I run: compass compile
     And I run: compass compile
 
   Scenario: compiling a specific file in a project
-    Given I am using the existing project in test/fixtures/stylesheets/compass
-    And I run: compass compile sass/utilities.scss
-    Then a sass file sass/layout.sass is not mentioned
-    And a sass file sass/print.sass is not mentioned
-    And a sass file sass/reset.sass is not mentioned
-    And a css file tmp/utilities.css is reported created
-    And a css file tmp/utilities.css is created
+    Given I am using the existing project in test/fixtures/stylesheets/valid
+    And I run: compass compile sass/simple.sass
+    Then a sass file sass/another_simple.scss is not mentioned
+    And a css file tmp/simple.css is reported written
+    And a css file tmp/simple.css is created
+    And a css file tmp/another_simple.css is not created
 
   Scenario: Re-compiling a specific file in a project with no changes
-    Given I am using the existing project in test/fixtures/stylesheets/compass
+    Given I am using the existing project in test/fixtures/stylesheets/valid
     When I run: compass compile
-    And I run: compass compile sass/utilities.scss
-    Then a sass file sass/layout.sass is not mentioned
-    And a sass file sass/print.sass is not mentioned
-    And a sass file sass/reset.sass is not mentioned
-    And a css file tmp/utilities.css is reported identical
-
-  Scenario: Installing a pattern into a project
-    Given I am using the existing project in test/fixtures/stylesheets/compass
-    When I run: compass install blueprint/buttons
-    Then a sass file sass/buttons.scss is created
-    And an image file images/buttons/cross.png is created
-    And an image file images/buttons/key.png is created
-    And an image file images/buttons/tick.png is created
-    And a css file tmp/buttons.css is created
+    And I run: compass compile sass/simple.sass --force
+    Then a sass file sass/another_simple.scss is not mentioned
+    And a css file tmp/simple.css is reported written
 
   Scenario: Basic help
     When I run: compass help
@@ -153,7 +94,6 @@ Feature: Command Line
       | config      |
       | extension   |
       | frameworks  |
-      | grid-img    |
       | help        |
       | imports     |
       | install     |
@@ -165,71 +105,45 @@ Feature: Command Line
       | version     |
 
   Scenario: Recompiling a project with no material changes
-    Given I am using the existing project in test/fixtures/stylesheets/compass
+    Given I am using the existing project in test/fixtures/stylesheets/valid
     When I run: compass compile
     And I wait 1 second
-    And I touch sass/layout.sass
+    And I touch sass/simple.sass
     And I run: compass compile
-    Then a css file tmp/layout.css is reported identical
+    Then a css file tmp/simple.css is reported written
 
   Scenario: Recompiling a project with changes
-    Given I am using the existing project in test/fixtures/stylesheets/compass
+    Given I am using the existing project in test/fixtures/stylesheets/valid
     When I run: compass compile
     And I wait 1 second
-    And I add some sass to sass/layout.sass
+    And I add some sass to sass/simple.sass
     And I run: compass compile
-    And a css file tmp/layout.css is reported overwritten
+    And a css file tmp/simple.css is reported written
 
   Scenario: Cleaning a project
-    Given I am using the existing project in test/fixtures/stylesheets/compass
+    Given I am using the existing project in test/fixtures/stylesheets/valid
     When I run: compass compile
     And I run: compass clean
     Then the following files are reported removed:
-      | .sass-cache/                |
-      | tmp/border_radius.css       |
-      | tmp/box.css                 |
-      | tmp/box_shadow.css          |
-      | tmp/columns.css             |
-      | tmp/fonts.css               |
-      | images/flag-s4798b5a210.png |
+      | .sass-cache/           |
+      | tmp/simple.css         |
+      | tmp/another_simple.css |
     And the following files are removed:
-      | .sass-cache/                |
-      | tmp/border_radius.css       |
-      | tmp/box.css                 |
-      | tmp/box_shadow.css          |
-      | tmp/columns.css             |
-      | tmp/fonts.css               |
-      | images/flag-s4798b5a210.png |
+      | .sass-cache/           |
+      | tmp/simple.css         |
+      | tmp/another_simple.css |
 
+  @now
   Scenario: Watching a project for changes
     Given ruby supports fork
-    Given I am using the existing project in test/fixtures/stylesheets/compass
+    Given I am using the existing project in test/fixtures/stylesheets/valid
     When I run: compass compile
     And I run in a separate process: compass watch 
-    And I wait 3 seconds
-    And I touch sass/layout.sass
+    And I wait 4 seconds
+    And I touch sass/simple.sass
     And I wait 2 seconds
     And I shutdown the other process
-    Then a css file tmp/layout.css is reported identical
-
-  Scenario: Generating a grid image so that I can debug my grid alignments
-    Given I am using the existing project in test/fixtures/stylesheets/compass
-    When I run: compass grid-img 30+10x24
-    Then a png file images/grid.png is created
-    And the image images/grid.png has a size of 40x24
-
-  Scenario: Generating a grid image to a specified path with custom dimensions
-    Given I am using the existing project in test/fixtures/stylesheets/compass
-    When I run: compass grid-img 50+10x24 assets/wide_grid.png
-    Then a directory assets is created
-    Then a png file assets/wide_grid.png is created
-    And the image assets/wide_grid.png has a size of 60x24
-
-  Scenario: Generating a grid image with invalid dimensions
-    Given I am using the existing project in test/fixtures/stylesheets/compass
-    When I run: compass grid-img 50x24 assets/wide_grid.png
-    Then a directory assets is not created
-    And a png file assets/wide_grid.png is not created
+    Then a css file tmp/simple.css is reported written
 
   Scenario: Generate a compass configuration file
     Given I should clean up the directory: config
@@ -241,7 +155,7 @@ Feature: Command Line
       | css_dir  | assets/css |
 
   Scenario Outline: Print out a configuration value
-    Given I am using the existing project in test/fixtures/stylesheets/compass
+    Given I am using the existing project in test/fixtures/stylesheets/valid
     When I run: compass config -p <property>
     Then I should see the following output: <value>
     And the command exits <exit>
@@ -265,28 +179,17 @@ Feature: Command Line
 
   @stats
   Scenario: Get stats for my project
-    Given I am using the existing project in test/fixtures/stylesheets/compass
-    When I run: compass stats
+    Given I am using the existing project in test/fixtures/stylesheets/valid
+    When I run: bundle exec compass stats
     Then I am told statistics for each file:
-      | Filename                  | Rules | Properties |    Mixins Defs | Mixins Used | Filesize | CSS Selectors | CSS Properties | CSS Filesize |
-      | sass/border_radius.scss   |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
-      | sass/box.sass             |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
-      | sass/fonts.sass           |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
-      | sass/gradients.sass       |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
-      | sass/image_size.sass      |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
-      | sass/images.scss          |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
-      | sass/layout.sass          |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
-      | sass/legacy_clearfix.scss |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
-      | sass/lists.scss           |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
-      | sass/print.sass           |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
-      | sass/reset.sass           |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
-      | sass/utilities.scss       |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
-      | Total.*                   |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
+      | Filename                 | Rules | Properties |    Mixins Defs | Mixins Used | Filesize | CSS Selectors | CSS Properties | CSS Filesize |
+      | sass/simple.sass         |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
+      | sass/another_simple.scss |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
+      | Total.*                  |   \d+ |        \d+ |            \d+ |         \d+ |  \d+ K?B |           \d+ |            \d+ |      \d+ K?B |
 
   @listframeworks
   Scenario: List frameworks registered with compass
     When I run: compass frameworks
     Then I should see the following lines of output:
-      | blueprint  |
       | compass    |