sass 3.1.17 → 3.1.18

data/Rakefile

@@ -147,7 +147,7 @@ def get_version
   version.map! {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
   return written_version unless version.size == 5 && version[3] == "alpha" # prerelease
 
-  return written_version if (commit_count = `git log --pretty=oneline --first-parent stable.. | wc -l`).empty?
+  return written_version if (commit_count = `git log --pretty=oneline HEAD ^stable | wc -l`).empty?
   version[4] = commit_count.strip
   version.join('.')
 end

data/VERSION

@@ -1 +1 @@
-3.1.17
+3.1.18

data/lib/sass/script/functions.rb

@@ -1148,8 +1148,8 @@ module Sass::Script
     # Rounds a number up to the nearest whole number.
     #
     # @example
-    #   ciel(10.4px) => 11px
-    #   ciel(10.6px) => 11px
+    #   ceil(10.4px) => 11px
+    #   ceil(10.6px) => 11px
     # @param value [Number] The number
     # @return [Number] The rounded number
     # @raise [ArgumentError] if `value` isn't a number

data/lib/sass/tree/directive_node.rb

@@ -19,5 +19,10 @@ module Sass::Tree
       @value = value
       super()
     end
+
+    # @return [String] The name of the directive, including `@`.
+    def name
+      value.gsub(/ .*$/, '')
+    end
   end
 end

data/lib/sass/tree/extend_node.rb

@@ -25,5 +25,17 @@ module Sass::Tree
       @selector = selector
       super()
     end
+
+    # Disables this `@extend` due to it being inside a directive.
+    def disable!
+      @disabled = true
+    end
+
+    # Whether this `@extend` is disabled due to it being inside a directive.
+    #
+    # @return [Boolean]
+    def disabled?
+      @disabled
+    end
   end
 end

data/lib/sass/tree/visitors/base.rb

@@ -33,7 +33,7 @@ module Sass::Tree::Visitors
     # @return [Object] The return value of the `visit_*` method for this node.
     def visit(node)
       method = "visit_#{node_name node}"
-      if self.respond_to?(method)
+      if self.respond_to?(method, true)
         self.send(method, node) {visit_children(node)}
       else
         visit_children(node)

data/lib/sass/tree/visitors/check_nesting.rb

@@ -2,13 +2,14 @@
 class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   protected
 
+  def initialize
+    @parents = []
+  end
+
   def visit(node)
-    if error = (@parent && (
-          try_send("invalid_#{node_name @parent}_child?", @parent, node) ||
-          try_send("invalid_#{node_name node}_parent?", @parent, node))) ||
-        (@real_parent && (
-          try_send("invalid_#{node_name @real_parent}_real_child?", @real_parent, node) ||
-          try_send("invalid_#{node_name node}_real_parent?", @real_parent, node)))
+    if error = @parent && (
+        try_send("invalid_#{node_name @parent}_child?", @parent, node) ||
+        try_send("invalid_#{node_name node}_parent?", @parent, node))
       raise Sass::SyntaxError.new(error)
     end
     super
@@ -22,11 +23,11 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   def visit_children(parent)
     old_parent = @parent
     @parent = parent unless is_any_of?(parent, SCRIPT_NODES)
-    old_real_parent, @real_parent = @real_parent, parent
+    @parents.push parent
     super
   ensure
     @parent = old_parent
-    @real_parent = old_real_parent
+    @parents.pop
   end
 
   def visit_root(node)
@@ -51,7 +52,19 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   VALID_EXTEND_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::MixinDefNode]
   def invalid_extend_parent?(parent, child)
     unless is_any_of?(parent, VALID_EXTEND_PARENTS)
