compass 0.10.5.pre.1 → 0.10.5

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 10
 :patch: 5
-:build: pre.1
+#:build: pre.1

data/features/command_line.feature

@@ -258,16 +258,22 @@ Feature: Command Line
     Given I am using the existing project in test/fixtures/stylesheets/compass
     When I run: compass stats
     Then I am told statistics for each file:
-      | Filename             | Rules | Properties | Mixins Defs | Mixins Used | CSS Rules | CSS Properties |
-      | sass/box.sass        |    15 |          0 |           0 |          19 |        15 |             59 |
-      | sass/gradients.sass  |    19 |          0 |           0 |          19 |        19 |             19 |
-      | sass/image_size.sass |     4 |          8 |           0 |           0 |         4 |              8 |
-      | 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.scss  |     2 |          0 |           0 |           2 |         5 |             11 |
-      | Total.*              |    44 |          9 |           0 |          45 |       299 |            832 |
- 
+      | Filename                  | Rules | Properties |    Mixins Defs | Mixins Used | CSS Rules | CSS Properties |
+      | sass/border_radius.scss   |     3 |          0 |              0 |           3 |         3 |             18 |
+      | sass/box.sass             |    15 |          0 |              0 |          19 |        15 |             59 |
+      | sass/fonts.sass           |     0 |          0 |              0 |           1 |         1 |              2 |
+      | sass/gradients.sass       |    19 |          0 |              0 |          19 |        19 |             19 |
+      | sass/image_size.sass      |     4 |          8 |              0 |           0 |         4 |              8 |
+      | sass/images.scss          |     3 |          3 |              0 |           0 |         3 |              3 |
+      | sass/layout.sass          |     0 |          0 |              0 |           1 |         5 |             10 |
+      | sass/legacy_clearfix.scss |     2 |          0 |              0 |           2 |         5 |             11 |
+      | sass/lists.scss           |     9 |          0 |              0 |           9 |        35 |            111 |
+      | sass/print.sass           |     0 |          0 |              0 |           2 |        61 |             61 |
+      | sass/reset.sass           |     4 |          1 |              0 |           2 |       190 |            664 |
+      | sass/utilities.scss       |     2 |          0 |              0 |           2 |         3 |              9 |
+      | ------------------------- | ----- | ---------- | -------------- | ----------- | --------- | -------------- |
+      | Total.*                   |    61 |         12 |              0 |          60 |       344 |            975 |
+
   @listframeworks
   Scenario: List frameworks registered with compass
     When I run: compass frameworks

data/features/step_definitions/command_line_steps.rb

@@ -34,7 +34,7 @@ Given %r{^I am in the parent directory$} do
   Dir.chdir ".."
 end
 
-Given /^I'm in a newly created rails project: (.+)$/ do |project_name|
+Given %r{^I'm in a newly created rails project: (.+)$} do |project_name|
   @cleanup_directories << project_name
   begin
     generate_rails_app project_name

data/lib/compass/commands.rb

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

data/lib/compass/commands/project_base.rb

@@ -24,7 +24,7 @@ module Compass
       def configure!
         add_project_configuration
         Compass.add_configuration(options, "command_line")
-        Compass.discover_extensions!
+        Compass.discover_extensions! unless skip_extension_discovery?
       end
 
       def add_project_configuration
@@ -88,6 +88,10 @@ module Compass
         path.index(File::SEPARATOR) == 0
       end
 
+      def skip_extension_discovery?
+        false
+      end
+
     end
   end
 end

data/lib/compass/commands/unpack_extension.rb

@@ -0,0 +1,117 @@
+require 'compass/commands/project_base'
+require 'fileutils'
+
+module Compass
+  module Commands
+    module ExtensionOptionsParser
+      def set_options(opts)
+        opts.banner = %Q{
+          Usage: compass unpack EXTENSION
+
+          Description:
+            Copy an extension into your extensions folder for easy access to the source code.
+            This makes it easier to peruse the source in unfamiliar projects. It is not recommended
+            that you change other extensions' source -- this makes it hard to take updates from
+            the original author. The following extensions are available:
+            
+          FRAMEWORKS
+            
+          Options:
+        }.strip.split("\n").map{|l| l.gsub(/^ {0,10}/,'')}.join("\n")
+        opts.banner.gsub!(/FRAMEWORKS/,Compass::Frameworks.pretty_print(true))
+        super
+      end
+    end
+
+    class UnpackExtension < ProjectBase
+
+      register :unpack
+
+      def initialize(working_path, options)
+        super
+        assert_project_directory_exists!
+      end
+
+      def perform
+        framework = Compass::Frameworks[options[:framework]]
+        files = Dir["#{framework.path}/**/*"]
+        extension_dir = File.join(Compass.configuration.extensions_path, framework.name)
+        FileUtils.rm_rf extension_dir
+        FileUtils.mkdir_p extension_dir
+        write_file File.join(extension_dir, "DO_NOT_MODIFY"), readme(framework)
+        files.each do |f|
+          next if File.directory?(f)
+          ending = f[(framework.path.size+1)..-1]
+          destination = File.join(extension_dir, ending)
+          FileUtils.mkdir_p(File.dirname(destination))
+          copy f, destination
+        end
+        puts "\nYou have unpacked \"#{framework.name}\""
+        puts
+        puts readme(framework)
+      end
+
+      def readme(framework)
+        %Q{| This is a copy of the "#{framework.name}" extension.
+           |
+           | It now overrides the original which was found here:
+           |
+           | #{framework.path}
+           |
+           | Unpacking an extension is useful when you need to easily peruse the
+           | extension's source. You might find yourself tempted to change the
+           | stylesheets here. If you do this, you'll find it harder to take
+           | updates from the original author. Sometimes this seems like a good
+           | idea at the time, but in a few months, you'll probably regret it.
+           |
+           | In the future, if you take an update of this framework, you'll need to run
+           |
+           |     compass unpack #{framework.name}
+           |
+           | again or remove this unpacked extension.
+           |}.gsub(/^\s*\| ?/,"")
+      end
+
+      def skip_extension_discovery?
+        true
+      end
+
+      class << self
+
+        def option_parser(arguments)
+          parser = Compass::Exec::CommandOptionParser.new(arguments)
+          parser.extend(Compass::Exec::GlobalOptionsParser)
+          parser.extend(Compass::Exec::ProjectOptionsParser)
+          parser.extend(ExtensionOptionsParser)
+        end
+
+        def usage
+          option_parser([]).to_s
+        end
+
+        def description(command)
+          "Copy an extension into your extensions folder."
+        end
+
+        def parse!(arguments)
+          parser = option_parser(arguments)
+          parser.parse!
+          parse_arguments!(parser, arguments)
+          parser.options
+        end
+
+        def parse_arguments!(parser, arguments)
+          if arguments.size == 1
+            parser.options[:framework] = arguments.shift
+          elsif arguments.size == 0
+            raise Compass::Error, "Please specify an extension to unpack."
+          else
+            raise Compass::Error, "Too many arguments were specified."
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/compass/frameworks.rb

@@ -7,10 +7,11 @@ module Compass
 
     class Framework
       attr_accessor :name
+      attr_accessor :path
       attr_accessor :templates_directory, :stylesheets_directory
       def initialize(name, *arguments)
         options = arguments.last.is_a?(Hash) ? arguments.pop : {}
-        path = options[:path] || arguments.shift
+        self.path = path = options[:path] || arguments.shift
         @name = name
         @templates_directory = options[:templates_directory] || File.join(path, 'templates')
         @stylesheets_directory = options[:stylesheets_directory] || File.join(path, 'stylesheets')
@@ -97,7 +98,7 @@ module Compass
       end
     end
 
-    def pretty_print
+    def pretty_print(skip_patterns = false)
       result = ""
       max = Compass::Frameworks::ALL.inject(0) do |gm, framework|
         fm = framework.template_directories.inject(0) do |lm,pattern|
@@ -108,12 +109,14 @@ module Compass
       Compass::Frameworks::ALL.each do |framework|
         next if framework.name =~ /^_/
         result << "  * #{framework.name}\n"
-        framework.template_directories.each do |pattern|
-          result << "    - #{framework.name}/#{pattern}".ljust(max)
-          if description = framework.manifest(pattern).description
-            result << " - #{description}"
+        unless skip_patterns
+          framework.template_directories.each do |pattern|
+            result << "    - #{framework.name}/#{pattern}".ljust(max)
+            if description = framework.manifest(pattern).description
+              result << " - #{description}"
+            end
+            result << "\n"
           end
-          result << "\n"
         end
       end
       result

data/lib/compass/stats.rb

@@ -11,7 +11,7 @@ module Compass
       def visit(node)
         self.prop_count += 1 if node.is_a?(Sass::Tree::PropNode) && !node.children.any?
         if node.is_a?(Sass::Tree::RuleNode)
-          self.rule_count += node.rule.map{|r| r.split(/,/)}.flatten.compact.size
+          self.rule_count += node.rule.reject{|r| r.is_a?(Sass::Script::Node)}.map{|r| r.split(/,/)}.flatten.compact.size
         end
         self.mixin_def_count += 1 if node.is_a?(Sass::Tree::MixinDefNode)
         self.mixin_count += 1 if node.is_a?(Sass::Tree::MixinNode)

data/lib/compass/validator.rb

@@ -4,6 +4,6 @@ begin
 rescue LoadError
   raise Compass::MissingDependency, %Q{The Compass CSS Validator could not be loaded. Please install it:
 
-sudo gem install chriseppstein-compass-validator --source http://gems.github.com/
+sudo gem install compass-validator
 }
 end

data/test/rails_helper.rb

@@ -19,13 +19,18 @@ module Compass
         end
       else
         begin
-          require 'rails/version'
-          require 'rails_generator'
-          require 'rails_generator/scripts/generate'
-          Rails::Generator::Base.use_application_sources!
-          capture_output do
-            Rails::Generator::Base.logger = Rails::Generator::SimpleLogger.new $stdout
-            Rails::Generator::Scripts::Generate.new.run([name], :generator => 'app')
+          require 'action_pack/version'
+          if ActionPack::VERSION::MAJOR >= 3
+            `rails new #{name}`
+          else
+            require 'rails/version'
+            require 'rails_generator'
+            require 'rails_generator/scripts/generate'
+            Rails::Generator::Base.use_application_sources!
+            capture_output do
+              Rails::Generator::Base.logger = Rails::Generator::SimpleLogger.new $stdout
+              Rails::Generator::Scripts::Generate.new.run([name], :generator => 'app')
+            end
           end
         rescue LoadError
           Kernel.exit!(2)

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: compass
 version: !ruby/object:Gem::Version 
-  hash: 1923831843
-  prerelease: true
+  hash: 61
+  prerelease: false
   segments: 
   - 0
   - 10
   - 5
-  - pre
-  - 1
-  version: 0.10.5.pre.1
+  version: 0.10.5
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -19,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 -07:00
+date: 2010-08-29 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -321,7 +319,6 @@ files:
 - frameworks/compass/stylesheets/compass/css3/_text-shadow.scss
 - frameworks/compass/stylesheets/compass/css3/_transform.scss
 - frameworks/compass/stylesheets/compass/css3/_transition.scss
-- frameworks/compass/stylesheets/compass/layout/_floated.scss
 - frameworks/compass/stylesheets/compass/layout/_sticky-footer.scss
 - frameworks/compass/stylesheets/compass/reset/_utilities.scss
 - frameworks/compass/stylesheets/compass/utilities/_general.scss
@@ -392,6 +389,7 @@ files:
 - lib/compass/commands/project_stats.rb
 - lib/compass/commands/registry.rb
 - lib/compass/commands/stamp_pattern.rb
+- lib/compass/commands/unpack_extension.rb
 - lib/compass/commands/update_project.rb
 - lib/compass/commands/validate_project.rb
 - lib/compass/commands/watch_project.rb
@@ -587,14 +585,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 

data/frameworks/compass/stylesheets/compass/layout/_floated.scss

@@ -1,111 +0,0 @@
-@import "compass/utilities/general/float";
-@import "compass/utilities/general/clearfix";
-
-// Direction of the float
-$compass-float-direction: left !default;
-// Set to 0 to disable gutters
-$compass-gutter-width: 10px !default;
-$compass-left-gutter-width: ceil($compass-gutter-width / 2);
-$compass-right-gutter-width: floor($compass-gutter-width / 2);
-
-// A floated element is generally assigned a width to achieve table-less alignment
-@mixin floated($side : $compass-float-direction, 
-               $left-gutter : $compass-left-gutter-width,
-               $right-gutter : $compass-right-gutter-width) {
-  @include float($side);
-  @if $left-gutter > 0 {
-    margin-left: $left-gutter;
-  }
-  @if $right-gutter > 0 {
-    margin-right: $right-gutter;
-  }
-}
-
-// Remove the gutter for a particular side of a floated element
-// pass `both` to disable the gutter on both sides.
-@mixin gutterless($side) {
-  margin-#{$side}: 0;
-  @if $side == both {
-    margin-#{opposite-position($side)}: 0;
-  }
-}
-
-// provides the base structure required to make an element pushable in
-// the specified direction (which defaults to `right`).
-@mixin pushable($side: opposite-position($compass-float-direction)) {
-  @include float($side);
-  position: relative;
-}
-
-// provides the base structure required to make an element pullable in
-// the specified direction (which defaults to `left`).
-@mixin pullable($side : $compass-float-direction) {
-  @include float($side);
-  position: relative;
-}
-
-// push an element in the specified direction by the specified amount.
-@mixin pushed($side, $amount) {
-  margin-#{$side}: -$amount;
-  margin-#{opposite-position($side)}: $amount;
-}
-
-// pull an element in the specified directionn by the specified amount.
-@mixin pulled($side, $amount) {
-  margin-#{$side}: $amount;
-}
-
-// Take an element out of the float if it had been made floated already.
-// This might be applied to an element to allow it to fill the remainder
-// of a row, in which case you'll probably want to make that element also
-// a float container.
-@mixin sunken {
-  float: none;
-  width: auto;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-// make an element centered within its fixed-width parent.
-// Can be applied to a top level float container to create
-// a centered layout within the window.
-@mixin centered {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-@mixin act-like-blueprint {
-  .clearfixed { @include pie-clearfix; }
-  .column     { @include floated(left, 0, $compass-gutter-width); }
-  .last       { @include gutterless(right); }
-  .float-container { @extend .clearfixed; }
-  .container  { @extend .float-container; @include centered; }
-  .push       { @include pushable; }
-  .pull       { @include pullable; }
-}
-
-@mixin act-like-960 {
-  .clearfixed     { @include pie-clearfix; }
-  .grid           { @include floated(left, $compass-gutter-left-width, $compass-gutter-right-width); }
-  .alpha          { @include gutterless(left);  }
-  .omega          { @include gutterless(right); }
-  .container      { @extend .clearfixed;        }
-  .grid-container { @extend .container; @include centered;  }
-  .push           { @include pushable; }
-  .pull           { @include pullable; }
-}
-
-@mixin act-like-oocss {
-  .clearfixed { @include pie-clearfix; }
-  .line       { @extend .clearfixed; }
-  .unit       { @include floated(left, 0, 0); }
-  .lastUnit   { @extend .clearfixed; @include sunken; }
-  .size1of1   { @include sunken; }
-
-  @for $divisions from 2 through 5 {
-    @for $segment from 1 to $divisions {
-      .size#{$segment}of#{$divisions} { width: percentage($segment / $divisions); }
-    }
-  }
-}
-