compass 0.8.17 → 0.10.0.pre1

data/lib/compass/commands/registry.rb

@@ -0,0 +1,22 @@
+module Compass::Commands
+  module Registry
+    def register(name, command_class)
+      @commands ||= Hash.new
+      @commands[name.to_sym] = command_class
+    end
+    def get(name)
+      @commands ||= Hash.new
+      @commands[name.to_sym]
+    end
+    def command_exists?(name)
+      @commands ||= Hash.new
+      name && @commands.has_key?(name.to_sym)
+    end
+    def all
+      @commands.keys
+    end
+    alias_method :[], :get
+    alias_method :[]=, :register
+  end
+  extend Registry
+end

data/lib/compass/commands/stamp_pattern.rb

@@ -1,11 +1,64 @@
 require 'fileutils'
-require File.join(File.dirname(__FILE__), 'base')
-require File.join(File.dirname(__FILE__), 'update_project')
+require 'compass/commands/base'
+require 'compass/commands/update_project'
 
 module Compass
   module Commands
+    module StampPatternOptionsParser
+      def set_options(opts)
+        opts.banner = %Q{Usage: compass install extension/pattern [path/to/project] [options]
+
+Description:
+  Install an extension's pattern into your compass project
+
+Example:
+  compass install blueprint/buttons
+
+Options:
+}
+        super
+      end
+    end
+
     class StampPattern < ProjectBase
 
+      register :install
+
+      class << self
+        def option_parser(arguments)
+          parser = Compass::Exec::CommandOptionParser.new(arguments)
+          parser.extend(Compass::Exec::GlobalOptionsParser)
+          parser.extend(Compass::Exec::ProjectOptionsParser)
+          parser.extend(StampPatternOptionsParser)
+        end
+        def usage
+          option_parser([]).to_s
+        end
+        def description(command)
+          "Install an extension's pattern into your compass project"
+        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 == 0
+            raise OptionParser::ParseError, "Please specify a pattern."
+          end
+          pattern = arguments.shift.split('/', 2)
+          parser.options[:framework] = pattern[0]
+          parser.options[:pattern] = pattern[1]
+          if arguments.size > 0
+            parser.options[:project_name] = arguments.shift
+          end
+          if arguments.size > 0
+            raise OptionParser::ParseError, "Unexpected trailing arguments: #{arguments.join(" ")}"
+          end
+        end
+
+      end
       include InstallerCommand
 
       def initialize(working_path, options)
@@ -30,4 +83,4 @@ module Compass
 
     end
   end
-end
+end

data/lib/compass/commands/update_project.rb

@@ -1,18 +1,35 @@
-require File.join(File.dirname(__FILE__), 'project_base')
-require File.join(Compass.lib_directory, 'compass', 'compiler')
+require 'compass/commands/project_base'
+require 'compass/compiler'
 
 module Compass
   module Commands
+    module CompileProjectOptionsParser
+      def set_options(opts)
+        opts.banner = %Q{
+          Usage: compass compile [path/to/project] [options]
+
+          Description:
+          compile project at the path specified or the current director if not specified.
+
+          Options:
+        }.split("\n").map{|l| l.gsub(/^ */,'')}.join("\n")
+
+        super
+      end
+    end
+
     class UpdateProject < ProjectBase
-      
+
+      register :compile
+
       def initialize(working_path, options)
         super
-        assert_project_directory_exists!
+        assert_project_directory_exists! unless dry_run?
       end
 
       def perform
         compiler = new_compiler_instance
-        if compiler.sass_files.empty?
+        if compiler.sass_files.empty? && !dry_run?
           message = "Nothing to compile. If you're trying to start a new project, you have left off the directory argument.\n"
           message << "Run \"compass -h\" to get help."
           raise Compass::Error, message
@@ -21,6 +38,10 @@ module Compass
         end
       end
 
+      def dry_run?
+        options[:dry_run]
+      end
+
       def new_compiler_instance(additional_options = {})
         Compass::Compiler.new(working_path,
           projectize(Compass.configuration.sass_dir),
@@ -29,6 +50,39 @@ module Compass
                                             :force => options[:force]).merge(additional_options))
       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(CompileProjectOptionsParser)
+        end
+
+        def usage
+          option_parser([]).to_s
+        end
+
+        def primary; true; end
+
+        def description(command)
+          "Compile Sass stylesheets to 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 > 1
+            raise Compass::Error, "Too many arguments were specified."
+          end
+        end
+      end
     end
   end
-end
+end

data/lib/compass/commands/validate_project.rb

@@ -1,21 +1,77 @@
-require File.join(File.dirname(__FILE__), 'project_base')
-require File.join(File.dirname(__FILE__), 'update_project')
+require 'compass/commands/project_base'
+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!
       end
 
       def perform
-        require File.join(File.dirname(__FILE__), '..', 'validator')
+        require 'compass/validator'
         UpdateProject.new(working_path, options).perform
-        Validator.new(project_css_subdirectory).validate()
+        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
+
       end
 
     end
   end
-end
+end

data/lib/compass/commands/watch_project.rb

@@ -1,12 +1,14 @@
 require 'fileutils'
 require 'pathname'
-require File.join(File.dirname(__FILE__), 'base')
-require File.join(File.dirname(__FILE__), 'update_project')
+require 'compass/commands/base'
+require 'compass/commands/update_project'
 
 module Compass
   module Commands
     class WatchProject < UpdateProject
 
+      register :watch
+
       attr_accessor :last_update_time, :last_sass_files
 
       def perform
@@ -19,7 +21,12 @@ module Compass
 
         puts ">>> Compass is watching for changes. Press Ctrl-C to Stop."
 
-        require File.join(Compass.lib_directory, 'vendor', 'fssm')
+        begin
+          require 'fssm'
+        rescue LoadError
+          $: << File.join(Compass.lib_directory, 'vendor')
+          retry
+        end
 
         FSSM.monitor do |monitor|
           Compass.configuration.sass_load_paths.each do |load_path|
@@ -54,11 +61,11 @@ module Compass
             puts ">>> Change detected to: #{file}"
             compiler.run
           rescue StandardError => e
-            ::Compass::Exec.report_error(e, options)
+            ::Compass::Exec::Helpers.report_error(e, options)
           end
         end
       end
 
     end
   end
-end
+end

data/lib/compass/commands/write_configuration.rb

@@ -1,9 +1,33 @@
-require File.join(File.dirname(__FILE__), 'project_base')
+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)
@@ -11,8 +35,33 @@ module Compass
         assert_project_directory_exists!
       end
 
+      def add_project_configuration
+        Compass.add_project_configuration
+      end
+
       def perform
-        installer.write_configuration_files(options[:configuration_file])
+        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
       end
 
       def installer_args
@@ -23,6 +72,42 @@ 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,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)
@@ -47,8 +48,16 @@ module Compass
         directory dir
       end
       sass_files.zip(css_files).each do |sass_filename, css_filename|
-        compile sass_filename, css_filename, options
+        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
       end
     end
   end
-end
+end