Merge branch 'master' into no-language

Conflicts:
	lib/linguist/heuristics.rb

test/test_heuristics.rb

@@ -126,6 +126,13 @@ class TestHeuristcs < Test::Unit::TestCase
     })
   end
 
+  def test_bb_by_heuristics
+    assert_heuristics({
+      "BitBake" => all_fixtures("BitBake"),
+      "BlitzBasic" => all_fixtures("BlitzBasic")
+    })
+  end
+
   def assert_heuristics(hash)
     candidates = hash.keys.map { |l| Language[l] }
 

test/test_language.rb

@@ -375,4 +375,13 @@ class TestLanguage < Test::Unit::TestCase
     message << missing.map { |language| sprintf("%-#{width}s %s", language.name, language.ace_mode) }.sort.join("\n")
     assert missing.empty?, message
   end
+
+  def test_all_popular_languages_exist
+    popular = YAML.load(File.read(File.expand_path("../../lib/linguist/popular.yml", __FILE__)))
+
+    missing = popular - Language.all.map(&:name)
+    message = "The following languages are listed in lib/linguist/popular.yml but not in lib/linguist/languages.yml.\n"
+    message << missing.sort.join("\n")
+    assert missing.empty?, message
+  end
 end

test/test_shebang.rb

@@ -17,6 +17,8 @@ class TestShebang < Test::Unit::TestCase
     assert_interpreter nil, " #!/usr/sbin/ruby"
     assert_interpreter nil, "\n#!/usr/sbin/ruby"
     assert_interpreter nil, "#!"
+    assert_interpreter nil, "#! "
+    assert_interpreter nil, "#!/usr/bin/env"
 
     assert_interpreter "ruby", "#!/usr/sbin/ruby\n# bar"
     assert_interpreter "ruby", "#!/usr/bin/ruby\n# foo"
@@ -34,6 +36,8 @@ class TestShebang < Test::Unit::TestCase
     assert_interpreter "python3", "#!/usr/bin/python3\n\n\n\n"
     assert_interpreter "sbcl", "#!/usr/bin/sbcl --script\n\n"
     assert_interpreter "perl", "#! perl"
+
+    assert_interpreter "ruby", "#!/bin/sh\n\n\nexec ruby $0 $@"
   end
 
 end