compass-edge 0.9.5.0 → 0.10.0.pre

data/lib/compass/commands/validate_project.rb

@@ -3,26 +3,8 @@ require 'compass/commands/update_project'
 
 module Compass
   module Commands
-    module ValidationOptionsParser
-      def set_options(opts)
-        opts.banner = %Q{
-          Usage: compass validate [path/to/project] [options]
-
-          Description:
-            Compile project at the path specified or the current
-            directory if not specified and then validate the 
-            generated CSS.
-
-          Options:
-        }.strip.split("\n").map{|l| l.gsub(/^ {0,10}/,'')}.join("\n")
-
-        super
-      end
-    end
     class ValidateProject < ProjectBase
-
-      register :validate
-
+      
       def initialize(working_path, options)
         super
         assert_project_directory_exists!
@@ -31,47 +13,9 @@ module Compass
       def perform
         require 'compass/validator'
         UpdateProject.new(working_path, options).perform
-        Dir.chdir Compass.configuration.project_path do
-          Validator.new(project_css_subdirectory).validate()
-        end
-      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(ValidationOptionsParser)
-        end
-
-        def usage
-          option_parser([]).to_s
-        end
-
-        def description(command)
-          "Validate your generated css."
-        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[:project_name] = arguments.shift
-          elsif arguments.size == 0
-            # default to the current directory.
-          else
-            raise Compass::Error, "Too many arguments were specified."
-          end
-        end
-
+        Validator.new(project_css_subdirectory).validate()
       end
 
     end
   end
-end
+end

data/lib/compass/commands/watch_project.rb

@@ -7,8 +7,6 @@ module Compass
   module Commands
     class WatchProject < UpdateProject
 
-      register :watch
-
       attr_accessor :last_update_time, :last_sass_files
 
       def perform
@@ -61,11 +59,11 @@ module Compass
             puts ">>> Change detected to: #{file}"
             compiler.run
           rescue StandardError => e
-            ::Compass::Exec::Helpers.report_error(e, options)
+            ::Compass::Exec.report_error(e, options)
           end
         end
       end
 
     end
   end
-end
+end

data/lib/compass/commands/write_configuration.rb

@@ -2,32 +2,8 @@ require 'compass/commands/project_base'
 
 module Compass
   module Commands
-    module ConfigurationOptionsParser
-      def set_options(opts)
-        opts.banner = %Q{
-          Usage: compass config [path/to/config_file.rb] [options]
-
-          Description:
-            Generate a configuration file for the options specified.
-            Compass will recognize configuration files in the
-            following locations relative to the project root:
-              * #{Compass::Configuration::Helpers::KNOWN_CONFIG_LOCATIONS.join("
-              * ")}
-            Any other location, and you'll need to specify it when working with the command line tool using the -c option.
-
-          Options:
-        }.strip.split("\n").map{|l| l.gsub(/^ {0,10}/,'')}.join("\n")
-        opts.on("--debug [PROPERTY]", "Debug your configuration by printing out details.") do |prop|
-          self.options[:debug] = prop.nil? ? true : prop.to_sym
-        end
-
-        super
-      end
-    end
     class WriteConfiguration < ProjectBase
-
-      register :config
-
+      
       include InstallerCommand
 
       def initialize(working_path, options)
@@ -40,28 +16,7 @@ module Compass
       end
 
       def perform
-        if options[:debug]
-          puts "Configuration sources:"
-          c = Compass.configuration
-          while c
-            print c.name
-            c = c.inherited_data
-            print ", " if c
-          end
-          print "\n"
-          Compass.configuration.debug.each do |prop, values|
-            if options[:debug].is_a?(Symbol)
-              next unless prop == options[:debug]
-            end
-            puts "***** #{prop} = #{values.first[:resolved].inspect} *****"
-            [:default, :value, :raw, :resolved].each do |kind|
-              puts "#{kind}: " + values.inject([]){|m, v| m << v[kind]}.map{|v| v.nil? ? '-' : v.inspect}.join(", ")
-            end
-          end
-        else
-          directory File.dirname(options[:configuration_file])
-          installer.write_configuration_files(options[:configuration_file])
-        end
+        installer.write_configuration_files(options[:configuration_file])
       end
 
       def installer_args
@@ -72,42 +27,6 @@ module Compass
         false
       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(ConfigurationOptionsParser)
