sass 3.1.4 → 3.1.5

data/vendor/fssm/lib/fssm/state/directory.rb

@@ -2,13 +2,15 @@ module FSSM::State
   class Directory
     attr_reader :path
 
-    def initialize(path)
-      @path = path
-      @cache = FSSM::Tree::Cache.new
+    def initialize(path, options={})
+      @path    = path
+      @options = options
+      @cache   = FSSM::Tree::Cache.new
     end
 
     def refresh(base=nil, skip_callbacks=false)
-      previous, current = recache(base || @path.to_pathname)
+      base_path = FSSM::Pathname.for(base || @path.to_pathname).expand_path
+      previous, current = recache(base_path)
 
       unless skip_callbacks
         deleted(previous, current)
@@ -20,31 +22,36 @@ module FSSM::State
     private
 
     def created(previous, current)
-      (current.keys - previous.keys).each {|created| @path.create(created)}
+      (current.keys - previous.keys).sort.each do |file|
+        @path.create(file, current[file][1])
+      end
     end
 
     def deleted(previous, current)
-      (previous.keys - current.keys).each {|deleted| @path.delete(deleted)}
+      (previous.keys - current.keys).sort.reverse.each do |file|
+        @path.delete(file, previous[file][1])
+      end
     end
 
     def modified(previous, current)
       (current.keys & previous.keys).each do |file|
-        @path.update(file) if (current[file] <=> previous[file]) != 0
+        current_data = current[file]
+        @path.update(file, current_data[1]) if (current_data[0] <=> previous[file][0]) != 0
       end
     end
 
     def recache(base)
-      base = FSSM::Pathname.for(base)
-      previous = @cache.files
+      base     = FSSM::Pathname.for(base)
+      previous = cache_entries
       snapshot(base)
-      current = @cache.files
+      current = cache_entries
       [previous, current]
     end
 
     def snapshot(base)
       base = FSSM::Pathname.for(base)
       @cache.unset(base)
-      @path.glob.each {|glob| add_glob(base, glob)}
+      @path.glob.each { |glob| add_glob(base, glob) }
     end
 
     def add_glob(base, glob)
@@ -53,5 +60,16 @@ module FSSM::State
       end
     end
 
+    def cache_entries
+      entries = tag_entries(@cache.files, :file)
+      entries.merge! tag_entries(@cache.directories, :directory) if @options[:directories]
+      entries
+    end
+
+    def tag_entries(entries, tag)
+      tagged_entries = {}
+      entries.each_pair { |fname, mtime| tagged_entries[fname] = [mtime, tag] }
+      tagged_entries
+    end
   end
 end

data/vendor/fssm/lib/fssm/state/file.rb

@@ -8,7 +8,7 @@ module FSSM::State
 
     def refresh(base=nil, skip_callbacks=false)
       base ||= @path.to_pathname
-      used_to_exist, @exists = @exists, base.exists?
+      used_to_exist, @exists = @exists, base.exist?
       # this handles bad symlinks without failing. why handle bad symlinks at
       # all? well, we could still be interested in their creation and deletion.
       old_mtime, @mtime = @mtime, base.symlink? ? Time.at(0) : base.mtime if @exists

data/vendor/fssm/lib/fssm/support.rb

@@ -2,15 +2,34 @@ require 'rbconfig'
 
 module FSSM::Support
   class << self
-    def backend
-      @@backend ||= case
-        when mac? && !jruby? && carbon_core?
-          'FSEvents'
-        when linux? && rb_inotify?
-          'Inotify'
-        else
-          'Polling'
+    def usable_backend
+      choice = case
+                 when mac? && !lion? && !jruby? && carbon_core?
+                   'FSEvents'
+                 when mac? && rb_fsevent?
+                   'RBFSEvent'
+                 when linux? && rb_inotify?
+                   'Inotify'
+                 else
+                   'Polling'
+               end
+
+      if (mac? || linux?) && choice == 'Polling'
+        optimal = case
+                    when mac?
+                      'rb-fsevent'
+                    when linux?
+                      'rb-inotify'
+                  end
+        FSSM.dbg("An optimized backend is available for this platform!")
+        FSSM.dbg("    gem install #{optimal}")
       end
+
+      choice
+    end
+
+    def backend
+      @@backend ||= usable_backend
     end
 
     def jruby?
@@ -21,6 +40,10 @@ module FSSM::Support
       Config::CONFIG['target_os'] =~ /darwin/i
     end
 
+    def lion?
+      Config::CONFIG['target_os'] =~ /darwin11/i
+    end
+
     def linux?
       Config::CONFIG['target_os'] =~ /linux/i
     end
@@ -31,13 +54,21 @@ module FSSM::Support
         OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework'
         true
       rescue LoadError
