sass 3.2.19 → 3.3.0.alpha.1

data/test/sass/util_test.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 require 'pathname'
-require 'tmpdir'
 
 class UtilTest < Test::Unit::TestCase
   include Sass::Util
@@ -244,14 +243,6 @@ class UtilTest < Test::Unit::TestCase
     test[['foo ', 1, "\n bar\n", [2, 3, 4], "\n baz"]]
   end
 
-  def nested_caller_info_fn
-    caller_info
-  end
-
-  def double_nested_caller_info_fn
-    nested_caller_info_fn
-  end
-
   def test_caller_info
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle'"))
     assert_equal(["/tmp/foo.rb", 12, nil], caller_info("/tmp/foo.rb:12"))
@@ -259,22 +250,6 @@ class UtilTest < Test::Unit::TestCase
     assert_equal(["", 12, "boop"], caller_info(":12: in `boop'"))
     assert_equal(["/tmp/foo.rb", -12, "fizzle"], caller_info("/tmp/foo.rb:-12: in `fizzle'"))
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle {}'"))
-
-    info = nested_caller_info_fn
-    assert_equal(__FILE__, info[0])
-    assert_equal("test_caller_info", info[2])
-
-    info = proc {nested_caller_info_fn}.call
-    assert_equal(__FILE__, info[0])
-    assert_match(/^(block in )?test_caller_info$/, info[2])
-
-    info = double_nested_caller_info_fn
-    assert_equal(__FILE__, info[0])
-    assert_equal("double_nested_caller_info_fn", info[2])
-
-    info = proc {double_nested_caller_info_fn}.call
-    assert_equal(__FILE__, info[0])
-    assert_equal("double_nested_caller_info_fn", info[2])
   end
 
   def test_version_gt
@@ -311,72 +286,4 @@ class UtilTest < Test::Unit::TestCase
       "UtilTest::FooBar must implement #foo") {FooBar.new.foo}
   end
 
-  def test_atomic_writes
-    # when using normal writes, this test fails about 90% of the time.
-    filename = File.join(Dir.tmpdir, "test_atomic")
-    5.times do
-      writes_to_perform = %w(1 2 3 4 5 6 7 8 9).map {|i| "#{i}\n" * 100_000}
-      threads = writes_to_perform.map do |to_write|
-        Thread.new do
-          # To see this test fail with a normal write,
-          # change to the standard file open mechanism:
-          # open(filename, "w") do |f|
-          atomic_create_and_write_file(filename) do |f|
-            f.write(to_write)
-          end
-        end
-      end
-      loop do
-        contents = File.exist?(filename) ? File.read(filename) : nil
-        next if contents.nil? || contents.size == 0
-        unless writes_to_perform.include?(contents)
-          if contents.size != writes_to_perform.first.size
-            fail "Incomplete write detected: was #{contents.size} characters, " +
-                 "should have been #{writes_to_perform.first.size}"
-          else
-            fail "Corrupted read/write detected"
-          end
-        end
-        break if threads.all? {|t| !t.alive?}
-      end
-      threads.each {|t| t.join}
-    end
-  end
-
-  def test_atomic_write_permissions
-    atomic_filename = File.join(Dir.tmpdir, "test_atomic_perms.atomic")
-    normal_filename = File.join(Dir.tmpdir, "test_atomic_perms.normal")
-    atomic_create_and_write_file(atomic_filename) {|f| f.write("whatever\n") }
-    open(normal_filename, "wb") {|f| f.write("whatever\n") }
-    assert_equal File.stat(normal_filename).mode.to_s(8), File.stat(atomic_filename).mode.to_s(8)
-  ensure
-    File.unlink(atomic_filename) rescue nil
-    File.unlink(normal_filename) rescue nil
-  end
-
-  def test_atomic_writes_respect_umask
-    atomic_filename = File.join(Dir.tmpdir, "test_atomic_perms.atomic")
-    atomic_create_and_write_file(atomic_filename) do |f|
-      f.write("whatever\n")
-    end
-    assert_equal 0, File.stat(atomic_filename).mode & File.umask
-  ensure
-    File.unlink(atomic_filename)
-  end
-
-  class FakeError < RuntimeError; end
-
-  def test_atomic_writes_handles_exceptions
-    filename = File.join(Dir.tmpdir, "test_atomic_exception")
-    FileUtils.rm_f(filename)
-    tmp_filename = nil
-    assert_raises FakeError do
-      atomic_create_and_write_file(filename) do |f|
-        tmp_filename = f.path
-        raise FakeError.new "Borken"
-      end
-    end
-    assert !File.exist?(filename)
-    assert !File.exist?(tmp_filename)
-  end
 end

