compass 0.12.1 → 0.12.2.rc.0

data/lib/compass/commands.rb

@@ -4,8 +4,9 @@ end
 require 'compass/commands/registry'
 
 %w(base generate_grid_background default help list_frameworks project_base
-   update_project watch_project create_project clean_project imports installer_command
-   print_version project_stats stamp_pattern sprite validate_project
-   write_configuration interactive unpack_extension).each do |lib|
+   update_project watch_project create_project clean_project extension_command
+   imports installer_command print_version project_stats stamp_pattern
+   sprite validate_project write_configuration interactive unpack_extension
+).each do |lib|
   require "compass/commands/#{lib}"
 end

data/lib/compass/commands/extension_command.rb

@@ -0,0 +1,60 @@
+require 'fileutils'
+require 'compass/commands/base'
+
+module Compass
+  module Commands
+    module ExtensionsOptionParser
+      def set_options(opts)
+        opts.banner = %Q{
+Usage: compass extension install EXTENSION_NAME [options]
+       compass extension uninstall EXTENSION_NAME [options]
+       compass extension list
+
+Description:
+  Manage the list of extensions on your system.
+  Compass to all of your compass projects.
+
+Example:
+  compass extension install sassy-buttons
+  compass extension uninstall sassy-buttons
+
+}
+        super
+      end
+    end
+
+    class ExtensionCommand < Base
+
+      register :extension
+
+      class << self
+        def option_parser(arguments)
+          parser = Compass::Exec::CommandOptionParser.new(arguments)
+          parser.extend(ExtensionsOptionParser)
+        end
+        def usage
+          option_parser([]).to_s
+        end
+        def description(command)
+          "Manage the list of compass extensions on your system"
+        end
+        def parse!(arguments)
+          {:arguments => arguments}
+        end
+      end
+      include InstallerCommand
+
+      def initialize(working_path, options)
+        super(working_path, options)
+      end
+
+      # all commands must implement perform
+      def perform
+        require 'rubygems/gem_runner'
+        Gem::GemRunner.new.run(options[:arguments])
+      end
+
+    end
+  end
+end
+

data/lib/compass/configuration/adapters.rb

@@ -13,8 +13,13 @@ module Compass
         Compass::Frameworks::ALL.each do |framework|
           locations << [framework.stylesheets_directory, File.join(css_path || css_dir || ".", framework.name)]
         end
+        load_paths = []
         resolve_additional_import_paths.each do |additional_path|
-          locations << [additional_path, File.join(css_path || css_dir || ".", File.basename(additional_path))]
+          if additional_path.is_a?(String)
+            locations << [additional_path, File.join(css_path || css_dir || ".", File.basename(additional_path))]
+          else
+            load_paths << additional_path
+          end
         end
         plugin_opts = {:template_location => locations}
         plugin_opts[:style] = output_style if output_style
@@ -23,13 +28,14 @@ module Compass
         plugin_opts[:cache_location] = cache_path unless cache_path.nil?
         plugin_opts.merge!(sass_options || {})
         plugin_opts[:load_paths] ||= []
+        plugin_opts[:load_paths] += load_paths
         plugin_opts[:load_paths] << Compass::SpriteImporter.new
         plugin_opts
       end
 
       def resolve_additional_import_paths
         (additional_import_paths || []).map do |path|
-          if project_path && !absolute_path?(path)
+          if path.is_a?(String) && project_path && !absolute_path?(path)
             File.join(project_path, path)
           else
             path

data/lib/compass/configuration/data.rb

@@ -79,6 +79,7 @@ module Compass
       end
 
       def add_import_path(*paths)
+        paths.map!{|p| defined?(Pathname) && Pathname === p ? p.to_s : p}
         # The @added_import_paths variable works around an issue where
         # the additional_import_paths gets overwritten during parse
         @added_import_paths ||= []

data/lib/compass/exec/global_options_parser.rb

@@ -26,6 +26,13 @@ module Compass::Exec::GlobalOptionsParser
         ::Compass.configuration.discover Pathname.new(frameworks_dir).realpath
       end
 
+    opts.on('-I IMPORT_PATH',
+            "Makes files under the IMPORT_PATH folder findable by Sass's @import directive."
+      ) do |import_path|
+        require 'pathname'
+        ::Compass.configuration.add_import_path Pathname.new(import_path).realpath
+      end
+
     opts.on('-q', '--quiet', :NONE, 'Quiet mode.') do
       self.options[:quiet] = true
     end
@@ -34,7 +41,7 @@ module Compass::Exec::GlobalOptionsParser
       self.options[:trace] = true
     end
 
