compass 0.11.2 → 0.11.3

data/lib/compass/commands.rb

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

data/lib/compass/commands/clean_project.rb

@@ -0,0 +1,79 @@
+require 'compass/commands/project_base'
+require 'compass/compiler'
+
+module Compass
+  module Commands
+    module CleanProjectOptionsParser
+      def set_options(opts)
+        opts.banner = %Q{
+          Usage: compass clean [path/to/project] [options]
+
+          Description:
+          Remove generated files and the sass cache.
+
+          Options:
+        }.split("\n").map{|l| l.gsub(/^ */,'')}.join("\n")
+
+        super
+      end
+    end
+
+    class CleanProject < UpdateProject
+
+      register :clean
+
+      def initialize(working_path, options)
+        super
+        assert_project_directory_exists!
+      end
+
+      def perform
+        compiler = new_compiler_instance
+        compiler.clean!
+        Compass::SpriteImporter.find_all_sprite_map_files(Compass.configuration.images_path).each do |sprite|
+          remove sprite
+        end
+      end
+
+      def determine_cache_location
+        Compass.configuration.cache_path || Sass::Plugin.options[:cache_location] || File.join(working_path, ".sass-cache")
+      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(CleanProjectOptionsParser)
+        end
+
+        def usage
+          option_parser([]).to_s
+        end
+
+        def primary; true; end
+
+        def description(command)
+          "Remove generated files and the sass cache"
+        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
+            parser.options[:project_name] = arguments.shift if File.directory?(arguments.first)
+            unless arguments.empty?
+              parser.options[:sass_files] = arguments.dup
+              parser.options[:force] = true
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/compass/commands/registry.rb

@@ -16,8 +16,10 @@ module Compass::Commands
         matching.first
       elsif name =~ /^-/
         nil
-      else
+      elsif matching.size > 1
         raise Compass::Error, "Ambiguous abbreviation '#{name}'. Did you mean one of: #{matching.join(", ")}"
+      else
+        raise Compass::Error, "Command not found: #{name}"
       end
     end
     def abbreviation?(name)

data/lib/compass/commands/sprite.rb

