compass 0.10.1 → 0.10.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 10
-:patch: 1
+:patch: 2

data/features/command_line.feature

@@ -91,7 +91,7 @@ Feature: Command Line
     And a sass file sass/layout.sass is reported compiled
     And a sass file sass/print.sass is reported compiled
     And a sass file sass/reset.sass is reported compiled
-    And a sass file sass/utilities.sass is reported compiled
+    And a sass file sass/utilities.scss is reported compiled
     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
@@ -105,12 +105,29 @@ Feature: Command Line
     And a sass file tmp_compass/sass/layout.sass is reported compiled
     And a sass file tmp_compass/sass/print.sass is reported compiled
     And a sass file tmp_compass/sass/reset.sass is reported compiled
-    And a sass file tmp_compass/sass/utilities.sass is reported compiled
+    And a sass file tmp_compass/sass/utilities.scss is reported compiled
     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 sass file sass/layout.sass is reported compiled
+    And a sass file sass/print.sass is reported compiled
+    And a sass file sass/reset.sass is reported compiled
+    And a sass file sass/utilities.scss is reported compiled
+    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
+
   Scenario: Recompiling a project with no changes
     Given I am using the existing project in test/fixtures/stylesheets/compass
     When I run: compass compile
@@ -118,26 +135,26 @@ Feature: Command Line
     Then a sass file sass/layout.sass is reported unchanged
     And a sass file sass/print.sass is reported unchanged
     And a sass file sass/reset.sass is reported unchanged
-    And a sass file sass/utilities.sass is reported unchanged
+    And a sass file sass/utilities.scss is reported unchanged
 
   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.sass
+    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 sass file sass/utilities.sass is reported compiled
+    And a sass file sass/utilities.scss is reported compiled
     And a css file tmp/utilities.css is reported created
     And a css file tmp/utilities.css is 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
     When I run: compass compile
-    And I run: compass compile sass/utilities.sass
+    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 sass file sass/utilities.sass is reported compiled
+    And a sass file sass/utilities.scss is reported compiled
     And a css file tmp/utilities.css is reported identical
 
   Scenario: Installing a pattern into a project
@@ -178,7 +195,7 @@ Feature: Command Line
     Then a css file tmp/layout.css is reported identical
     And a sass file sass/print.sass is reported unchanged
     And a sass file sass/reset.sass is reported unchanged
-    And a sass file sass/utilities.sass is reported unchanged
+    And a sass file sass/utilities.scss is reported unchanged
 
   Scenario: Recompiling a project with changes
     Given I am using the existing project in test/fixtures/stylesheets/compass
@@ -190,7 +207,7 @@ Feature: Command Line
     And a css file tmp/layout.css is reported overwritten
     And a sass file sass/print.sass is reported unchanged
     And a sass file sass/reset.sass is reported unchanged
-    And a sass file sass/utilities.sass is reported unchanged
+    And a sass file sass/utilities.scss is reported unchanged
 
   Scenario: Watching a project for changes
     Given I am using the existing project in test/fixtures/stylesheets/compass
@@ -236,7 +253,7 @@ Feature: Command Line
     Then my css is validated
     And I am informed that my css is valid.
 
-  @broken
+  @stats
   Scenario: Get stats for my project
     Given I am using the existing project in test/fixtures/stylesheets/compass
     When I run: compass stats
@@ -248,6 +265,13 @@ Feature: Command Line
       | sass/layout.sass     |     0 |          0 |           0 |           1 |         5 |             10 |
       | sass/print.sass      |     0 |          0 |           0 |           2 |        61 |             61 |
       | sass/reset.sass      |     4 |          1 |           0 |           2 |       190 |            664 |
-      | sass/utilities.sass  |     2 |          0 |           0 |           2 |         5 |             11 |
+      | sass/utilities.scss  |     2 |          0 |           0 |           2 |         5 |             11 |
       | Total.*              |    44 |          9 |           0 |          45 |       299 |            832 |
  
+  @listframeworks
+  Scenario: List frameworks registered with compass
+    When I run: compass frameworks
+    Then I should see the following lines of output:
+      | blueprint  |
+      | compass    |
+

data/features/extensions.feature

@@ -4,17 +4,19 @@ Feature: Extensions
   I can install extensions that others have created
   And I can create and publish my own extensions
 
+  @listframeworks
   Scenario: Extensions directory for stand_alone projects
     Given I am using the existing project in test/fixtures/stylesheets/compass
     And the "extensions" directory exists
     And and I have a fake extension at extensions/testing
-    When I run: compass --list-frameworks
+    When I run: compass frameworks
     Then the list of frameworks includes "testing"
 
+  @listframeworks
   Scenario: Extensions directory for rails projects
     Given I'm in a newly created rails project: my_rails_project
     And the "my_rails_project/vendor/plugins/compass/extensions" directory exists
     And and I have a fake extension at my_rails_project/vendor/plugins/compass/extensions/testing
-    When I run: compass --list-frameworks
+    When I run: compass frameworks
     Then the list of frameworks includes "testing"
 

data/features/step_definitions/command_line_steps.rb

@@ -232,3 +232,6 @@ Then /^the image ([^ ]+) has a size of (\d+)x(\d+)$/ do |file, width, height|
   IO.read(file)[0x10..0x18].unpack('NN').should == [width.to_i, height.to_i]
 end
 
+Then /^I should see the following lines of output:$/ do |table|
+  table.diff!([['blueprint'],['compass']])
+end

data/features/step_definitions/extension_steps.rb

@@ -5,9 +5,18 @@ end
 Given /^and I have a fake extension at (.*)$/ do |directory|
   FileUtils.mkdir_p File.join(directory, 'stylesheets')
   FileUtils.mkdir_p File.join(directory, 'templates/project')
+  open(File.join(directory, 'templates/project/manifest.rb'),"w") do |f|
+    f.puts %Q{
+      description "This is a fake extension"
+
+      help "this is the fake help"
+
+      welcome_message "this is a fake welcome"
+    }
+  end
 end
 
 Then /^the list of frameworks includes "([^\"]*)"$/ do |framework|
-  @last_result.split("\n").map{|f| f.strip}.should include(framework)
+  @last_result.split("\n").map{|f| f.gsub(/(^\s+[*-]\s+)|(\s+$)/,'')}.should include(framework)
 end
 

data/frameworks/blueprint/stylesheets/blueprint/_utilities.scss

@@ -1,5 +1,5 @@
 @import "compass/utilities/text/nowrap";
-@import "compass/utilities/general/float";
+@import "compass/utilities/general/clearfix";
 
 // Most of these utility classes are not "semantic". If you use them,
 // you are mixing your content and presentation. For shame!

data/frameworks/blueprint/templates/basic/manifest.rb

@@ -1,4 +1,4 @@
-description "The blueprint framework."
+description "A basic blueprint install that mimics the actual blueprint css."
 
 stylesheet 'screen.sass', :media => 'screen, projection'
 stylesheet 'partials/_base.sass'

data/frameworks/blueprint/templates/basic/screen.sass

@@ -9,3 +9,4 @@
 
 // Generate the blueprint framework according to your configuration:
 +blueprint
++blueprint-scaffolding

data/frameworks/blueprint/templates/project/ie.sass

@@ -1,7 +1,7 @@
 @import blueprint
 
 // To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
-// +blueprint-ie
+// @include blueprint-ie
 
 //Recommended Blueprint configuration with scoping and semantic layout:
 body.bp

data/frameworks/blueprint/templates/project/print.sass

@@ -1,7 +1,7 @@
 @import blueprint
 
 // To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
-// +blueprint-print
+// @include blueprint-print
 
 //Recommended Blueprint configuration with scoping and semantic layout:
 body.bp

data/frameworks/blueprint/templates/project/screen.sass

@@ -7,10 +7,13 @@
 // Import the non-default scaffolding module.
 @import blueprint/scaffolding
 
-// To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
-// +blueprint
+// To generate css equivalent to the blueprint css but with your
+// configuration applied, uncomment:
+// @include blueprint
 
-//Recommended Blueprint configuration with scoping and semantic layout:
+// But Compass recommends that you scope your blueprint styles
+// So that you can better control what pages use blueprint
+// when stylesheets are concatenated together.
 +blueprint-scaffolding("body.bp")
 body.bp
   +blueprint-typography(true)

data/frameworks/blueprint/templates/semantic/manifest.rb

@@ -1,4 +1,4 @@
-description "The blueprint framework."
+description "The blueprint framework for use with semantic markup."
 
 stylesheet 'screen.sass', :media => 'screen, projection'
 stylesheet 'partials/_base.sass'

data/frameworks/blueprint/templates/semantic/print.sass

@@ -1,8 +1,5 @@
 @import blueprint
 
-// To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
-// +blueprint-print
-
 //Recommended Blueprint configuration with scoping and semantic layout:
 body.bp
   +blueprint-print(true)

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

@@ -6,11 +6,11 @@
 //
 // This yields a linear gradient spanning from bottom to top
 //
-//     +linear-gradient(color-stops(white, black), "bottom")
+//     +linear-gradient(color-stops(white, black), bottom)
 //
 // This yields a linear gradient spanning from left to right
 //
-//     +linear-gradient(color-stops(white, black), "left")
+//     +linear-gradient(color-stops(white, black), left)
 //
 // This yields a linear gradient starting at white passing
 // thru blue at 33% down and then to black
@@ -24,7 +24,7 @@
 //
 // This yields a linear gradient on top of a background image
 //
-//     +linear-gradient(color_stops(white,black), "top", image-url('noise.png'))
+//     +linear-gradient(color_stops(white,black), top, image-url('noise.png'))
 // Browsers Supported:
 //
 // - Chrome
@@ -36,6 +36,7 @@
   // Webkit's gradient api sucks -- hence these backflips:
   $background: unquote("");
   @if $image { $background : $image + unquote(", "); }
