chriseppstein-compass 0.8.14 → 0.8.15

data/REVISION

@@ -1 +1 @@
-65e5b122f2d5c0022e65a519342adb2cc4a27907
+495854bb78b7b4ffbd94fbdaaaefbc5892ad47c4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 14
+:patch: 15
 :major: 0
 :minor: 8

data/lib/vendor/fssm/backends/fsevents.rb

@@ -8,16 +8,17 @@ module FSSM::Backends
     end
     
     def add_path(path, preload=true)
-      handler = FSSM::State.new(path, preload)
+      handler = FSSM::State.new(path)
       @handlers["#{path}"] = handler
       
-      fsevent = Rucola::FSEvents.new("#{path}") do |events|
+      fsevent = Rucola::FSEvents.new("#{path}", {:latency => 0.5}) do |events|
         events.each do |event|
           handler.refresh(event.path)
         end
       end
       
       fsevent.create_stream
+      handler.refresh(path.to_pathname, true) if preload
       fsevent.start
       @fsevents << fsevent
     end

data/lib/vendor/fssm/backends/polling.rb

@@ -6,7 +6,9 @@ module FSSM::Backends
     end
 
     def add_path(path, preload=true)
-      @handlers << FSSM::State.new(path, preload)
+      handler = FSSM::State.new(path)
+      handler.refresh(path.to_pathname, true) if preload
+      @handlers << handler
     end
 
     def run

data/lib/vendor/fssm/ext.rb

@@ -4,7 +4,32 @@ class Pathname
       path.is_a?(Pathname) ? path : new(path)
     end
   end
-
+  
+  # before overwriting chop_basename:
+  #   %total - 29.50%
+  #   %self - 20.50%
+  # after overwriting chop_basename:
+  #   %total - 24.36%
+  #   %self - 15.47%
+  CHOP_PAT = /\A#{SEPARATOR_PAT}?\z/
+  def chop_basename(path)
+    base = File.basename(path)
+    # the original version of this method recalculates this regexp
+    # each run, despite the pattern never changing.
+    if CHOP_PAT =~ base
+      return nil
+    else
+      return path[0, path.rindex(base)], base
+    end
+  end
+  
+  def segments
+    prefix, names = split_names(@path)
+    names.unshift(prefix) unless prefix.empty?
+    names.shift if names[0] == '.'
+    names
+  end
+  
   def names
     prefix, names = split_names(@path)
     names

data/lib/vendor/fssm/state.rb

@@ -1,17 +1,18 @@
 require 'yaml'
 class FSSM::State
-  def initialize(path, preload=true)
+  def initialize(path)
     @path = path
-    @cache = FSSM::Cache.new
-    snapshot(@path.to_pathname) if preload
+    @cache = FSSM::Tree::Cache.new
   end
 
-  def refresh(base=nil)
+  def refresh(base=nil, skip_callbacks=false)
     previous, current = recache(base || @path.to_pathname)
 
-    deleted(previous, current)
-    created(previous, current)
-    modified(previous, current)
+    unless skip_callbacks
+      deleted(previous, current)
+      created(previous, current)
+      modified(previous, current)
+    end
   end
 
   private

data/lib/vendor/fssm/tree.rb

@@ -0,0 +1,176 @@
+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 ? 
+                  Pathname.for(prefix).join(segment) :
+                  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)
+      Pathname.for(key).segments
+    end
+    
+    def descendant(path)
+      recurse(path, false)
+    end
+    
+    def descendant!(path)
+      recurse(path, true)
+    end
+    
+    def recurse(key, create=false)
+      key = key_segments(key)
+      node = self
+      
+      until key.empty?
+        segment = key.shift
+        node = create ? node.child!(segment) : node.child(segment)
+        return nil unless node
+      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 = 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
+    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 = 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
+    
+    private
+    
+    def ftype(ft)
+      inject({}) do |hash, entry|
+        path, node = entry
+        hash["#{path}"] = node.mtime if node.ftype == ft
+        hash
+      end
+    end
+  end
+  
+end

data/lib/vendor/fssm.rb

@@ -4,9 +4,13 @@ $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 module FSSM
   FileNotFoundError = Class.new(StandardError)
   CallbackError = Class.new(StandardError)
-
+  
   class << self
-    def monitor(*args, &block)
+    def dbg(msg=nil)
+      STDERR.puts(msg)
+    end
+
+    def monitor(*args, &block)      
       monitor = FSSM::Monitor.new
       context = args.empty? ? monitor : monitor.path(*args)
 
@@ -28,7 +32,7 @@ require 'pathname'
 
 require 'fssm/ext'
 require 'fssm/support'
-require 'fssm/cache'
+require 'fssm/tree'
 require 'fssm/path'
 require 'fssm/state'
 require 'fssm/monitor'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chriseppstein-compass
 version: !ruby/object:Gem::Version 
-  version: 0.8.14
+  version: 0.8.15
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 -07:00
+date: 2009-09-05 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -270,6 +270,7 @@ files:
 - lib/vendor/fssm/path.rb
 - lib/vendor/fssm/state.rb
 - lib/vendor/fssm/support.rb
+- lib/vendor/fssm/tree.rb
 - test/command_line_helper.rb
 - test/command_line_test.rb
 - test/compass_test.rb
@@ -307,7 +308,6 @@ files:
 - test/test_rails_helper.rb
 has_rdoc: false
 homepage: http://compass-style.org
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -328,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: compass
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: A Real Stylesheet Framework