compass-edge 0.9.1 → 0.9.2

data/lib/compass/compiler.rb

@@ -13,8 +13,9 @@ module Compass
       self.options[:cache_location] ||= File.join(from, ".sass-cache")
     end
 
-    def sass_files
-      @sass_files || Dir.glob(separate("#{from}/**/[^_]*.sass"))
+    def sass_files(options = {})
+      exclude_partials = options.fetch(:exclude_partials, true)
+      @sass_files || Dir.glob(separate("#{from}/**/#{'[^_]' if exclude_partials}*.sass"))
     end
 
     def stylesheet_name(sass_file)
@@ -51,4 +52,4 @@ module Compass
       end
     end
   end
-end
+end

data/lib/compass/configuration/helpers.rb

@@ -66,6 +66,15 @@ module Compass
         File.join(project_path, *path.split('/'))
       end
 
+      def deprojectize(path, project_path = nil)
+        project_path ||= configuration.project_path
+        if path[0..(project_path.size - 1)] == project_path
+          path[(project_path.size + 1)..-1]
+        else
+          path
+        end
+      end
+
       # TODO: Deprecate the src/config.rb location.
       KNOWN_CONFIG_LOCATIONS = [".compass/config.rb", "config/compass.config", "config.rb", "src/config.rb"]
 

data/lib/compass/errors.rb

@@ -4,4 +4,7 @@ module Compass
 
   class FilesystemConflict < Error
   end
-end
+
+  class MissingDependency < Error
+  end
+end

data/lib/compass/exec.rb

@@ -3,6 +3,7 @@ require 'optparse'
 require 'compass/logger'
 require 'compass/errors'
 require 'compass/actions'
+require 'compass/installers'
 require 'compass/commands'
 
 module Compass::Exec

data/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass

@@ -33,7 +33,7 @@
   q, blockquote
     +reset-quotation
     
-  img a
+  a img
     +reset-image-anchor-border
  
  
@@ -57,7 +57,7 @@
   q, blockquote
     +reset-quotation
   
-  img a
+  a img
     +reset-image-anchor-border
  
 //Mixins partials

data/lib/compass/installers.rb

@@ -1,3 +1,3 @@
-%w(manifest template_context base).each do |f|
+%w(manifest template_context base manifest_installer bare_installer).each do |f|
   require "compass/installers/#{f}"
 end

data/lib/compass/installers/bare_installer.rb

@@ -0,0 +1,62 @@
+module Compass
+  module Installers
+
+    class BareInstaller < Base
+      def default_configuration
+        Compass::Configuration::Data.new.extend(Compass::AppIntegration::StandAlone::ConfigurationDefaults)
+      end
+
+      def completed_configuration
+        nil
+      end
+
+      def init
+        directory targetize("")
+        directory targetize(Compass.configuration.sass_dir)
+      end
+
+      def prepare
+      end
+
+      def install
+        config_file ||= targetize('config.rb')
+        write_file config_file, config_contents
+      end
+
+      def config_contents
+        project_path, Compass.configuration.project_path = Compass.configuration.project_path, nil
+        Compass.configuration.serialize
+      ensure
+        Compass.configuration.project_path = project_path
+      end
+
+      def finalize(options = {})
+        puts <<-NEXTSTEPS
+
+*********************************************************************
+Congratulations! Your compass project has been created.
+
+You may now add sass stylesheets to the #{Compass.configuration.sass_dir} subdirectory of your project.
+
+Sass files beginning with an underscore are called partials and won't be
+compiled to CSS, but they can be imported into other sass stylesheets.
+
+You can configure your project by editing the config.rb configuration file.
+
+You must compile your sass stylesheets into CSS when they change.
+This can be done in one of the following ways:
+  1. To compile on demand:
+     compass compile [path/to/project]
+  2. To monitor your project for changes and automatically recompile:
+     compass watch [path/to/project]
+
+More Resources:
+  * Wiki: http://wiki.github.com/chriseppstein/compass
+  * Sass: http://sass-lang.com
+  * Community: http://groups.google.com/group/compass-users/
+NEXTSTEPS
+      end
+
+    end
+  end
+end

data/lib/compass/installers/base.rb

@@ -7,21 +7,15 @@ module Compass
 
       attr_accessor :template_path, :target_path, :working_path
       attr_accessor :options
