Skip .gitignore if it's a directory.

fhwang · fhwang · commit c22c123df0d6 · 2015-09-29T09:05:56.000-04:00
IncludePathsBuilder was erroring on repos where .gitignore was a
directory (most likely due to developer error). Now it just skips
.gitignore instead.
diff --git a/lib/cc/analyzer/include_paths_builder.rb b/lib/cc/analyzer/include_paths_builder.rb
@@ -46,7 +46,7 @@ def filter_by_cc_includes
 
       def ignored_files
         Tempfile.open(".cc_gitignore") do |tmp|
-          tmp.write(File.read(".gitignore")) if File.exist?(".gitignore")
+          tmp.write(File.read(".gitignore")) if File.file?(".gitignore")
           tmp << @cc_exclude_paths.join("\n")
           tmp.close
           tracked_and_ignored = `git ls-files -zi -X #{tmp.path}`.split("\0")
diff --git a/spec/cc/analyzer/include_paths_builder_spec.rb b/spec/cc/analyzer/include_paths_builder_spec.rb
@@ -243,5 +243,15 @@ module CC::Analyzer
         result.include?("untrackable.rb").must_equal(false)
       end
     end
+
+    describe "when .gitignore is a directory" do
+      before do
+        FileUtils.mkdir(".gitignore")
+      end
+
+      it "skips it entirely" do
+        result.include?("./").must_equal(true)
+      end
+    end
   end
 end
