compass 0.11.2 → 0.11.3

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 11
-:build: 2
+:patch: 3
 :name: Antares

data/features/command_line.feature

@@ -145,6 +145,7 @@ Feature: Command Line
   Scenario: Basic help
     When I run: compass help
     Then I should see the following "primary" commands:
+      | clean   |
       | compile |
       | create  |
       | init    |
@@ -179,6 +180,27 @@ Feature: Command Line
     And I run: compass compile
     And a css file tmp/layout.css is reported overwritten
 
+  Scenario: Cleaning a project
+    Given I am using the existing project in test/fixtures/stylesheets/compass
+    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-s03c3b29b35.png |
+    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-s03c3b29b35.png |
+
   Scenario: Watching a project for changes
     Given ruby supports fork
     Given I am using the existing project in test/fixtures/stylesheets/compass
@@ -218,7 +240,6 @@ Feature: Command Line
       | sass_dir | sass       |
       | css_dir  | assets/css |
 
-  @now
   Scenario Outline: Print out a configuration value
     Given I am using the existing project in test/fixtures/stylesheets/compass
     When I run: compass config -p <property>

data/features/step_definitions/command_line_steps.rb

@@ -76,7 +76,7 @@ When /^I run in a separate process: compass ([^\s]+) ?(.+)?$/ do |command, args|
         file.puts $stdout.string
       end
       open('/tmp/last_error.compass_test.txt', 'w') do |file|
-        file.puts @stderr.string
+        file.puts $stderr.string
       end
       exit!
     end
@@ -116,10 +116,30 @@ Then /^a directory ([^ ]+) is (not )?created$/ do |directory, negated|
   File.directory?(directory).should == !negated
 end
  
+Then /an? \w+ file ([^ ]+) is (not )?removed/ do |filename, negated|
+  File.exists?(filename).should == !!negated
+end
+
 Then /an? \w+ file ([^ ]+) is (not )?created/ do |filename, negated|
   File.exists?(filename).should == !negated
 end
 
+Then "the following files are reported removed:" do |table|
+  table.rows.each do |css_file|
+    Then %Q{a css file #{css_file.first} is reported removed}
+  end
+end
+
+Then "the following files are removed:" do |table|
+  table.rows.each do |css_file|
+    Then %Q{a css file #{css_file.first} is removed}
+  end
+end
+
+Then /an? \w+ file ([^ ]+) is reported removed/ do |filename|
+  @last_result.should =~ /remove.*#{Regexp.escape(filename)}/
+end
+
 Then /an? \w+ file ([^ ]+) is reported created/ do |filename|
   @last_result.should =~ /create.*#{Regexp.escape(filename)}/
 end

data/frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss

@@ -1,3 +1,4 @@
+@charset "utf-8";
 @import "typography";
 
 $alternate-text-font : "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiqua", Georgia, serif !default;

data/frameworks/compass/stylesheets/compass/css3/_box.scss

@@ -3,7 +3,7 @@
 // display:box; must be used for any of the other flexbox mixins to work properly
 @mixin display-box {
   @include experimental-value(display, box,
-    -moz, -webkit, not -o, not -ms, not -khtml, official
+    -moz, -webkit, not -o, -ms, not -khtml, official
   );
 }
 
@@ -16,7 +16,7 @@ $default-box-orient: horizontal !default;
 ) {
   $orientation : unquote($orientation);
   @include experimental(box-orient, $orientation,
-    -moz, -webkit, not -o, not -ms, not -khtml, official
+    -moz, -webkit, not -o, -ms, not -khtml, official
   );
 }
 
@@ -29,7 +29,7 @@ $default-box-align: stretch !default;
 ) {
   $alignment : unquote($alignment);
   @include experimental(box-align, $alignment,
-    -moz, -webkit, not -o, not -ms, not -khtml, official
+    -moz, -webkit, not -o, -ms, not -khtml, official
   );
 }
 
@@ -43,7 +43,7 @@ $default-box-flex: 0 !default;
   $flex: $default-box-flex
 ) {
   @include experimental(box-flex, $flex,
-    -moz, -webkit, not -o, not -ms, not -khtml, official
+    -moz, -webkit, not -o, -ms, not -khtml, official
   );
 }
 
