Merge pull request #1436 from sass/merge-master

Merge origin/master into feature.use

Author: nex3

lib/sass_spec/cli.rb

@@ -48,18 +48,21 @@ def self.parse
 
       opts.on("-c", "--command COMMAND", "Sets a specific binary to run") do |v|
         options[:engine_adapter] = ExecutableEngineAdapter.new(v)
+        options[:engine_adapter].args = options[:cmd_args]
       end
 
       opts.on("--dart PATH", "Run Dart Sass, whose repo should be at the given path.") do |path|
         options[:engine_adapter] = DartEngineAdapter.new(path)
-        options[:engine_adapter].args = options[:dart_args]
+        options[:engine_adapter].args = options[:cmd_args]
       end
 
-      opts.on("--dart-args ARGS", "Pass ARGS to Dart Sass.") do |args|
+      opts.on("--cmd-args ARGS", "Pass ARGS to command or Dart Sass.") do |args|
         if (adapter = options[:engine_adapter]) && adapter.is_a?(DartEngineAdapter)
           adapter.args = args
+        elsif (adapter = options[:engine_adapter]) && adapter.is_a?(ExecutableEngineAdapter)
+          adapter.args = args
         else
-          options[:dart_args] = args
+          options[:cmd_args] = args
         end
       end
 

lib/sass_spec/directory.rb

@@ -164,24 +164,14 @@ def delete_dir!
   def with_real_files
     return yield unless @archive
 
-    files = @archive.entries.select {|entry| entry.is_a?(HRX::File)}
-
-    # If any files in this directory contain "../"s that reach out of this
-    # directory, materialize the appropriate level of parent directory instead.
-    if parent.hrx? &&
-       files.any? do |file|
-         levels_up = file.content.
-            scan(%r{(?:\.\./)+}).
-            map {|s| s.count("/")}.
-            max
-         (levels_up || 0) > file.path.count("/")
-       end
+    files = @archive.entries.select {|entry| entry.is_a?(HRX::File)}.to_a
+    if parent.hrx? && files.any? {|file| _reaches_out?(file)}
       return parent.with_real_files {yield}
     end
 
     outermost_new_dir = SassSpec::Util.each_directory(@path).find {|dir| !Dir.exist?(dir)}
 
-    @archive.entries.select {|entry| entry.is_a?(HRX::File)}.each do |file|
+    files.each do |file|
       path = File.join(@path, file.path)
       FileUtils.mkdir_p(File.dirname(path))
       File.write(path, file.content)
@@ -210,6 +200,13 @@ def to_s
 
   private
 
+  # Returns whether `file` contains enough `../` references to reach outside
+  # this directory.
+  def _reaches_out?(file)
+    depth = file.path.count("/")
+    file.content.scan(%r{(?:\.\./)+}).any? {|match| match.count("/") > depth}
+  end
+
   # Writes `@parent_archive` to disk.
   def _write!
     @parent_archive.write!(@parent_archive_path)

lib/sass_spec/engine_adapter.rb

@@ -22,6 +22,7 @@ def not_implemented
 
 class ExecutableEngineAdapter < EngineAdapter
   include CaptureWithTimeout
+  attr_accessor :args
 
   def initialize(command, description = nil)
     @command = command
@@ -42,7 +43,8 @@ def compile(sass_filename, precision)
     command = File.absolute_path(@command)
     dirname, basename = File.split(sass_filename)
     result = capture3_with_timeout(
-      command, "--precision", precision.to_s, "-t", "expanded", basename,
+      command, "--precision", precision.to_s, "-t", "expanded",
+      "-I", File.absolute_path("spec"), *@args&.split(/\s+/), basename,
       binmode: true, timeout: @timeout, chdir: dirname)
 
     if result[:timeout]
@@ -107,7 +109,8 @@ def describe
   def compile(sass_filename, precision)
     dirname, basename = File.split(sass_filename)
     @stdin.puts "!cd #{File.absolute_path(dirname)}"
-    @stdin.puts "--no-color --no-unicode #{@args} #{basename}"
+    @stdin.puts("--no-color --no-unicode -I #{File.absolute_path("spec")} " +
+                "#{@args} #{basename}")
     [next_chunk(@stdout), next_chunk(@stderr), next_chunk(@stdout).to_i]
   end
 

lib/sass_spec/test_case_metadata.rb

@@ -12,20 +12,21 @@ def self.merge_options(existing_opts, new_opts)
       existing_opts = existing_opts.dup
 
       new_opts.each do |key, value|
-        if key =~ /add_(.*)/
-          key = $1.to_sym
-          existing_opts[key] ||= []
-          value.each do |v|
-            existing_opts[key] << v
-          end
-          existing_opts[key].uniq!
-        elsif key =~ /remove_(.*)/
-          key = $1.to_sym
-          existing_opts[key] ||= []
-          value.each do |v|
-            existing_opts[key].delete(v)
-          end
-          existing_opts.delete(key) if existing_opts[key].empty?
+        if added_key = key[/^add_(.*)/, 1]
+          added_key = added_key.to_sym
+          (existing_opts[added_key] ||= [])
+            .concat(value)
+            .uniq!
+        elsif removed_key = key[/^remove_((?:warning_)?todo)/, 1]
+          removed_key = removed_key.to_sym
+          (existing_opts[removed_key] ||= [])
+            .delete_if {|name| value.include?(_normalize_todo(name))}
+          existing_opts.delete(removed_key) if existing_opts[removed_key].empty?
+        elsif removed_key = key[/^remove_(.*)/, 1]
+          removed_key = removed_key.to_sym
+          (existing_opts[removed_key] ||= [])
+            .delete_if {|name| value.include?(name)}
+          existing_opts.delete(removed_key) if existing_opts[removed_key].empty?
         elsif value.nil?
           existing_opts.delete(key)
         else
@@ -84,11 +85,17 @@ def _resolve_options(dir)
     def _normalize_todos(options, field)
       if options.include?(field)
         options[field] = options[field]
-          .map {|name| name =~ %r{^sass/(.*)#} ? $1 : name}
+          .map {|name| self.class._normalize_todo(name)}
           .to_set
       end
     end
 
+    # Normalize a single TODO value to convert a GitHub issue reference to an
+    # implementation name.
+    def self._normalize_todo(value)
+      value =~ %r{^sass/(.*)#} ? $1 : value
+    end
+
     def todo?(impl)
       @options[:todo] && @options[:todo].include?(impl)
     end