compass 1.0.0.alpha.21 → 1.0.0.rc.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98142ce60fa2216da11a92493a53638d0b27305d
-  data.tar.gz: 03fed89e7920ea0f968dd5978a63f3e8acd964e7
+  metadata.gz: a26745c6095de368da35711b64f29a0be0a3897e
+  data.tar.gz: a00c977cd66bd80da2dd604bb4f52aecb989636f
 SHA512:
-  metadata.gz: 34becf7dc33fdb3afecee8001cf8c649683ddf19ee8d52ed6b74d4d08b08563867c7303ddc4687a1d84876182dea575591d752f71fa270d380e7635584b8b6ca
-  data.tar.gz: 73652bdf46ad7586d75fb1ad1f58d7390ced875b32e0d6bff60cf14360d61e7ed355dd6a24a185488d79dc3cbed30da264fbd7a20e4eeea7a4812be510b7bdb2
+  metadata.gz: 50187461fe4d727c49786feb10cba2666191d842c42caa81242c40017fe3549128a24ff1750a93f2c8110912937e9bb7d865676881d628af9f57df987619e9a8
+  data.tar.gz: bf6637915bb3f293cbfd702bf04f43a994010941fad637bc0a3e9cb965b3c5634ca56cbe99ba198c9cbebf4a4d7aff95459e2f5e185b1819417f374cc598c82f

data/Rakefile

@@ -1,4 +1,4 @@
-FileUtils.rm_f(FileList["RELEASE_VERSION"].first)
+sh "git checkout lib/compass/generated_version.rb"
 require 'rubygems'
 require 'rubygems/package_task'
 require 'rake/testtask'
@@ -171,7 +171,8 @@ end
 # Release tasks
 gemspec_file = FileList['compass.gemspec'].first
 spec = eval(File.read(gemspec_file), binding, gemspec_file)
-spec.files << "RELEASE_VERSION"
+spec.files.delete("VERSION")
+spec.files.delete("VERSION_NAME")
 
 def spec.bump!
   segments = version.to_s.split(".")
@@ -190,8 +191,13 @@ task :build => [:default, :gem]
 task :gem => :release_version
 
 task :release_version do
-  open("RELEASE_VERSION", "w") do |f|
-    f.write(spec.version.to_s)
+  open("lib/compass/generated_version.rb", "w") do |f|
+    f.write(<<VERSION_EOF)
+module Compass
+  VERSION = "#{spec.version}"
+  VERSION_NAME = "#{File.read('VERSION_NAME').strip}"
+end
+VERSION_EOF
   end
 end
 
@@ -213,8 +219,8 @@ task :record_version do
       f.write(spec.version.to_s)
     end
     sh "git add VERSION"
+    sh "git checkout lib/compass/generated_version.rb"
     sh %Q{git commit -m "Bump version to #{spec.version}."}
-    sh "rm RELEASE_VERSION"
   end
 end
 

data/features/command_line.feature

@@ -25,17 +25,6 @@ Feature: Command Line
     And a sass file custom_project/sass/screen.scss is created
     And a css file custom_project/css/screen.css is created
 
-  Scenario: Perform a dry run of creating a project
-    When I create a project using: compass create my_project --dry-run
-    Then a directory my_project/ is not created
-    But a configuration file my_project/config.rb is reported created
-    And a sass file my_project/sass/screen.scss is reported created
-    And a sass file my_project/sass/print.scss is reported created
-    And a sass file my_project/sass/ie.scss is reported created
-    And I am told how to link to /stylesheets/screen.css for media "screen, projection"
-    And I am told how to link to /stylesheets/print.css for media "print"
-    And I am told how to conditionally link "IE" to /stylesheets/ie.css for media "screen, projection"
-
   Scenario: Creating a bare project
     When I create a project using: compass create bare_project --bare
     Then a directory bare_project/ is created
@@ -73,15 +62,6 @@ Feature: Command Line
     Then a directory tmp_valid/tmp/ is created
     And a css file tmp_valid/tmp/simple.css is created
 
-  Scenario: Dry Run of Compiling an existing project.
-    Given I am using the existing project in test/fixtures/stylesheets/valid
-    When I run: compass compile --dry-run
-    Then a directory tmp/ is not created
-    And a css file tmp/simple.css is not created
-    And a css file tmp/simple.css is reported created
-    And a css file tmp/another_simple.css is not created
-    And a css file tmp/another_simple.css is reported created
-
   Scenario: Recompiling a project with no changes
     Given I am using the existing project in test/fixtures/stylesheets/valid
     When I run: compass compile
@@ -91,7 +71,7 @@ Feature: Command Line
     Given I am using the existing project in test/fixtures/stylesheets/valid
     And I run: compass compile sass/simple.sass
     Then a sass file sass/another_simple.scss is not mentioned