+  $start: unquote($start);
   $end: grad-opposite-position($start);
   @if $experimental-support-for-webkit {
     background-image: #{$background}-webkit-gradient(linear, grad-point($start), grad-point($end), grad-color-stops($color-stops));
@@ -53,11 +54,12 @@
 //     // Defaults to a centered, 100px radius gradient
 //     +radial-gradient(color-stops(#c00, #00c))
 //     // 100px radius gradient in the top left corner
-//     +radial-gradient(color-stops(#c00, #00c), "top left")
+//     +radial-gradient(color-stops(#c00, #00c), top left)
 //     // Three colors, ending at 50px and passing thru #fff at 25px
 //     +radial-gradient(color-stops(#c00, #fff, #00c 50px))
-//     // gradient on top of a background image
-//     +radial-gradient(color_stops(#c00, #fff), "top left", image-url("noise.png")))
+//     // a background image on top of the gradient
+//     // Requires an image with an alpha-layer.
+//     +radial-gradient(color_stops(#c00, #fff), top left, image-url("noise.png")))
 // Browsers Supported:
 //
 // - Chrome
@@ -65,6 +67,7 @@
 // - Firefox 3.6
 
 @mixin radial-gradient($color-stops, $center-position: center center, $image: false) {
+  $center-position: unquote($center-position);
   $end-pos: grad-end-position($color-stops, true);
   $background: unquote("");
   @if $image { $background: $image + unquote(", "); }

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

@@ -40,6 +40,7 @@ $default-transition-delay: false !default;
 // * these durations will affect the properties in the same list position
 
 @mixin transition-duration($duration: $default-transition-duration) {
+  @if type-of($duration) == string { $duration: unquote($duration); }
   @include experimental(transition-duration, $duration,
     -moz, -webkit, -o, not -ms, not -khtml, official
   );
@@ -52,7 +53,7 @@ $default-transition-delay: false !default;
 // * These functions will effect the properties in the same list position
 
 @mixin transition-timing-function($function: $default-transition-function) {
-  @include experimental(transition-timing-function, $function,
+  @include experimental(transition-timing-function, unquote($function),
     -moz, -webkit, -o, not -ms, not -khtml, official
   );
 }
@@ -63,6 +64,7 @@ $default-transition-delay: false !default;
 // * these delays will effect the properties in the same list position
 
 @mixin transition-delay($delay: $default-transition-delay) {
+  @if type-of($delay) == string { $delay: unquote($delay); }
   @include experimental(transition-delay, $delay,
     -moz, -webkit, -o, not -ms, not -khtml, official
   );

data/lib/compass/app_integration/rails.rb

@@ -26,6 +26,14 @@ module Compass
         end
       end
 
+      def root
+        if defined?(::Rails)
+          ::Rails.root
+        elsif defined?(RAILS_ROOT)
+          RAILS_ROOT
+        end
+      end
+
     end
   end
 end

data/lib/compass/app_integration/rails/installer.rb

@@ -94,7 +94,7 @@ NEXTSTEPS
           "# This configuration file works with both the Compass command line tool and within Rails.\n" +
           Compass.configuration.serialize do |prop, value|
             if prop == :project_path
-              "project_path = RAILS_ROOT if defined?(RAILS_ROOT)\n"
+              "project_path = Compass::AppIntegration::Rails.root\n"
             elsif prop == :environment
               "environment = Compass::AppIntegration::Rails.env\n"
             elsif prop == :output_style

data/lib/compass/commands/help.rb

@@ -23,17 +23,7 @@ To get help on a particular command please specify the command.
         banner << command_list("Other Commands:", other_commands)
  
         banner << "\nAvailable Frameworks & Patterns:\n\n"
-        Compass::Frameworks::ALL.each do |framework|
-          next if framework.name =~ /^_/
-          banner << "  * #{framework.name}\n"
-          framework.template_directories.each do |pattern|
-            banner << "    - #{framework.name}/#{pattern}"
-            if description = framework.manifest(pattern).description
-              banner << "\t- #{description}"
-            end
-            banner << "\n"
-          end
-        end
+        banner << Compass::Frameworks.pretty_print
         banner << "\nGlobal Options:\n"
         opts.banner = banner
 

data/lib/compass/commands/installer_command.rb

@@ -6,11 +6,7 @@ module Compass
       include Compass::Installers
 
       def configure!
-        if respond_to?(:is_project_creation?) && is_project_creation?
-          Compass.add_configuration(options.delete(:project_type) || :stand_alone)
-        else
-          Compass.add_project_configuration(:project_type => options.delete(:project_type))
-        end
+        add_project_configuration
         Compass.add_configuration(options, 'command_line')
         Compass.discover_extensions!
         Compass.add_configuration(installer.completed_configuration, 'installer')

data/lib/compass/commands/list_frameworks.rb

@@ -8,14 +8,31 @@ module Compass
       end
   
       def execute
-        Compass::Frameworks::ALL.each do |framework|
-          puts framework.name unless framework.name =~ /^_/
+        if options[:quiet]
+          Compass::Frameworks::ALL.each do |framework|
+            puts framework.name unless framework.name =~ /^_/
+          end
+        else
+          puts "Available Frameworks & Patterns:\n\n"
+          puts Compass::Frameworks.pretty_print
         end
       end
       class << self
+        def option_parser(arguments)
+          parser = Compass::Exec::CommandOptionParser.new(arguments)
+          parser.extend(Compass::Exec::GlobalOptionsParser)
+        end
+        def usage
+          option_parser([]).to_s
+        end
         def description(command)
           "List the available frameworks"
         end
+        def parse!(arguments)
+          parser = option_parser(arguments)
+          parser.parse!
+          parser.options
+        end
       end
     end
   end

data/lib/compass/commands/project_base.rb

@@ -23,12 +23,14 @@ module Compass
 
       def configure!
         add_project_configuration
-        Compass.add_configuration(options, "cli")
+        Compass.add_configuration(options, "command_line")
         Compass.discover_extensions!
       end
 
       def add_project_configuration
-        Compass.add_project_configuration(options[:configuration_file])
+        Compass.add_project_configuration(options[:configuration_file]) do
+          options[:project_type]
+        end
       end
 
       def projectize(path)

data/lib/compass/commands/update_project.rb

@@ -46,12 +46,16 @@ module Compass
       end
 
       def new_compiler_instance(additional_options = {})
+        compiler_opts = Compass.sass_engine_options
+        compiler_opts.merge!(:quiet => options[:quiet],
+                             :force => options[:force],
+                             :sass_files => explicit_sass_files,
+                             :dry_run => options[:dry_run])
+        compiler_opts.merge!(additional_options)
         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],
-                                            :sass_files => explicit_sass_files).merge(additional_options))
+          compiler_opts)
       end
 
       def explicit_sass_files