-        end
-
-        def usage
-          option_parser([]).to_s
-        end
-
-        def description(command)
-          "Generate a configuration file for the provided command line options."
-        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[:configuration_file] = arguments.shift
-          elsif arguments.size == 0
-            # default to the current directory.
-          else
-            raise Compass::Error, "Too many arguments were specified."
-          end
-        end
-
-      end
-
     end
   end
-end
+end

data/lib/compass/compiler.rb

@@ -13,9 +13,8 @@ module Compass
       self.options[:cache_location] ||= File.join(from, ".sass-cache")
     end
 
-    def sass_files(options = {})
-      exclude_partials = options.fetch(:exclude_partials, true)
-      @sass_files || Dir.glob(separate("#{from}/**/#{'[^_]' if exclude_partials}*.sass"))
+    def sass_files
+      @sass_files || Dir.glob(separate("#{from}/**/[^_]*.sass"))
     end
 
     def stylesheet_name(sass_file)
@@ -48,16 +47,8 @@ module Compass
         directory dir
       end
       sass_files.zip(css_files).each do |sass_filename, css_filename|
-        begin
-          compile sass_filename, css_filename, options
-        rescue Sass::SyntaxError => e
-          full_exception = Compass.configuration.environment == :development
-          logger.record :error, basename(sass_filename), "(Line #{e.sass_line}: #{e.message})"
-          write_file(css_filename,
-            Sass::SyntaxError.exception_to_css(e, :full_exception => full_exception),
-            options.merge(:force => true))
-        end
+        compile sass_filename, css_filename, options
       end
     end
   end
-end
+end

data/lib/compass/configuration.rb

@@ -1,39 +1,34 @@
 module Compass
   module Configuration
 
-    def self.attributes_for_directory(dir_name, http_dir_name = dir_name)
-      [
-        "#{dir_name}_dir",
-        "#{dir_name}_path",
-        ("http_#{http_dir_name}_dir" if http_dir_name),
-        ("http_#{http_dir_name}_path" if http_dir_name)
-      ].compact.map{|a| a.to_sym}
-    end
-
     ATTRIBUTES = [
-      # What kind of project?
       :project_type,
-      # Where is the project?
       :project_path,
+      :css_dir,
+      :sass_dir,
+      :images_dir,
+      :javascripts_dir,
+      :extensions_dir,
+      :css_path,
+      :sass_path,
+      :images_path,
+      :javascripts_path,
+      :extensions_path,
       :http_path,
-      # Where are the various bits of the project
-      attributes_for_directory(:css, :stylesheets),
-      attributes_for_directory(:sass, nil),
-      attributes_for_directory(:images),
-      attributes_for_directory(:javascripts),
-      attributes_for_directory(:fonts),
-      attributes_for_directory(:extensions, nil),
-      # Compilation options
+      :http_images_dir,
+      :http_stylesheets_dir,
+      :http_javascripts_dir,
+      :http_images_path,
+      :http_stylesheets_path,
+      :http_javascripts_path,
       :output_style,
       :environment,
       :relative_assets,
       :additional_import_paths,
       :sass_options,
       :asset_host,
-      :asset_cache_buster,
-      :line_comments,
-      :color_output
-    ].flatten
+      :asset_cache_buster
+    ]
 
   end
 end

data/lib/compass/configuration/adapters.rb

@@ -49,7 +49,7 @@ module Compass
         load_paths = []
         load_paths << sass_path if sass_path
         Compass::Frameworks::ALL.each do |framework|
-          load_paths << framework.stylesheets_directory if File.exists?(framework.stylesheets_directory)
+          load_paths << framework.stylesheets_directory
         end
         load_paths += resolve_additional_import_paths
         load_paths

data/lib/compass/configuration/data.rb

@@ -18,7 +18,6 @@ module Compass
     class Data
 
       attr_accessor :required_libraries
-      attr_reader :name
 
       include Compass::Configuration::Inheritance
       include Compass::Configuration::Serialization
@@ -26,9 +25,7 @@ module Compass
 
       inherited_accessor *ATTRIBUTES
 
-      def initialize(name, attr_hash = nil)
-        raise "I need a name!" unless name
-        @name = name
+      def initialize(attr_hash = nil)
         self.required_libraries = []
         set_all(attr_hash) if attr_hash
         self.top_level = self
@@ -103,4 +100,4 @@ module Compass
 
     end
   end
-end
+end

data/lib/compass/configuration/defaults.rb