-    opts.on('--force', :NONE, 'Allows some failing commands to succeed instead.') do
+    opts.on('--force', :NONE, 'Allows compass to overwrite existing files.') do
       self.options[:force] = true
     end
 

data/lib/compass/sass_extensions/functions/sprites.rb

@@ -110,7 +110,7 @@ module Compass::SassExtensions::Functions::Sprites
     unless VALID_SELECTORS.include?(selector.value)
       raise Sass::SyntaxError, "Invalid Selctor did you mean one of: #{VALID_SELECTORS.join(', ')}"
     end
-    Sass::Script::Bool.new map.send(:"has_#{selector.value}?", sprite)
+    Sass::Script::Bool.new map.send(:"has_#{selector.value}?", sprite.value)
   end
   
   Sass::Script::Functions.declare :sprite_has_selector, [:map, :sprite, :selector]
@@ -176,10 +176,18 @@ module Compass::SassExtensions::Functions::Sprites
 
 protected
 
+  def reversed_color_names
+    if Sass::Script::Color.const_defined?(:HTML4_COLORS_REVERSE)
+      Sass::Script::Color::HTML4_COLORS_REVERSE
+    else
+      Sass::Script::Color::COLOR_NAMES_REVERSE
+    end
+  end
+
   def convert_sprite_name(sprite)
     case sprite
       when Sass::Script::Color
-        Sass::Script::String.new(Sass::Script::Color::HTML4_COLORS_REVERSE[sprite.rgb])
+        Sass::Script::String.new(reversed_color_names[sprite.rgb])
       when Sass::Script::Bool
         Sass::Script::String.new(sprite.to_s)
       else

data/lib/compass/version.rb

@@ -26,8 +26,9 @@ module Compass
       @version[:teeny]  = @version[:patch]
       @version[:string] = "#{@version[:major]}.#{@version[:minor]}"
       @version[:string] << ".#{@version[:patch]}" if @version[:patch]
-      @version[:string] << ".#{@version[:state]}" if @version[:state]
       @version[:string] << ".#{@version[:build]}" if @version[:build]
+      @version[:string] << ".#{@version[:state]}" if @version[:state]
+      @version[:string] << ".#{@version[:iteration]}" if @version[:iteration]
       if !ENV['OFFICIAL'] && r = revision
         @version[:string] << ".#{r[0..6]}"
       end

data/test/fixtures/stylesheets/blueprint/css/screen.css

@@ -14,11 +14,11 @@ time, mark, audio, video {
   margin: 0;
   padding: 0;
   border: 0;
-  font-size: 100%;
   font: inherit;
+  font-size: 100%;
   vertical-align: baseline; }
 