-        STDERR.puts("Warning: Unable to load CarbonCore. FSEvents will be unavailable.")
+        false
+      end
+    end
+
+    def rb_fsevent?
+      begin
+        require 'rb-fsevent'
+        defined?(FSEvent::VERSION) ? FSEvent::VERSION.to_f >= 0.4 : false
+      rescue LoadError
         false
       end
     end
 
     def rb_inotify?
-      found = begin
+      begin
         require 'rb-inotify'
         if defined?(INotify::VERSION)
           version = INotify::VERSION
@@ -46,8 +77,6 @@ module FSSM::Support
       rescue LoadError
         false
       end
-      STDERR.puts("Warning: Unable to load rb-inotify >= 0.5.1. Inotify will be unavailable.") unless found
-      found
     end
 
     def use_block(context, block)

data/vendor/fssm/lib/fssm/tree.rb

@@ -34,8 +34,8 @@ module FSSM::Tree
     def each(prefix=nil, &block)
       @children.each do |segment, node|
         cprefix = prefix ?
-                FSSM::Pathname.for(prefix).join(segment) :
-                FSSM::Pathname.for(segment)
+            FSSM::Pathname.for(prefix).join(segment) :
+            FSSM::Pathname.for(segment)
         block.call([cprefix, node])
         node.each(cprefix, &block)
       end
@@ -54,7 +54,7 @@ module FSSM::Tree
       end
 
       segment = key.pop
-      node = descendant(key)
+      node    = descendant(key)
 
       return unless node
 
@@ -84,12 +84,12 @@ module FSSM::Tree
     end
 
     def recurse(key, create=false)
-      key = key_segments(key)
+      key  = key_segments(key)
       node = self
 
       until key.empty?
         segment = key.shift
-        node = create ? node.child!(segment) : node.child(segment)
+        node    = create ? node.child!(segment) : node.child(segment)
         return nil unless node
       end
 
@@ -127,7 +127,7 @@ module FSSM::Tree
     end
 
     def from_path(path)
