compass 0.10.0.pre3 → 0.10.0.pre4

data/CHANGELOG.markdown

@@ -1,6 +1,11 @@
 COMPASS CHANGELOG
 =================
 
+0.10.0.pre4 (January 04, 2010)
+------------------------------
+* Fixed an FSSM loading issue that broke the compass watcher.
+* Fixed some compatibility issues with edge versions of Sass.
+
 0.10.0.pre3 (January 02, 2010)
 ------------------------------
 

data/REVISION

@@ -1 +1 @@
-26b3efb3e6b7b8cabac5ae203bc3a590ab62d1b8
+08894dc6ab17c4d79297868e177cbed3d338b93b

data/VERSION.yml

@@ -2,4 +2,4 @@
 :patch: 0
 :major: 0
 :minor: 10
-:build: pre3
+:build: pre4

data/lib/compass/compiler.rb

@@ -42,7 +42,7 @@ module Compass
     def out_of_date?
       Compass.configure_sass_plugin! unless Compass.sass_plugin_configured?
       sass_files.zip(css_files).each do |sass_filename, css_filename|
-        return sass_filename if Sass::Plugin.exact_stylesheet_needs_update?(css_filename, sass_filename)
+        return sass_filename if Sass::Plugin.send(:exact_stylesheet_needs_update?, css_filename, sass_filename)
       end
       false
     end
@@ -99,7 +99,7 @@ module Compass
     end
 
     def should_compile?(sass_filename, css_filename)
-      options[:force] || Sass::Plugin.exact_stylesheet_needs_update?(css_filename, sass_filename)
+      options[:force] || Sass::Plugin.send(:exact_stylesheet_needs_update?, css_filename, sass_filename)
     end
 
     # A sass engine for compiling a single file.
@@ -114,12 +114,13 @@ module Compass
     # if there's an error.
     def handle_exception(sass_filename, css_filename, e)
       logger.record :error, basename(sass_filename), "(Line #{e.sass_line}: #{e.message})"
-      write_file css_filename, error_contents(e), options.merge(:force => true)
+      write_file css_filename, error_contents(e, sass_filename), options.merge(:force => true)
     end
 
     # Haml refactored this logic in 2.3, this is backwards compatibility for either one
-    def error_contents(e)
+    def error_contents(e, sass_filename)
       if Sass::SyntaxError.respond_to?(:exception_to_css)
+        e.sass_template = sass_filename
         Sass::SyntaxError.exception_to_css(e, :full_exception => show_full_exception?)
       else
         Sass::Plugin.options[:full_exception] ||= show_full_exception?

data/lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb

@@ -2,22 +2,39 @@ require 'sass/plugin'
 
 # XXX: We can remove this monkeypatch once Sass 2.2 is released.
 module Sass::Plugin
-  class << self
-    unless method_defined?(:exact_stylesheet_needs_update?)
-      def stylesheet_needs_update?(name, template_path, css_path)
-        css_file = css_filename(name, css_path)
-        template_file = template_filename(name, template_path)
-        exact_stylesheet_needs_update?(css_file, template_file)
+
+  # splits the stylesheet_needs_update? method into two pieces so I can use the exact_stylesheet_needs_update? piece
+  module StylesheetNeedsUpdate
+    def stylesheet_needs_update?(name, template_path, css_path)
+      css_file = css_filename(name, css_path)
+      template_file = template_filename(name, template_path)
+      exact_stylesheet_needs_update?(css_file, template_file)
+    end
+    def exact_stylesheet_needs_update?(css_file, template_file)
+      if !File.exists?(css_file)
+        return true
+      else
+        css_mtime = File.mtime(css_file)
+        File.mtime(template_file) > css_mtime ||
+          dependencies(template_file).any?(&dependency_updated?(css_mtime))
       end
-      def exact_stylesheet_needs_update?(css_file, template_file)
-        if !File.exists?(css_file)
-          return true
-        else
-          css_mtime = File.mtime(css_file)
-          File.mtime(template_file) > css_mtime ||
-            dependencies(template_file).any?(&dependency_updated?(css_mtime))
-        end
+    end
+  end
+
+  # At some point Sass::Plugin changed from using the metaclass to extend self.
+  metaclass = class << self; self; end
+  if metaclass.included_modules.include?(Sass::Plugin)
+    if method(:stylesheet_needs_update?).arity == 2
+      alias exact_stylesheet_needs_update? stylesheet_needs_update?
+    elsif !method_defined?(:exact_stylesheet_needs_update?)
+      include StylesheetNeedsUpdate
+    end
+  else
+    class << self
+      unless method_defined?(:exact_stylesheet_needs_update?)
+        include StylesheetNeedsUpdate
       end
     end
   end
-end
+
+end

data/lib/vendor/fssm.rb