-body {
+html {
   line-height: 1; }
 
 ol, ul {

data/test/fixtures/stylesheets/compass/css/border_radius.css

@@ -1,20 +1,14 @@
 .simple {
   -webkit-border-radius: 4px 4px;
   -moz-border-radius: 4px / 4px;
-  -ms-border-radius: 4px / 4px;
-  -o-border-radius: 4px / 4px;
   border-radius: 4px / 4px; }
 
 .compound {
   -webkit-border-radius: 2px 3px;
   -moz-border-radius: 2px 5px / 3px 6px;
-  -ms-border-radius: 2px 5px / 3px 6px;
-  -o-border-radius: 2px 5px / 3px 6px;
   border-radius: 2px 5px / 3px 6px; }
 
 .crazy {
   -webkit-border-radius: 1px 2px;
   -moz-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px;
-  -ms-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px;
-  -o-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px;
   border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px; }

data/test/fixtures/stylesheets/compass/css/columns.css

@@ -1,47 +1,62 @@
+.columns {
+  -webkit-columns: 20em 5;
+  -moz-columns: 20em 5;
+  -ms-columns: 20em 5;
+  -o-columns: 20em 5;
+  columns: 20em 5; }
+
 .column-count {
   -webkit-column-count: 5;
   -moz-column-count: 5;
+  -ms-column-count: 5;
   -o-column-count: 5;
   column-count: 5; }
 
 .column-gap {
   -webkit-column-gap: 10px;
   -moz-column-gap: 10px;
+  -ms-column-gap: 10px;
   -o-column-gap: 10px;
   column-gap: 10px; }
 
 .column-width {
   -webkit-column-width: 90px;
   -moz-column-width: 90px;
+  -ms-column-width: 90px;
   -o-column-width: 90px;
   column-width: 90px; }
 
 .column-rule-width {
   -webkit-rule-width: 1px;
   -moz-rule-width: 1px;
+  -ms-rule-width: 1px;
   -o-rule-width: 1px;
   rule-width: 1px; }
 
 .column-rule-style {
   -webkit-rule-style: dotted;
   -moz-rule-style: dotted;
+  -ms-rule-style: dotted;
   -o-rule-style: dotted;
   rule-style: dotted; }
 
 .column-rule-color {
   -webkit-rule-color: blue;
   -moz-rule-color: blue;
+  -ms-rule-color: blue;
   -o-rule-color: blue;
   rule-color: blue; }
 
 .column-rule {
   -webkit-column-rule: 1px solid blue;
   -moz-column-rule: 1px solid blue;
+  -ms-column-rule: 1px solid blue;
   -o-column-rule: 1px solid blue;
   column-rule: 1px solid blue; }
 
 .column-rule-spaced {
   -webkit-column-rule: 1px solid blue;
   -moz-column-rule: 1px solid blue;
+  -ms-column-rule: 1px solid blue;
   -o-column-rule: 1px solid blue;
   column-rule: 1px solid blue; }

data/test/fixtures/stylesheets/compass/css/regions.css

@@ -0,0 +1,7 @@
+.source {
+  -webkit-flow-into: target;
+  -ms-flow-into: target; }
+
+.new-container {
+  -webkit-flow-from: target;
+  -ms-flow-from: target; }

data/test/fixtures/stylesheets/compass/css/reset.css

@@ -14,11 +14,11 @@ time, mark, audio, video {
   margin: 0;
   padding: 0;
   border: 0;
-  font-size: 100%;
   font: inherit;
+  font-size: 100%;
   vertical-align: baseline; }
 
-body {
+html {
   line-height: 1; }
 
 ol, ul {

data/test/fixtures/stylesheets/compass/css/transform.css

@@ -7,6 +7,9 @@
 
 .apply-origin-3d {
   -webkit-transform-origin: 2px 5% 2in;
+  -moz-transform-origin: 2px 5% 2in;
+  -ms-transform-origin: 2px 5% 2in;
+  -o-transform-origin: 2px 5% 2in;
   transform-origin: 2px 5% 2in; }
 
 .transform-origin-2d {
@@ -18,6 +21,9 @@
 
 .transform-origin-3d {
   -webkit-transform-origin: 100px 100px 100px;
+  -moz-transform-origin: 100px 100px 100px;
+  -ms-transform-origin: 100px 100px 100px;
+  -o-transform-origin: 100px 100px 100px;
   transform-origin: 100px 100px 100px; }
 
 .transform-2d {
@@ -29,22 +35,37 @@
 
 .transform-3d {
   -webkit-transform: rotateZ(20deg);
+  -moz-transform: rotateZ(20deg);
+  -ms-transform: rotateZ(20deg);
+  -o-transform: rotateZ(20deg);
   transform: rotateZ(20deg); }
 
 .perspective {
   -webkit-perspective: 500;
+  -moz-perspective: 500;
+  -ms-perspective: 500;
+  -o-perspective: 500;
   perspective: 500; }
 
 .perspective-origin {
   -webkit-perspective-origin: 25% 25%;
+  -moz-perspective-origin: 25% 25%;
+  -ms-perspective-origin: 25% 25%;
+  -o-perspective-origin: 25% 25%;
   perspective-origin: 25% 25%; }
 
 .transform-style {
   -webkit-transform-style: preserve-3d;
+  -moz-transform-style: preserve-3d;
+  -ms-transform-style: preserve-3d;
+  -o-transform-style: preserve-3d;
   transform-style: preserve-3d; }
 
 .backface-visibility {
   -webkit-backface-visibility: hidden;
+  -moz-backface-visibility: hidden;
+  -ms-backface-visibility: hidden;
+  -o-backface-visibility: hidden;
   backface-visibility: hidden; }
 
 .scale {
@@ -56,6 +77,9 @@
 
 .scale-3d {
   -webkit-transform: scale(30px, 50px);
+  -moz-transform: scale(30px, 50px);
+  -ms-transform: scale(30px, 50px);
+  -o-transform: scale(30px, 50px);
   transform: scale(30px, 50px); }
 
 .scale-with-perspective {
@@ -67,6 +91,9 @@
 
 .scale-3d-with-perspective {
   -webkit-transform: perspective(500) scale(30px, 50px);
+  -moz-transform: perspective(500) scale(30px, 50px);
+  -ms-transform: perspective(500) scale(30px, 50px);
+  -o-transform: perspective(500) scale(30px, 50px);
   transform: perspective(500) scale(30px, 50px); }
 
 .scale-x {
@@ -78,6 +105,9 @@
 
 .scale-x-3d {
   -webkit-transform: scaleX(30px);
+  -moz-transform: scaleX(30px);
+  -ms-transform: scaleX(30px);
+  -o-transform: scaleX(30px);
   transform: scaleX(30px); }
 
 .scale-x-with-perspective {
@@ -89,6 +119,9 @@
 
 .scale-x-3d-with-perspective {
   -webkit-transform: perspective(500) scaleX(30px);
+  -moz-transform: perspective(500) scaleX(30px);
+  -ms-transform: perspective(500) scaleX(30px);
+  -o-transform: perspective(500) scaleX(30px);
   transform: perspective(500) scaleX(30px); }
 
 .scale-y {
@@ -100,6 +133,9 @@
 
 .scale-y-3d {
   -webkit-transform: scaleY(50px);
+  -moz-transform: scaleY(50px);
+  -ms-transform: scaleY(50px);
+  -o-transform: scaleY(50px);
   transform: scaleY(50px); }
 
 .scale-y-with-perspective {
@@ -111,22 +147,37 @@
 
 .scale-y-3d-with-perspective {
   -webkit-transform: perspective(500) scaleY(50px);
+  -moz-transform: perspective(500) scaleY(50px);
+  -ms-transform: perspective(500) scaleY(50px);
+  -o-transform: perspective(500) scaleY(50px);
   transform: perspective(500) scaleY(50px); }
 
 .scale-z {
   -webkit-transform: scaleZ(50px);
+  -moz-transform: scaleZ(50px);
+  -ms-transform: scaleZ(50px);
+  -o-transform: scaleZ(50px);
   transform: scaleZ(50px); }
 
 .scale-z-with-perspective {
   -webkit-transform: perspective(500) scaleZ(50px);
+  -moz-transform: perspective(500) scaleZ(50px);
+  -ms-transform: perspective(500) scaleZ(50px);
+  -o-transform: perspective(500) scaleZ(50px);
   transform: perspective(500) scaleZ(50px); }
 
 .scale3d {
   -webkit-transform: scale3d(30px, 50px, 100px);
+  -moz-transform: scale3d(30px, 50px, 100px);
+  -ms-transform: scale3d(30px, 50px, 100px);
+  -o-transform: scale3d(30px, 50px, 100px);
   transform: scale3d(30px, 50px, 100px); }
 
 .scaled3-with-perspective {
   -webkit-transform: perspective(500) scale3d(30px, 50px, 100px);
+  -moz-transform: perspective(500) scale3d(30px, 50px, 100px);
+  -ms-transform: perspective(500) scale3d(30px, 50px, 100px);
+  -o-transform: perspective(500) scale3d(30px, 50px, 100px);
   transform: perspective(500) scale3d(30px, 50px, 100px); }
 
 .rotate {
@@ -159,26 +210,44 @@
 
 .rotate-x {
   -webkit-transform: rotateX(25deg);
+  -moz-transform: rotateX(25deg);
+  -ms-transform: rotateX(25deg);
+  -o-transform: rotateX(25deg);
   transform: rotateX(25deg); }
 
 .rotate-x-with-perspective {
   -webkit-transform: perspective(500) rotateX(25deg);
+  -moz-transform: perspective(500) rotateX(25deg);
+  -ms-transform: perspective(500) rotateX(25deg);
+  -o-transform: perspective(500) rotateX(25deg);
   transform: perspective(500) rotateX(25deg); }
 
 .rotate-y {
   -webkit-transform: rotateY(25deg);
+  -moz-transform: rotateY(25deg);
+  -ms-transform: rotateY(25deg);
+  -o-transform: rotateY(25deg);
   transform: rotateY(25deg); }
 
 .rotate-y-with-perspective {
   -webkit-transform: perspective(500) rotateY(25deg);
+  -moz-transform: perspective(500) rotateY(25deg);
+  -ms-transform: perspective(500) rotateY(25deg);
+  -o-transform: perspective(500) rotateY(25deg);
   transform: perspective(500) rotateY(25deg); }
 
 .rotate-3d {
   -webkit-transform: rotate3d(5, 2, 1, 75deg);
+  -moz-transform: rotate3d(5, 2, 1, 75deg);
+  -ms-transform: rotate3d(5, 2, 1, 75deg);
+  -o-transform: rotate3d(5, 2, 1, 75deg);
   transform: rotate3d(5, 2, 1, 75deg); }
 
 .rotate-3d-with-perspective {
   -webkit-transform: perspective(500) rotate3d(5, 2, 1, 75deg);
+  -moz-transform: perspective(500) rotate3d(5, 2, 1, 75deg);
+  -ms-transform: perspective(500) rotate3d(5, 2, 1, 75deg);
+  -o-transform: perspective(500) rotate3d(5, 2, 1, 75deg);
   transform: perspective(500) rotate3d(5, 2, 1, 75deg); }
 
 .translate {
@@ -197,10 +266,16 @@
 
 .translate-3d {
   -webkit-transform: translate(20px, 30%);
+  -moz-transform: translate(20px, 30%);
+  -ms-transform: translate(20px, 30%);
+  -o-transform: translate(20px, 30%);
   transform: translate(20px, 30%); }
 
 .translate-3d-with-perspective {
   -webkit-transform: perspective(500) translate(20px, 30%);
+  -moz-transform: perspective(500) translate(20px, 30%);
+  -ms-transform: perspective(500) translate(20px, 30%);
+  -o-transform: perspective(500) translate(20px, 30%);
   transform: perspective(500) translate(20px, 30%); }
 
 .translate-x {
@@ -212,6 +287,9 @@
 
 .translate-x-3d {
   -webkit-transform: translateX(30px);
+  -moz-transform: translateX(30px);
+  -ms-transform: translateX(30px);
+  -o-transform: translateX(30px);
   transform: translateX(30px); }
 
 .translate-x-with-perspective {
@@ -223,6 +301,9 @@
 
 .translate-x-3d-with-perspective {
   -webkit-transform: perspective(500) translateX(30px);
+  -moz-transform: perspective(500) translateX(30px);
+  -ms-transform: perspective(500) translateX(30px);
+  -o-transform: perspective(500) translateX(30px);
   transform: perspective(500) translateX(30px); }
 
 .translate-y {
@@ -234,6 +315,9 @@
 
 .translate-y-3d {
   -webkit-transform: translateY(30px);
+  -moz-transform: translateY(30px);
+  -ms-transform: translateY(30px);
+  -o-transform: translateY(30px);
   transform: translateY(30px); }
 
 .translate-y-with-perspective {
@@ -245,22 +329,37 @@
 
 .translate-y-3d-with-perspective {
   -webkit-transform: perspective(500) translateY(30px);
+  -moz-transform: perspective(500) translateY(30px);
+  -ms-transform: perspective(500) translateY(30px);
+  -o-transform: perspective(500) translateY(30px);
   transform: perspective(500) translateY(30px); }
 
 .translate-z {
   -webkit-transform: translateZ(30px);
+  -moz-transform: translateZ(30px);
+  -ms-transform: translateZ(30px);
+  -o-transform: translateZ(30px);
   transform: translateZ(30px); }
 
 .translate-z-with-perspective {
   -webkit-transform: perspective(500) translateZ(30px);
+  -moz-transform: perspective(500) translateZ(30px);
+  -ms-transform: perspective(500) translateZ(30px);
+  -o-transform: perspective(500) translateZ(30px);
   transform: perspective(500) translateZ(30px); }
 
 .translate-3d {
   -webkit-transform: translate3d(30px, 50px, 75px);
+  -moz-transform: translate3d(30px, 50px, 75px);
+  -ms-transform: translate3d(30px, 50px, 75px);
+  -o-transform: translate3d(30px, 50px, 75px);
   transform: translate3d(30px, 50px, 75px); }
 
 .translate-3d-with-perspective {
   -webkit-transform: perspective(500) translate3d(30px, 50px, 75px);
+  -moz-transform: perspective(500) translate3d(30px, 50px, 75px);
+  -ms-transform: perspective(500) translate3d(30px, 50px, 75px);
+  -o-transform: perspective(500) translate3d(30px, 50px, 75px);
   transform: perspective(500) translate3d(30px, 50px, 75px); }
 
 .skew {
@@ -272,6 +371,9 @@
 
 .skew-3d {
   -webkit-transform: skew(20deg, 50deg);
+  -moz-transform: skew(20deg, 50deg);
+  -ms-transform: skew(20deg, 50deg);
+  -o-transform: skew(20deg, 50deg);
   transform: skew(20deg, 50deg); }
 
 .skew-x {
@@ -283,6 +385,9 @@
 
 .skew-x-3d {
   -webkit-transform: skewX(20deg);
+  -moz-transform: skewX(20deg);
+  -ms-transform: skewX(20deg);
+  -o-transform: skewX(20deg);
   transform: skewX(20deg); }
 
 .skew-y {
@@ -294,6 +399,9 @@
 
 .skew-y-3d {
   -webkit-transform: skewY(20deg);
+  -moz-transform: skewY(20deg);
+  -ms-transform: skewY(20deg);
+  -o-transform: skewY(20deg);
   transform: skewY(20deg); }
 
 .create-transform-2d {