-      attr_accessor :manifest
 
       def initialize(template_path, target_path, options = {})
         @template_path = template_path
         @target_path = target_path
         @working_path = Dir.getwd
         @options = options
-        @manifest = Manifest.new(manifest_file, options) if template_path
         self.logger = options[:logger]
       end
 
-      def manifest_file
-        @manifest_file ||= File.join(template_path, "manifest.rb")
-      end
-
       [:css_dir, :sass_dir, :images_dir, :javascripts_dir, :http_stylesheets_path].each do |dir|
         define_method dir do
           Compass.configuration.send(dir)
@@ -31,23 +25,6 @@ module Compass
         end
       end
 
-      # Initializes the project to work with compass
-      def init
-        dirs = manifest.map do |entry|
-          loc = send("install_location_for_#{entry.type}", entry.to, entry.options)
-          File.dirname(loc)
-        end
-
-        if manifest.has_stylesheet?
-          dirs << sass_dir
-          dirs << css_dir
-        end
-
-        dirs.uniq.sort.each do |dir|
-          directory targetize(dir)
-        end
-      end
-
       # Runs the installer.
       # Every installer must conform to the installation strategy of prepare, install, and then finalize.
       # A default implementation is provided for each step.
@@ -62,25 +39,14 @@ module Compass
       def prepare
       end
 
-      def configure_option_with_default(opt)
-        value = options[opt]
-        value ||= begin
-          default_method = "default_#{opt}".to_sym
-          send(default_method) if respond_to?(default_method)
-        end
-        send("#{opt}=", value)
-      end
-
-      # The default install method. Calls install_<type> methods in the order specified by the manifest.
+      # The install method override this to install
       def install
-        manifest.each do |entry|
-          send("install_#{entry.type}", entry.from, entry.to, entry.options)
-        end
+        raise "Not Yet Implemented"
       end
 
       # The default finalize method -- it is a no-op.
       # This could print out a message or something.
-      def finalize
+      def finalize(options = {})
       end
 
       def compilation_required?
@@ -165,22 +131,12 @@ module Compass
         strip_trailing_separator File.join(template_path, separate(path))
       end
 
+      # Emits an HTML fragment that can be used to link to the compiled css files
       def stylesheet_links
-        html = "<head>\n"
-        manifest.each_stylesheet do |stylesheet|
-          # Skip partials.
-          next if File.basename(stylesheet.from)[0..0] == "_"
-          media = if stylesheet.options[:media]
-            %Q{ media="#{stylesheet.options[:media]}"}
-          end
-          ss_line = %Q{  <link href="#{http_stylesheets_path}/#{stylesheet.to.sub(/\.sass$/,'.css')}"#{media} rel="stylesheet" type="text/css" />}
-          if stylesheet.options[:condition]
-            ss_line = "  <!--[if #{stylesheet.options[:condition]}]>\n    #{ss_line}\n  <![endif]-->"
-          end
-          html << ss_line + "\n"
-        end
-        html << "</head>"
+        ""
       end
     end
   end
 end
+require 'compass/installers/bare_installer'
+require 'compass/installers/manifest_installer'

data/lib/compass/installers/manifest_installer.rb

@@ -0,0 +1,59 @@
+module Compass
+  module Installers
+
+    class ManifestInstaller < Base
+
+      attr_accessor :manifest
+
+      def initialize(template_path, target_path, options = {})
+        super
+        @manifest = Manifest.new(manifest_file, options) if template_path
+      end
+
+      def manifest_file
+        @manifest_file ||= File.join(template_path, "manifest.rb")
+      end
+
+      # Initializes the project to work with compass
+      def init
+        dirs = manifest.map do |entry|
+          loc = send("install_location_for_#{entry.type}", entry.to, entry.options)
+          File.dirname(loc)
+        end
+
+        if manifest.has_stylesheet?
+          dirs << sass_dir
+          dirs << css_dir
+        end
+
+        dirs.uniq.sort.each do |dir|
+          directory targetize(dir)
+        end
+      end
+
+      # The default install method. Calls install_<type> methods in the order specified by the manifest.
+      def install
+        manifest.each do |entry|
+          send("install_#{entry.type}", entry.from, entry.to, entry.options)
+        end
+      end
+
+      def stylesheet_links
+        html = "<head>\n"
+        manifest.each_stylesheet do |stylesheet|
+          # Skip partials.
+          next if File.basename(stylesheet.from)[0..0] == "_"
+          media = if stylesheet.options[:media]
+            %Q{ media="#{stylesheet.options[:media]}"}
+          end
+          ss_line = %Q{  <link href="#{http_stylesheets_path}/#{stylesheet.to.sub(/\.sass$/,'.css')}"#{media} rel="stylesheet" type="text/css" />}
+          if stylesheet.options[:condition]
+            ss_line = "  <!--[if #{stylesheet.options[:condition]}]>\n    #{ss_line}\n  <![endif]-->"
+          end
+          html << ss_line + "\n"
+        end
+        html << "</head>"
+      end
+    end
+  end
+end

data/lib/compass/sass_extensions/monkey_patches.rb

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

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

@@ -0,0 +1,23 @@
+module Sass
+  module Tree
+    class Node
+      unless method_defined?(:visit_depth_first)
+        def visit_depth_first(visitor)
+          visitor.visit(self)
+          visitor.down(self) if children.any? and visitor.respond_to?(:down)
+          if is_a?(ImportNode) && visitor.import?(self)
+            root = Sass::Files.tree_for(import, @options)
+            imported_children = root.children
+          end
+
+          (imported_children || children).each do |child|
+            break if visitor.respond_to?(:stop?) && visitor.stop?
+            child.visit_depth_first(visitor)
+          end
+          visitor.up(self) if children.any?
+        end
+      end
+    end
+  end
+end
+

data/lib/compass/stats.rb

@@ -0,0 +1,92 @@
+module Compass
+  module Stats
+    class StatsVisitor
+      attr_accessor :rule_count, :prop_count, :mixin_def_count, :mixin_count
+      def initialize
+        self.rule_count = 0
+        self.prop_count = 0
+        self.mixin_def_count = 0
+        self.mixin_count = 0
+      end
+      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.rules.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)
+      end
+      def up(node)
+      end
+      def down(node)
+      end
+      def import?(node)
+        return false
+        full_filename = node.send(:import)
+        full_filename != Compass.deprojectize(full_filename)
+      end
+    end
+    class CssFile
+      attr_accessor :path, :css
+      attr_accessor :selector_count, :prop_count
+      def initialize(path)
+        require 'css_parser'
+        self.path = path
+        self.css = CssParser::Parser.new
+        self.css.add_block!(contents)
+        self.selector_count = 0
+        self.prop_count = 0
+      end
+      def contents
+        @contents ||= File.read(path)
+      end
+      def lines
+        contents.inject(0){|m,c| m + 1 }
+      end
+      def analyze!
+        css.each_selector do |selector, declarations, specificity|
+          sels = selector.split(/,/).size
+          props = declarations.split(/;/).size
+          self.selector_count += sels
+          self.prop_count += props
+        end
+      end
+    end
+    class SassFile
+      attr_accessor :path
+      attr_reader :visitor
+      def initialize(path)
+        self.path = path
+      end
+      def contents
+        @contents ||= File.read(path)
+      end
+      def tree
+        @tree = Sass::Engine.new(contents, Compass.configuration.to_sass_engine_options).to_tree
+      end
+      def visit_tree!
+        @visitor = StatsVisitor.new
+        tree.visit_depth_first(@visitor)
+        @visitor
+      end
+      def analyze!
+        visit_tree!
+      end
+      def lines
+        contents.inject(0){|m,c| m + 1 }
+      end
+      def rule_count
+        visitor.rule_count
+      end
+      def prop_count
+        visitor.prop_count
+      end
+      def mixin_def_count
+        visitor.mixin_def_count
+      end
+      def mixin_count
+        visitor.mixin_count
+      end
+    end
+  end
+end

data/lib/compass/validator.rb

@@ -2,9 +2,8 @@ begin
   require 'rubygems'
   require 'compass-validator'
 rescue LoadError
-  puts %Q{The Compass CSS Validator could not be loaded. Please install it:
+  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/
 }
-  exit(1)
-end
+end

data/test/command_line_helper.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 module Compass::CommandLineHelper
   def compass(*arguments)
     options = arguments.last.is_a?(Hash) ? arguments.pop : {}
@@ -35,8 +37,10 @@ module Compass::CommandLineHelper
         end
       end
     else
-      @last_result = capture_output do
-        execute *arguments
+      @last_error = capture_warning do
+        @last_result = capture_output do
+          @last_exit_code = execute *arguments
+        end
       end
     end
   rescue Timeout::Error