-    And a css file tmp/simple.css is reported created
+    And a css file tmp/simple.css is reported written
     And a css file tmp/simple.css is created
     And a css file tmp/another_simple.css is not created
 
@@ -100,7 +80,7 @@ Feature: Command Line
     When I run: compass compile
     And I run: compass compile sass/simple.sass --force
     Then a sass file sass/another_simple.scss is not mentioned
-    And a css file tmp/simple.css is reported identical
+    And a css file tmp/simple.css is reported written
 
   Scenario: Basic help
     When I run: compass help
@@ -130,7 +110,7 @@ Feature: Command Line
     And I wait 1 second
     And I touch sass/simple.sass
     And I run: compass compile
-    Then a css file tmp/simple.css is reported identical
+    Then a css file tmp/simple.css is reported written
 
   Scenario: Recompiling a project with changes
     Given I am using the existing project in test/fixtures/stylesheets/valid
@@ -138,7 +118,7 @@ Feature: Command Line
     And I wait 1 second
     And I add some sass to sass/simple.sass
     And I run: compass compile
-    And a css file tmp/simple.css is reported overwritten
+    And a css file tmp/simple.css is reported written
 
   Scenario: Cleaning a project
     Given I am using the existing project in test/fixtures/stylesheets/valid
@@ -163,7 +143,7 @@ Feature: Command Line
     And I touch sass/simple.sass
     And I wait 2 seconds
     And I shutdown the other process
-    Then a css file tmp/simple.css is reported identical
+    Then a css file tmp/simple.css is reported written
 
   Scenario: Generate a compass configuration file
     Given I should clean up the directory: config

data/features/step_definitions/command_line_steps.rb

@@ -135,11 +135,11 @@ Then "the following files are removed:" do |table|
 end
 
 Then /an? \w+ file ([^ ]+) is reported removed/ do |filename|
-  @last_result.should =~ /remove.*#{Regexp.escape(filename)}/
+  @last_result.should =~ /delete.*#{Regexp.escape(filename)}/
 end
 
-Then /an? \w+ file ([^ ]+) is reported created/ do |filename|
-  @last_result.should =~ /create.*#{Regexp.escape(filename)}/
+Then /an? \w+ file ([^ ]+) is reported written/ do |filename|
+  @last_result.should =~ /write.*#{Regexp.escape(filename)}/
 end
 
 Then /a \w+ file ([^ ]+) is (?:reported )?compiled/ do |filename|

data/lib/compass.rb