-      path = FSSM::Pathname.for(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.

data/vendor/fssm/lib/fssm/version.rb

@@ -0,0 +1,3 @@
+module FSSM
+  VERSION = "0.2.7"
+end

data/vendor/fssm/profile/prof-cache.rb

@@ -5,7 +5,7 @@ require 'fssm'
 require 'rubygems'
 require 'ruby-prof'
 
-$test_path = FSSM::Pathname.new('..').expand_path
+$test_path  = FSSM::Pathname.new('..').expand_path
 $test_files = FSSM::Pathname.glob(File.join($test_path, '**', '*'))
 
 RubyProf.start
@@ -33,8 +33,8 @@ cache = FSSM::Tree::Cache.new
   print "\n\n"
 end
 
-result = RubyProf.stop
-output = File.new('prof.html', 'w+')
+result  = RubyProf.stop
+output  = File.new('prof.html', 'w+')
 
 printer = RubyProf::GraphHtmlPrinter.new(result)
 printer.print(output, :min_percent => 1)

data/vendor/fssm/profile/prof-pathname-rubinius.rb

@@ -0,0 +1,35 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'pathname'
+
+$test_path  = "#{Pathname.new('..').expand_path}"
+$iterations = 900000
+
+if ARGV.first == 'native'
+  puts "Using native Pathname"
+
+  class Pathname
+    # original segments implementation I was using with
+    # the plain ruby Pathname library.
+    def segments
+      prefix, names = split_names(@path)
+      names.unshift(prefix) unless prefix.empty?
+      names.shift if names[0] == '.'
+      names
+    end
+  end
+
+  $iterations.times do |num|
+    p        = ::Pathname.new($test_path)
+    segments = p.segments
+  end
+else
+  puts "Using FSSM::Pathname"
+
+  require 'fssm'
+
+  $iterations.times do |num|
+    p        = FSSM::Pathname.new($test_path)
+    segments = p.segments
+  end
+end

data/vendor/fssm/profile/prof-pathname.rb

@@ -6,7 +6,7 @@ require 'pathname'
 require 'rubygems'
 require 'ruby-prof'
 
-$test_path = "#{Pathname.new('..').expand_path}"
+$test_path  = "#{Pathname.new('..').expand_path}"
 $iterations = 90000
 
 class Pathname
@@ -32,15 +32,15 @@ $iterations.times do |num|
   puts "FSSM::Pathname iteration #{iteration}"
 
   RubyProf.resume
-  p = FSSM::Pathname.new($test_path)
+  p        = FSSM::Pathname.new($test_path)
   segments = p.segments
   RubyProf.pause
 end
 
 puts "\nFSSM Pathname profile finished\n\n"
 
-result = RubyProf.stop
-output = File.new('prof-fssm-pathname.html', 'w+')
+result  = RubyProf.stop
+output  = File.new('prof-fssm-pathname.html', 'w+')
 
 printer = RubyProf::GraphHtmlPrinter.new(result)
 printer.print(output, :min_percent => 1)
@@ -54,15 +54,15 @@ $iterations.times do |num|
   puts "::Pathname iteration #{iteration}"
 
   RubyProf.resume
-  p = ::Pathname.new($test_path)
+  p        = ::Pathname.new($test_path)
   segments = p.segments
   RubyProf.pause
 end
 
 puts "\nruby Pathname profile finished\n\n"
 
-result = RubyProf.stop
-output = File.new('prof-plain-pathname.html', 'w+')
+result  = RubyProf.stop
+output  = File.new('prof-plain-pathname.html', 'w+')
 
 printer = RubyProf::GraphHtmlPrinter.new(result)
 printer.print(output, :min_percent => 1)

data/vendor/fssm/spec/count_down_latch.rb

@@ -0,0 +1,151 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+
+require 'thread'
+
+class CountDownLatch
+  attr_reader :count
+
+  def initialize(to)
+    @count = to.to_i
+    raise ArgumentError, "cannot count down from negative integer" unless @count >= 0
+    @lock      = Mutex.new
+    @condition = ConditionVariable.new
+  end
+
+  def count_down
+    @lock.synchronize do
+      @count -= 1 if @count > 0
+      @condition.broadcast if @count == 0
+    end
+  end
+
+  def wait
+    @lock.synchronize do
+      @condition.wait(@lock) while @count > 0
+    end
+  end
+end
+
+if $0 == __FILE__
+  require 'test/unit'
+
+  class CountDownLatchTest < Test::Unit::TestCase
+    def test_requires_positive_count
+      assert_raise(ArgumentError) { CountDownLatch.new(-1) }
+    end
+
+    def test_basic_latch_usage
+      latch = CountDownLatch.new(1)
+      name  = "foo"
+      Thread.new do
+        name = "bar"
+        latch.count_down
+      end
+      latch.wait
+      assert_equal(0, latch.count)
+      assert_equal("bar", name)
+    end
+
+    def test_basic_latch_usage_inverted
+      latch = CountDownLatch.new(1)
+      name  = "foo"
+      Thread.new do
+        latch.wait
+        assert_equal(0, latch.count)
+        assert_equal("bar", name)
+      end
+      name = "bar"
+      latch.count_down
+    end
+
+    def test_count_down_from_zero_skips_wait
+      latch = CountDownLatch.new(0)
+      latch.wait
+      assert_equal(0, latch.count)
+    end
+
+    def test_count_down_twice_with_thread
+      latch = CountDownLatch.new(2)
+      name  = "foo"
+      Thread.new do
+        latch.count_down
+        name = "bar"
+        latch.count_down
+      end
+      latch.wait
+      assert_equal(0, latch.count)
+      assert_equal("bar", name)
+    end
+
+    def test_count_down_twice_with_two_parallel_threads
+      latch = CountDownLatch.new(2)
+      name  = "foo"
+      Thread.new { latch.count_down }
+      Thread.new do
+        name = "bar"
+        latch.count_down
+      end
+      latch.wait
+      assert_equal(0, latch.count)
+      assert_equal("bar", name)
+    end
+
+    def test_count_down_twice_with_two_chained_threads
+      latch = CountDownLatch.new(2)
+      name  = "foo"
+      Thread.new do
+        latch.count_down
+        Thread.new do
+          name = "bar"
+          latch.count_down
+        end
+      end
+      latch.wait
+      assert_equal(0, latch.count)
+      assert_equal("bar", name)
+    end
+
+    def test_count_down_with_multiple_waiters
+      proceed_latch = CountDownLatch.new(2)
+      check_latch   = CountDownLatch.new(2)
+      results       = {}
+      Thread.new do
+        proceed_latch.wait
+        results[:first] = 1
+        check_latch.count_down
+      end
+      Thread.new do
+        proceed_latch.wait
+        results[:second] = 2
+        check_latch.count_down
+      end
+      assert_equal({}, results)
+      proceed_latch.count_down
+      proceed_latch.count_down
+      check_latch.wait
+      assert_equal(0, proceed_latch.count)
+      assert_equal(0, check_latch.count)
+      assert_equal({:first => 1, :second => 2}, results)
+    end
+
+    def test_interleaved_latches
+      change_1_latch = CountDownLatch.new(1)
+      check_latch    = CountDownLatch.new(1)
+      change_2_latch = CountDownLatch.new(1)
+      name           = "foo"
+      Thread.new do
+        name = "bar"
+        change_1_latch.count_down
+        check_latch.wait
+        name = "man"
+        change_2_latch.count_down
+      end
+      change_1_latch.wait
+      assert_equal("bar", name)
+      check_latch.count_down
+      change_2_latch.wait
+      assert_equal("man", name)
+    end
+  end
+end