@@ -55,7 +55,7 @@ $default-box-flex-group: 1 !default;
   $group: $default-box-flex-group
 ) {
   @include experimental(box-flex-group, $group,
-    -moz, -webkit, not -o, not -ms, not -khtml, official
+    -moz, -webkit, not -o, -ms, not -khtml, official
   );
 }
 
@@ -67,7 +67,7 @@ $default-box-ordinal-group: 1 !default;
   $group: $default-ordinal-flex-group
 ) {
   @include experimental(box-ordinal-group, $group,
-    -moz, -webkit, not -o, not -ms, not -khtml, official
+    -moz, -webkit, not -o, -ms, not -khtml, official
   );
 }
 
@@ -80,7 +80,7 @@ $default-box-direction: normal !default;
 ) {
   $direction: unquote($direction);
   @include experimental(box-direction, $direction,
-    -moz, -webkit, not -o, not -ms, not -khtml, official
+    -moz, -webkit, not -o, -ms, not -khtml, official
   );
 }
 
@@ -93,7 +93,7 @@ $default-box-lines: single !default;
 ) {
   $lines: unquote($lines);
   @include experimental(box-lines, $lines,
-    -moz, -webkit, not -o, not -ms, not -khtml, official
+    -moz, -webkit, not -o, -ms, not -khtml, official
   );
 }
 
@@ -106,6 +106,6 @@ $default-box-pack: start !default;
 ) {
   $pack: unquote($pack);
   @include experimental(box-pack, $pack,
-    -moz, -webkit, not -o, not -ms, not -khtml, official
+    -moz, -webkit, not -o, -ms, not -khtml, official
   );
 }

data/frameworks/compass/stylesheets/compass/css3/_font-face.scss

@@ -12,7 +12,10 @@
 //
 // If you need to generate other formats check out the Font Squirrel
 // [font generator](http://www.fontsquirrel.com/fontface/generator)
-
+//
+// Example:
+//
+//     +font-face("this name", font-files("this.woff", "woff", "this.otf", "opentype"), "this.eot")
 @mixin font-face(
   $name, 
   $font-files, 
@@ -28,16 +31,3 @@
     src: $font-files; 
   }
 }
-
-// EXAMPLE
-// +font-face("this name", font-files("this.woff", "woff", "this.otf", "opentype"), "this.eot")
-//
-// will generate:
-//
-//   @font-face { 
-//     font-family: 'this name'; 
-//     src: url('fonts/this.eot'); 
-//     src: local("☺"),
-//       url('fonts/this.otf') format('woff'), 
-//       url('fonts/this.woff') format('opentype'); 
-//   }

data/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.scss

@@ -18,7 +18,7 @@
 // [Easy Clearing](http://www.positioniseverything.net/easyclearing.html)
 // has the advantage of allowing positioned elements to hang
 // outside the bounds of the container at the expense of more tricky CSS.
