sass 3.2.0.alpha.64 → 3.2.0.alpha.70

data/test/sass/plugin_test.rb

@@ -110,6 +110,30 @@ CSS
     File.delete(tempfile_loc('bork1'))
   end
 
+  def test_single_level_import_loop
+    File.delete(tempfile_loc('single_import_loop'))
+    check_for_updates!
+    File.open(tempfile_loc('single_import_loop')) do |file|
+      assert_equal(<<CSS.strip, file.read.split("\n")[0...2].join("\n"))
+/*
+Sass::SyntaxError: An @import loop has been found: #{template_loc('single_import_loop')} imports itself
+CSS
+    end
+  end
+
+  def test_double_level_import_loop
+    File.delete(tempfile_loc('double_import_loop1'))
+    check_for_updates!
+    File.open(tempfile_loc('double_import_loop1')) do |file|
+      assert_equal(<<CSS.strip, file.read.split("\n")[0...4].join("\n"))
+/*
+Sass::SyntaxError: An @import loop has been found:
+    #{template_loc('double_import_loop1')} imports #{template_loc('_double_import_loop2')}
+    #{template_loc('_double_import_loop2')} imports #{template_loc('double_import_loop1')}
+CSS
+    end
+  end
+
   def test_nonfull_exception_handling
     old_full_exception = Sass::Plugin.options[:full_exception]
     Sass::Plugin.options[:full_exception] = false

data/test/sass/templates/_double_import_loop2.sass

@@ -0,0 +1 @@
+@import "double_import_loop1"

data/test/sass/templates/double_import_loop1.sass

@@ -0,0 +1 @@
+@import "double_import_loop2"

data/test/sass/templates/single_import_loop.sass

@@ -0,0 +1 @@
+@import "single_import_loop"

data/vendor/fssm/ext/rakefile.rb

@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
+
+require 'rubygems/dependency_installer'
+require 'fssm'
+
+# semi-elegant solution or hack? *shrug*
+task :default do
+  name, version = FSSM::Support.optimal_backend_dependency
+  if name and version
+    installer = Gem::DependencyInstaller.new({:domain => :both, :env_shebang => true})
+    installer.install name, version
+  end
+end

data/vendor/fssm/fssm.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables       = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths     = ["lib"]
+  
+#  s.extensions        = 'ext/rakefile.rb'
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec", ">= 2.4.0"
 end

data/vendor/fssm/lib/fssm.rb

@@ -1,12 +1,62 @@
-dir = File.dirname(__FILE__)
+dir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 
-#noinspection ALL
-module FSSM
-  FileNotFoundError = Class.new(StandardError)
-  FileNotRealError  = Class.new(StandardError)
-  CallbackError     = Class.new(StandardError)
+require 'thread'
 
+module FSSM
+  
+  FSSMError         = Class.new(StandardError)
+  FileNotFoundError = Class.new(FSSMError)
+  FileNotRealError  = Class.new(FSSMError)
+  CallbackError     = Class.new(FSSMError)
+  
+  autoload :VERSION,        'fssm/version'
+  autoload :Pathname,       'fssm/pathname'
+  autoload :Support,        'fssm/support'
+  autoload :Tree,           'fssm/tree'
+  autoload :Path,           'fssm/path'
+  autoload :Monitor,        'fssm/monitor'
+  
+  module State
+    autoload :Directory,    'fssm/state/directory'
+    autoload :File,         'fssm/state/file'
+  end
+  
+  module Backends
+    autoload :Polling,      'fssm/backends/polling'
+    autoload :FSEvents,     'fssm/backends/fsevents'
+    autoload :RBFSEvent,    'fssm/backends/rbfsevent'
+    autoload :Inotify,      'fssm/backends/inotify'
+    
+    class << self
+      def set_backend(const_symbol=nil, value=nil)
+        const_symbol ||= :Default
+        value ||= ::FSSM::Support.backend
+        
+        if (value.is_a?(Symbol) || value.is_a?(String))
+          unless const_defined?(value)
+            raise NameError,
+              "uninitialized constant FSSM::Backends::#{value}"
+          end
+          value = const_get(value)
+        end
+        
+        unless value.is_a?(Class)
+          raise ArgumentError,
+            "value must be a class or the symbol of an existing backend"
+        end
+        
+        remove_const(const_symbol) if const_defined?(const_symbol)
+        const_set(const_symbol, value)
+      end
+      
+      def const_missing(symbol)
+        symbol == :Default ? set_backend(symbol, FSSM::Support.backend) : super
+      end
+      
+    end
+  end
+ 
   class << self
     def dbg(msg=nil)
       STDERR.puts("FSSM -> #{msg}")
@@ -20,18 +70,5 @@ module FSSM
       monitor.run
     end
   end
+  
 end
-
-require 'thread'
-
-require 'fssm/version'
-require 'fssm/pathname'
-require 'fssm/support'
-require 'fssm/tree'
-require 'fssm/path'
-require 'fssm/state/directory'
-require 'fssm/state/file'
-require 'fssm/monitor'
-
-require "fssm/backends/#{FSSM::Support.backend.downcase}"
-FSSM::Backends::Default = FSSM::Backends.const_get(FSSM::Support.backend)

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

@@ -3,29 +3,24 @@ require 'rbconfig'
 module FSSM::Support
   class << self
     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}")
+      case
+        when mac? && !lion? && !jruby? && carbon_core?
+          'FSEvents'
+        when mac? && rb_fsevent?
+          'RBFSEvent'
+        when linux? && rb_inotify?
+          'Inotify'
+        else
+          'Polling'
+      end
+    end
+    
+    def optimal_backend_dependency
+      return case
+        when mac?     then  ['rb-fsevent', '>= 0.4.3.1']
+        when linux?   then  ['rb-inotify', '>= 0.8.8']
+        else                [nil, nil]
       end
-
-      choice
     end
 
     def backend
@@ -37,15 +32,15 @@ module FSSM::Support
     end
 
     def mac?
-      Config::CONFIG['target_os'] =~ /darwin/i
+      RbConfig::CONFIG['target_os'] =~ /darwin/i
     end
 
     def lion?
-      Config::CONFIG['target_os'] =~ /darwin11/i
+      RbConfig::CONFIG['target_os'] =~ /darwin11/i
     end
 
     def linux?
-      Config::CONFIG['target_os'] =~ /linux/i
+      RbConfig::CONFIG['target_os'] =~ /linux/i
     end
 
     def carbon_core?

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

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592303005
+  hash: 592302993
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 64
-  version: 3.2.0.alpha.64
+  - 70
+  version: 3.2.0.alpha.70
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-05 00:00:00 -05:00
+date: 2012-02-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,7 +86,7 @@ files:
 - lib/sass/logger.rb
 - lib/sass/logger/base.rb
 - lib/sass/logger/log_level.rb
-- lib/sass/util.rb
+- lib/sass/repl.rb
 - lib/sass/plugin.rb
 - lib/sass/plugin/compiler.rb
 - lib/sass/plugin/configuration.rb
@@ -96,7 +96,7 @@ files:
 - lib/sass/plugin/rails.rb
 - lib/sass/plugin/staleness_checker.rb
 - lib/sass/railtie.rb
-- lib/sass/repl.rb
+- lib/sass/media.rb
 - lib/sass/root.rb
 - lib/sass/script.rb
 - lib/sass/script/bool.rb
@@ -151,7 +151,6 @@ files:
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/rule_node.rb
 - lib/sass/tree/content_node.rb
-- lib/sass/tree/trace_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
@@ -163,7 +162,8 @@ files:
 - lib/sass/tree/visitors/to_css.rb
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
-- lib/sass/media.rb
+- lib/sass/tree/trace_node.rb
+- lib/sass/util.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/subset_map.rb
 - lib/sass/version.rb
@@ -172,6 +172,7 @@ files:
 - vendor/fssm/README.markdown
 - vendor/fssm/Rakefile
 - vendor/fssm/example.rb
+- vendor/fssm/ext/rakefile.rb
 - vendor/fssm/fssm.gemspec
 - vendor/fssm/lib/fssm.rb
 - vendor/fssm/lib/fssm/backends/fsevents.rb
@@ -306,6 +307,9 @@ files:
 - test/sass/templates/units.sass
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
+- test/sass/templates/_double_import_loop2.sass
+- test/sass/templates/double_import_loop1.sass
+- test/sass/templates/single_import_loop.sass
 - test/sass/test_helper.rb
 - test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/util/subset_map_test.rb