compass 0.10.0 → 0.10.1

data/VERSION.yml

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

data/features/command_line.feature

@@ -158,8 +158,10 @@ Feature: Command Line
       | watch   |
     And I should see the following "other" commands:
       | config      |
+      | frameworks  |
       | grid-img    |
       | help        |
+      | imports     |
       | install     |
       | interactive |
       | stats       |

data/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/modules/_reset.sass

@@ -1,2 +1,2 @@
-@warn "DEPRECATED: Please change your @import of blueprint/modules/reset.sass to: @import \"blueprint/reset\""
-@import blueprint/reset.scss
+@warn "DEPRECATED: Please change your @import of blueprint/modules/reset.sass to: @import \"blueprint/reset/utilities\""
+@import blueprint/reset/utilities.scss

data/frameworks/blueprint/stylesheets/blueprint/_reset.scss

@@ -1,58 +1,3 @@
-// Global reset rules.
-// For more specific resets, use the reset mixins provided below
-@mixin blueprint-global-reset {
-  html, body {
-    @include blueprint-reset; }
-  html {
-    font-size: 100.01%; }
-  @include blueprint-nested-reset; }
+@import "reset/utilities";
 
-// Reset all elements within some selector scope.To reset the selector itself,
-// mixin the appropriate reset mixin for that element type as well. This could be
-// useful if you want to style a part of your page in a dramatically different way.
-@mixin blueprint-nested-reset {
-  div, span, object, iframe, h1, h2, h3, h4, h5, h6, p,
-  pre, a, abbr, acronym, address, code, del, dfn, em, img,
-  dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr {
-    @include blueprint-reset; }
-  blockquote, q {
-    @include blueprint-reset-quotation; }
-  th, td, caption {
-    @include blueprint-reset-table-cell; }
-  table {
-    @include blueprint-reset-table; }
-  a img {
-    border: none; } }
-
-@mixin blueprint-reset-box-model {
-  margin: 0;
-  padding: 0;
-  border: 0; }
-
-@mixin blueprint-reset {
-  @include blueprint-reset-box-model;
-  font: {
-    weight: inherit;
-    style: inherit;
-    size: 100%;
-    family: inherit; };
-  vertical-align: baseline; }
-
-@mixin blueprint-reset-quotation {
-  @include blueprint-reset;
-  quotes: "" "";
-  &:before,
-  &:after {
-    content: ""; } }
-
-@mixin blueprint-reset-table-cell {
-  @include blueprint-reset;
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle; }
-
-@mixin blueprint-reset-table {
-  @include blueprint-reset;
-  border-collapse: separate;
-  border-spacing: 0;
-  vertical-align: middle; }
+@include blueprint-global-reset;

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

@@ -0,0 +1,58 @@
+// Global reset rules.
+// For more specific resets, use the reset mixins provided below
+@mixin blueprint-global-reset {
+  html, body {
+    @include blueprint-reset; }
+  html {
+    font-size: 100.01%; }
+  @include blueprint-nested-reset; }
+
+// Reset all elements within some selector scope.To reset the selector itself,
+// mixin the appropriate reset mixin for that element type as well. This could be
+// useful if you want to style a part of your page in a dramatically different way.
+@mixin blueprint-nested-reset {
+  div, span, object, iframe, h1, h2, h3, h4, h5, h6, p,
+  pre, a, abbr, acronym, address, code, del, dfn, em, img,
+  dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr {
+    @include blueprint-reset; }
+  blockquote, q {
+    @include blueprint-reset-quotation; }
+  th, td, caption {
+    @include blueprint-reset-table-cell; }
+  table {
+    @include blueprint-reset-table; }
+  a img {
+    border: none; } }
+
+@mixin blueprint-reset-box-model {
+  margin: 0;
+  padding: 0;
+  border: 0; }
+
+@mixin blueprint-reset {
+  @include blueprint-reset-box-model;
+  font: {
+    weight: inherit;
+    style: inherit;
+    size: 100%;
+    family: inherit; };
+  vertical-align: baseline; }
+
+@mixin blueprint-reset-quotation {
+  @include blueprint-reset;
+  quotes: "" "";
+  &:before,
+  &:after {
+    content: ""; } }
+
+@mixin blueprint-reset-table-cell {
+  @include blueprint-reset;
+  text-align: left;
+  font-weight: normal;
+  vertical-align: middle; }
+
+@mixin blueprint-reset-table {
+  @include blueprint-reset;
+  border-collapse: separate;
+  border-spacing: 0;
+  vertical-align: middle; }

