From 04a2845e91e407f2846269aba19d40cf41fe1574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Thu, 6 Dec 2012 23:19:02 +0100 Subject: [PATCH] add ApacheConf language Recognizes httpd/apache2.conf and .htaccess files --- lib/linguist/languages.yml | 10 ++++++++++ test/test_language.rb | 3 +++ 2 files changed, 13 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 13e37fcf..c639d4dc 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -63,6 +63,16 @@ Ada: - .adb - .ads +ApacheConf: + type: markup + aliases: + - apache + primary_extension: .conf + filenames: + - .htaccess + - httpd.conf + - apache2.conf + Apex: type: programming lexer: Text only diff --git a/test/test_language.rb b/test/test_language.rb index 8ed8261b..14b39f7e 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -61,6 +61,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal Language['ASP'], Language.find_by_alias('aspx') assert_equal Language['ASP'], Language.find_by_alias('aspx-vb') assert_equal Language['ActionScript'], Language.find_by_alias('as3') + assert_equal Language['ApacheConf'], Language.find_by_alias('apache') assert_equal Language['Assembly'], Language.find_by_alias('nasm') assert_equal Language['Batchfile'], Language.find_by_alias('bat') assert_equal Language['C#'], Language.find_by_alias('c#') @@ -230,6 +231,8 @@ class TestLanguage < Test::Unit::TestCase assert_equal [Language['Ruby']], Language.find_by_filename('foo/bar.rb') assert_equal [Language['Ruby']], Language.find_by_filename('Rakefile') assert_equal [Language['Ruby']], Language.find_by_filename('PKGBUILD.rb') + assert_equal Language['ApacheConf'], Language.find_by_filename('httpd.conf').first + assert_equal [Language['ApacheConf']], Language.find_by_filename('.htaccess') assert_equal ['C', 'C++', 'Objective-C'], Language.find_by_filename('foo.h').map(&:name).sort assert_equal [], Language.find_by_filename('rb') assert_equal [], Language.find_by_filename('.rb')