compass-edge 0.9.1 → 0.9.2

data/lib/compass/app_integration/rails/installer.rb

@@ -2,11 +2,13 @@ module Compass
   module Installers
     class Base
     end
+    class ManifestInstaller < Base
+    end
   end
 
   module AppIntegration
     module Rails    
-      class Installer < Compass::Installers::Base
+      class Installer < Compass::Installers::ManifestInstaller
 
         def default_configuration
           Compass::Configuration::Data.new.extend(ConfigurationDefaults)

data/lib/compass/app_integration/stand_alone/installer.rb

@@ -2,11 +2,13 @@ module Compass
   module Installers
     class Base
     end
+    class ManifestInstaller < Base
+    end
   end
 
   module AppIntegration
     module StandAlone
-      class Installer < Compass::Installers::Base
+      class Installer < Compass::Installers::ManifestInstaller
 
         def init
           directory targetize("")
@@ -45,16 +47,29 @@ module Compass
           if options[:create]
             puts <<-NEXTSTEPS
 
-  Congratulations! Your compass project has been created.
-  You must recompile your sass stylesheets when they change.
-  This can be done in one of the following ways:
-    1. From within your project directory run:
-       compass
-    2. From any directory run:
-       compass -u path/to/project
-    3. To monitor your project for changes and automatically recompile:
-       compass --watch [path/to/project]
-  NEXTSTEPS
+*********************************************************************
+Congratulations! Your compass project has been created.
+
+You may now add and edit sass stylesheets in 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
           if manifest.has_stylesheet?
             puts "\nTo import your new stylesheets add the following lines of HTML (or equivalent) to your webpage:"

data/lib/compass/commands.rb

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

data/lib/compass/commands/create_project.rb

@@ -15,6 +15,10 @@ module Compass
 
             Options:
           }.split("\n").map{|l| l.gsub(/^ */,'')}.join("\n")
+
+          opts.on_tail("--bare", "Don't generate any Sass or CSS files.") do
+            self.options[:bare] = true
+          end
         else
           opts.banner = %Q{
             Usage: compass init project_type path/to/project [options]
@@ -68,6 +72,9 @@ module Compass
           parser = option_parser(arguments)
           parse_options!(parser, arguments)
           parse_arguments!(parser, arguments)
+          if parser.options[:framework] && parser.options[:bare]
+            raise Compass::Error, "A bare project cannot be created when a framework is specified."
+          end
           set_default_arguments(parser)
           parser.options
         end
@@ -92,7 +99,7 @@ module Compass
           if arguments.size == 1
             parser.options[:project_name] = arguments.shift
           elsif arguments.size == 0
-            raise Compass::Error, "Please specify a path to the project."
+            # default to the current directory.
           else
             raise Compass::Error, "Too many arguments were specified."
           end

data/lib/compass/commands/installer_command.rb

@@ -16,8 +16,12 @@ module Compass
       end
 
       def installer
-        project_type = options[:project_type] || Compass.configuration.project_type
-        installer_class = "Compass::AppIntegration::#{camelize(project_type)}::Installer"
+        installer_class = if options[:bare]
+          "Compass::Installers::BareInstaller"
+        else
+          project_type = options[:project_type] || Compass.configuration.project_type
+          "Compass::AppIntegration::#{camelize(project_type)}::Installer"
+        end
         @installer = eval("#{installer_class}.new *installer_args")
       end
 

data/lib/compass/commands/project_stats.rb

@@ -0,0 +1,160 @@
+require 'compass/commands/project_base'
+require 'compass/commands/update_project'
+
+module Compass
+  module Commands
+    module StatsOptionsParser
+      def set_options(opts)
+        opts.banner = %Q{
+          Usage: compass stats [path/to/project] [options]
+
+          Description:
+            Compile project at the path specified (or the current
+            directory if not specified) and then compute statistics
+            for the sass and css files in the project.
+
+          Options:
+        }.strip.split("\n").map{|l| l.gsub(/^ {0,10}/,'')}.join("\n")
+
+        super
+      end
+    end
+    class ProjectStats < UpdateProject
+
+      register :stats
+
+      def initialize(working_path, options)
+        super
+        assert_project_directory_exists!
+      end
+
+      def perform
+        super
+        require 'compass/stats'
+        compiler = new_compiler_instance
+        sass_files = sorted_sass_files(compiler)
+        rows       = [[           :-,           :-,           :-,            :-,            :-,            :-,               :- ],
+                      [   'Filename',      'Rules', 'Properties', 'Mixins Defs', 'Mixins Used',   'CSS Rules', 'CSS Properties' ],
+                      [           :-,           :-,           :-,            :-,            :-,            :-,               :- ]]
+        maximums   =  [            8,            5,           10,            14,            11,             9,               14 ]
+        alignments =  [        :left,       :right,       :right,        :right,        :right,        :right,           :right ]
+        delimiters =  [ ['| ', ' |'],  [' ', ' |'],  [' ', ' |'],   [' ', ' |'],   [' ', ' |'],   [' ', ' |'],      [' ', ' |'] ]
+        totals     =  [ "Total (#{sass_files.size} files):", 0, 0,            0,             0,             0,                0 ]
+
+        sass_files.each do |sass_file|
+          css_file = compiler.corresponding_css_file(sass_file) unless sass_file[0..0] == '_'
+          row = filename_columns(sass_file)
+          row += sass_columns(sass_file)
+          row += css_columns(css_file)
+          row.each_with_index do |c, i|
+            maximums[i] = [maximums[i].to_i, c.size].max
+            totals[i] = totals[i] + c.to_i if i > 0
+          end
+          rows << row
+        end
+        rows << [:-] * 7
+        rows << totals.map{|t| t.to_s}
+        rows << [:-] * 7
+        rows.each do |row|
+          row.each_with_index do |col, i|
+            print pad(col, maximums[i], :align => alignments[i], :left => delimiters[i].first, :right => delimiters[i].last)
+          end
+          print "\n"
+        end
+        if @missing_css_parser
+          puts "\nInstall css_parser to enable stats on your css files:\n\n\tgem install css_parser"
+        end
+      end
+
+      def pad(c, max, options = {})
+        options[:align] ||= :left
+        if c == :-
+          filler = '-'
+          c = ''
+        else
+          filler = ' '
+        end
+        spaces = max - c.size
+        filled = filler * [spaces,0].max
+        "#{options[:left]}#{filled if options[:align] == :right}#{c}#{filled if options[:align] == :left}#{options[:right]}"
+      end
+
+      def sorted_sass_files(compiler)
+        sass_files = compiler.sass_files(:exclude_partials => false)
+        sass_files.map! do |s| 
+          filename = Compass.deprojectize(s, File.join(Compass.configuration.project_path, Compass.configuration.sass_dir))
+          [s, File.dirname(filename), File.basename(filename)]
+        end
+        sass_files = sass_files.sort_by do |s,d,f|
+          File.join(d, f[0] == ?_ ? f[1..-1] : f)
+        end
+        sass_files.map!{|s,d,f| s}
+      end
+
+      def filename_columns(sass_file)
+        filename = Compass.deprojectize(sass_file, working_path)
+        [filename]
+      end
+
+      def sass_columns(sass_file)
+        sf = Compass::Stats::SassFile.new(sass_file)
+        sf.analyze!
+        %w(rule_count prop_count mixin_def_count mixin_count).map do |t|
+          sf.send(t).to_s
+        end
+      end
+
+      def css_columns(css_file)
+        if File.exists?(css_file)
+          cf = Compass::Stats::CssFile.new(css_file)
+          cf.analyze!
+          %w(selector_count prop_count).map do |t|
+            cf.send(t).to_s
+          end
+        else
+          return [ '--', '--' ]
+        end
+      rescue LoadError
+        @missing_css_parser = true
+        return [ 'DISABLED', 'DISABLED' ]
+      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(StatsOptionsParser)
+        end
+
+        def usage
+          option_parser([]).to_s
+        end
+
+        def description(command)
+          "Report statistics about your stylesheets"
+        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

data/lib/compass/commands/update_project.rb

@@ -3,8 +3,25 @@ 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! unless dry_run?
@@ -33,6 +50,37 @@ 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 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

data/lib/compass/commands/validate_project.rb

@@ -3,8 +3,26 @@ 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!
@@ -16,6 +34,42 @@ module Compass
         Validator.new(project_css_subdirectory).validate()
       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

@@ -7,6 +7,8 @@ module Compass
   module Commands
     class WatchProject < UpdateProject
 
+      register :watch
+
       attr_accessor :last_update_time, :last_sass_files
 
       def perform
@@ -66,4 +68,4 @@ module Compass
 
     end
   end
-end
+end

data/lib/compass/commands/write_configuration.rb

@@ -2,8 +2,29 @@ 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")
+
+        super
+      end
+    end
     class WriteConfiguration < ProjectBase
-      
+
+      register :config
+
       include InstallerCommand
 
       def initialize(working_path, options)
@@ -16,6 +37,7 @@ module Compass
       end
 
       def perform
+        directory projectize(File.dirname(options[:configuration_file]))
         installer.write_configuration_files(options[:configuration_file])
       end
 
@@ -27,6 +49,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