@@ -39,7 +39,7 @@ module Compass
 
       def perform
         relative_uri = options[:uri].gsub(/^#{Compass.configuration.images_dir}\//, '')
-        sprites = Compass::SpriteMap.new(relative_uri, Compass.sass_engine_options)
+        sprites = Compass::SpriteImporter.new(:uri => relative_uri, :options => Compass.sass_engine_options)
         options[:output_file] ||= File.join(Compass.configuration.sass_path, "sprites", "_#{sprites.name}.#{Compass.configuration.preferred_syntax}")
         options[:skip_overrides] ||= false
         contents = sprites.content_for_images(options[:skip_overrides])

data/lib/compass/commands/update_project.rb

@@ -33,6 +33,7 @@ module Compass
       def perform
         compiler = new_compiler_instance
         check_for_sass_files!(compiler)
+        compiler.clean! if compiler.new_config?
         compiler.run
       end
 
@@ -50,12 +51,10 @@ module Compass
 
       def new_compiler_instance(additional_options = {})
         @compiler_opts ||= begin
-          compiler_opts = Compass.sass_engine_options
-          compiler_opts.merge!(:force => options[:force],
-                               :sass_files => explicit_sass_files,
-                               :dry_run => options[:dry_run])
-          compiler_opts[:quiet] = options[:quiet] if options[:quiet]
-          compiler_opts[:time] = options[:time] if options[:time]
+          compiler_opts = {:sass => Compass.sass_engine_options}
+          compiler_opts.merge!(options)
+          compiler_opts[:sass_files] = explicit_sass_files
+          compiler_opts[:cache_location] = determine_cache_location
           compiler_opts
         end
 

data/lib/compass/commands/watch_project.rb

@@ -135,7 +135,7 @@ module Compass
 
       def recompile(base = nil, relative = nil)
         @memory_cache.reset! if @memory_cache
-        compiler = new_compiler_instance(:quiet => true)
+        compiler = new_compiler_instance(:quiet => true, :loud => [:identical, :overwrite, :create])
         if file = compiler.out_of_date?
           begin
             puts ">>> Change detected to: #{relative || compiler.relative_stylesheet_name(file)}"

data/lib/compass/compiler.rb

@@ -3,16 +3,19 @@ module Compass
 
     include Actions
 
-    attr_accessor :working_path, :from, :to, :options, :staleness_checker, :importer
+    attr_accessor :working_path, :from, :to, :options, :sass_options, :staleness_checker, :importer
 
     def initialize(working_path, from, to, options)
       self.working_path = working_path
       self.from, self.to = from.gsub('./', ''), to
       self.logger = options.delete(:logger)
+      sass_opts = options.delete(:sass) || {}
       self.options = options
-      self.options[:cache_location] ||= determine_cache_location
-      options[:importer] = self.importer = Sass::Importers::Filesystem.new(from)
-      self.staleness_checker = Sass::Plugin::StalenessChecker.new(options)
+      self.sass_options = options.dup
+      self.sass_options.update(sass_opts)
+      self.sass_options[:cache_location] ||= determine_cache_location
+      self.sass_options[:importer] = self.importer = Sass::Importers::Filesystem.new(from)
+      self.staleness_checker = Sass::Plugin::StalenessChecker.new(sass_options)
     end
 
     def determine_cache_location
@@ -72,16 +75,16 @@ module Compass
     end
 
     def clean!
-      FileUtils.rm_rf options[:cache_location]
+      remove options[:cache_location]
       css_files.each do |css_file|
-        FileUtils.rm_f css_file
+        remove css_file
       end
     end
 
     def run
       if new_config?
         # Wipe out the cache and force compilation if the configuration has changed.
-        FileUtils.rm_rf options[:cache_location]
+        remove options[:cache_location]
         options[:force] = true
       end
 
@@ -142,7 +145,7 @@ module Compass
     # A sass engine for compiling a single file.
     def engine(sass_filename, css_filename)
       syntax = (sass_filename =~ /\.(s[ac]ss)$/) && $1.to_sym || :sass
-      opts = options.merge :filename => sass_filename, :css_filename => css_filename, :syntax => syntax
+      opts = sass_options.merge(:filename => sass_filename, :css_filename => css_filename, :syntax => syntax)
       Sass::Engine.new(open(sass_filename).read, opts)
     end
 
@@ -153,7 +156,7 @@ module Compass
       formatted_error = "(Line #{e.sass_line}: #{e.message})"
       file = basename(sass_filename)
       logger.record :error, file, formatted_error
-      Compass.configuration.run_callback(:styesheet_error, sass_filename, formatted_error)
+      Compass.configuration.run_callback(:stylesheet_error, sass_filename, formatted_error)
       write_file css_filename, error_contents(e, sass_filename), options.merge(:force => true)
     end
 

data/lib/compass/compiler.rbc

@@ -124,7 +124,7 @@ x
 8
 Compiler
 i
-323
+325
 5
 66
 5
@@ -149,307 +149,309 @@ i
 7
 7
 8
+7
+9
 47
 49
-9
-6
+10
+7
 15
 99
 7
-10
-7
 11
+7
+12
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-14
-7
 15
+7
+16
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-16
-7
 17
+7
+18
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-18
-7
 19
+7
+20
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-20
-7
 21
+7
+22
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-22
-7
 23
+7
+24
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-24
-7
 25
+7
+26
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-26
-7
 27
+7
+28
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-28
-7
 29
+7
+30
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-30
-7
 31
+7
+32
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-32
-7
 33
+7
+34
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-34
-7
 35
+7
+36
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-36
-7
 37
+7
+38
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-38
-7
 39
+7
+40
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-40
-7
 41
+7
+42
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-42
-7
 43
+7
+44
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-44
-7
 45
+7
+46
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-46
-7
 47
+7
+48
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-48
-7
 49
+7
+50
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-50
-7
 51
+7
+52
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 15
 99
 7
-52
-7
 53
+7
+54
 65
 67
 49
-12
+13
 0
 49
-13
+14
 4
 11
 I
-7
+8
 I
 0
 I
@@ -458,7 +460,7 @@ I
 0
 n
 p
-54
+55
 x
 7
 Actions
@@ -479,6 +481,9 @@ x
 7
 options
 x
+12
+sass_options
+x
 17
 staleness_checker
 x
@@ -498,7 +503,7 @@ x
 10
 initialize
 i
-199
+249
 5
 20
 0
@@ -559,6 +564,27 @@ i
 1
 15
 15
+20
+3
+7
+9
+49
+7
+1
+13
+10
+78
+15
+44
+43
+10
+78
+49
+11
+1
+19
+4
+15
 5
 20
 3
@@ -567,148 +593,177 @@ i
 2
 47
 49
-9
+12
 1
 15
 15
 5
+20
+3
 49
-10
+13
+0
+13
+18
+2
+47
+49
+14
+1
+15
+15
+5
+49
+15
+0
+20
+4
+49
+16
+1
+15
+5
+49
+15
 0
 7
-11
+17
 14
 2
 49
-12
+18
 1
 13
 10
-99
+145
 15
 5
 48
-13
+19
 13
 18
 3
 49
-14
+20
 2
 15
 8
-103
+149
 18
 2
 16
 2
 15
-20
-3
-7
+5
+49
 15
+0
+7
+21
 5
 45
-16
-17
+22
+23
 43
-18
+24
 43
-19
+25
 13
 71
-20
+26
 47
 9
-136
+184
 47
 49
-21
+27
 0
 13
 20
 1
 47
 49
-22
+28
 1
 15
 8
-141
+189
 20
 1
 49
-20
+26
 1
 13
 18
 2
 47
 49
-23
+29
 1
 15
 13
 18
 3
 49
-14
+20
 2
 15
 15
 5
 45
-16
-24
+22
+30
 43
-25
+31
 43
-26
+32
 13
 71
-20
+26
 47
 9
-185
+234
 47
 49
-21
+27
 0
 13
-20
-3
+5
+48
+15
 47
 49
-22
+28
 1
 15
 8
-190
-20
-3
+240
+5
+48
+15
 49
-20
+26
 1
 13
 18
 2
 47
 49
-27
+33
 1
 15
 11
 I
-a
+b
 I
-4
+5
 I
 4
 I
 4
 n
 p
-28
+34
 x
 13
 working_path=
@@ -737,11 +792,29 @@ x
 7
 logger=
 x
+4
+sass
+x
+4
+Hash
+x
+16
+new_from_literal
+x
 8
 options=
 x
-7
-options
+3
+dup
+x
+13
+sass_options=
+x
+12
+sass_options
+x
+6
+update
 x
 14
 cache_location
@@ -790,7 +863,7 @@ x
 18
 staleness_checker=
 p
-29
+37
 I
 -1
 I
@@ -798,7 +871,7 @@ I
 I
 0
 I
-b1
+b4
 I
 1
 I
@@ -810,7 +883,7 @@ a
 I
 1b
 I
-b1
+b4
 I
 2c
 I
@@ -818,42 +891,58 @@ b
 I
 3c
 I
-b1
+c
 I
-3d
+51
 I
-c
+b4
 I
-48
+52
 I
 d
 I
-68
+5d
+I
+b4
+I
+5e
 I
 e
 I
 6c
 I
-b1
+f
 I
-6d
+76
 I
-e
+10
+I
+96
+I
+11
+I
+9c
+I
+b4
 I
 9d
 I
-b1
+11
 I
-9e
+cd
 I
-f
+b4
 I
-c7
+ce
+I
+12
+I
+f9
 x
 53
 /Users/chris/Projects/compass/lib/compass/compiler.rb
 p
-4
+5
 x
 12
 working_path
@@ -867,6 +956,9 @@ x
 7
 options
 x
+9
+sass_opts
+x
 17
 method_visibility
 x
@@ -982,11 +1074,11 @@ p
 I
 -1
 I
-12
+15
 I
 0
 I
-13
+16
 I
 2b
 x
@@ -1148,15 +1240,15 @@ p
 I
 -1
 I
-16
+19
 I
 e
 I
-17
+1a
 I
 19
 I
-18
+1b
 I
 4d
 x
@@ -1238,11 +1330,11 @@ p
 I
 -1
 I
-1b
+1e
 I
 0
 I
-1c
+1f
 I
 16
 x
@@ -1371,19 +1463,19 @@ p
 I
 -1
 I
-1f
+22
 I
 0
 I
-20
+23
 I
 d
 I
-21
+24
 I
 25
 I
-23
+26
 I
 33
 x
@@ -1485,7 +1577,7 @@ p
 I
 0
 I
-28
+2b
 I
 c
 x
@@ -1504,11 +1596,11 @@ p
 I
 -1
 I
-27
+2a
 I
 0
 I
-28
+2b
 I
 11
 x
@@ -1582,11 +1674,11 @@ p
 I
 -1
 I
-2b
+2e
 I
 0
 I
-2c
+2f
 I
 17
 x
@@ -1693,7 +1785,7 @@ p
 I
 0
 I
-30
+33
 I
 d
 x
@@ -1756,7 +1848,7 @@ p
 I
 0
 I
-30
+33
 I
 a
 x
@@ -1775,11 +1867,11 @@ p
 I
 -1
 I
-2f
+32
 I
 0
 I
-30
+33
 I
 14
 x
@@ -1897,11 +1989,11 @@ p
 I
 0
 I
-35
+38
 I
 a
 I
-36
+39
 I
 1c
 x
@@ -1923,15 +2015,15 @@ p
 I
 -1
 I
-34
+37
 I
 0
 I
-35
+38
 I
 f
 I
-38
+3b
 I
 11
 x
@@ -2003,11 +2095,11 @@ p
 I
 -1
 I
-3b
+3e
 I
 0
 I
-3c
+3f
 I
 14
 x
@@ -2185,11 +2277,11 @@ p
 I
 0
 I
-44
+47
 I
 4
 I
-45
+48
 I
 27
 x
@@ -2208,27 +2300,27 @@ p
 I
 -1
 I
-40
+43
 I
 0
 I
-41
+44
 I
 9
 I
-42
+45
 I
 13
 I
-43
+46
 I
 1e
 I
-44
+47
 I
 27
 I
-47
+4a
 I
 29
 x
@@ -2358,11 +2450,11 @@ p
 I
 0
 I
-4c
+4f
 I
 4
 I
-4d
+50
 I
 d
 x
@@ -2381,15 +2473,15 @@ p
 I
 -1
 I
-4a
+4d
 I
 0
 I
-4b
+4e
 I
 f
 I
-4c
+4f
 I
 18
 x
@@ -2597,7 +2689,7 @@ p
 I
 0
 I
-59
+5c
 I
 c
 x
@@ -2783,27 +2875,27 @@ p
 I
 0
 I
-5d
+60
 I
 a
 I
-5f
+62
 I
 22
 I
-60
+63
 I
 31
 I
-62
+65
 I
 32
 I
-60
+63
 I
 35
 I
-61
+64
 I
 4c
 x
@@ -2828,7 +2920,7 @@ p
 I
 0
 I
-5d
+60
 I
 f
 x
@@ -2875,43 +2967,43 @@ p
 I
 -1
 I
-51
+54
 I
 0
 I
-52
+55
 I
 7
 I
-54
+57
 I
 16
 I
-55
+58
 I
 25
 I
-52
+55
 I
 27
 I
-59
+5c
 I
 30
 I
-5c
+5f
 I
 3a
 I
-65
+68
 I
 44
 I
-66
+69
 I
 66
 I
-65
+68
 I
 68
 x
@@ -3028,19 +3120,19 @@ p
 I
 -1
 I
-6a
+6d
 I
 0
 I
-6b
+6e
 I
 b
 I
-6c
+6f
 I
 16
 I
-6e
+71
 I
 33
 x
@@ -3181,11 +3273,11 @@ p
 I
 -1
 I
-77
+7a
 I
 0
 I
-78
+7b
 I
 3
 x
@@ -3201,31 +3293,31 @@ p
 I
 -1
 I
-72
+75
 I
 0
 I
-73
+76
 I
 9
 I
-74
+77
 I
 e
 I
-75
+78
 I
 17
 I
-76
+79
 I
 26
 I
-77
+7a
 I
 32
 I
-7a
+7d
 I
 35
 x
@@ -3470,7 +3562,7 @@ p
 I
 0
 I
-82
+85
 I
 f
 x
@@ -3486,7 +3578,7 @@ p
 I
 0
 I
-81
+84
 I
 8
 x
@@ -3573,27 +3665,27 @@ p
 I
 -1
 I
-7e
+81
 I
 0
 I
-7f
+82
 I
 6
 I
-80
+83
 I
 11
 I
-85
+88
 I
 3e
 I
-86
+89
 I
 66
 I
-87
+8a
 I
 74
 x
@@ -3681,11 +3773,11 @@ p
 I
 -1
 I
-8a
+8d
 I
 0
 I
-8b
+8e
 I
 16
 x
@@ -3885,8 +3977,8 @@ x
 4
 sass
 x
-7
-options
+12
+sass_options
 x
 4
 Hash
@@ -3932,19 +4024,19 @@ p
 I
 -1
 I
-8f
+92
 I
 0
 I
-90
+93
 I
 2d
 I
-91
+94
 I
 59
 I
-92
+95
 I
 8c
 x
@@ -4129,8 +4221,8 @@ x
 13
 configuration
 x
-15
-styesheet_error
+16
+stylesheet_error
 x
 12
 run_callback
@@ -4163,27 +4255,27 @@ p
 I
 -1
 I
-98
+9b
 I
 0
 I
-99
+9c
 I
 1b
 I
-9a
+9d
 I
 25
 I
-9b
+9e
 I
 32
 I
-9c
+9f
 I
 42
 I
-9d
+a0
 I
 68
 x
@@ -4389,27 +4481,27 @@ p
 I
 -1
 I
-a1
+a4
 I
 0
 I
-a2
+a5
 I
 c
 I
-a3
+a6
 I
 18
 I
-a4
+a7
 I
 37
 I
-a6
+a9
 I
 5d
 I
-a7
+aa
 I
 6a
 x
@@ -4481,11 +4573,11 @@ p
 I
 -1
 I
-ac
+af
 I
 0
 I
-ad
+b0
 I
 e
 x
@@ -4504,91 +4596,91 @@ b
 I
 6
 I
-1d
+1f
 I
 8
 I
-2b
+2d
 I
-12
+15
 I
-39
+3b
 I
-16
+19
 I
-47
+49
 I
-1b
+1e
 I
-55
+57
 I
-1f
+22
 I
-63
+65
 I
-27
+2a
 I
-71
+73
 I
-2b
+2e
 I
-7f
+81
 I
-2f
+32
 I
-8d
+8f
 I
-34
+37
 I
-9b
+9d
 I
-3b
+3e
 I
-a9
+ab
 I
-40
+43
 I
-b7
+b9
 I
-4a
+4d
 I
-c5
+c7
 I
-51
+54
 I
-d3
+d5
 I
-6a
+6d
 I
-e1
+e3
 I
-72
+75
 I
-ef
+f1
 I
-7e
+81
 I
-fd
+ff
 I
-8a
+8d
 I
-10b
+10d
 I
-8f
+92
 I
-119
+11b
 I
-98
+9b
 I
-127
+129
 I
-a1
+a4
 I
-135
+137
 I
-ac
+af
 I
-143
+145
 x
 53
 /Users/chris/Projects/compass/lib/compass/compiler.rb