compass 0.8.17 → 0.10.0.pre1

data/lib/compass/installers.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), 'installers', 'manifest')
-require File.join(File.dirname(__FILE__), 'installers', 'base')
-require File.join(File.dirname(__FILE__), 'installers', 'stand_alone')
-require File.join(File.dirname(__FILE__), 'installers', 'rails')
-
+%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,58 @@
+module Compass
+  module Installers
+
+    class BareInstaller < Base
+      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,40 +7,21 @@ 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) 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].each do |dir|
+      [:css_dir, :sass_dir, :images_dir, :javascripts_dir, :http_stylesheets_path, :fonts_dir].each do |dir|
         define_method dir do
           Compass.configuration.send(dir)
         end
-      end
-
-      # Initializes the project to work with compass
-      def init
-        dirs = manifest.map do |entry|
-          File.dirname(send("install_location_for_#{entry.type}", entry.to, entry.options))
-        end
-
-        if manifest.has_stylesheet?
-          dirs << sass_dir
-          dirs << css_dir
-        end
-
-        dirs.uniq.sort.each do |dir|
-          directory targetize(dir)
+        define_method "#{dir}_without_default" do
+          Compass.configuration.send("#{dir}_without_default")
         end
       end
 
@@ -50,7 +31,7 @@ module Compass
       def run(options = {})
         prepare
         install
-        finalize unless options[:skip_finalization]
+        finalize(options) unless options[:skip_finalization]
       end
 
       # The default prepare method -- it is a no-op.
@@ -58,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?
@@ -121,10 +91,39 @@ module Compass
         "#{javascripts_dir}/#{to}"
       end
 
+      installer :font do |to|
+        "#{fonts_dir}/#{to}"
+      end
+
       installer :file do |to|
         "#{pattern_name_as_dir}#{to}"
       end
 
+      installer :html do |to|
+        "#{pattern_name_as_dir}#{to}"
+      end
+
+      alias install_html_without_haml install_html
+      def install_html(from, to, options)
+        if to =~ /\.haml$/
+          require 'haml'
+          to = to[0..-(".haml".length+1)]
+          if respond_to?(:install_location_for_html)
+            to = install_location_for_html(to, options)
+          end
+          contents = File.read(templatize(from))
+          if options.delete(:erb)
+            ctx = TemplateContext.ctx(:to => to, :options => options)
+            contents = process_erb(contents, ctx)
+          end
+          Compass.configure_sass_plugin!
+          html = Haml::Engine.new(contents, :filename => templatize(from)).render
+          write_file(targetize(to), html, options)
+        else
+          install_html_without_haml(from, to, options)
+        end
+      end
+
       # returns an absolute path given a path relative to the current installation target.
       # Paths can use unix style "/" and will be corrected for the current platform.
       def targetize(path)
@@ -137,22 +136,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="/stylesheets/#{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.rb

@@ -11,8 +11,12 @@ module Compass
         end
       end
 
-      def initialize(manifest_file = nil)
+      attr_reader :options
+      def initialize(manifest_file = nil, options = {})
         @entries = []
+        @options = options
+        @generate_config = true
+        @compile_after_generation = true
         parse(manifest_file) if manifest_file
       end
 
@@ -33,15 +37,64 @@ module Compass
       type :stylesheet
       type :image
       type :javascript
+      type :font
       type :file
+      type :html
+
+      def help(value = nil)
+        if value
+          @help = value
+        else
+          @help
+        end
+      end
+
+      attr_reader :welcome_message_options
+
+      def welcome_message(value = nil, options = {})
+        if value
+          @welcome_message = value
+          @welcome_message_options = options
+        else
+          @welcome_message
+        end
+      end
+
+      def welcome_message_options
+        @welcome_message_options || {}
+      end
+
+      def description(value = nil)
+        if value
+          @description = value
+        else
+          @description
+        end
+      end
 
       # Enumerates over the manifest files
       def each
         @entries.each {|e| yield e}
       end
 
+      def generate_config?
+        @generate_config
+      end
+
+      def compile?
+        @compile_after_generation
+      end
 
       protected
+
+      def no_configuration_file!
+        @generate_config = false
+      end
+
+      def skip_compilation!
+        @compile_after_generation = false
+      end
+
       # parses a manifest file which is a ruby script
       # evaluated in a Manifest instance context
       def parse(manifest_file)
@@ -55,4 +108,4 @@ module Compass
     end
 
   end
-end
+end

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/installers/template_context.rb

@@ -0,0 +1,44 @@
+module Compass
+  module Installers
+    class TemplateContext
+
+      def self.ctx(*arguments)
+        new(*arguments).send(:get_binding)
+      end
+
+      def initialize(template, locals = {})
+        @template = template
+        @locals = locals
+      end
+
+      def http_stylesheets_path
+        config.http_stylesheets_path ||
+        config.default_for(:http_stylesheets_path) ||
+        config.http_root_relative(config.css_dir)
+      end
+
+      Compass::Configuration::ATTRIBUTES.each do |attribute|
+        unless instance_methods.include?(attribute.to_s)
+          define_method attribute do
+            config.send(attribute) || config.default_for(attribute)
+          end
+        end
+      end
+
+      def config
+        Compass.configuration
+      end
+
+      alias configuration config
+
+      protected
+
+      def get_binding
+        @locals.each do |k, v|
+          eval("#{k} = v")
+        end
+        binding
+      end
+    end
+  end
+end

data/lib/compass/logger.rb

@@ -1,7 +1,20 @@
 module Compass
   class Logger
 
-    DEFAULT_ACTIONS = [:directory, :exists, :remove, :create, :overwrite, :compile]
+    DEFAULT_ACTIONS = [:directory, :exists, :remove, :create, :overwrite, :compile, :error, :identical]
+
+    ACTION_COLORS = {
+      :error => :red,
+      :compile => :green,
+      :overwrite => :yellow,
+      :create => :green,
+      :remove => :yellow,
+      :exists => :green,
+      :directory => :green,
+      :identical => :green
+    }
+
+    COLORS = { :clear => 0, :red => 31, :green => 32, :yellow => 33 }
 
     attr_accessor :actions, :options
 
@@ -13,9 +26,22 @@ module Compass
 
     # Record an action that has occurred
     def record(action, *arguments)
+      emit color(ACTION_COLORS[action]) if Compass.configuration.color_output
       log "#{action_padding(action)}#{action} #{arguments.join(' ')}"
+      emit color(:clear) if Compass.configuration.color_output
     end
 
+    def color(c)
+      if c && COLORS.has_key?(c.to_sym)
+        "\e[#{COLORS[c.to_sym]}m"
+      else
+        ""
+      end
+    end
+
+    def emit(msg)
+      print msg
+    end
     # Emit a log message
     def log(msg)
       puts msg
@@ -39,4 +65,4 @@ module Compass
     def log(msg)
     end
   end
-end
+end