data/frameworks/compass/templates/extension/manifest.rb

@@ -12,7 +12,7 @@ help %Q{
 welcome_message %Q{
 For a full tutorial on how to build your own extension see:
 
-http://github.com/chriseppstein/compass/blob/edge/docs/EXTENSIONS.markdown
+http://compass-style.org/docs/tutorials/extensions/
 
 }, :replace => true
 

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

@@ -26,7 +26,7 @@ module Compass
         end
 
         def config_files_exist?
-          File.exists?(targetize('config/compass.config')) &&
+          File.exists?(targetize('config/compass.rb')) &&
           File.exists?(targetize('config/initializers/compass.rb'))
         end
 
@@ -38,11 +38,22 @@ module Compass
           if options[:create]
             puts <<-NEXTSTEPS
 
-  Congratulations! Your rails project has been configured to use Compass.
-  Sass will automatically compile your stylesheets during the next
-  page request and keep them up to date when they change.
-  Make sure you restart your server!
-  NEXTSTEPS
+Congratulations! Your rails project has been configured to use Compass.
+Just one more thing left to do: Register the compass gem.
+
+In Rails 2.2 & 2.3, add the following to your evironment.rb:
+
+  config.gem "compass", :version => ">= #{Compass::VERSION}"
+
+In Rails 3, add the following to your Gemfile:
+
+  gem "compass", ">= #{Compass::VERSION}"
+
+Then, make sure you restart your server.
+
+Sass will automatically compile your stylesheets during the next
+page request and keep them up to date when they change.
+NEXTSTEPS
           end
           if manifest.has_stylesheet?
             puts "\nNext add these lines to the head of your layouts:\n\n"

data/lib/compass/app_integration/rails/templates/compass-install-rails.rb

@@ -61,8 +61,8 @@ end
 use_sudo = sudo_is_an_option? if use_sudo.blank?
 
 # define dependencies
-gem "haml", :version => ">=3.0.0.rc.3"
-gem "compass", :version => ">= 0.10.0.rc4"
+gem "haml", :version => ">=3.0.0"
+gem "compass", :version => ">= 0.10.0"
 
 # install and unpack
 rake "gems:install GEM=haml --trace", :sudo => use_sudo

data/lib/compass/commands.rb

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

data/lib/compass/commands/create_project.rb

@@ -68,7 +68,7 @@ module Compass
           if command.to_sym == :create
             "Create a new compass project"
           else
-            "Initialize an existing project"
+            "Add compass to an existing project"
           end
         end
 

data/lib/compass/commands/imports.rb

@@ -0,0 +1,29 @@
+module Compass
+  module Commands
+    class Imports < ProjectBase
+      attr_accessor :options
+      register :imports
+      def initialize(working_path, options)
+        super
+      end
+  
+      def execute
+        print ::Compass::Frameworks::ALL.map{|f|
+                  "-I #{f.stylesheets_directory}"
+                }.join(' ')
+      end
+      class << self
+        def description(command)
+          "Emit an imports suitable for passing to the sass command-line."
+        end
+        def parse!(arguments)
+          if arguments.join("").strip.size > 0
+            raise OptionParser::ParseError, "This command takes no options or arguments."
+          else
+            {}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/compass/commands/list_frameworks.rb

@@ -2,6 +2,7 @@ module Compass
   module Commands
     class ListFrameworks < ProjectBase
       attr_accessor :options
+      register :frameworks
       def initialize(working_path, options)
         super
       end
@@ -11,6 +12,11 @@ module Compass
           puts framework.name unless framework.name =~ /^_/
         end
       end
+      class << self
+        def description(command)
+          "List the available frameworks"
+        end
+      end
     end
   end
 end

data/lib/compass/commands/watch_project.rb

@@ -97,6 +97,10 @@ module Compass
       end
 
       class << self
+        def description(command)
+          "Compile Sass stylesheets to CSS when they change"
+        end
+
         def option_parser(arguments)
           parser = Compass::Exec::CommandOptionParser.new(arguments)
           parser.extend(Compass::Exec::GlobalOptionsParser)

data/lib/compass/compiler.rb

@@ -42,7 +42,7 @@ module Compass
     def out_of_date?
       Compass.configure_sass_plugin! unless Compass.sass_plugin_configured?
       sass_files.zip(css_files).each do |sass_filename, css_filename|
-        return sass_filename if Sass::Plugin.send(:exact_stylesheet_needs_update?, css_filename, sass_filename)
+        return sass_filename if Sass::Plugin.send(:stylesheet_needs_update?, css_filename, sass_filename)
       end
       false
     end
@@ -106,7 +106,7 @@ module Compass
     end
 
     def should_compile?(sass_filename, css_filename)
-      options[:force] || Sass::Plugin.send(:exact_stylesheet_needs_update?, css_filename, sass_filename)
+      options[:force] || Sass::Plugin.send(:stylesheet_needs_update?, css_filename, sass_filename)
     end
 
     # A sass engine for compiling a single file.

data/lib/compass/configuration/helpers.rb

@@ -54,8 +54,15 @@ module Compass
       end
 
       def configure_sass_plugin!
+        return if sass_plugin_configured?
+        require 'sass/plugin'
         @sass_plugin_configured = true
-        Sass::Plugin.options.merge!(sass_plugin_configuration)
+        config = sass_plugin_configuration
+        locations = config.delete(:template_location)
+        Sass::Plugin.options.merge!(config)
+        locations.each do |sass_dir, css_dir|
+          Sass::Plugin.add_template_location sass_dir, css_dir
+        end
       end
 
       def sass_plugin_configured?

data/lib/compass/sass_extensions/monkey_patches.rb

@@ -1,3 +1,3 @@
-%w(stylesheet_updating traversal).each do |patch|
+%w(traversal).each do |patch|
   require "compass/sass_extensions/monkey_patches/#{patch}"
 end

data/lib/compass/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -07:00
+date: 2010-05-15 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        - 4
+        version: 3.0.4
   type: :runtime
   version_requirements: *id001
 description: Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintainance of CSS.
@@ -257,6 +257,7 @@ files:
 - frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss
 - frameworks/blueprint/stylesheets/blueprint/_typography.scss
 - frameworks/blueprint/stylesheets/blueprint/_utilities.scss
+- frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss
 - frameworks/blueprint/templates/basic/grid.png
 - frameworks/blueprint/templates/basic/ie.sass
 - frameworks/blueprint/templates/basic/manifest.rb
@@ -374,6 +375,7 @@ files:
 - lib/compass/commands/create_project.rb
 - lib/compass/commands/generate_grid_background.rb
 - lib/compass/commands/help.rb
+- lib/compass/commands/imports.rb
 - lib/compass/commands/installer_command.rb
 - lib/compass/commands/interactive.rb
 - lib/compass/commands/list_frameworks.rb
@@ -425,7 +427,6 @@ files:
 - lib/compass/sass_extensions/functions/selectors.rb
 - lib/compass/sass_extensions/functions/urls.rb
 - lib/compass/sass_extensions/functions.rb
-- lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb
 - lib/compass/sass_extensions/monkey_patches/traversal.rb
 - lib/compass/sass_extensions/monkey_patches.rb
 - lib/compass/sass_extensions.rb

data/lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb

@@ -1,40 +0,0 @@
-require 'sass/plugin'
-
-# XXX: We can remove this monkeypatch once Sass 2.2 is released.
-module Sass::Plugin
-
-  # splits the stylesheet_needs_update? method into two pieces so I can use the exact_stylesheet_needs_update? piece
-  module StylesheetNeedsUpdate
-    def stylesheet_needs_update?(name, template_path, css_path)
-      css_file = css_filename(name, css_path)
-      template_file = template_filename(name, template_path)
-      exact_stylesheet_needs_update?(css_file, template_file)
-    end
-    def exact_stylesheet_needs_update?(css_file, template_file)
-      if !File.exists?(css_file)
-        return true
-      else
-        css_mtime = File.mtime(css_file)
-        File.mtime(template_file) > css_mtime ||
-          dependencies(template_file).any?(&dependency_updated?(css_mtime))
-      end
-    end
-  end
-
-  # At some point Sass::Plugin changed from using the metaclass to extend self.
-  metaclass = class << self; self; end
-  if metaclass.included_modules.include?(Sass::Plugin)
-    if method(:stylesheet_needs_update?).arity == 2
-      alias exact_stylesheet_needs_update? stylesheet_needs_update?
-    elsif !method_defined?(:exact_stylesheet_needs_update?)
-      include StylesheetNeedsUpdate
-    end
-  else
-    class << self
-      unless method_defined?(:exact_stylesheet_needs_update?)
-        include StylesheetNeedsUpdate
-      end
-    end
-  end
-
-end