-      "Extend directives may only be used within rules."
+      return "Extend directives may only be used within rules."
+    end
+
+    if !child.disabled? &&
+        directive = @parents.find {|p| p.is_a?(Sass::Tree::DirectiveNode)}
+      child.disable!
+      Sass::Util.sass_warn <<WARNING
+DEPRECATION WARNING on line #{child.line}#{" of #{child.filename}" if child.filename}:
+  Using @extend within directives (e.g. #{directive.name}) is deprecated.
+  It will be an error in Sass 3.2.
+  This will only work once @extend is supported natively in the browser.
+WARNING
+      nil
     end
   end
 
@@ -69,12 +82,9 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     end
   end
 
-  VALID_IMPORT_PARENTS = [
-    Sass::Tree::IfNode,   Sass::Tree::ForNode, Sass::Tree::WhileNode,
-    Sass::Tree::EachNode, Sass::Tree::MixinDefNode
-  ]
+  INVALID_IMPORT_PARENTS = CONTROL_NODES + [Sass::Tree::MixinDefNode]
   def invalid_import_parent?(parent, child)
-    if is_any_of?(@real_parent, VALID_IMPORT_PARENTS)
+    unless (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
       return "Import directives may not be used within control directives or mixins."
     end
     return if parent.is_a?(Sass::Tree::RootNode)
@@ -89,10 +99,6 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     raise e
   end
 
-  def invalid_import_real_parent?(parent, child)
-    
-  end
-
   def invalid_mixindef_parent?(parent, child)
     "Mixins may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end

data/lib/sass/tree/visitors/cssize.rb

@@ -82,6 +82,7 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
 
   # Registers an extension in the `@extends` subset map.
   def visit_extend(node)
+    return [] if node.disabled?
     node.resolved_selector.members.each do |seq|
       if seq.members.size > 1
         raise Sass::SyntaxError.new("Can't extend #{seq.to_a.join}: can't extend nested selectors")

data/test/sass/engine_test.rb

@@ -61,7 +61,9 @@ MSG
     "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
     "foo\n  @import foo.css" => "CSS import directives may only be used at the root of a document.",
     "@if true\n  @import foo" => "Import directives may not be used within control directives or mixins.",
+    "@if true\n  .foo\n    @import foo" => "Import directives may not be used within control directives or mixins.",
     "@mixin foo\n  @import foo" => "Import directives may not be used within control directives or mixins.",
+    "@mixin foo\n  .foo\n    @import foo" => "Import directives may not be used within control directives or mixins.",
     "@import foo;" => "Invalid @import: expected end of line, was \";\".",
     '$foo: "bar" "baz" !' => %Q{Invalid CSS after ""bar" "baz" ": expected expression (e.g. 1px, bold), was "!"},
     '$foo: "bar" "baz" $' => %Q{Invalid CSS after ""bar" "baz" ": expected expression (e.g. 1px, bold), was "$"},

data/test/sass/extend_test.rb

@@ -1369,6 +1369,43 @@ CSS
 SCSS
   end
 
+
+  def test_extend_in_media
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
+DEPRECATION WARNING on line 3 of test_extend_in_media_inline.sass:
+  Using @extend within directives (e.g. @media) is deprecated.
+  It will be an error in Sass 3.2.
+  This will only work once @extend is supported natively in the browser.
+WARN
+.foo {
+  a: b; }
+CSS
+.foo {a: b}
+@media screen {
+  .bar {@extend .foo}
+}
+SCSS
+  end
+
+  def test_extend_in_unknown_directive
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
+DEPRECATION WARNING on line 3 of test_extend_in_unknown_directive_inline.sass:
+  Using @extend within directives (e.g. @flooblehoof) is deprecated.
+  It will be an error in Sass 3.2.
+  This will only work once @extend is supported natively in the browser.
+WARN
+.foo {
+  a: b; }
+
+@flooblehoof {}
+CSS
+.foo {a: b}
+@flooblehoof {
+  .bar {@extend .foo}
+}
+SCSS
+  end
+
   # Regression Tests
 
   def test_duplicated_selector_with_newlines

data/vendor/listen/README.md

@@ -193,6 +193,9 @@ These options can be set through `Listen.to` params or via methods (see the "Obj
 :latency => 0.5                                # Set the delay (**in seconds**) between checking for changes
                                                # default: 0.1 sec (1.0 sec for polling)
 
+:relative_paths => true                        # Enable the use of relative paths in the callback.
+                                               # default: false
+
 :force_polling => true                         # Force the use of the polling adapter
                                                # default: none
 

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

@@ -83,6 +83,14 @@ module Listen
       @turnstile.signal # ensure no thread is blocked
     end
 
+    # Returns whether the adapter is statred or not
+    #
+    # @return [Boolean] whether the adapter is started or not
+    #
+    def started?
+      @stop.nil? ? false : !@stop
+    end
+
     # Blocks the main thread until the poll thread
     # calls the callback.
     #
@@ -129,7 +137,7 @@ module Listen
     ensure
       Thread.kill(t) if t
       FileUtils.rm(test_file) if File.exists?(test_file)
-      adapter.stop
+      adapter.stop if adapter && adapter.started?
     end
 
     private

data/vendor/listen/lib/listen/adapters/linux.rb

@@ -1,22 +1,33 @@
 module Listen
   module Adapters
 
-    # Watched INotify EVENTS
-    #
-    # @see http://www.tin.org/bin/man.cgi?section=7&topic=inotify
-    # @see https://github.com/nex3/rb-inotify/blob/master/lib/rb-inotify/notifier.rb#L99-L177
-    #
-    EVENTS = %w[recursive attrib close modify move create delete delete_self move_self]
-
     # Listener implementation for Linux `inotify`.
     #
     class Linux < Adapter
 
+      # Watched inotify events
+      #
+      # @see http://www.tin.org/bin/man.cgi?section=7&topic=inotify
+      # @see https://github.com/nex3/rb-inotify/blob/master/lib/rb-inotify/notifier.rb#L99-L177
+      #
+      EVENTS = %w[recursive attrib close modify move create delete delete_self move_self]
+
+      # The message to show when the limit of inotify watchers is not enough
+      #
+      INOTIFY_LIMIT_MESSAGE = <<-EOS.gsub(/^\s*/, '')
+        Listen error: unable to monitor directories for changes.
+
+        Please head to https://github.com/guard/listen/wiki/Increasing-the-amount-of-inotify-watchers
+        for information on how to solve this issue.
+      EOS
+
       # Initializes the Adapter. See {Listen::Adapter#initialize} for more info.
       #
       def initialize(directories, options = {}, &callback)
         super
         @worker = init_worker
+      rescue Errno::ENOSPC
+        abort(INOTIFY_LIMIT_MESSAGE)
       end
 
       # Starts the adapter.

data/vendor/listen/lib/listen/directory_record.rb

@@ -15,6 +15,15 @@ module Listen
 
     DEFAULT_IGNORED_EXTENSIONS  = %w[.DS_Store]
 
+    # Defines the used precision based on the type of mtime returned by the
+    # system (whether its in milliseconds or just seconds)
+    #
+    HIGH_PRECISION_SUPPORTED = File.mtime(__FILE__).to_f.to_s[-2..-1] != '.0'
+
+    # Data structure used to save meta data about a path
+    #
+    MetaData = Struct.new(:type, :mtime)
+
     # Class methods
     #
     class << self
@@ -71,7 +80,7 @@ module Listen
     # Adds ignoring patterns to the record.
     #
     # @example Ignore some paths
-    #   ignore ".git", ".svn"
+    #   ignore %r{^ignored/path/}, /man/
     #
     # @param [Regexp] regexp a pattern for ignoring paths
     #
@@ -86,8 +95,6 @@ module Listen
     #
     # @param [Regexp] regexp a pattern for filtering paths
     #
-    # @return [Listen::Listener] the listener itself
-    #
     def filter(*regexps)
       @filtering_patterns.merge(regexps)
     end
@@ -123,7 +130,6 @@ module Listen
     def build
       @paths = Hash.new { |h, k| h[k] = Hash.new }
       important_paths { |path| insert_path(path) }
-      @updated_at = Time.now.to_i
     end
 
     # Detects changes in the passed directories, updates
@@ -139,13 +145,13 @@ module Listen
     def fetch_changes(directories, options = {})
       @changes    = { :modified => [], :added => [], :removed => [] }
       directories = directories.sort_by { |el| el.length }.reverse # diff sub-dir first
-      update_time = Time.now.to_i
+
       directories.each do |directory|
         next unless directory[@directory] # Path is or inside directory
         detect_modifications_and_removals(directory, options)
         detect_additions(directory, options)
       end
-      @updated_at = update_time
+
       @changes
     end
 
@@ -174,10 +180,10 @@ module Listen
     # @option options [Boolean] relative_paths whether or not to use relative paths for changes
     #
     def detect_modifications_and_removals(directory, options = {})
-      @paths[directory].each do |basename, type|
+      @paths[directory].each do |basename, meta_data|
         path = File.join(directory, basename)
 
-        case type
+        case meta_data.type
         when 'Dir'
           if File.directory?(path)
             detect_modifications_and_removals(path, options) if options[:recursive]
@@ -188,8 +194,15 @@ module Listen
           end
         when 'File'
           if File.exist?(path)
-            new_mtime = File.mtime(path).to_i
-            if @updated_at < new_mtime || (@updated_at == new_mtime && content_modified?(path))
+            new_mtime = mtime_of(path)
+
+            # First check if we are in the same second (to update checksums)
+            # before checking the time difference
+            if  (meta_data.mtime.to_i == new_mtime.to_i && content_modified?(path)) || meta_data.mtime < new_mtime
+              # Update the meta data of the files
+              meta_data.mtime = new_mtime
+              @paths[directory][basename] = meta_data
+
               @changes[:modified] << (options[:relative_paths] ? relative_to_base(path) : path)
             end
           else
@@ -239,12 +252,12 @@ module Listen
     #
     def content_modified?(path)
       sha1_checksum = Digest::SHA1.file(path).to_s
-      if @sha1_checksums[path] != sha1_checksum
-        @sha1_checksums[path] = sha1_checksum
-        true
-      else
-        false
-      end
+      return false if @sha1_checksums[path] == sha1_checksum
+
+      had_no_checksum = @sha1_checksums[path].nil?
+      @sha1_checksums[path] = sha1_checksum
+
+      had_no_checksum ? false : true
     end
 
     # Traverses the base directory looking for paths that should
@@ -275,7 +288,10 @@ module Listen
     # @param [String] path the path to insert in @paths.
     #
     def insert_path(path)
-      @paths[File.dirname(path)][File.basename(path)] = File.directory?(path) ? 'Dir' : 'File'
+      meta_data = MetaData.new
+      meta_data.type = File.directory?(path) ? 'Dir' : 'File'
+      meta_data.mtime = mtime_of(path) unless meta_data.type == 'Dir' # mtimes of dirs are not used yet
+      @paths[File.dirname(path)][File.basename(path)] = meta_data
     end
 
     # Returns whether or not a path exists in the paths hash.
@@ -287,5 +303,15 @@ module Listen
     def existing_path?(path)
       @paths[File.dirname(path)][File.basename(path)] != nil
     end
+
+    # Returns the modification time of a file based on the precision defined by the system
+    #
+    # @param [String] file the file for which the mtime must be returned
+    #
+    # @return [Fixnum, Float] the mtime of the file
+    #
+    def mtime_of(file)
+      File.mtime(file).send(HIGH_PRECISION_SUPPORTED ? :to_f : :to_i)
+    end
   end
 end

data/vendor/listen/lib/listen/listener.rb

@@ -119,7 +119,7 @@ module Listen
       self
     end
 
-    # Defines whether the use of the polling adapter
+    # Sets whether the use of the polling adapter
     # should be forced or not.
     #
     # @example Forcing the use of the polling adapter
@@ -134,6 +134,21 @@ module Listen
       self
     end
 
+    # Sets whether the paths in the callback should be
+    # relative or absolute.
+    #
+    # @example Enabling relative paths in the callback
+    #   relative_paths true
+    #
+    # @param [Boolean] value whether to enable relative paths in the callback or not
+    #
+    # @return [Listen::Listener] the listener
+    #
+    def relative_paths(value)
+      @use_relative_paths = value
+      self
+    end
+
     # Defines a custom polling fallback message of disable it.
     #
     # @example Disabling the polling fallback message

data/vendor/listen/spec/listen/adapters/linux_spec.rb

@@ -9,6 +9,17 @@ describe Listen::Adapters::Linux do
 
       it_should_behave_like 'a filesystem adapter'
       it_should_behave_like 'an adapter that call properly listener#on_change'
+
+      describe '#initialize' do
+        context 'when the inotify limit for watched files is not enough' do
+          before { INotify::Notifier.any_instance.should_receive(:watch).and_raise(Errno::ENOSPC) }
+
+          it 'fails gracefully' do
+            described_class.any_instance.should_receive(:abort).with(described_class::INOTIFY_LIMIT_MESSAGE)
+            described_class.new(File.dirname(__FILE__))
+          end
+        end
+      end
     else
       it "isn't usable on Linux with #{RbConfig::CONFIG['RUBY_INSTALL_NAME']}" do
         described_class.should_not be_usable

data/vendor/listen/spec/listen/directory_record_spec.rb

@@ -125,9 +125,9 @@ describe Listen::DirectoryRecord do
         record = described_class.new(path)
         record.build
 
-        record.paths[path]['file.rb'].should eq 'File'
-        record.paths[path]['a_directory'].should eq 'Dir'
-        record.paths["#{path}/a_directory"]['file.txt'].should eq 'File'
+        record.paths[path]['file.rb'].type.should eq 'File'
+        record.paths[path]['a_directory'].type.should eq 'Dir'
+        record.paths["#{path}/a_directory"]['file.txt'].type.should eq 'File'
       end
     end
 
@@ -175,9 +175,9 @@ describe Listen::DirectoryRecord do
           record.build
 
           record.paths[path]['file.rb'].should be_nil
-          record.paths[path]['file.zip'].should eq 'File'
-          record.paths[path]['a_directory'].should eq 'Dir'
-          record.paths["#{path}/a_directory"]['file.txt'].should eq 'File'
+          record.paths[path]['file.zip'].type.should eq 'File'
+          record.paths[path]['a_directory'].type.should eq 'Dir'
+          record.paths["#{path}/a_directory"]['file.txt'].type.should eq 'File'
           record.paths["#{path}/a_directory"]['file.rb'].should be_nil
         end
       end
@@ -365,13 +365,17 @@ describe Listen::DirectoryRecord do
           end
         end
 
-        context 'during the same second' do
-          it 'always detects the modified file the first time' do
+        context 'during the same second at which we are checking for changes' do
+          before { ensure_same_second }
+
+          # The following test can only be run on systems that report
+          # modification times in milliseconds.
+          it 'always detects the modified file the first time', :if => described_class::HIGH_PRECISION_SUPPORTED do
             fixtures do |path|
               touch 'existing_file.txt'
 
               modified, added, removed = changes(path) do
-                small_time_difference
+                sleep 0.3 # make sure the mtime is changed a bit
                 touch 'existing_file.txt'
               end
 
@@ -381,6 +385,23 @@ describe Listen::DirectoryRecord do
             end
           end
 
+          context '#27 - when a file is created and then checked for modifications at the same second' do
+            # This issue was the result of checking a file for content changes when
+            # the mtime and the checking time are the same. In this case there
+            # is no checksum saved, so the file was reported as being changed.
+            it ' does not report any changes' do
+              fixtures do |path|
+                touch 'a_file.rb'
+
+                modified, added, removed = changes(path)
+
+                added.should be_empty
+                modified.should be_empty
+                removed.should be_empty
+              end
+            end
+          end
+
           it "doesn't detects the modified file the second time if the content haven't changed" do
             fixtures do |path|
               touch 'existing_file.txt'
@@ -408,7 +429,6 @@ describe Listen::DirectoryRecord do
               end
 
               modified, added, removed = changes(path, :use_last_record => true) do
-                small_time_difference
                 open('existing_file.txt', 'w') { |f| f.write('foo') }
               end
 
@@ -869,8 +889,9 @@ describe Listen::DirectoryRecord do
           touch 'a_directory/a_file.rb'
           touch 'a_directory/b_file.rb'
 
+          small_time_difference
+
           modified, added, removed = changes(path) do
-            small_time_difference
             touch 'b_file.rb'
             touch 'a_directory/a_file.rb'
           end

data/vendor/listen/spec/support/adapter_helper.rb

@@ -43,6 +43,31 @@ shared_examples_for 'a filesystem adapter' do
       end
     end
   end
+
+  describe '#started?' do
+    context 'with a new adapter' do
+      it 'returns false' do
+        subject.should_not be_started
+      end
+    end
+
+    context 'with a stopped adapter' do
+      before { subject.start(false); subject.stop }
+
+      it 'returns false' do
+        subject.should_not be_started
+      end
+    end
+
+    context 'with a started adapter' do
+      before { subject.start(false) }
+      after { subject.start }
+
+      it 'returns true' do
+        subject.should be_started
+      end
+    end
+  end
 end
 
 shared_examples_for 'an adapter that call properly listener#on_change' do |*args|
@@ -66,6 +91,24 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
         end
       end
 
+      context 'given a symlink' do
+        it 'detects the added file' do
+          fixtures do |path|
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
+            end
+
+            touch 'new_file.rb'
+
+            watch(listener, path) do
+              ln_s 'new_file.rb', 'new_file_symlink.rb'
+            end
+          end
+        end
+      end
+
       context 'given a new created directory' do
         it 'detects the added file' do
           fixtures do |path|
@@ -141,6 +184,25 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
         end
       end
 
+      context 'given a symlink' do
+        it 'detects the modified file' do
+          fixtures do |path|
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
+            end
+
+            touch 'existing_file.rb'
+            ln_s  'existing_file.rb', 'existing_file_symlink.rb'
+
+            watch(listener, path) do
+              touch 'existing_file.rb'
+            end
+          end
+        end
+      end
+
       context 'given a hidden file' do
         it 'detects the modified file' do
           fixtures do |path|
@@ -235,6 +297,25 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
         end
       end
 
+      context 'given a symlink' do
+        it 'detects the file move' do
+          fixtures do |path|
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
+            end
+
+            touch 'move_me.rb'
+            ln_s  'move_me.rb', 'move_me_symlink.rb'
+
+            watch(listener, path) do
+              mv 'move_me_symlink.rb', 'new_symlink.rb'
+            end
+          end
+        end
+      end
+
       context 'given an existing directory' do
         it 'detects the file move into the directory' do
           fixtures do |path|
@@ -335,6 +416,25 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
         end
       end
 
+      context 'given a symlink' do
+        it 'detects the file removal' do
+          fixtures do |path|
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
+            end
+
+            touch 'unnecessary.rb'
+            ln_s  'unnecessary.rb', 'unnecessary_symlink.rb'
+
+            watch(listener, path) do
+              rm 'unnecessary_symlink.rb'
+            end
+          end
+        end
+      end
+
       context 'given an existing directory' do
         it 'detects the file removal' do
           fixtures do |path|

data/vendor/listen/spec/support/directory_record_helper.rb

@@ -19,7 +19,7 @@ def changes(root_path, options = {})
     @record.build
   end
 
-  yield
+  yield if block_given?
 
   paths = options.delete(:paths) || [root_path]
   options[:recursive] = true if options[:recursive].nil?
@@ -41,3 +41,15 @@ def small_time_difference
 
   sleep( 1.5 - (diff < 0.5 ? diff : 0.4) )
 end
+
+# Ensures that the test runs at almost the same second at which
+# changes are being checked.
+#
+def ensure_same_second
+  t = Time.now
+  diff = t.to_f - t.to_i
+
+  if diff > 0.1 # We are not at the beginning of a second
+    sleep 1.1 - diff # 1.1 is used instead of 1 to account for the processing time (estimated at 0.1 sec)
+  end
+end

data/vendor/listen/spec/support/listeners_helper.rb

@@ -115,6 +115,17 @@ shared_examples_for 'a listener to changes on a file-system' do
     end
   end
 
+  describe '#relative_paths' do
+    it 'sets the relative paths option for paths in the callback' do
+      subject.relative_paths(true)
+      subject.instance_variable_get(:@use_relative_paths).should be_true
+    end
+
+    it 'returns the same listener to allow chaining' do
+      subject.relative_paths(true).should equal subject
+    end
+  end
+
   describe '#polling_fallback_message' do
     it 'sets custom polling fallback message to @adapter_options' do
       subject.polling_fallback_message('custom message')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 33
-  prerelease: 
+  hash: 39
+  prerelease: false
   segments: 
   - 3
   - 1
-  - 17
-  version: 3.1.17
+  - 18
+  version: 3.1.18
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -17,7 +17,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-05 00:00:00 Z
+date: 2012-05-11 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yard
@@ -63,258 +64,259 @@ extra_rdoc_files: []
 
 files: 
 - rails/init.rb
-- lib/sass/util/multibyte_string_scanner.rb
-- lib/sass/util/subset_map.rb
-- lib/sass/shared.rb
-- lib/sass/error.rb
-- lib/sass/importers.rb
-- lib/sass/cache_stores/filesystem.rb
-- lib/sass/cache_stores/chain.rb
-- lib/sass/cache_stores/memory.rb
-- lib/sass/cache_stores/null.rb
-- lib/sass/cache_stores/base.rb
-- lib/sass/environment.rb
-- lib/sass/plugin/rack.rb
-- lib/sass/plugin/staleness_checker.rb
+- lib/sass.rb
+- lib/sass/cache_stores.rb
 - lib/sass/plugin/compiler.rb
-- lib/sass/plugin/configuration.rb
 - lib/sass/plugin/merb.rb
+- lib/sass/plugin/staleness_checker.rb
+- lib/sass/plugin/rack.rb
 - lib/sass/plugin/rails.rb
+- lib/sass/plugin/configuration.rb
 - lib/sass/plugin/generic.rb
-- lib/sass/railtie.rb
-- lib/sass/logger.rb
-- lib/sass/callbacks.rb
-- lib/sass/script/string.rb
-- lib/sass/script/node.rb
-- lib/sass/script/lexer.rb
-- lib/sass/script/string_interpolation.rb
-- lib/sass/script/css_parser.rb
-- lib/sass/script/variable.rb
-- lib/sass/script/literal.rb
-- lib/sass/script/bool.rb
-- lib/sass/script/number.rb
-- lib/sass/script/unary_operation.rb
-- lib/sass/script/css_lexer.rb
-- lib/sass/script/operation.rb
-- lib/sass/script/parser.rb
-- lib/sass/script/funcall.rb
-- lib/sass/script/color.rb
-- lib/sass/script/interpolation.rb
-- lib/sass/script/list.rb
-- lib/sass/script/functions.rb
 - lib/sass/version.rb
-- lib/sass/tree/visitors/deep_copy.rb
-- lib/sass/tree/visitors/set_options.rb
-- lib/sass/tree/visitors/cssize.rb
-- lib/sass/tree/visitors/to_css.rb
-- lib/sass/tree/visitors/perform.rb
-- lib/sass/tree/visitors/base.rb
-- lib/sass/tree/visitors/check_nesting.rb
-- lib/sass/tree/visitors/convert.rb
+- lib/sass/cache_stores/chain.rb
+- lib/sass/cache_stores/memory.rb
+- lib/sass/cache_stores/null.rb
+- lib/sass/cache_stores/filesystem.rb
+- lib/sass/cache_stores/base.rb
+- lib/sass/shared.rb
+- lib/sass/repl.rb
+- lib/sass/error.rb
+- lib/sass/tree/import_node.rb
+- lib/sass/tree/return_node.rb
 - lib/sass/tree/root_node.rb
-- lib/sass/tree/node.rb
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/charset_node.rb
-- lib/sass/tree/extend_node.rb
-- lib/sass/tree/rule_node.rb
-- lib/sass/tree/mixin_def_node.rb
-- lib/sass/tree/return_node.rb
-- lib/sass/tree/mixin_node.rb
-- lib/sass/tree/prop_node.rb
-- lib/sass/tree/warn_node.rb
+- lib/sass/tree/function_node.rb
+- lib/sass/tree/media_node.rb
+- lib/sass/tree/while_node.rb
+- lib/sass/tree/for_node.rb
 - lib/sass/tree/directive_node.rb
+- lib/sass/tree/rule_node.rb
 - lib/sass/tree/each_node.rb
+- lib/sass/tree/node.rb
+- lib/sass/tree/mixin_node.rb
+- lib/sass/tree/extend_node.rb
+- lib/sass/tree/mixin_def_node.rb
+- lib/sass/tree/visitors/perform.rb
+- lib/sass/tree/visitors/to_css.rb
+- lib/sass/tree/visitors/check_nesting.rb
+- lib/sass/tree/visitors/deep_copy.rb
+- lib/sass/tree/visitors/set_options.rb
+- lib/sass/tree/visitors/cssize.rb
+- lib/sass/tree/visitors/convert.rb
+- lib/sass/tree/visitors/base.rb
 - lib/sass/tree/comment_node.rb
-- lib/sass/tree/media_node.rb
-- lib/sass/tree/variable_node.rb
-- lib/sass/tree/function_node.rb
+- lib/sass/tree/warn_node.rb
 - lib/sass/tree/debug_node.rb
-- lib/sass/tree/import_node.rb
-- lib/sass/tree/while_node.rb
-- lib/sass/tree/for_node.rb
+- lib/sass/tree/prop_node.rb
+- lib/sass/tree/variable_node.rb
+- lib/sass/engine.rb
+- lib/sass/plugin.rb
+- lib/sass/root.rb
+- lib/sass/importers.rb
+- lib/sass/logger.rb
+- lib/sass/util/multibyte_string_scanner.rb
+- lib/sass/util/subset_map.rb
+- lib/sass/scss.rb
+- lib/sass/scss/static_parser.rb
+- lib/sass/scss/parser.rb
 - lib/sass/scss/sass_parser.rb
-- lib/sass/scss/script_parser.rb
-- lib/sass/scss/css_parser.rb
 - lib/sass/scss/script_lexer.rb
 - lib/sass/scss/rx.rb
-- lib/sass/scss/parser.rb
-- lib/sass/scss/static_parser.rb
+- lib/sass/scss/script_parser.rb
+- lib/sass/scss/css_parser.rb
+- lib/sass/logger/log_level.rb
+- lib/sass/logger/base.rb
+- lib/sass/css.rb
+- lib/sass/script.rb
+- lib/sass/util.rb
+- lib/sass/importers/filesystem.rb
+- lib/sass/importers/base.rb
+- lib/sass/script/color.rb
+- lib/sass/script/variable.rb
+- lib/sass/script/operation.rb
+- lib/sass/script/funcall.rb
+- lib/sass/script/literal.rb
+- lib/sass/script/parser.rb
+- lib/sass/script/functions.rb
+- lib/sass/script/number.rb
+- lib/sass/script/string_interpolation.rb
+- lib/sass/script/interpolation.rb
+- lib/sass/script/node.rb
+- lib/sass/script/bool.rb
+- lib/sass/script/unary_operation.rb
+- lib/sass/script/lexer.rb
+- lib/sass/script/list.rb
+- lib/sass/script/css_lexer.rb
+- lib/sass/script/string.rb
+- lib/sass/script/css_parser.rb
+- lib/sass/selector.rb
 - lib/sass/less.rb
-- lib/sass/selector/simple_sequence.rb
+- lib/sass/callbacks.rb
 - lib/sass/selector/simple.rb
 - lib/sass/selector/sequence.rb
 - lib/sass/selector/abstract_sequence.rb
 - lib/sass/selector/comma_sequence.rb
-- lib/sass/root.rb
-- lib/sass/importers/filesystem.rb
-- lib/sass/importers/base.rb
-- lib/sass/css.rb
-- lib/sass/selector.rb
-- lib/sass/engine.rb
-- lib/sass/plugin.rb
-- lib/sass/logger/log_level.rb
-- lib/sass/logger/base.rb
-- lib/sass/repl.rb
-- lib/sass/scss.rb
+- lib/sass/selector/simple_sequence.rb
+- lib/sass/railtie.rb
+- lib/sass/environment.rb
 - lib/sass/exec.rb
-- lib/sass/util.rb
-- lib/sass/cache_stores.rb
-- lib/sass/script.rb
-- lib/sass.rb
-- vendor/listen/lib/listen.rb
+- vendor/listen/README.md
+- vendor/listen/Guardfile
+- vendor/listen/Gemfile
 - vendor/listen/lib/listen/turnstile.rb
+- vendor/listen/lib/listen/directory_record.rb
+- vendor/listen/lib/listen/version.rb
 - vendor/listen/lib/listen/multi_listener.rb
-- vendor/listen/lib/listen/adapters/darwin.rb
+- vendor/listen/lib/listen/listener.rb
 - vendor/listen/lib/listen/adapters/polling.rb
-- vendor/listen/lib/listen/adapters/windows.rb
+- vendor/listen/lib/listen/adapters/darwin.rb
 - vendor/listen/lib/listen/adapters/linux.rb
+- vendor/listen/lib/listen/adapters/windows.rb
 - vendor/listen/lib/listen/adapter.rb
-- vendor/listen/lib/listen/listener.rb
-- vendor/listen/lib/listen/version.rb
-- vendor/listen/lib/listen/directory_record.rb
-- vendor/listen/Vagrantfile
+- vendor/listen/lib/listen.rb
 - vendor/listen/CHANGELOG.md
-- vendor/listen/LICENSE
 - vendor/listen/Rakefile
-- vendor/listen/Gemfile
-- vendor/listen/README.md
-- vendor/listen/Guardfile
+- vendor/listen/LICENSE
 - vendor/listen/listen.gemspec
-- vendor/listen/spec/spec_helper.rb
-- vendor/listen/spec/listen_spec.rb
-- vendor/listen/spec/support/directory_record_helper.rb
-- vendor/listen/spec/support/fixtures_helper.rb
-- vendor/listen/spec/support/listeners_helper.rb
-- vendor/listen/spec/support/platform_helper.rb
-- vendor/listen/spec/support/adapter_helper.rb
-- vendor/listen/spec/listen/turnstile_spec.rb
-- vendor/listen/spec/listen/adapters/windows_spec.rb
-- vendor/listen/spec/listen/adapters/darwin_spec.rb
+- vendor/listen/Vagrantfile
+- vendor/listen/spec/listen/directory_record_spec.rb
 - vendor/listen/spec/listen/adapters/linux_spec.rb
+- vendor/listen/spec/listen/adapters/darwin_spec.rb
 - vendor/listen/spec/listen/adapters/polling_spec.rb
+- vendor/listen/spec/listen/adapters/windows_spec.rb
+- vendor/listen/spec/listen/turnstile_spec.rb
 - vendor/listen/spec/listen/adapter_spec.rb
-- vendor/listen/spec/listen/directory_record_spec.rb
 - vendor/listen/spec/listen/listener_spec.rb
 - vendor/listen/spec/listen/multi_listener_spec.rb
-- bin/sass
-- bin/scss
+- vendor/listen/spec/listen_spec.rb
+- vendor/listen/spec/spec_helper.rb
+- vendor/listen/spec/support/directory_record_helper.rb
+- vendor/listen/spec/support/listeners_helper.rb
+- vendor/listen/spec/support/adapter_helper.rb
+- vendor/listen/spec/support/platform_helper.rb
+- vendor/listen/spec/support/fixtures_helper.rb
 - bin/sass-convert
-- test/sass/plugin_test.rb
-- test/sass/util/subset_map_test.rb
-- test/sass/util/multibyte_string_scanner_test.rb
+- bin/scss
+- bin/sass
+- test/Gemfile
+- test/Gemfile.lock
+- test/test_helper.rb
+- test/sass/engine_test.rb
+- test/sass/functions_test.rb
+- test/sass/fixtures/test_staleness_check_across_importers.scss
+- test/sass/fixtures/test_staleness_check_across_importers.css
+- test/sass/data/hsl-rgb.txt
+- test/sass/extend_test.rb
+- test/sass/logger_test.rb
+- test/sass/css2sass_test.rb
 - test/sass/templates/basic.sass
-- test/sass/templates/line_numbers.sass
-- test/sass/templates/nested_bork2.sass
-- test/sass/templates/_imported_charset_utf8.sass
-- test/sass/templates/mixin_bork.sass
-- test/sass/templates/import_charset.sass
+- test/sass/templates/mixins.sass
+- test/sass/templates/options.sass
+- test/sass/templates/scss_import.scss
+- test/sass/templates/subdir/subdir.sass
+- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
+- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
+- test/sass/templates/alt.sass
+- test/sass/templates/nested_bork1.sass
+- test/sass/templates/complex.sass
+- test/sass/templates/units.sass
+- test/sass/templates/nested_import.sass
+- test/sass/templates/importee.sass
 - test/sass/templates/importee.less
-- test/sass/templates/warn.sass
-- test/sass/templates/single_import_loop.sass
-- test/sass/templates/parent_ref.sass
-- test/sass/templates/nested_bork3.sass
-- test/sass/templates/script.sass
-- test/sass/templates/import.sass
 - test/sass/templates/scss_importee.scss
-- test/sass/templates/bork1.sass
-- test/sass/templates/compressed.sass
-- test/sass/templates/importee.sass
-- test/sass/templates/_partial.sass
-- test/sass/templates/units.sass
-- test/sass/templates/nested_bork1.sass
-- test/sass/templates/_double_import_loop2.sass
+- test/sass/templates/line_numbers.sass
+- test/sass/templates/expanded.sass
 - test/sass/templates/bork3.sass
-- test/sass/templates/nested_mixin_bork.sass
-- test/sass/templates/complex.sass
-- test/sass/templates/if.sass
+- test/sass/templates/bork5.sass
 - test/sass/templates/nested_bork5.sass
+- test/sass/templates/warn_imported.sass
 - test/sass/templates/import_charset_ibm866.sass
-- test/sass/templates/double_import_loop1.sass
-- test/sass/templates/alt.sass
-- test/sass/templates/scss_import.scss
+- test/sass/templates/bork1.sass
+- test/sass/templates/warn.sass
+- test/sass/templates/bork2.sass
+- test/sass/templates/nested.sass
 - test/sass/templates/compact.sass
+- test/sass/templates/single_import_loop.sass
+- test/sass/templates/multiline.sass
 - test/sass/templates/_imported_charset_ibm866.sass
-- test/sass/templates/nested.sass
-- test/sass/templates/subdir/subdir.sass
-- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
-- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- test/sass/templates/warn_imported.sass
-- test/sass/templates/options.sass
+- test/sass/templates/double_import_loop1.sass
+- test/sass/templates/_double_import_loop2.sass
+- test/sass/templates/import_charset.sass
+- test/sass/templates/parent_ref.sass
+- test/sass/templates/import.sass
+- test/sass/templates/nested_bork3.sass
+- test/sass/templates/script.sass
 - test/sass/templates/bork4.sass
-- test/sass/templates/bork5.sass
+- test/sass/templates/if.sass
+- test/sass/templates/_partial.sass
+- test/sass/templates/nested_mixin_bork.sass
 - test/sass/templates/import_charset_1_8.sass
+- test/sass/templates/nested_bork2.sass
+- test/sass/templates/mixin_bork.sass
+- test/sass/templates/compressed.sass
 - test/sass/templates/nested_bork4.sass
-- test/sass/templates/nested_import.sass
-- test/sass/templates/multiline.sass
-- test/sass/templates/expanded.sass
-- test/sass/templates/mixins.sass
-- test/sass/templates/bork2.sass
-- test/sass/script_conversion_test.rb
-- test/sass/mock_importer.rb
-- test/sass/test_helper.rb
-- test/sass/logger_test.rb
-- test/sass/fixtures/test_staleness_check_across_importers.css
-- test/sass/fixtures/test_staleness_check_across_importers.scss
-- test/sass/functions_test.rb
-- test/sass/util_test.rb
-- test/sass/less_conversion_test.rb
-- test/sass/more_results/more1.css
-- test/sass/more_results/more1_with_line_comments.css
-- test/sass/more_results/more_import.css
-- test/sass/data/hsl-rgb.txt
-- test/sass/scss/test_helper.rb
-- test/sass/scss/css_test.rb
-- test/sass/scss/rx_test.rb
-- test/sass/scss/scss_test.rb
-- test/sass/script_test.rb
-- test/sass/importer_test.rb
-- test/sass/cache_test.rb
+- test/sass/templates/_imported_charset_utf8.sass
 - test/sass/conversion_test.rb
-- test/sass/more_templates/more1.sass
-- test/sass/more_templates/_more_partial.sass
-- test/sass/more_templates/more_import.sass
-- test/sass/extend_test.rb
-- test/sass/engine_test.rb
-- test/sass/css2sass_test.rb
+- test/sass/script_test.rb
+- test/sass/util/subset_map_test.rb
+- test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/callbacks_test.rb
-- test/sass/results/units.css
-- test/sass/results/alt.css
-- test/sass/results/scss_importee.css
-- test/sass/results/line_numbers.css
-- test/sass/results/import_charset.css
+- test/sass/importer_test.rb
+- test/sass/scss/css_test.rb
+- test/sass/scss/scss_test.rb
+- test/sass/scss/rx_test.rb
+- test/sass/scss/test_helper.rb
+- test/sass/util_test.rb
+- test/sass/results/mixins.css
+- test/sass/results/warn_imported.css
 - test/sass/results/expanded.css
-- test/sass/results/warn.css
-- test/sass/results/script.css
-- test/sass/results/if.css
-- test/sass/results/scss_import.css
-- test/sass/results/nested.css
+- test/sass/results/compact.css
+- test/sass/results/compressed.css
+- test/sass/results/scss_importee.css
+- test/sass/results/basic.css
+- test/sass/results/subdir/nested_subdir/nested_subdir.css
+- test/sass/results/subdir/subdir.css
 - test/sass/results/options.css
-- test/sass/results/import_charset_1_8.css
+- test/sass/results/scss_import.css
+- test/sass/results/units.css
 - test/sass/results/parent_ref.css
+- test/sass/results/script.css
+- test/sass/results/complex.css
+- test/sass/results/import_charset.css
+- test/sass/results/alt.css
+- test/sass/results/if.css
 - test/sass/results/multiline.css
+- test/sass/results/import_charset_1_8.css
+- test/sass/results/warn.css
 - test/sass/results/import_charset_ibm866.css
-- test/sass/results/subdir/subdir.css
-- test/sass/results/subdir/nested_subdir/nested_subdir.css
-- test/sass/results/warn_imported.css
-- test/sass/results/compact.css
-- test/sass/results/mixins.css
-- test/sass/results/complex.css
-- test/sass/results/compressed.css
 - test/sass/results/import.css
-- test/sass/results/basic.css
-- test/test_helper.rb
-- test/Gemfile.lock
-- test/Gemfile
+- test/sass/results/nested.css
+- test/sass/results/line_numbers.css
+- test/sass/test_helper.rb
+- test/sass/more_templates/_more_partial.sass
+- test/sass/more_templates/more_import.sass
+- test/sass/more_templates/more1.sass
+- test/sass/script_conversion_test.rb
+- test/sass/less_conversion_test.rb
+- test/sass/more_results/more1.css
+- test/sass/more_results/more1_with_line_comments.css
+- test/sass/more_results/more_import.css
+- test/sass/mock_importer.rb
+- test/sass/cache_test.rb
+- test/sass/plugin_test.rb
 - extra/update_watch.rb
 - Rakefile
 - init.rb
 - .yardopts
-- MIT-LICENSE
+- README.md
+- VERSION_NAME
 - REVISION
+- MIT-LICENSE
 - VERSION
-- VERSION_NAME
-- README.md
 - CONTRIBUTING
+has_rdoc: false
 homepage: http://sass-lang.com/
 licenses: []
 
@@ -346,27 +348,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sass
-rubygems_version: 1.8.15
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
 test_files: 
-- test/sass/plugin_test.rb
+- test/sass/engine_test.rb
+- test/sass/functions_test.rb
+- test/sass/extend_test.rb
+- test/sass/logger_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/conversion_test.rb
+- test/sass/script_test.rb
 - test/sass/util/subset_map_test.rb
 - test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/script_conversion_test.rb
-- test/sass/logger_test.rb
-- test/sass/functions_test.rb
-- test/sass/util_test.rb
-- test/sass/less_conversion_test.rb
+- test/sass/callbacks_test.rb
+- test/sass/importer_test.rb
 - test/sass/scss/css_test.rb
-- test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
-- test/sass/script_test.rb
-- test/sass/importer_test.rb
+- test/sass/scss/rx_test.rb
+- test/sass/util_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/less_conversion_test.rb
 - test/sass/cache_test.rb
-- test/sass/conversion_test.rb
-- test/sass/extend_test.rb
-- test/sass/engine_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/callbacks_test.rb
+- test/sass/plugin_test.rb