Merge pull request #1732 from github/filename-matches-multiple-langages

Require samples if filename matches multiple languages

test/test_language.rb

@@ -349,12 +349,6 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal '.coffee', Language['CoffeeScript'].primary_extension
     assert_equal '.t', Language['Turing'].primary_extension
     assert_equal '.ts', Language['TypeScript'].primary_extension
-
-    # This is a nasty requirement, but there's some code in GitHub that
-    # expects this. Really want to drop this.
-    Language.all.each do |language|
-      assert language.primary_extension, "#{language} has no primary extension"
-    end
   end
 
   def test_eql

test/test_pedantic.rb

@@ -1,57 +1,30 @@
 require 'test/unit'
+require 'yaml'
 
 class TestPedantic < Test::Unit::TestCase
-  Lib = File.expand_path("../../lib/linguist", __FILE__)
-
-  def file(name)
-    File.read(File.join(Lib, name))
-  end
+  filename = File.expand_path("../../lib/linguist/languages.yml", __FILE__)
+  LANGUAGES = YAML.load(File.read(filename))
 
   def test_language_names_are_sorted
-    languages = []
-    file("languages.yml").lines.each do |line|
-      if line =~ /^(\w+):$/
-        languages << $1
-      end
-    end
-    assert_sorted languages
+    assert_sorted LANGUAGES.keys
   end
 
   def test_extensions_are_sorted
-    extensions = nil
-    file("languages.yml").lines.each do |line|
-      if line =~ /^  extensions:$/
-        extensions = []
-      elsif extensions && line =~ /^  - \.([\w\-\.]+)( *#.*)?$/
-        extensions << $1
-      else
-        assert_sorted extensions[1..-1] if extensions
-        extensions = nil
-      end
+    LANGUAGES.each do |name, language|
+      extensions = language['extensions']
+      assert_sorted extensions[1..-1] if extensions && extensions.size > 1
     end
   end
 
   def test_filenames_are_sorted
-    filenames = nil
-    file("languages.yml").lines.each do |line|
-      if line =~ /^  filenames:$/
-        filenames = []
-      elsif filenames && line =~ /^  - \.(\w+)$/
-        filenames << $1
-      else
-        assert_sorted filenames if filenames
-        filenames = nil
-      end
+    LANGUAGES.each do |name, language|
+      assert_sorted language['filenames'] if language['filenames']
     end
   end
 
   def assert_sorted(list)
-    previous = nil
-    list.each do |item|
-      if previous && previous > item
-        flunk "#{previous} should come after #{item}"
-      end
-      previous = item
+    list.each_cons(2) do |previous, item|
+      flunk "#{previous} should come after #{item}" if previous > item
     end
   end
 end

test/test_samples.rb

@@ -55,20 +55,28 @@ class TestSamples < Test::Unit::TestCase
   end
 
   # If a language extension isn't globally unique then make sure there are samples
-  def test_presence
-    Linguist::Language.all.each do |language|
-      language.all_extensions.each do |extension|
-        language_matches = Language.find_by_filename("foo#{extension}")
+  Linguist::Language.all.each do |language|
+    define_method "test_#{language.name}_has_samples" do
+      language.extensions.each do |extension|
+        language_matches = Language.find_by_extension(extension)
 
-        # If there is more than one language match for a given extension
-        # then check that there are examples for that language with the extension
+        # Check for samples if more than one language matches the given extension.
         if language_matches.length > 1
-          language_matches.each do |language|
-            assert File.directory?("samples/#{language.name}"), "#{language.name} is missing a samples directory"
-            assert Dir.glob("samples/#{language.name}/*#{extension}").any?, "#{language.name} is missing samples for extension #{extension}"
+          language_matches.each do |match|
+            samples = "samples/#{match.name}/*#{extension}"
+            assert Dir.glob(samples).any?, "Missing samples in #{samples.inspect}. See https://github.com/github/linguist/blob/master/CONTRIBUTING.md"
           end
         end
       end
+
+      language.filenames.each do |filename|
+        # Check for samples if more than one language matches the given filename
+        if Language.find_by_filename(filename).size > 1
+          sample = "samples/#{language.name}/filenames/#{filename}"
+          assert File.exists?(sample),
+            "Missing sample in #{sample.inspect}. See https://github.com/github/linguist/blob/master/CONTRIBUTING.md"
+        end
+      end
     end
   end
 end