-@mixin pie-clearfix {
+@mixin legacy-pie-clearfix {
   &:after {
     content    : "\0020";
     display    : block;
@@ -29,3 +29,16 @@
   }
   @include has-layout;
 }
+
+// This is an updated version of the PIE clearfix method that reduces the amount of CSS output.
+// If you need to support Firefox before 3.5 you need to use `legacy-pie-clearfix` instead.
+//
+// Adapted from: [A new micro clearfix hack](http://nicolasgallagher.com/micro-clearfix-hack/)
+@mixin pie-clearfix {
+  &:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+  @include has-layout;
+}

data/lib/compass.rbc

@@ -502,21 +502,63 @@ x
 22
 shared_extension_paths
 i
-12
-45
+54
+39
 0
+13
+10
+53
+15
+45
 1
-7
 2
+7
+3
 64
 49
+4
+1
+13
+9
+34
+15
+45
+5
+6
+45
+1
+7
+7
 3
+64
+49
+4
+1
+49
+8
+1
+9
+49
+45
+5
+9
+7
+10
+64
+49
+11
 1
 35
 1
+8
+51
+35
+0
+38
+0
 11
 I
-2
+3
 I
 0
 I
@@ -525,11 +567,29 @@ I
 0
 n
 p
+12
+x
+23
+@shared_extension_paths
+x
+3
+ENV
+n
+s
 4
+HOME
+x
+2
+[]
 x
 4
 File
 n
+n
+x
+10
+directory?
+n
 s
 21
 ~/.compass/extensions
@@ -537,7 +597,7 @@ x
 11
 expand_path
 p
-5
+13
 I
 -1
 I
@@ -545,9 +605,25 @@ I
 I
 0
 I
+18
+I
+6
+I
+13
+I
+24
+I
+14
+I
+31
+I
+16
+I
+33
+I
 12
 I
-c
+36
 x
 44
 /Users/chris/Projects/compass/lib/compass.rb
@@ -580,11 +656,11 @@ I
 I
 2c
 I
-14
+1a
 I
 38
 I
-15
+1b
 I
 41
 x
@@ -668,11 +744,11 @@ p
 I
 0
 I
-18
+1e
 I
 4
 I
-19
+1f
 I
 13
 x
@@ -704,7 +780,7 @@ a
 I
 4a
 I
-18
+1e
 I
 63
 x

data/lib/compass/actions.rb

@@ -4,7 +4,7 @@ module Compass
     attr_writer :logger
 
     def logger
-      @logger ||= Logger.new
+      @logger ||= ::Compass::Logger.new
     end
 
     # copy/process a template in the compass template directory to the project directory.
@@ -17,13 +17,14 @@ module Compass
     # create a directory and all the directories necessary to reach it.
     def directory(dir, options = nil)
       options ||= self.options if self.respond_to?(:options)
+      options ||= {}
       if File.exists?(dir) && File.directory?(dir)
-          # logger.record :exists, basename(dir) unless options[:quiet]
+          # do nothing
       elsif File.exists?(dir)
         msg = "#{basename(dir)} already exists and is not a directory."
         raise Compass::FilesystemConflict.new(msg)
       else
-        logger.record :directory, separate("#{basename(dir)}/")
+        log_action :directory, separate("#{basename(dir)}/"), options
         FileUtils.mkdir_p(dir) unless options[:dry_run]
       end
     end
@@ -33,20 +34,19 @@ module Compass
       options ||= self.options if self.respond_to?(:options)
       skip_write = options[:dry_run]
       contents = process_erb(contents, options[:erb]) if options[:erb]
-      extra = options[:extra] || ""
       if File.exists?(file_name)
         existing_contents = IO.read(file_name)
         if existing_contents == contents
-          logger.record :identical, basename(file_name), extra
+          log_action :identical, basename(file_name), options
           skip_write = true
         elsif options[:force]
-          logger.record :overwrite, basename(file_name), extra
+          log_action :overwrite, basename(file_name), options
         else
           msg = "File #{basename(file_name)} already exists. Run with --force to force overwrite."
           raise Compass::FilesystemConflict.new(msg)
         end
       else
-        logger.record :create, basename(file_name), extra
+        log_action :create, basename(file_name), options
       end
       if skip_write
         FileUtils.touch file_name unless options[:dry_run]
@@ -65,9 +65,12 @@ module Compass
     end
 
     def remove(file_name)
-      if File.exists?(file_name)
+      if File.directory?(file_name)
+        FileUtils.rm_rf file_name
+        log_action :remove, basename(file_name)+"/", options
+      elsif File.exists?(file_name)
         File.unlink file_name
-        logger.record :remove, basename(file_name)
+        log_action :remove, basename(file_name), options
       end
     end
 
@@ -95,5 +98,14 @@ module Compass
       (path[-1..-1] == File::SEPARATOR) ? path[0..-2] : path
     end
 
+    def log_action(action, file, options)
+      quiet = !!options[:quiet]
+      quiet = false if options[:loud] && options[:loud] == true
+      quiet = false if options[:loud] && options[:loud].is_a?(Array) && options[:loud].include?(action)
+      unless quiet
+        logger.record(action, file, options[:extra].to_s)
+      end
+    end
+
   end
 end