@@ -1,176 +1,40 @@
-module FSSM::Tree
-  module NodeBase
-    def initialize
-      @children = {}
-    end
-
-    protected
-
-    def child(segment)
-      @children["#{segment}"]
-    end
-
-    def child!(segment)
-      (@children["#{segment}"] ||= Node.new)
-    end
-
-    def has_child?(segment)
-      @children.has_key?("#{segment}")
-    end
-
-    def remove_child(segment)
-      @children.delete("#{segment}")
-    end
-
-    def remove_children
-      @children.clear
-    end
-  end
-
-  module NodeEnumerable
-    include NodeBase
-    include Enumerable
-
-    def each(prefix=nil, &block)
-      @children.each do |segment, node|
-        cprefix = prefix ?
-                FSSM::Pathname.for(prefix).join(segment) :
-                FSSM::Pathname.for(segment)
-        block.call([cprefix, node])
-        node.each(cprefix, &block)
-      end
-    end
-  end
-
-  module NodeInsertion
-    include NodeBase
-
-    def unset(path)
-      key = key_segments(path)
-
-      if key.empty?
-        remove_children
-        return nil
-      end
-
-      segment = key.pop
-      node = descendant(key)
-
-      return unless node
-
-      node.remove_child(segment)
-
-      nil
-    end
-
-    def set(path)
-      node = descendant!(path)
-      node.from_path(path).mtime
-    end
-
-    protected
-
-    def key_segments(key)
-      return key if key.is_a?(Array)
-      FSSM::Pathname.for(key).segments
-    end
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 
-    def descendant(path)
-      recurse(path, false)
-    end
+module FSSM
+  FileNotFoundError = Class.new(StandardError)
+  CallbackError = Class.new(StandardError)
 
-    def descendant!(path)
-      recurse(path, true)
+  class << self
+    def dbg(msg=nil)
+      STDERR.puts(msg)
     end
 
-    def recurse(key, create=false)
-      key = key_segments(key)
-      node = self
+    def monitor(*args, &block)
+      monitor = FSSM::Monitor.new
+      context = args.empty? ? monitor : monitor.path(*args)
 
-      until key.empty?
-        segment = key.shift
-        node = create ? node.child!(segment) : node.child(segment)
-        return nil unless node
+      if block_given?
+        if block.arity == 1
+          block.call(context)
+        else
+          context.instance_eval(&block)
+        end
       end
 
-      node
-    end
-  end
-
-  module CacheDebug
-    def set(path)
-      FSSM.dbg("Cache#set(#{path})")
-      super
-    end
-
-    def unset(path)
-      FSSM.dbg("Cache#unset(#{path})")
-      super
-    end
-
-    def ftype(ft)
-      FSSM.dbg("Cache#ftype(#{ft})")
-      super
-    end
-  end
-
-  class Node
-    include NodeBase
-    include NodeEnumerable
-
-    attr_accessor :mtime
-    attr_accessor :ftype
-
-    def <=>(other)
-      return unless other.is_a?(::FSSM::Tree::Node)
-      self.mtime <=> other.mtime
-    end
-
-    def from_path(path)
-      path = FSSM::Pathname.for(path)
-      @ftype = path.ftype
-      # this handles bad symlinks without failing. why handle bad symlinks at
-      # all? well, we could still be interested in their creation and deletion.
-      @mtime = path.symlink? ? Time.at(0) : path.mtime
-      self
+      monitor.run
     end
   end
+end
 
-  class Cache
-    include NodeBase
-    include NodeEnumerable
-    include NodeInsertion
-    include CacheDebug if $DEBUG
-
-    def set(path)
-      # all paths set from this level need to be absolute
-      # realpath will fail on broken links
-      path = FSSM::Pathname.for(path).expand_path
-      super(path)
-    end
-
-    def files
-      ftype('file')
-    end
-
-    def directories
-      ftype('directory')
-    end
-
-    def links
-      ftype('link')
-    end
-
-    alias symlinks links
+require 'thread'
 
-    private
+require 'fssm/pathname'
+require 'fssm/support'
+require 'fssm/tree'
+require 'fssm/path'
+require 'fssm/state'
+require 'fssm/monitor'
 
-    def ftype(ft)
-      inject({}) do |hash, (path, node)|
-        hash["#{path}"] = node.mtime if node.ftype == ft
-        hash
-      end
-    end
-  end
-
-end
+require "fssm/backends/#{FSSM::Support.backend.downcase}"
+FSSM::Backends::Default = FSSM::Backends.const_get(FSSM::Support.backend)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: compass
 version: !ruby/object:Gem::Version 
-  version: 0.10.0.pre3
+  version: 0.10.0.pre4
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 -08:00
+date: 2010-01-04 00:00:00 -08:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency