sass 3.3.0 → 3.3.1

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

@@ -24,7 +24,7 @@ def changes(root_path, options = {})
   paths = options.delete(:paths) || [root_path]
   options[:recursive] = true if options[:recursive].nil?
 
-  changes = @record.fetch_changes(paths, {:relative_paths => true}.merge(options))
+  changes = @record.fetch_changes(paths, { :relative_paths => true }.merge(options))
 
   [changes[:modified], changes[:added], changes[:removed]]
 end
@@ -32,14 +32,15 @@ end
 # Generates a small time difference before performing a time sensitive
 # task (like comparing mtimes of files).
 #
-# @note Modification time for files only includes the milliseconds on Linux with MRI > 1.9.2,
+# @note Modification time for files only includes the milliseconds on Linux with MRI > 1.9.2
+#   and platform that support it (OS X 10.8 not included),
 #   that's why we generate a difference that's greater than 1 second.
 #
 def small_time_difference
   t = Time.now
   diff = t.to_f - t.to_i
 
-  sleep( 1.5 - (diff < 0.5 ? diff : 0.4) )
+  sleep(1.05 - diff)
 end
 
 # Ensures that the test runs at almost the same second at which
@@ -49,7 +50,8 @@ 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)
+  # We are not at the end of a second
+  if diff >= (1 - Listen::Adapter::DEFAULT_LATENCY)
+    sleep(1.05 - diff)
   end
 end

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

@@ -9,14 +9,37 @@ shared_examples_for 'a listener to changes on a file-system' do
       subject.start
     end
 
-    context 'with the blocking param set to false' do
-      it 'passes the blocking param to the adapter' do
-        adapter.should_receive(:start).with(false)
+    context 'with the blocking deprecated param set to true' do
+      it 'displays a deprecation notice' do
+        Kernel.should_receive(:warn).with(/#{Listen::Listener::BLOCKING_PARAMETER_DEPRECATION_MESSAGE}/)
+        subject.start(true)
+      end
+    end
+
+    context 'with the blocking deprecated param set to false' do
+      it 'displays a deprecation notice' do
+        Kernel.should_receive(:warn).with(/#{Listen::Listener::BLOCKING_PARAMETER_DEPRECATION_MESSAGE}/)
         subject.start(false)
       end
     end
   end
 
+  describe '#start!' do
+    before do
+      subject.stub(:initialize_adapter) { adapter }
+    end
+
+    it 'starts the adapter' do
+      adapter.should_receive(:start!)
+      subject.start!
+    end
+
+    it 'passes the blocking param to the adapter' do
+      adapter.should_receive(:start!)
+      subject.start!
+    end
+  end
+
   context 'with a started listener' do
     before do
       subject.start
@@ -31,7 +54,7 @@ shared_examples_for 'a listener to changes on a file-system' do
 
     describe '#pause' do
       it 'sets adapter.paused to true' do
-        adapter.should_receive(:paused=).with(true)
+        adapter.should_receive(:pause)
         subject.pause
       end
 
@@ -42,7 +65,7 @@ shared_examples_for 'a listener to changes on a file-system' do
 
     describe '#unpause' do
       it 'sets adapter.paused to false' do
-        adapter.should_receive(:paused=).with(false)
+        adapter.should_receive(:unpause)
         subject.unpause
       end
 
@@ -58,12 +81,12 @@ shared_examples_for 'a listener to changes on a file-system' do
       end
 
       it 'returns true when adapter is paused' do
-        adapter.should_receive(:paused) { true }
+        adapter.should_receive(:paused?) { true }
         subject.should be_paused
       end
 
       it 'returns false when adapter is not paused' do
-        adapter.should_receive(:paused) { false }
+        adapter.should_receive(:paused?) { false }
         subject.should_not be_paused
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,22 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -64,8 +50,7 @@ executables:
 - sass
 - sass-convert
 - scss
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - rails/init.rb
@@ -200,8 +185,6 @@ files:
 - vendor/listen/lib/listen/turnstile.rb
 - vendor/listen/lib/listen/directory_record.rb
 - vendor/listen/lib/listen/version.rb
-- vendor/listen/lib/listen/dependency_manager.rb
-- vendor/listen/lib/listen/multi_listener.rb
 - vendor/listen/lib/listen/listener.rb
 - vendor/listen/lib/listen/adapters/polling.rb
 - vendor/listen/lib/listen/adapters/darwin.rb
@@ -215,7 +198,6 @@ files:
 - vendor/listen/LICENSE
 - vendor/listen/listen.gemspec
 - vendor/listen/Vagrantfile
-- vendor/listen/spec/listen/dependency_manager_spec.rb
 - vendor/listen/spec/listen/directory_record_spec.rb
 - vendor/listen/spec/listen/adapters/linux_spec.rb
 - vendor/listen/spec/listen/adapters/darwin_spec.rb
@@ -225,7 +207,6 @@ files:
 - vendor/listen/spec/listen/turnstile_spec.rb
 - vendor/listen/spec/listen/adapter_spec.rb
 - vendor/listen/spec/listen/listener_spec.rb
-- vendor/listen/spec/listen/multi_listener_spec.rb
 - vendor/listen/spec/listen_spec.rb
 - vendor/listen/spec/spec_helper.rb
 - vendor/listen/spec/support/directory_record_helper.rb
@@ -369,7 +350,6 @@ files:
 - MIT-LICENSE
 - VERSION
 - CONTRIBUTING
-- ext/mkrf_conf.rb
 homepage: http://sass-lang.com/
 licenses:
 - MIT

data/ext/mkrf_conf.rb

@@ -1,27 +0,0 @@
-require 'rubygems'
-require 'rubygems/command.rb'
-require 'rubygems/dependency_installer.rb'
-
-require '../lib/sass'
-
-# This script installs the correct version of listen. Listen versions
-# beyond 1.1 don't support Ruby 1.8, any RubyGems isn't clever enough
-# to install the most recent version that works, so we have to do it
-# manually.
-
-puts "Ensuring you have the right version of listen installed."
-
-Gem::Command.build_args = ARGV
-inst = Gem::DependencyInstaller.new
-if Sass::Util.version_geq(RUBY_VERSION, "1.9.3")
-  puts "Installing listen >= 1.1.0, < 3.0.0"
-  inst.install "listen", Gem::Requirement.new(">= 1.1.0", "< 3.0.0")
-else
-  puts "Installing listen ~> 1.1.0"
-  inst.install "listen", "~> 1.1.0"
-end
-
-# Create a dummy rakefile to indicate success.
-f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")
-f.write("task :default\n")
-f.close

data/vendor/listen/lib/listen/dependency_manager.rb

@@ -1,126 +0,0 @@
-require 'set'
-
-module Listen
-
-  # The dependency-manager offers a simple DSL which allows
-  # classes to declare their gem dependencies and load them when
-  # needed.
-  # It raises a user-friendly exception when the dependencies
-  # can't be loaded which has the install command in the message.
-  #
-  module DependencyManager
-
-    GEM_LOAD_MESSAGE = <<-EOS.gsub(/^ {6}/, '')
-      Missing dependency '%s' (version '%s')!
-    EOS
-
-    GEM_INSTALL_COMMAND = <<-EOS.gsub(/^ {6}/, '')
-      Please run the following to satisfy the dependency:
-        gem install --version '%s' %s
-    EOS
-
-    BUNDLER_DECLARE_GEM = <<-EOS.gsub(/^ {6}/, '')
-      Please add the following to your Gemfile to satisfy the dependency:
-        gem '%s', '%s'
-    EOS
-
-    Dependency = Struct.new(:name, :version)
-
-    # The error raised when a dependency can't be loaded.
-    class Error < StandardError; end
-
-    # A list of all loaded dependencies in the dependency manager.
-    @_loaded_dependencies = Set.new
-
-    # class methods
-    class << self
-
-      # Initializes the extended class.
-      #
-      # @param [Class] the class for which some dependencies must be managed
-      #
-      def extended(base)
-        base.class_eval do
-          @_dependencies = Set.new
-        end
-      end
-
-      # Adds a loaded dependency to a list so that it doesn't have
-      # to be loaded again by another classes.
-      #
-      # @param [Dependency] dependency
-      #
-      def add_loaded(dependency)
-        @_loaded_dependencies << dependency
-      end
-
-      # Returns whether the dependency is alread loaded or not.
-      #
-      # @param [Dependency] dependency
-      # @return [Boolean]
-      #
-      def already_loaded?(dependency)
-        @_loaded_dependencies.include?(dependency)
-      end
-
-      # Clears the list of loaded dependencies.
-      #
-      def clear_loaded
-        @_loaded_dependencies.clear
-      end
-    end
-
-    # Registers a new dependency.
-    #
-    # @param [String] name the name of the gem
-    # @param [String] version the version of the gem
-    #
-    def dependency(name, version)
-      @_dependencies << Dependency.new(name, version)
-    end
-
-    # Loads the registered dependencies.
-    #
-    # @raise DependencyManager::Error if the dependency can't be loaded.
-    #
-    def load_depenencies
-      @_dependencies.each do |dependency|
-        begin
-          next if DependencyManager.already_loaded?(dependency)
-          gem(dependency.name, dependency.version)
-          require(dependency.name)
-          DependencyManager.add_loaded(dependency)
-          @_dependencies.delete(dependency)
-        rescue Gem::LoadError
-          args = [dependency.name, dependency.version]
-          command = if running_under_bundler?
-            BUNDLER_DECLARE_GEM % args
-          else
-            GEM_INSTALL_COMMAND % args.reverse
-          end
-          message = GEM_LOAD_MESSAGE % args
-
-          raise Error.new(message + command)
-        end
-      end
-    end
-
-    # Returns whether all the dependencies has been loaded or not.
-    #
-    # @return [Boolean]
-    #
-    def dependencies_loaded?
-      @_dependencies.empty?
-    end
-
-    private
-
-    # Returns whether we are running under bundler or not
-    #
-    # @return [Boolean]
-    #
-    def running_under_bundler?
-      !!(File.exists?('Gemfile') && ENV['BUNDLE_GEMFILE'])
-    end
-  end
-end

data/vendor/listen/lib/listen/multi_listener.rb

@@ -1,143 +0,0 @@
-module Listen
-  class MultiListener < Listener
-    attr_reader :directories, :directories_records, :adapter
-
-    # Initializes the multiple directories listener.
-    #
-    # @param [String] directories the directories to listen to
-    # @param [Hash] options the listen options
-    # @option options [Regexp] ignore a pattern for ignoring paths
-    # @option options [Regexp] filter a pattern for filtering paths
-    # @option options [Float] latency the delay between checking for changes in seconds
-    # @option options [Boolean] force_polling whether to force the polling adapter or not
-    # @option options [String, Boolean] polling_fallback_message to change polling fallback message or remove it
-    #
-    # @yield [modified, added, removed] the changed files
-    # @yieldparam [Array<String>] modified the list of modified files
-    # @yieldparam [Array<String>] added the list of added files
-    # @yieldparam [Array<String>] removed the list of removed files
-    #
-    def initialize(*args, &block)
-      options     = args.last.is_a?(Hash) ? args.pop : {}
-      directories = args
-
-      @block               = block
-      @directories         = directories.map  { |d| Pathname.new(d).realpath.to_s }
-      @directories_records = @directories.map { |d| DirectoryRecord.new(d) }
-
-      ignore(*options.delete(:ignore)) if options[:ignore]
-      filter(*options.delete(:filter)) if options[:filter]
-
-      @adapter_options = options
-    end
-
-    # Starts the listener by initializing the adapter and building
-    # the directory record concurrently, then it starts the adapter to watch
-    # for changes.
-    #
-    # @param [Boolean] blocking whether or not to block the current thread after starting
-    #
-    def start(blocking = true)
-      t = Thread.new { @directories_records.each { |r| r.build } }
-      @adapter = initialize_adapter
-      t.join
-      @adapter.start(blocking)
-    end
-
-    # Unpauses the listener.
-    #
-    # @return [Listen::Listener] the listener
-    #
-    def unpause
-      @directories_records.each { |r| r.build }
-      @adapter.paused = false
-      self
-    end
-
-    # Adds ignored paths to the listener.
-    #
-    # @param (see Listen::DirectoryRecord#ignore)
-    #
-    # @return [Listen::Listener] the listener
-    #
-    def ignore(*paths)
-      @directories_records.each { |r| r.ignore(*paths) }
-      self
-    end
-
-    # Replaces ignored paths in the listener.
-    #
-    # @param (see Listen::DirectoryRecord#ignore!)
-    #
-    # @return [Listen::Listener] the listener
-    #
-    def ignore!(*paths)
-      @directories_records.each { |r| r.ignore!(*paths) }
-      self
-    end
-
-    # Adds file filters to the listener.
-    #
-    # @param (see Listen::DirectoryRecord#filter)
-    #
-    # @return [Listen::Listener] the listener
-    #
-    def filter(*regexps)
-      @directories_records.each { |r| r.filter(*regexps) }
-      self
-    end
-
-    # Replaces file filters in the listener.
-    #
-    # @param (see Listen::DirectoryRecord#filter!)
-    #
-    # @return [Listen::Listener] the listener
-    #
-    def filter!(*regexps)
-      @directories_records.each { |r| r.filter!(*regexps) }
-      self
-    end
-
-    # Runs the callback passing it the changes if there are any.
-    #
-    # @param (see Listen::DirectoryRecord#fetch_changes)
-    #
-    def on_change(directories_to_search, options = {})
-      changes = fetch_records_changes(directories_to_search, options)
-      unless changes.values.all? { |paths| paths.empty? }
-        @block.call(changes[:modified],changes[:added],changes[:removed])
-      end
-    end
-
-    private
-
-    # Initializes an adapter passing it the callback and adapters' options.
-    #
-    def initialize_adapter
-      callback = lambda { |changed_dirs, options| self.on_change(changed_dirs, options) }
-      Adapter.select_and_initialize(@directories, @adapter_options, &callback)
-    end
-
-    # Returns the sum of all the changes to the directories records
-    #
-    # @param (see Listen::DirectoryRecord#fetch_changes)
-    #
-    # @return [Hash] the changes
-    #
-    def fetch_records_changes(directories_to_search, options)
-      @directories_records.inject({}) do |h, r|
-        # directory records skips paths outside their range, so passing the
-        # whole `directories` array is not a problem.
-        record_changes = r.fetch_changes(directories_to_search, options.merge(:relative_paths => DEFAULT_TO_RELATIVE_PATHS))
-
-        if h.empty?
-          h.merge!(record_changes)
-        else
-          h.each { |k, v| h[k] += record_changes[k] }
-        end
-
-        h
-      end
-    end
-  end
-end