data/vendor/listen/CHANGELOG.md

@@ -1,69 +1,3 @@
-## 0.7.3 - February 24, 2013
-
-### Bug fix
-
-- [#88] Update wdm dependency. (fixed by [@mrbinky3000][])
-- [#78] Depend on latest rb-inotify. (fixed by [@mbj][])
-
-## 0.7.2 - January 11, 2013
-
-### Bug fix
-
-- [#76] Exception on filename which is not in UTF-8. (fixed by [@piotr-sokolowski][])
-
-## 0.7.1 - January 6, 2013
-
-### Bug fix
-
-- [#75] Default high precision off if the mtime call fails. (fixed by [@zanker][])
-
-## 0.7.0 - December 29, 2012
-
-### Bug fixes
-
-- [#73] Rescue Errno::EOPNOTSUPP on sha1_checksum generation. (fixed by [@thibaudgg][])
-
-### New feature
-
-- Add support for *BSD with rb-kqueue. ([@mat813][])
-
-## 0.6.0 - November 21, 2012
-
-### New feature
-
-- Add bang versions for filter and ignore listener methods. ([@tarsolya][])
-
-## 0.5.3 - October 3, 2012
-
-### Bug fixes
-
-- [#65] Fix ruby warning in adapter.rb. (fixed by [@vongruenigen][])
-- [#64] ENXIO raised when hashing UNIX domain socket file. (fixed by [@sunaku][])
-
-## 0.5.2 - Septemper 23, 2012
-
-### Bug fix
-
-- [#62] Fix double change callback with polling adapter. (fixed by [@thibaudgg][])
-
-## 0.5.1 - Septemper 18, 2012
-
-### Bug fix
-
-- [#61] Fix a synchronisation bug that caused constant fallback to polling. (fixed by [@Maher4Ever][])
-
-## 0.5.0 - Septemper 1, 2012
-
-### New features
-
-- Add a dependency manager to handle platform-specific gems. So there is no need anymore to install
-  extra gems which will never be used on the user system. ([@Maher4Ever][])
-- Add a manual reporting mode to the adapters. ([@Maher4Ever][])
-
-### Improvements
-
-- [#28] Enhance the speed of detecting changes on Windows by using the [WDM][] library. ([@Maher4Ever][])
-
 ## 0.4.7 - June 27, 2012
 
 ### Bug fixes
@@ -194,16 +128,8 @@
 [#21]: https://github.com/guard/listen/issues/21
 [#24]: https://github.com/guard/listen/issues/24
 [#27]: https://github.com/guard/listen/issues/27
-[#28]: https://github.com/guard/listen/issues/28
 [#32]: https://github.com/guard/listen/issues/32
-[#41]: https://github.com/guard/listen/issues/41
-[#61]: https://github.com/guard/listen/issues/61
-[#62]: https://github.com/guard/listen/issues/62
-[#64]: https://github.com/guard/listen/issues/64
-[#65]: https://github.com/guard/listen/issues/65
-[#73]: https://github.com/guard/listen/issues/73
-[#75]: https://github.com/guard/listen/issues/75
-[#76]: https://github.com/guard/listen/issues/76
+[#39]: https://github.com/guard/listen/issues/39
 [@Maher4Ever]: https://github.com/Maher4Ever
 [@dkubb]: https://github.com/dkubb
 [@ebroder]: https://github.com/ebroder
@@ -212,17 +138,10 @@
 [@daemonza]: https://github.com/daemonza
 [@fny]: https://github.com/fny
 [@markiz]: https://github.com/markiz
-[@mat813]: https://github.com/mat813
 [@napcs]: https://github.com/napcs
 [@netzpirat]: https://github.com/netzpirat
 [@nex3]: https://github.com/nex3
-[@piotr-sokolowski]: https://github.com/piotr-sokolowski
 [@rymai]: https://github.com/rymai
 [@scottdavis]: https://github.com/scottdavis
-[@sunaku]: https://github.com/sunaku
 [@textgoeshere]: https://github.com/textgoeshere
-[@thibaudgg]: https://github.com/thibaudgg
-[@tarsolya]: https://github.com/tarsolya
-[@vongruenigen]: https://github.com/vongruenigen
-[@zanker]: https://github.com/zanker
-[WDM]: https://github.com/Maher4Ever/wdm
+[@thibaudgg]: https://github.com/thibaudgg

data/vendor/listen/Gemfile

@@ -1,16 +1,9 @@
-require 'rbconfig'
-
 source :rubygems
 
 gemspec
 
 gem 'rake'
 
-gem 'rb-kqueue', '~> 0.2' if RbConfig::CONFIG['target_os'] =~ /freebsd/i
-gem 'rb-fsevent', '~> 0.9.1' if RbConfig::CONFIG['target_os'] =~ /darwin(1.+)?$/i
-gem 'rb-inotify', '~> 0.9.0' if RbConfig::CONFIG['target_os'] =~ /linux/i
-gem 'wdm',        '~> 0.0.3' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
-
 group :development do
   platform :ruby do
     gem 'coolline'
@@ -27,4 +20,4 @@ end
 
 group :test do
   gem 'rspec'
-end
+end

data/vendor/listen/Guardfile

@@ -1,4 +1,4 @@
-guard :rspec, :all_on_start => false, :all_after_pass => false do
+guard :rspec, :all_on_start => false, :all_after_pass => false, :cli => '--fail-fast --format doc' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})                { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/support/adapter_helper.rb')  { "spec/listen/adapters" }

data/vendor/listen/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Thibaud Guillaume-Gentil
+Copyright (c) 2012 Thibaud Guillaume-Gentil
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/vendor/listen/README.md

@@ -6,10 +6,10 @@ The Listen gem listens to file modifications and notifies you about the changes.
 
 * Works everywhere!
 * Supports watching multiple directories from a single listener.
-* OS-specific adapters for Mac OS X 10.6+, Linux, *BSD and Windows.
+* OS-specific adapters for Mac OS X 10.6+, Linux and Windows.
 * Automatic fallback to polling if OS-specific adapter doesn't work.
-* Detects file modification, addition and removal.
-* Checksum comparison for modifications made under the same second.
+* Detects files modification, addidation and removal.
+* Checksum comparaison for modifications made under the same second.
 * Allows supplying regexp-patterns to ignore and filter paths for better results.
 * Tested on all Ruby environments via [travis-ci](http://travis-ci.org/guard/listen).
 
@@ -215,8 +215,6 @@ with a directory-separator, otherwise they won't work as expected.
 As an example: to ignore the `build` directory in a C-project, use `%r{build/}`
 and not `%r{/build/}`.
 
-Use `#filter!` and `#ignore!` methods to overwrites default patterns.
-
 ### Non-blocking listening to changes
 
 Starting a listener blocks the current thread by default. That means any code after the
@@ -242,7 +240,7 @@ block execution. See the "Block API" section for an example.
 ## Listen adapters
 
 The Listen gem has a set of adapters to notify it when there are changes.
-There are 3 OS-specific adapters to support Mac, Linux, *BSD and Windows. These adapters are fast
+There are 3 OS-specific adapters to support Mac, Linux and Windows. These adapters are fast
 as they use some system-calls to implement the notifying function.
 
 There is also a polling adapter which is a cross-platform adapter and it will
@@ -253,6 +251,7 @@ want to force the use of the polling adapter, either use the `:force_polling` op
 while initializing the listener or call the `force_polling` method on your listener
 before starting it.
 
+<a name="fallback"/>
 ## Polling fallback
 
 When a OS-specific adapter doesn't work the Listen gem automatically falls back to the polling adapter.
@@ -287,7 +286,6 @@ For questions please join us in our [Google group](http://groups.google.com/grou
 * [Michael Kessler (netzpirat)][] for having written the [initial specs](https://github.com/guard/listen/commit/1e457b13b1bb8a25d2240428ce5ed488bafbed1f).
 * [Travis Tilley (ttilley)][] for this awesome work on [fssm][] & [rb-fsevent][].
 * [Nathan Weizenbaum (nex3)][] for [rb-inotify][], a thorough inotify wrapper.
-* [Mathieu Arnold (mat813)][] for [rb-kqueue][], a simple kqueue wrapper.
 * [stereobooster][] for [rb-fchange][], windows support wouldn't exist without him.
 * [Yehuda Katz (wycats)][] for [vigilo][], that has been a great source of inspiration.
 
@@ -306,7 +304,6 @@ For questions please join us in our [Google group](http://groups.google.com/grou
 [Travis Tilley (ttilley)]: https://github.com/ttilley
 [fssm]: https://github.com/ttilley/fssm
 [rb-fsevent]: https://github.com/thibaudgg/rb-fsevent
-[Mathieu Arnold (mat813)]: https://github.com/mat813
 [Nathan Weizenbaum (nex3)]: https://github.com/nex3
 [rb-inotify]: https://github.com/nex3/rb-inotify
 [stereobooster]: https://github.com/stereobooster

data/vendor/listen/lib/listen.rb

@@ -1,16 +1,14 @@
 module Listen
 
-  autoload :Turnstile,         'listen/turnstile'
-  autoload :Listener,          'listen/listener'
-  autoload :MultiListener,     'listen/multi_listener'
-  autoload :DirectoryRecord,   'listen/directory_record'
-  autoload :DependencyManager, 'listen/dependency_manager'
-  autoload :Adapter,           'listen/adapter'
+  autoload :Turnstile,       'listen/turnstile'
+  autoload :Listener,        'listen/listener'
+  autoload :MultiListener,   'listen/multi_listener'
+  autoload :DirectoryRecord, 'listen/directory_record'
+  autoload :Adapter,         'listen/adapter'
 
   module Adapters
     autoload :Darwin,  'listen/adapters/darwin'
     autoload :Linux,   'listen/adapters/linux'
-    autoload :BSD,     'listen/adapters/bsd'
     autoload :Windows, 'listen/adapters/windows'
     autoload :Polling, 'listen/adapters/polling'
   end

data/vendor/listen/lib/listen/adapter.rb

@@ -10,15 +10,8 @@ module Listen
     # The default delay between checking for changes.
     DEFAULT_LATENCY = 0.25
 
-    # The default warning message when there is a missing dependency.
-    MISSING_DEPENDENCY_MESSAGE = <<-EOS.gsub(/^\s*/, '')
-      For a better performance, it's recommended that you satisfy the missing dependency.
-    EOS
-
     # The default warning message when falling back to polling adapter.
-    POLLING_FALLBACK_MESSAGE = <<-EOS.gsub(/^\s*/, '')
-      Listen will be polling changes. Learn more at https://github.com/guard/listen#polling-fallback.
-    EOS
+    POLLING_FALLBACK_MESSAGE = "WARNING: Listen has fallen back to polling, learn more at https://github.com/guard/listen#fallback."
 
     # Selects the appropriate adapter implementation for the
     # current OS and initializes it.
@@ -38,28 +31,18 @@ module Listen
     def self.select_and_initialize(directories, options = {}, &callback)
       return Adapters::Polling.new(directories, options, &callback) if options.delete(:force_polling)
 
-      warning = ''
-
-      begin
-        if Adapters::Darwin.usable_and_works?(directories, options)
-          return Adapters::Darwin.new(directories, options, &callback)
-        elsif Adapters::Linux.usable_and_works?(directories, options)
-          return Adapters::Linux.new(directories, options, &callback)
-        elsif Adapters::BSD.usable_and_works?(directories, options)
-          return Adapters::BSD.new(directories, options, &callback)
-        elsif Adapters::Windows.usable_and_works?(directories, options)
-          return Adapters::Windows.new(directories, options, &callback)
+      if Adapters::Darwin.usable_and_works?(directories, options)
+        Adapters::Darwin.new(directories, options, &callback)
+      elsif Adapters::Linux.usable_and_works?(directories, options)
+        Adapters::Linux.new(directories, options, &callback)
+      elsif Adapters::Windows.usable_and_works?(directories, options)
+        Adapters::Windows.new(directories, options, &callback)
+      else
+        unless options[:polling_fallback_message] == false
+          Kernel.warn(options[:polling_fallback_message] || POLLING_FALLBACK_MESSAGE)
         end
-      rescue DependencyManager::Error => e
-        warning += e.message + "\n" + MISSING_DEPENDENCY_MESSAGE
-      end
-
-      unless options[:polling_fallback_message] == false
-        warning += options[:polling_fallback_message] || POLLING_FALLBACK_MESSAGE
-        Kernel.warn "[Listen warning]:\n" + warning.gsub(/^(.*)/, '  \1')
+        Adapters::Polling.new(directories, options, &callback)
       end
-
-      Adapters::Polling.new(directories, options, &callback)
     end
 
     # Initializes the adapter.
@@ -67,7 +50,6 @@ module Listen
     # @param [String, Array<String>] directories the directories to watch
     # @param [Hash] options the adapter options
     # @option options [Float] latency the delay between checking for changes in seconds
-    # @option options [Boolean] report_changes whether or not to automatically report changes (run the callback)
     #
     # @yield [changed_dirs, options] callback Callback called when a change happens
     # @yieldparam [Array<String>] changed_dirs the changed directories
@@ -78,13 +60,12 @@ module Listen
     def initialize(directories, options = {}, &callback)
       @directories  = Array(directories)
       @callback     = callback
+      @latency    ||= DEFAULT_LATENCY
+      @latency      = options[:latency] if options[:latency]
       @paused       = false
       @mutex        = Mutex.new
       @changed_dirs = Set.new
       @turnstile    = Turnstile.new
-      @latency    ||= DEFAULT_LATENCY
-      @latency      = options[:latency] if options[:latency]
-      @report_changes = options[:report_changes].nil? ? true : options[:report_changes]
     end
 
     # Starts the adapter.
@@ -111,37 +92,12 @@ module Listen
     end
 
     # Blocks the main thread until the poll thread
-    # runs the callback.
+    # calls the callback.
     #
     def wait_for_callback
       @turnstile.wait unless @paused
     end
 
-    # Blocks the main thread until N changes are
-    # detected.
-    #
-    def wait_for_changes(goal = 0)
-      changes = 0
-
-      loop do
-        @mutex.synchronize { changes = @changed_dirs.size }
-
-        return if @paused || @stop
-        return if changes >= goal
-
-        sleep(@latency)
-      end
-    end
-
-    # Checks if the adapter is usable on the current OS.
-    #
-    # @return [Boolean] whether usable or not
-    #
-    def self.usable?
-      load_depenencies
-      dependencies_loaded?
-    end
-
     # Checks if the adapter is usable and works on the current OS.
     #
     # @param [String, Array<String>] directories the directories to watch
@@ -168,7 +124,7 @@ module Listen
     def self.works?(directory, options = {})
       work = false
       test_file = "#{directory}/.listen_test"
-      callback = lambda { |*| work = true }
+      callback = lambda { |changed_dirs, options| work = true }
       adapter  = self.new(directory, options, &callback)
       adapter.start(false)
 
@@ -184,30 +140,27 @@ module Listen
       adapter.stop if adapter && adapter.started?
     end
 
-    # Runs the callback and passes it the changes if there are any.
-    #
-    def report_changes
-      changed_dirs = nil
-
-      @mutex.synchronize do
-        return if @changed_dirs.empty?
-        changed_dirs = @changed_dirs.to_a
-        @changed_dirs.clear
-      end
-
-      @callback.call(changed_dirs, {})
-      @turnstile.signal
-    end
-
     private
 
     # Polls changed directories and reports them back
     # when there are changes.
     #
-    def poll_changed_dirs
+    # @option [Boolean] recursive whether or not to pass the recursive option to the callback
+    #
+    def poll_changed_dirs(recursive = false)
       until @stop
         sleep(@latency)
-        report_changes
+        next if @changed_dirs.empty?
+
+        changed_dirs = []
+
+        @mutex.synchronize do
+          changed_dirs = @changed_dirs.to_a
+          @changed_dirs.clear
+        end
+
+        @callback.call(changed_dirs, recursive ? {:recursive => recursive} : {})
+        @turnstile.signal
       end
     end
   end