@@ -14,14 +14,6 @@ module Compass
         "extensions"
       end
 
-      def default_fonts_dir
-        File.join(top_level.css_dir, "fonts")
-      end
-
-      def default_environment
-        :development
-      end
-
       def default_output_style
         if top_level.environment == :development
           :expanded
@@ -34,10 +26,6 @@ module Compass
         top_level.environment == :development
       end
 
-      def default_color_output
-        true
-      end
-
       def default_sass_path
         if (pp = top_level.project_path) && (dir = top_level.sass_dir)
           File.join(pp, dir)
@@ -68,12 +56,6 @@ module Compass
         end
       end
 
-      def default_fonts_path
-        if (pp = top_level.project_path) && (dir = top_level.fonts_dir)
-          File.join(pp, dir)
-        end
-      end
-
 
       def default_http_images_dir
         top_level.images_dir
@@ -91,18 +73,6 @@ module Compass
         http_root_relative top_level.http_stylesheets_dir
       end
 
-      def default_http_fonts_dir
-        if fd = top_level.fonts_dir_without_default
-          fd
-        else
-          "#{top_level.http_stylesheets_dir}/fonts"
-        end
-      end
-
-      def default_http_fonts_path
-        http_root_relative top_level.http_fonts_dir
-      end
-
       def default_http_javascripts_dir
         top_level.javascripts_dir
       end
@@ -115,7 +85,6 @@ module Compass
 
       def http_join(*segments)
         segments.map do |segment|
-          next unless segment
           segment = http_pathify(segment)
           segment[-1..-1] == "/" ? segment[0..-2] : segment
         end.join("/")
@@ -135,4 +104,4 @@ module Compass
 
     end
   end
-end
+end

data/lib/compass/configuration/helpers.rb

@@ -11,36 +11,25 @@ module Compass
       end
 
       def default_configuration
-        Data.new('defaults').extend(Defaults).extend(Comments)
+        Data.new.extend(Defaults).extend(Comments)
       end
 
       def add_configuration(config, filename = nil)
         return if config.nil?
-
-
-        data = configuration_for(config, filename)
-
-        # puts "New configuration: #{data.name}"
-        # puts caller.join("\n")
-        data.inherit_from!(configuration)
-        data.on_top!
-        @configuration = data
-      end
-
-      def configuration_for(config, filename = nil)
-        if config.is_a?(Compass::Configuration::Data)
+        data = if config.is_a?(Compass::Configuration::Data)
           config
         elsif config.respond_to?(:read)
           Compass::Configuration::Data.new_from_string(config.read, filename)
         elsif config.is_a?(Hash)
-          Compass::Configuration::Data.new(filename, config)
+          Compass::Configuration::Data.new(config)
         elsif config.is_a?(String)
           Compass::Configuration::Data.new_from_file(config)
-        elsif config.is_a?(Symbol)
-          Compass::AppIntegration.lookup(config).configuration
         else
           raise "I don't know what to do with: #{config.inspect}"
         end
+        data.inherit_from!(configuration)
+        data.on_top!
+        @configuration = data
       end
 
       # Support for testing.
@@ -66,26 +55,9 @@ module Compass
       end
 
       # Read the configuration file for this project
-      def add_project_configuration(*args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        configuration_file_path = args.shift || detect_configuration_file
-        raise ArgumentError, "Too many arguments" if args.any?
-        if configuration_file_path
-
-          data = configuration_for(configuration_file_path)
-
-          if data.raw_project_type
-            add_configuration(data.raw_project_type.to_sym)
-          elsif options[:project_type]
-            add_configuration(options[:project_type])
-          else
-            add_configuration(:stand_alone)
-          end
-
-          add_configuration(data)
-        else
-          add_configuration(options[:project_type] || configuration.project_type || :stand_alone)
-        end
+      def add_project_configuration(configuration_file_path = nil)
+        configuration_file_path ||= detect_configuration_file
+        Compass.add_configuration(configuration_file_path) if configuration_file_path
       end
 
       # Returns a full path to the relative path to the project directory
@@ -94,17 +66,8 @@ 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 = ['config/compass.rb', ".compass/config.rb", "config/compass.config", "config.rb", "src/config.rb"]
+      KNOWN_CONFIG_LOCATIONS = [".compass/config.rb", "config/compass.config", "config.rb", "src/config.rb"]
 
       # Finds the configuration file, if it exists in a known location.
       def detect_configuration_file(project_path = nil)