@@ -2,6 +2,7 @@ module Compass
 end
 
 %w(core
+   deprecation
    dependencies
    sass_extensions
    version
@@ -26,8 +27,7 @@ module Compass
   extend QuickCache
 end
 
-%w(watcher
-   configuration/adapters
+%w(configuration/adapters
    configuration/comments
    configuration/helpers
    configuration/serialization

data/lib/compass/actions.rb

@@ -29,14 +29,14 @@ module Compass
         raise Compass::FilesystemConflict.new(msg)
       else
         log_action :directory, separate("#{basename(dir)}/"), options
-        FileUtils.mkdir_p(dir) unless options[:dry_run]
+        FileUtils.mkdir_p(dir)
       end
     end
 
     # Write a file given the file contents as a string
     def write_file(file_name, contents, options = nil, binary = false)
       options ||= self.options if self.respond_to?(:options)
-      skip_write = options[:dry_run]
+      skip_write = false
       contents = process_erb(contents, options[:erb]) if options[:erb]
       if File.exists?(file_name)
         existing_contents = IO.read(file_name)
@@ -53,7 +53,7 @@ module Compass
         log_action :create, basename(file_name), options
       end
       if skip_write
-        FileUtils.touch file_name unless options[:dry_run]
+        FileUtils.touch file_name
       else
         mode = "w"
         mode << "b" if binary
@@ -84,6 +84,7 @@ module Compass
     end
 
     def relativize(path)
+      path = File.expand_path(path)
       if path.index(working_path+File::SEPARATOR) == 0
         path[(working_path+File::SEPARATOR).length..-1]
       elsif block_given?

data/lib/compass/commands/update_project.rb

@@ -39,69 +39,69 @@ module Compass
 
       def initialize(working_path, options)
         super
-        assert_project_directory_exists! unless dry_run?
+        assert_project_directory_exists!
       end
 
       def perform
         compiler = new_compiler_instance
         check_for_sass_files!(compiler)
-        compiler.clean! if compiler.new_config?
-        error_count = compiler.run
-        failed! if error_count > 0
+        prepare_project!(compiler)
+        compiler.compile!
+        if compiler.error_count > 0
+          compiler.logger.red do
+            compiler.logger.log "Compilation failed in #{compiler.error_count} files."
+          end
+          failed! 
+        end
+      end
+
+      def prepare_project!(compiler)
+        if options[:project_name]
+          Compass.configuration.project_path = File.expand_path(options[:project_name])
+        end
+
+        if config_file = new_config?(compiler)
+          compiler.logger.record :modified, relativize(config_file)
+          compiler.logger.record :clean, relativize(Compass.configuration.css_path)
+          compiler.clean!
+        end
+      end
+
+      # Determines if the configuration file is newer than any css file
+      def new_config?(compiler)
+        config_file = Compass.detect_configuration_file
+        return false unless config_file
+        config_mtime = File.mtime(config_file)
+        compiler.file_list.each do |(_, css_filename, _)|
+          return config_file if File.exists?(css_filename) && config_mtime > File.mtime(css_filename)
+        end
+        nil
       end
 
       def check_for_sass_files!(compiler)
-        if compiler.sass_files.empty? && !dry_run?
+        file_list = compiler.file_list
+        if file_list.empty?
           message = "Compass can't find any Sass files to compile.\nIs your compass configuration correct?.\nIf 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
+        elsif missing = file_list.find {|(sass_file, _, _)| !File.exist?(sass_file)}
+          raise Compass::Error, "File not found: #{missing[0]}"
         end
       end
 
-      def dry_run?
-        options[:dry_run]
+      def new_compiler_instance
+        Compass::SassCompiler.new(compiler_options)
       end
 
-      def new_compiler_instance(additional_options = {})
-        @compiler_opts ||= begin
-          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[:sourcemap] = Compass.configuration.sourcemap if compiler_opts[:sourcemap].nil?
-          if options.include?(:debug_info) && options[:debug_info]
-            compiler_opts[:sass][:debug_info] = options.delete(:debug_info)
-          end
-          compiler_opts
-        end
-
-        @memory_store ||= Sass::CacheStores::Memory.new
-        @backing_store ||= compiler_opts[:cache_store]
-        @backing_store ||= Sass::CacheStores::Filesystem.new(determine_cache_location)
-        @cache_store ||= Sass::CacheStores::Chain.new(@memory_store, @backing_store)
-        @memory_store.reset!
-
-        Compass::Compiler.new(
-          working_path,
-          Compass.configuration.sass_path,
-          Compass.configuration.css_path,
-          @compiler_opts.merge(:cache_store => @cache_store).merge(additional_options)
-        )
+      def compiler_options
+        transfer_options(options, {}, :time, :debug_info, :only_sass_files, :force)
       end
 
-      def explicit_sass_files
-        return unless options[:sass_files]
-        options[:sass_files].map do |sass_file|
-          if absolute_path? sass_file
-            sass_file
-          else
-            File.join(Dir.pwd, sass_file)
-          end
+      def transfer_options(from, to, *keys)
+        keys.each do |k|
+          to[k] = from[k] unless from[k].nil?
         end
-      end
-
-      def determine_cache_location
-        Compass.configuration.cache_path || Sass::Plugin.options[:cache_location] || File.join(working_path, ".sass-cache")
+        to
       end
 
       class << self
@@ -133,10 +133,15 @@ module Compass
           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[:only_sass_files] = absolutize(*arguments)
             end
           end
         end
+
+        def absolutize(*paths)
+          paths.map {|path| File.expand_path(path) }
+        end
+
       end
     end
   end

data/lib/compass/commands/watch_project.rb

@@ -1,9 +1,8 @@
+# encoding: UTF-8
 require 'fileutils'
 require 'pathname'
-require 'compass/commands/base'
 require 'compass/commands/update_project'
-require 'compass/watcher'
-require 'sass/plugin'
+require "compass/sass_compiler"
 
 module Compass
   module Commands
@@ -34,20 +33,70 @@ module Compass
       attr_accessor :last_update_time, :last_sass_files
 
       def perform
-        # '.' assumes you are in the executing directory. so get the full path to the directory
-        if options[:project_name] == '.'
-          Compass.configuration.project_path = Dir.pwd
+        compiler = new_compiler_instance
+        compiler.logger.time = true if options[:time]
+        prepare_project!(compiler)
+        compiler.logger.log ">>> #{compiler.logger.color(:green)}Compass is watching for changes.#{compiler.logger.color(:clear)} #{compiler.logger.color(:red)}Press Ctrl-C to Stop.#{compiler.logger.color(:clear)}"
+        begin
+          compiler.watch!(:additional_watch_paths => additional_watch_paths, &method(:notify_watches))
+          happy_styling!(compiler.logger)
+        rescue Interrupt
+          happy_styling!(compiler.logger)
         end
-        
-        project_watcher = Compass::Watcher::ProjectWatcher.new(Compass.configuration.project_path, Compass.configuration.watches, options, options[:poll])
+      end
+
+      def happy_styling!(logger)
+          logger.log "\n#{logger.color(:yellow)}★★★ #{logger.color(:blue)}Happy Styling!#{logger.color(:yellow)} ★★★#{logger.color(:clear)}"
+      end
+
+      def compiler_options
+        super.merge(:poll => options[:poll])
+      end
+
+      def additional_watch_paths
+        Compass.configuration.watches.map do |watch|
+          pathname = Pathname.new(File.join(Compass.configuration.project_path, watch.glob))
+          real_path = nil
+          pathname.ascend do |p|
+            if p.exist?
+              real_path = p
+              break
+            end
+          end
+          real_path
+        end.compact.uniq
+      end
+
+      def notify_watches(modified, added, removed)
+        project_path = Compass.configuration.project_path
+        files = {:modified => modified,
+                 :added    => added,
+                 :removed  => removed}
+
+        run_once, run_each = Compass.configuration.watches.partition {|w| w.run_once_per_changeset?}
 
-        puts ">>> Compass is watching for changes. Press Ctrl-C to Stop."
-        $stdout.flush
-        
-        project_watcher.compile
-        project_watcher.watch!
+        run_once.each do |watcher|
+          if file = files.values.flatten.detect{|f| watcher.match?(f) }
+            action = files.keys.detect{|k| files[k].include?(file) }
+            watcher.run_callback(project_path, relative_to(file, project_path), action)
+          end
+        end
 
+        run_each.each do |watcher|
+          files.each do |action, list|
+            list.each do |file|
+              if watcher.match?(file)
+                watcher.run_callback(project_path, relative_to(file, project_path), action)
+              end
+            end
+          end
+        end
+      end
 
+      def relative_to(f, dir)
+        Pathname.new(f).relative_path_from(Pathname.new(dir))
+      rescue ArgumentError # does not share a common path.
+        f
       end
 
       class << self

data/lib/compass/compiler.rb

@@ -8,6 +8,8 @@ module Compass
     attr_accessor :working_path, :from, :to, :options, :sass_options, :staleness_checker, :importer
 
     def initialize(working_path, from, to, options)
+      Compass::Deprecation.deprecated!(:compass_compiler_constructor,
+        "Compass::Compiler is deprecated. Use Compass::SassCompiler instead.")
       self.working_path = working_path.to_s
       self.from, self.to = File.expand_path(from), to
       self.logger = options.delete(:logger)

data/lib/compass/configuration/adapters.rb

@@ -30,12 +30,21 @@ module Compass
         plugin_opts = {:template_location => locations}
         plugin_opts[:style] = output_style if output_style
         plugin_opts[:line_comments] = line_comments
+        if sass_3_4?
+          plugin_opts[:sourcemap] = sourcemap ? :auto : :none
+        else
+          plugin_opts[:sourcemap] = sourcemap
+        end
         plugin_opts[:cache] = cache unless cache.nil?
         plugin_opts[:cache_location] = cache_path unless cache_path.nil?
+        plugin_opts[:quiet] = disable_warnings if disable_warnings
+        plugin_opts[:compass] = {}
+        plugin_opts[:compass][:environment] = environment
         plugin_opts.merge!(sass_options || {})
         plugin_opts[:load_paths] ||= []
         plugin_opts[:load_paths] += load_paths
         plugin_opts[:load_paths] << Compass::SpriteImporter.new
+        plugin_opts[:full_exception] = (environment == :development)
         plugin_opts
       end
 
@@ -58,9 +67,17 @@ module Compass
         engine_opts = {:load_paths => sass_load_paths}
         engine_opts[:style] = output_style if output_style
         engine_opts[:line_comments] = line_comments
+        if sass_3_4?
+          engine_opts[:sourcemap] = sourcemap ? :auto : :none
+        else
+          engine_opts[:sourcemap] = sourcemap
+        end
         engine_opts[:cache] = cache
         engine_opts[:cache_location] = cache_path
         engine_opts[:quiet] = disable_warnings if disable_warnings
+        engine_opts[:compass] = {}
+        engine_opts[:compass][:environment] = environment
+        engine_opts[:full_exception] = (environment == :development)
         engine_opts.merge!(sass_options || {})
       end
 
@@ -80,6 +97,10 @@ module Compass
         load_paths << Compass::SpriteImporter.new
         load_paths
       end
+
+      def sass_3_4?
+        Sass.version[:major] == 3 && Sass.version[:minor] == 4
+      end
     end
     class Data
       include Adapters